localhost_frssoft/bloat
1
0
Fork 0
mirror of https://gitea.phreedom.club/localhost_frssoft/bloat.git synced 2025-05-10 13:58:46 +00:00
Code Issues Projects Releases Wiki Activity

fix merge conflicts

Browse source
This commit is contained in:
localhost_frssoft 2023-10-12 16:07:27 +03:00
parent 4379eab5bf
commit 96a0d7cf05
3 changed files with 2 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

12
mastodon/accounts.go
View file

@ -185,8 +185,8 @@ type Profile struct {
Source *AccountSource
// Set the base64 encoded character string of the image.
Avatar string
Header string
Avatar *multipart.FileHeader
Header *multipart.FileHeader
//Other settings
Bot *bool
@ -275,14 +275,6 @@ func (c *Client) AccountUpdate(ctx context.Context, profile *Profile) (*Account,
if err != nil {
return nil, err
}
if profile.Bot != nil {
params.Set("bot", strconv.FormatBool(*profile.Bot))
}
if profile.Pleroma != nil {
if profile.Pleroma.AcceptsChatMessages != nil {
params.Set("accepts_chat_messages", strconv.FormatBool(*profile.Pleroma.AcceptsChatMessages))
}
}
params := &multipartRequest{Data: &buf, ContentType: mw.FormDataContentType()}
var account Account