mirror of
https://gitea.phreedom.club/localhost_frssoft/bloat.git
synced 2024-09-28 12:16:26 +00:00
Compare commits
No commits in common. "6a233f6cb24d29d1a571506a7bb1276a4ca0edb1" and "44f8a72a76fd8f0f5634c667d6c6ebb34e965fe2" have entirely different histories.
6a233f6cb2
...
44f8a72a76
@ -210,9 +210,6 @@ type Toot struct {
|
|||||||
SpoilerText string `json:"spoiler_text"`
|
SpoilerText string `json:"spoiler_text"`
|
||||||
Visibility string `json:"visibility"`
|
Visibility string `json:"visibility"`
|
||||||
ContentType string `json:"content_type"`
|
ContentType string `json:"content_type"`
|
||||||
Language string `json:"language"`
|
|
||||||
ExpiresIn int `json:"expires_in"`
|
|
||||||
ScheduledAt string `json:"scheduled_at"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mention hold information for mention.
|
// Mention hold information for mention.
|
||||||
|
@ -358,16 +358,6 @@ func (c *Client) PostStatus(ctx context.Context, toot *Toot) (*Status, error) {
|
|||||||
if toot.ContentType != "" {
|
if toot.ContentType != "" {
|
||||||
params.Set("content_type", toot.ContentType)
|
params.Set("content_type", toot.ContentType)
|
||||||
}
|
}
|
||||||
if toot.Language != "" {
|
|
||||||
params.Set("language", toot.Language)
|
|
||||||
}
|
|
||||||
if toot.ExpiresIn >= 3600 {
|
|
||||||
params.Set("expires_in", fmt.Sprint(toot.ExpiresIn))
|
|
||||||
}
|
|
||||||
if toot.ScheduledAt != "" {
|
|
||||||
params.Set("scheduled_at", toot.ScheduledAt)
|
|
||||||
}
|
|
||||||
|
|
||||||
var status Status
|
var status Status
|
||||||
if toot.Edit != "" {
|
if toot.Edit != "" {
|
||||||
err := c.doAPI(ctx, http.MethodPut, fmt.Sprintf("/api/v1/statuses/%s", toot.Edit), params, &status, nil)
|
err := c.doAPI(ctx, http.MethodPut, fmt.Sprintf("/api/v1/statuses/%s", toot.Edit), params, &status, nil)
|
||||||
|
@ -988,7 +988,7 @@ func (s *service) Signout(c *client) (err error) {
|
|||||||
|
|
||||||
func (s *service) Post(c *client, content string, replyToID string,
|
func (s *service) Post(c *client, content string, replyToID string,
|
||||||
format string, visibility string, isNSFW bool, spoilerText string,
|
format string, visibility string, isNSFW bool, spoilerText string,
|
||||||
files []*multipart.FileHeader, edit string, language string, expiresIn int, scheduledAt string) (id string, err error) {
|
files []*multipart.FileHeader, edit string) (id string, err error) {
|
||||||
|
|
||||||
var mediaIDs []string
|
var mediaIDs []string
|
||||||
for _, f := range files {
|
for _, f := range files {
|
||||||
@ -999,8 +999,6 @@ func (s *service) Post(c *client, content string, replyToID string,
|
|||||||
mediaIDs = append(mediaIDs, a.ID)
|
mediaIDs = append(mediaIDs, a.ID)
|
||||||
}
|
}
|
||||||
|
|
||||||
expiresIn = expiresIn * 3600
|
|
||||||
|
|
||||||
tweet := &mastodon.Toot{
|
tweet := &mastodon.Toot{
|
||||||
SpoilerText: spoilerText,
|
SpoilerText: spoilerText,
|
||||||
Status: content,
|
Status: content,
|
||||||
@ -1010,11 +1008,7 @@ func (s *service) Post(c *client, content string, replyToID string,
|
|||||||
Visibility: visibility,
|
Visibility: visibility,
|
||||||
Sensitive: isNSFW,
|
Sensitive: isNSFW,
|
||||||
Edit: edit,
|
Edit: edit,
|
||||||
Language: language,
|
|
||||||
ExpiresIn: expiresIn, // pleroma compatible
|
|
||||||
ScheduledAt: scheduledAt,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
st, err := c.PostStatus(c.ctx, tweet)
|
st, err := c.PostStatus(c.ctx, tweet)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
|
@ -314,21 +314,8 @@ func NewHandler(s *service, verbose bool, staticDir string) http.Handler {
|
|||||||
quickReply := c.r.FormValue("quickreply") == "true"
|
quickReply := c.r.FormValue("quickreply") == "true"
|
||||||
files := c.r.MultipartForm.File["attachments"]
|
files := c.r.MultipartForm.File["attachments"]
|
||||||
edit := c.r.FormValue("edit-status-id")
|
edit := c.r.FormValue("edit-status-id")
|
||||||
language := c.r.FormValue("lang-code")
|
|
||||||
expiresIn, err := strconv.Atoi(c.r.FormValue("expires-in"))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
scheduledAt := c.r.FormValue("scheduled")
|
|
||||||
if scheduledAt != "" {
|
|
||||||
scheduled, err := time.Parse("2006-01-02T15:04", scheduledAt)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
scheduledAt = string(scheduled.UTC().Format(time.RFC3339))
|
|
||||||
}
|
|
||||||
|
|
||||||
id, err := s.Post(c, content, replyToID, format, visibility, isNSFW, spoilerText, files, edit, language, expiresIn, scheduledAt)
|
id, err := s.Post(c, content, replyToID, format, visibility, isNSFW, spoilerText, files, edit)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -48,9 +48,6 @@
|
|||||||
<button type="submit" accesskey="P" title="Post (P)"> Post </button>
|
<button type="submit" accesskey="P" title="Post (P)"> Post </button>
|
||||||
<button type="reset" title="Reset"> Reset </button>
|
<button type="reset" title="Reset"> Reset </button>
|
||||||
<input id="edit-status-id" name="edit-status-id" placeholder="Input Status ID for edit" title="Edit ID">
|
<input id="edit-status-id" name="edit-status-id" placeholder="Input Status ID for edit" title="Edit ID">
|
||||||
<input id="lang-code" name="lang-code" placeholder="lang" title="Post language (ISO 639) [en, ru, etc..] Default: none" size="4">
|
|
||||||
<input type="number" id="expires-in" name="expires-in" title="Post autodeleted after hour(s)" min="0" value="0" size="4">
|
|
||||||
<input type="datetime-local" id="scheduled" name="scheduled" step=300 title="Schedule your status (timezone UTC+0)">
|
|
||||||
</form>
|
</form>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user