From eb1a00ef5f93b19c2d49b26de057ee2c51c09e45 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 16 Nov 2017 15:04:27 -0600 Subject: Reorganize file util functionality (#7848) * reorganize file util functionality * fix api test compilation * fix rebase issue --- api4/emoji.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'api4/emoji.go') diff --git a/api4/emoji.go b/api4/emoji.go index 7a05e1ae1..e96e0755f 100644 --- a/api4/emoji.go +++ b/api4/emoji.go @@ -10,7 +10,6 @@ import ( l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/einterfaces" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) @@ -31,7 +30,7 @@ func createEmoji(c *Context, w http.ResponseWriter, r *http.Request) { return } - if emojiInterface := einterfaces.GetEmojiInterface(); emojiInterface != nil && + if emojiInterface := c.App.Emoji; emojiInterface != nil && !emojiInterface.CanUserCreateEmoji(c.Session.Roles, c.Session.TeamMembers) { c.Err = model.NewAppError("getEmoji", "api.emoji.disabled.app_error", nil, "user_id="+c.Session.UserId, http.StatusUnauthorized) return -- cgit v1.2.3-1-g7c22