diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2022-08-15 12:35:05 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-08-15 11:35:05 +0100 |
| commit | ac6ed3d939fe9dad81aadbd04541e905c625ca82 (patch) | |
| tree | 6116baf25675837dc99f69c49b9fec2ff112ce5c /internal/media/processingmedia.go | |
| parent | [frontend] Sensitive media spoilers (#752) (diff) | |
| download | gotosocial-ac6ed3d939fe9dad81aadbd04541e905c625ca82.tar.xz | |
[chore] Update bun / sqlite versions; update gtsmodels (#754)
* upstep bun and sqlite versions
* allow specific columns to be updated in the db
* only update necessary columns for user
* bit tidier
* only update necessary fields of media_attachment
* only update relevant instance fields
* update tests
* update only specific account columns
* use bool pointers on gtsmodels
includes attachment, status, account, user
* update columns more selectively
* test all default fields on new account insert
* updating remaining bools on gtsmodels
* initialize pointer fields when extracting AP emoji
* copy bools properly
* add copyBoolPtr convenience function + test it
* initialize false bool ptrs a bit more neatly
Diffstat (limited to 'internal/media/processingmedia.go')
| -rw-r--r-- | internal/media/processingmedia.go | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/internal/media/processingmedia.go b/internal/media/processingmedia.go index 885e97417..914d6d276 100644 --- a/internal/media/processingmedia.go +++ b/internal/media/processingmedia.go @@ -346,7 +346,9 @@ func (p *ProcessingMedia) store(ctx context.Context) error { if err := p.storage.PutStream(ctx, p.attachment.File.Path, clean); err != nil { return fmt.Errorf("store: error storing stream: %s", err) } - p.attachment.Cached = true + + cached := true + p.attachment.Cached = &cached p.read = true if p.postData != nil { @@ -376,6 +378,10 @@ func (m *manager) preProcessMedia(ctx context.Context, data DataFunc, postData P UpdatedAt: time.Now(), } + avatar := false + header := false + cached := false + // populate initial fields on the media attachment -- some of these will be overwritten as we proceed attachment := >smodel.MediaAttachment{ ID: id, @@ -393,9 +399,9 @@ func (m *manager) preProcessMedia(ctx context.Context, data DataFunc, postData P Processing: gtsmodel.ProcessingStatusReceived, File: file, Thumbnail: thumbnail, - Avatar: false, - Header: false, - Cached: false, + Avatar: &avatar, + Header: &header, + Cached: &cached, } // check if we have additional info to add to the attachment, @@ -426,11 +432,11 @@ func (m *manager) preProcessMedia(ctx context.Context, data DataFunc, postData P } if ai.Avatar != nil { - attachment.Avatar = *ai.Avatar + attachment.Avatar = ai.Avatar } if ai.Header != nil { - attachment.Header = *ai.Header + attachment.Header = ai.Header } if ai.FocusX != nil { |