SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

compiling now

Browse Source
This commit is contained in:
tsmethurst
2022-01-08 17:17:01 +01:00
parent c2ff8f392b
commit f61c3ddcf7
18 changed files with 345 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
internal/federation/dereferencing/account.go
View File

@@ -246,25 +246,49 @@ func (d *deref) fetchHeaderAndAviForAccount(ctx context.Context, targetAccount *
}
if targetAccount.AvatarRemoteURL != "" && (targetAccount.AvatarMediaAttachmentID == "" || refresh) {
a, err := d.mediaManager.ProcessRemoteHeaderOrAvatar(ctx, t, &gtsmodel.MediaAttachment{
RemoteURL: targetAccount.AvatarRemoteURL,
Avatar: true,
}, targetAccount.ID)
avatarIRI, err := url.Parse(targetAccount.AvatarRemoteURL)
if err != nil {
return fmt.Errorf("error processing avatar for user: %s", err)
return err
}
targetAccount.AvatarMediaAttachmentID = a.ID
data, err := t.DereferenceMedia(ctx, avatarIRI)
if err != nil {
return err
}
media, err := d.mediaManager.ProcessMedia(ctx, data, targetAccount.ID, targetAccount.AvatarRemoteURL)
if err != nil {
return err
}
if err := media.SetAsAvatar(ctx); err != nil {
return err
}
targetAccount.AvatarMediaAttachmentID = media.AttachmentID()
}
if targetAccount.HeaderRemoteURL != "" && (targetAccount.HeaderMediaAttachmentID == "" || refresh) {
a, err := d.mediaManager.ProcessRemoteHeaderOrAvatar(ctx, t, &gtsmodel.MediaAttachment{
RemoteURL: targetAccount.HeaderRemoteURL,
Header: true,
}, targetAccount.ID)
headerIRI, err := url.Parse(targetAccount.HeaderRemoteURL)
if err != nil {
return fmt.Errorf("error processing header for user: %s", err)
return err
}
targetAccount.HeaderMediaAttachmentID = a.ID
data, err := t.DereferenceMedia(ctx, headerIRI)
if err != nil {
return err
}
media, err := d.mediaManager.ProcessMedia(ctx, data, targetAccount.ID, targetAccount.HeaderRemoteURL)
if err != nil {
return err
}
if err := media.SetAsHeader(ctx); err != nil {
return err
}
targetAccount.HeaderMediaAttachmentID = media.AttachmentID()
}
return nil
}