diff options
| author | Chris <ccbrown112@gmail.com> | 2017-11-16 15:04:27 -0600 |
|---|---|---|
| committer | Jonathan <jonfritz@gmail.com> | 2017-11-16 16:04:27 -0500 |
| commit | eb1a00ef5f93b19c2d49b26de057ee2c51c09e45 (patch) | |
| tree | e63afa695283e15c5cd9ee2a437d74024dcc5c20 /api/emoji.go | |
| parent | ef69d93abfb192bc7a2416f3cf2622d99fd27dd5 (diff) | |
| download | chat-eb1a00ef5f93b19c2d49b26de057ee2c51c09e45.tar.gz chat-eb1a00ef5f93b19c2d49b26de057ee2c51c09e45.tar.bz2 chat-eb1a00ef5f93b19c2d49b26de057ee2c51c09e45.zip | |
Reorganize file util functionality (#7848)
* reorganize file util functionality
* fix api test compilation
* fix rebase issue
Diffstat (limited to 'api/emoji.go')
| -rw-r--r-- | api/emoji.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/api/emoji.go b/api/emoji.go index 4edbbd082..cbe7b07bf 100644 --- a/api/emoji.go +++ b/api/emoji.go @@ -16,7 +16,6 @@ import ( "github.com/disintegration/imaging" "github.com/gorilla/mux" "github.com/mattermost/mattermost-server/app" - "github.com/mattermost/mattermost-server/einterfaces" "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/utils" ) @@ -51,7 +50,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("createEmoji", "api.emoji.create.permissions.app_error", nil, "user_id="+c.Session.UserId, http.StatusUnauthorized) return @@ -106,7 +105,7 @@ func createEmoji(c *Context, w http.ResponseWriter, r *http.Request) { if imageData := m.File["image"]; len(imageData) == 0 { c.SetInvalidParam("createEmoji", "image") return - } else if err := app.UploadEmojiImage(emoji.Id, imageData[0]); err != nil { + } else if err := c.App.UploadEmojiImage(emoji.Id, imageData[0]); err != nil { c.Err = err return } |