diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2023-11-10 19:29:26 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-11-10 19:29:26 +0100 |
| commit | ba9d6b467a1f03447789844048d913738c843569 (patch) | |
| tree | 5a464ee4a33f26e3284179582ab6d3332d9d5388 /internal/federation/dereferencing/account.go | |
| parent | [chore/bugfix/horror] Allow `expires_in` and poll choices to be parsed from s... (diff) | |
| download | gotosocial-ba9d6b467a1f03447789844048d913738c843569.tar.xz | |
[feature] Media attachment placeholders (#2331)
* [feature] Use placeholders for unknown media types
* fix read of underreported small files
* switch to reduce nesting
* simplify cleanup
Diffstat (limited to 'internal/federation/dereferencing/account.go')
| -rw-r--r-- | internal/federation/dereferencing/account.go | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/internal/federation/dereferencing/account.go b/internal/federation/dereferencing/account.go index 562062c8d..d551c3f0b 100644 --- a/internal/federation/dereferencing/account.go +++ b/internal/federation/dereferencing/account.go @@ -622,21 +622,16 @@ func (d *Dereferencer) fetchRemoteAccountAvatar(ctx context.Context, tsport tran processing, ok := d.derefAvatars[latestAcc.AvatarRemoteURL] if !ok { - var err error - // Set the media data function to dereference avatar from URI. data := func(ctx context.Context) (io.ReadCloser, int64, error) { return tsport.DereferenceMedia(ctx, avatarURI) } // Create new media processing request from the media manager instance. - processing, err = d.mediaManager.PreProcessMedia(ctx, data, latestAcc.ID, &media.AdditionalMediaInfo{ + processing = d.mediaManager.PreProcessMedia(data, latestAcc.ID, &media.AdditionalMediaInfo{ Avatar: func() *bool { v := true; return &v }(), RemoteURL: &latestAcc.AvatarRemoteURL, }) - if err != nil { - return gtserror.Newf("error preprocessing media for attachment %s: %w", latestAcc.AvatarRemoteURL, err) - } // Store media in map to mark as processing. d.derefAvatars[latestAcc.AvatarRemoteURL] = processing @@ -713,21 +708,16 @@ func (d *Dereferencer) fetchRemoteAccountHeader(ctx context.Context, tsport tran processing, ok := d.derefHeaders[latestAcc.HeaderRemoteURL] if !ok { - var err error - // Set the media data function to dereference avatar from URI. data := func(ctx context.Context) (io.ReadCloser, int64, error) { return tsport.DereferenceMedia(ctx, headerURI) } // Create new media processing request from the media manager instance. - processing, err = d.mediaManager.PreProcessMedia(ctx, data, latestAcc.ID, &media.AdditionalMediaInfo{ + processing = d.mediaManager.PreProcessMedia(data, latestAcc.ID, &media.AdditionalMediaInfo{ Header: func() *bool { v := true; return &v }(), RemoteURL: &latestAcc.HeaderRemoteURL, }) - if err != nil { - return gtserror.Newf("error preprocessing media for attachment %s: %w", latestAcc.HeaderRemoteURL, err) - } // Store media in map to mark as processing. d.derefHeaders[latestAcc.HeaderRemoteURL] = processing |