Compare commits
No commits in common. "4038814d6ad88940e9ef47be3ff623d0a3cbc6ee" and "e73dbb45ed22e291535c259f1da124c6b0da7262" have entirely different histories.
4038814d6a
...
e73dbb45ed
5 changed files with 36 additions and 248 deletions
|
@ -1,8 +1,6 @@
|
||||||
package client
|
package client
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
|
@ -24,59 +22,3 @@ func (g *Client) GetStatus(statusID string) (model.Status, error) {
|
||||||
|
|
||||||
return status, nil
|
return status, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *Client) CreateStatus(
|
|
||||||
content,
|
|
||||||
contentType,
|
|
||||||
language,
|
|
||||||
spoilerText string,
|
|
||||||
boostable,
|
|
||||||
federated,
|
|
||||||
likeable,
|
|
||||||
replyable,
|
|
||||||
sensitive bool,
|
|
||||||
visibility model.StatusVisibility,
|
|
||||||
) (model.Status, error) {
|
|
||||||
form := struct {
|
|
||||||
ContentType string `json:"content_type"`
|
|
||||||
Language string `json:"language"`
|
|
||||||
SpoilerText string `json:"spoiler_text"`
|
|
||||||
Status string `json:"status"`
|
|
||||||
Boostable bool `json:"boostable"`
|
|
||||||
Federated bool `json:"federated"`
|
|
||||||
Likeable bool `json:"likeable"`
|
|
||||||
Replyable bool `json:"replyable"`
|
|
||||||
Sensitive bool `json:"sensitive"`
|
|
||||||
Visibility model.StatusVisibility `json:"visibility"`
|
|
||||||
}{
|
|
||||||
ContentType: contentType,
|
|
||||||
Language: language,
|
|
||||||
SpoilerText: spoilerText,
|
|
||||||
Status: content,
|
|
||||||
Boostable: boostable,
|
|
||||||
Federated: federated,
|
|
||||||
Likeable: likeable,
|
|
||||||
Sensitive: sensitive,
|
|
||||||
Replyable: replyable,
|
|
||||||
Visibility: visibility,
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := json.Marshal(form)
|
|
||||||
if err != nil {
|
|
||||||
return model.Status{}, fmt.Errorf("unable to create the JSON form; %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
requestBody := bytes.NewBuffer(data)
|
|
||||||
url := g.Authentication.Instance + "/api/v1/statuses"
|
|
||||||
|
|
||||||
var status model.Status
|
|
||||||
|
|
||||||
if err := g.sendRequest(http.MethodPost, url, requestBody, &status); err != nil {
|
|
||||||
return model.Status{}, fmt.Errorf(
|
|
||||||
"received an error after sending the request to create the status; %w",
|
|
||||||
err,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
return status, nil
|
|
||||||
}
|
|
||||||
|
|
|
@ -2,33 +2,24 @@ package executor
|
||||||
|
|
||||||
const (
|
const (
|
||||||
flagAccountName = "account-name"
|
flagAccountName = "account-name"
|
||||||
flagBoostable = "boostable"
|
|
||||||
flagBrowser = "browser"
|
flagBrowser = "browser"
|
||||||
flagContentType = "content-type"
|
|
||||||
flagContent = "content"
|
flagContent = "content"
|
||||||
flagFederated = "federated"
|
|
||||||
flagFrom = "from"
|
|
||||||
flagInstance = "instance"
|
flagInstance = "instance"
|
||||||
flagLanguage = "language"
|
|
||||||
flagLikeable = "likeable"
|
|
||||||
flagLimit = "limit"
|
flagLimit = "limit"
|
||||||
flagListID = "list-id"
|
flagListID = "list-id"
|
||||||
flagListTitle = "list-title"
|
flagListTitle = "list-title"
|
||||||
flagListRepliesPolicy = "list-replies-policy"
|
flagListRepliesPolicy = "list-replies-policy"
|
||||||
flagMyAccount = "my-account"
|
flagMyAccount = "my-account"
|
||||||
flagNotify = "notify"
|
flagNotify = "notify"
|
||||||
flagReplyable = "replyable"
|
flagFrom = "from"
|
||||||
flagSensitive = "sensitive"
|
flagType = "type"
|
||||||
flagSkipRelationship = "skip-relationship"
|
flagSkipRelationship = "skip-relationship"
|
||||||
flagShowPreferences = "show-preferences"
|
flagShowPreferences = "show-preferences"
|
||||||
flagShowReposts = "show-reposts"
|
flagShowReposts = "show-reposts"
|
||||||
flagSpoilerText = "spoiler-text"
|
|
||||||
flagStatusID = "status-id"
|
flagStatusID = "status-id"
|
||||||
flagTag = "tag"
|
flagTag = "tag"
|
||||||
flagTimelineCategory = "timeline-category"
|
flagTimelineCategory = "timeline-category"
|
||||||
flagTo = "to"
|
flagTo = "to"
|
||||||
flagType = "type"
|
|
||||||
flagVisibility = "visibility"
|
|
||||||
|
|
||||||
resourceAccount = "account"
|
resourceAccount = "account"
|
||||||
resourceBlocked = "blocked"
|
resourceBlocked = "blocked"
|
||||||
|
|
|
@ -12,19 +12,9 @@ type CreateExecutor struct {
|
||||||
*flag.FlagSet
|
*flag.FlagSet
|
||||||
|
|
||||||
topLevelFlags TopLevelFlags
|
topLevelFlags TopLevelFlags
|
||||||
boostable bool
|
|
||||||
federated bool
|
|
||||||
likeable bool
|
|
||||||
replyable bool
|
|
||||||
sensitive bool
|
|
||||||
content string
|
|
||||||
contentType string
|
|
||||||
language string
|
|
||||||
spoilerText string
|
|
||||||
resourceType string
|
resourceType string
|
||||||
listTitle string
|
listTitle string
|
||||||
listRepliesPolicy string
|
listRepliesPolicy string
|
||||||
visibility string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewCreateExecutor(tlf TopLevelFlags, name, summary string) *CreateExecutor {
|
func NewCreateExecutor(tlf TopLevelFlags, name, summary string) *CreateExecutor {
|
||||||
|
@ -34,16 +24,6 @@ func NewCreateExecutor(tlf TopLevelFlags, name, summary string) *CreateExecutor
|
||||||
topLevelFlags: tlf,
|
topLevelFlags: tlf,
|
||||||
}
|
}
|
||||||
|
|
||||||
createExe.BoolVar(&createExe.boostable, flagBoostable, true, "specify if the status can be reposted/boosted by others")
|
|
||||||
createExe.BoolVar(&createExe.federated, flagFederated, true, "specify if the status can be federated beyond the local timelines")
|
|
||||||
createExe.BoolVar(&createExe.likeable, flagLikeable, true, "specify if the status can be liked/favourited")
|
|
||||||
createExe.BoolVar(&createExe.replyable, flagReplyable, true, "specify if the status can be replied to")
|
|
||||||
createExe.BoolVar(&createExe.sensitive, flagSensitive, false, "specify if the status should be marked as sensitive")
|
|
||||||
createExe.StringVar(&createExe.content, flagContent, "", "the content of the status to create")
|
|
||||||
createExe.StringVar(&createExe.contentType, flagContentType, "text/plain", "the type that the contents should be parsed from (valid values are plain and markdown)")
|
|
||||||
createExe.StringVar(&createExe.language, flagLanguage, "", "the ISO 639 language code for this status")
|
|
||||||
createExe.StringVar(&createExe.spoilerText, flagSpoilerText, "", "the text to display as the status' warning or subject")
|
|
||||||
createExe.StringVar(&createExe.visibility, flagVisibility, "", "the visibility of the posted status")
|
|
||||||
createExe.StringVar(&createExe.resourceType, flagType, "", "specify the type of resource to create")
|
createExe.StringVar(&createExe.resourceType, flagType, "", "specify the type of resource to create")
|
||||||
createExe.StringVar(&createExe.listTitle, flagListTitle, "", "specify the title of the list")
|
createExe.StringVar(&createExe.listTitle, flagListTitle, "", "specify the title of the list")
|
||||||
createExe.StringVar(&createExe.listRepliesPolicy, flagListRepliesPolicy, "list", "specify the policy of the replies for this list (valid values are followed, list and none)")
|
createExe.StringVar(&createExe.listRepliesPolicy, flagListRepliesPolicy, "list", "specify the policy of the replies for this list (valid values are followed, list and none)")
|
||||||
|
@ -65,7 +45,6 @@ func (c *CreateExecutor) Execute() error {
|
||||||
|
|
||||||
funcMap := map[string]func(*client.Client) error{
|
funcMap := map[string]func(*client.Client) error{
|
||||||
resourceList: c.createList,
|
resourceList: c.createList,
|
||||||
resourceStatus: c.createStatus,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
doFunc, ok := funcMap[c.resourceType]
|
doFunc, ok := funcMap[c.resourceType]
|
||||||
|
@ -96,57 +75,3 @@ func (c *CreateExecutor) createList(gtsClient *client.Client) error {
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *CreateExecutor) createStatus(gtsClient *client.Client) error {
|
|
||||||
if c.content == "" {
|
|
||||||
return FlagNotSetError{flagText: flagContent}
|
|
||||||
}
|
|
||||||
|
|
||||||
var (
|
|
||||||
language string
|
|
||||||
visibility string
|
|
||||||
)
|
|
||||||
|
|
||||||
preferences, err := gtsClient.GetUserPreferences()
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println("WARNING: Unable to get your posting preferences; %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if c.language != "" {
|
|
||||||
language = c.language
|
|
||||||
} else {
|
|
||||||
language = preferences.PostingDefaultLanguage
|
|
||||||
}
|
|
||||||
|
|
||||||
if c.visibility != "" {
|
|
||||||
visibility = c.visibility
|
|
||||||
} else {
|
|
||||||
visibility = preferences.PostingDefaultVisibility
|
|
||||||
}
|
|
||||||
|
|
||||||
parsedVisibility := model.ParseStatusVisibility(visibility)
|
|
||||||
if parsedVisibility == model.StatusVisibilityUnknown {
|
|
||||||
return fmt.Errorf("invalid status visibility %q", visibility)
|
|
||||||
}
|
|
||||||
|
|
||||||
status, err := gtsClient.CreateStatus(
|
|
||||||
c.content,
|
|
||||||
c.contentType,
|
|
||||||
language,
|
|
||||||
c.spoilerText,
|
|
||||||
c.boostable,
|
|
||||||
c.federated,
|
|
||||||
c.likeable,
|
|
||||||
c.replyable,
|
|
||||||
c.sensitive,
|
|
||||||
parsedVisibility,
|
|
||||||
)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("unable to create the status; %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
fmt.Println("Successfully created the following status:")
|
|
||||||
fmt.Println(status)
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ func ParseListRepliesPolicy(policy string) (ListRepliesPolicy, error) {
|
||||||
return ListRepliesPolicyNone, nil
|
return ListRepliesPolicyNone, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return ListRepliesPolicy(-1), fmt.Errorf("%q is not a valid list replies policy", policy)
|
return ListRepliesPolicy(-1), errors.New("invalid list replies policy")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l ListRepliesPolicy) String() string {
|
func (l ListRepliesPolicy) String() string {
|
||||||
|
@ -43,12 +43,12 @@ func (l ListRepliesPolicy) String() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l ListRepliesPolicy) MarshalJSON() ([]byte, error) {
|
func (l ListRepliesPolicy) MarshalJSON() ([]byte, error) {
|
||||||
value := l.String()
|
str := l.String()
|
||||||
if value == "" {
|
if str == "" {
|
||||||
return nil, errors.New("invalid list replies policy")
|
return nil, errors.New("invalid list replies policy")
|
||||||
}
|
}
|
||||||
|
|
||||||
return json.Marshal(value)
|
return json.Marshal(str)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (l *ListRepliesPolicy) UnmarshalJSON(data []byte) error {
|
func (l *ListRepliesPolicy) UnmarshalJSON(data []byte) error {
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package model
|
package model
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
@ -37,7 +36,7 @@ type Status struct {
|
||||||
Text string `json:"text"`
|
Text string `json:"text"`
|
||||||
URI string `json:"uri"`
|
URI string `json:"uri"`
|
||||||
URL string `json:"url"`
|
URL string `json:"url"`
|
||||||
Visibility StatusVisibility `json:"visibility"`
|
Visibility string `json:"visibility"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Card struct {
|
type Card struct {
|
||||||
|
@ -110,7 +109,7 @@ type StatusReblogged struct {
|
||||||
Text string `json:"text"`
|
Text string `json:"text"`
|
||||||
URI string `json:"uri"`
|
URI string `json:"uri"`
|
||||||
URL string `json:"url"`
|
URL string `json:"url"`
|
||||||
Visibility StatusVisibility `json:"visibility"`
|
Visibility string `json:"visibility"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Tag struct {
|
type Tag struct {
|
||||||
|
@ -196,72 +195,3 @@ func (s Status) String() string {
|
||||||
s.URL,
|
s.URL,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
type StatusVisibility int
|
|
||||||
|
|
||||||
const (
|
|
||||||
StatusVisibilityPublic StatusVisibility = iota
|
|
||||||
StatusVisibilityPrivate
|
|
||||||
StatusVisibilityUnlisted
|
|
||||||
StatusVisibilityMutualsOnly
|
|
||||||
StatusVisibilityDirect
|
|
||||||
StatusVisibilityUnknown
|
|
||||||
)
|
|
||||||
|
|
||||||
func (s StatusVisibility) String() string {
|
|
||||||
switch s {
|
|
||||||
case StatusVisibilityPublic:
|
|
||||||
return "public"
|
|
||||||
case StatusVisibilityPrivate:
|
|
||||||
return "private"
|
|
||||||
case StatusVisibilityUnlisted:
|
|
||||||
return "unlisted"
|
|
||||||
case StatusVisibilityMutualsOnly:
|
|
||||||
return "mutuals_only"
|
|
||||||
case StatusVisibilityDirect:
|
|
||||||
return "direct"
|
|
||||||
}
|
|
||||||
|
|
||||||
return "unknown"
|
|
||||||
}
|
|
||||||
|
|
||||||
func ParseStatusVisibility(visibility string) StatusVisibility {
|
|
||||||
switch visibility {
|
|
||||||
case "public":
|
|
||||||
return StatusVisibilityPublic
|
|
||||||
case "private":
|
|
||||||
return StatusVisibilityPrivate
|
|
||||||
case "unlisted":
|
|
||||||
return StatusVisibilityUnlisted
|
|
||||||
case "mutuals_only":
|
|
||||||
return StatusVisibilityMutualsOnly
|
|
||||||
case "direct":
|
|
||||||
return StatusVisibilityDirect
|
|
||||||
}
|
|
||||||
|
|
||||||
return StatusVisibilityUnknown
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s StatusVisibility) MarshalJSON() ([]byte, error) {
|
|
||||||
value := s.String()
|
|
||||||
if value == "unknown" {
|
|
||||||
return nil, fmt.Errorf("%q is not a valid status visibility", value)
|
|
||||||
}
|
|
||||||
|
|
||||||
return json.Marshal(value)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *StatusVisibility) UnmarshalJSON(data []byte) error {
|
|
||||||
var (
|
|
||||||
value string
|
|
||||||
err error
|
|
||||||
)
|
|
||||||
|
|
||||||
if err = json.Unmarshal(data, &value); err != nil {
|
|
||||||
return fmt.Errorf("unable to unmarshal the data; %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
*s = ParseStatusVisibility(value)
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in a new issue