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/processingemoji.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/processingemoji.go')
| -rw-r--r-- | internal/media/processingemoji.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/internal/media/processingemoji.go b/internal/media/processingemoji.go index b28dc7f02..098d0aa19 100644 --- a/internal/media/processingemoji.go +++ b/internal/media/processingemoji.go @@ -230,6 +230,9 @@ func (m *manager) preProcessEmoji(ctx context.Context, data DataFunc, postData P return nil, fmt.Errorf("preProcessEmoji: error fetching this instance account from the db: %s", err) } + disabled := false + visibleInPicker := true + // populate initial fields on the emoji -- some of these will be overwritten as we proceed emoji := >smodel.Emoji{ ID: id, @@ -248,9 +251,9 @@ func (m *manager) preProcessEmoji(ctx context.Context, data DataFunc, postData P ImageFileSize: 0, ImageStaticFileSize: 0, ImageUpdatedAt: time.Now(), - Disabled: false, + Disabled: &disabled, URI: uri, - VisibleInPicker: true, + VisibleInPicker: &visibleInPicker, CategoryID: "", } @@ -274,11 +277,11 @@ func (m *manager) preProcessEmoji(ctx context.Context, data DataFunc, postData P } if ai.Disabled != nil { - emoji.Disabled = *ai.Disabled + emoji.Disabled = ai.Disabled } if ai.VisibleInPicker != nil { - emoji.VisibleInPicker = *ai.VisibleInPicker + emoji.VisibleInPicker = ai.VisibleInPicker } if ai.CategoryID != nil { |