diff options
Diffstat (limited to 'api/emoji.go')
| -rw-r--r-- | api/emoji.go | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/api/emoji.go b/api/emoji.go index 9108db2ad..37adace49 100644 --- a/api/emoji.go +++ b/api/emoji.go @@ -209,11 +209,14 @@ func deleteEmoji(c *Context, w http.ResponseWriter, r *http.Request) { return } + var emoji *model.Emoji if result := <-Srv.Store.Emoji().Get(id); result.Err != nil { c.Err = result.Err return } else { - if c.Session.UserId != result.Data.(*model.Emoji).CreatorId && !HasPermissionToContext(c, model.PERMISSION_MANAGE_SYSTEM) { + emoji = result.Data.(*model.Emoji) + + if c.Session.UserId != emoji.CreatorId && !HasPermissionToContext(c, model.PERMISSION_MANAGE_SYSTEM) { c.Err = model.NewLocAppError("deleteEmoji", "api.emoji.delete.permissions.app_error", nil, "user_id="+c.Session.UserId) c.Err.StatusCode = http.StatusUnauthorized return @@ -226,6 +229,7 @@ func deleteEmoji(c *Context, w http.ResponseWriter, r *http.Request) { } go deleteEmojiImage(id) + go deleteReactionsForEmoji(emoji.Name) ReturnStatusOK(w) } @@ -236,6 +240,13 @@ func deleteEmojiImage(id string) { } } +func deleteReactionsForEmoji(emojiName string) { + if result := <-Srv.Store.Reaction().DeleteAllWithEmojiName(emojiName); result.Err != nil { + l4g.Warn(utils.T("api.emoji.delete.delete_reactions.app_error"), emojiName) + l4g.Warn(result.Err) + } +} + func getEmojiImage(c *Context, w http.ResponseWriter, r *http.Request) { if !*utils.Cfg.ServiceSettings.EnableCustomEmoji { c.Err = model.NewLocAppError("getEmojiImage", "api.emoji.disabled.app_error", nil, "") |