diff options
author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2017-04-17 16:07:28 +0200 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-04-17 10:07:28 -0400 |
commit | 80684ad69f641bb759095beff0e1a15db0aa33b1 (patch) | |
tree | aecc0fd9fe73bc10f28467aa1f3d7194bb043e41 /api | |
parent | 62974f19cd0025a3a5098741210f1b61b08765a9 (diff) | |
download | chat-80684ad69f641bb759095beff0e1a15db0aa33b1.tar.gz chat-80684ad69f641bb759095beff0e1a15db0aa33b1.tar.bz2 chat-80684ad69f641bb759095beff0e1a15db0aa33b1.zip |
implement DELETE /emoji/{emoji_id} fro apiV4 (#6021)
implement GET /emoji/{emoji_id} for apiv4
Diffstat (limited to 'api')
-rw-r--r-- | api/emoji.go | 41 |
1 files changed, 12 insertions, 29 deletions
diff --git a/api/emoji.go b/api/emoji.go index e1a37e509..feb65877a 100644 --- a/api/emoji.go +++ b/api/emoji.go @@ -148,41 +148,24 @@ func deleteEmoji(c *Context, w http.ResponseWriter, r *http.Request) { return } - var emoji *model.Emoji - if result := <-app.Srv.Store.Emoji().Get(id, false); result.Err != nil { - c.Err = result.Err - return - } else { - emoji = result.Data.(*model.Emoji) - - if c.Session.UserId != emoji.CreatorId && !app.SessionHasPermissionTo(c.Session, 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 - } - } - - if err := (<-app.Srv.Store.Emoji().Delete(id, model.GetMillis())).Err; err != nil { + emoji, err := app.GetEmoji(id) + if err != nil { c.Err = err return } - go deleteEmojiImage(id) - go deleteReactionsForEmoji(emoji.Name) - - ReturnStatusOK(w) -} - -func deleteEmojiImage(id string) { - if err := app.MoveFile(getEmojiImagePath(id), "emoji/"+id+"/image_deleted"); err != nil { - l4g.Error("Failed to rename image when deleting emoji %v", id) + if c.Session.UserId != emoji.CreatorId && !app.SessionHasPermissionTo(c.Session, 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 } -} -func deleteReactionsForEmoji(emojiName string) { - if result := <-app.Srv.Store.Reaction().DeleteAllWithEmojiName(emojiName); result.Err != nil { - l4g.Warn(utils.T("api.emoji.delete.delete_reactions.app_error"), emojiName) - l4g.Warn(result.Err) + err = app.DeleteEmoji(emoji) + if err != nil { + c.Err = err + return + } else { + ReturnStatusOK(w) } } |