summaryrefslogtreecommitdiff
path: root/internal/media/processingemoji.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2022-11-24 19:12:07 +0100
committerLibravatar GitHub <noreply@github.com>2022-11-24 18:12:07 +0000
commitb6dbe21026615ef3fbaacff98c7cc860cef39d16 (patch)
treecef207c759ba936c9432c456e751c862e2c0830c /internal/media/processingemoji.go
parent[bugfix] Fix status boosts giving 404 (#1137) (diff)
downloadgotosocial-b6dbe21026615ef3fbaacff98c7cc860cef39d16.tar.xz
[feature] `PATCH /api/v1/admin/custom_emojis/{id}` endpoint (#1061)
* start adding admin emoji PATCH stuff * updating works OK, now how about copying * allow emojis to be copied * update swagger docs * update admin processer to use non-interface storage driver * remove shortcode updating for local emojis * go fmt Co-authored-by: f0x52 <f0x@cthu.lu>
Diffstat (limited to 'internal/media/processingemoji.go')
-rw-r--r--internal/media/processingemoji.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/media/processingemoji.go b/internal/media/processingemoji.go
index a660ad775..ad3f02a53 100644
--- a/internal/media/processingemoji.go
+++ b/internal/media/processingemoji.go
@@ -115,6 +115,7 @@ func (p *ProcessingEmoji) LoadEmoji(ctx context.Context) (*gtsmodel.Emoji, error
"image_file_size",
"image_static_file_size",
"image_updated_at",
+ "shortcode",
"uri",
}
if _, err := p.database.UpdateEmoji(ctx, p.emoji, columns...); err != nil {
@@ -340,7 +341,7 @@ func (m *manager) preProcessEmoji(ctx context.Context, data DataFunc, postData P
emoji.ImageStaticURL = uris.GenerateURIForAttachment(instanceAccount.ID, string(TypeEmoji), string(SizeStatic), newPathID, mimePng)
emoji.ImageStaticPath = fmt.Sprintf("%s/%s/%s/%s.%s", instanceAccount.ID, TypeEmoji, SizeStatic, newPathID, mimePng)
- // update these fields as we go
+ emoji.Shortcode = shortcode
emoji.URI = uri
} else {
disabled := false