From 7ce8d16ce09cb5585e2e066db0ddb43336405faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jespinog@gmail.com>
Date: Fri, 11 May 2018 18:56:09 +0200
Subject: [PATCH] MM-8853: Removing unnecesary emoji enterprise feature

---
 api4/emoji.go        |  6 ----
 app/app.go           | 75 ++++++++++++++++++++++++++++++++++++++------
 einterfaces/emoji.go | 12 -------
 3 files changed, 65 insertions(+), 28 deletions(-)
 delete mode 100644 einterfaces/emoji.go

diff --git a/api4/emoji.go b/api4/emoji.go
index 4d5e8ba459a..42f66a22afe 100644
--- a/api4/emoji.go
+++ b/api4/emoji.go
@@ -33,12 +33,6 @@ func createEmoji(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	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
-	}
-
 	if len(*c.App.Config().FileSettings.DriverName) == 0 {
 		c.Err = model.NewAppError("createEmoji", "api.emoji.storage.app_error", nil, "", http.StatusNotImplemented)
 		return
diff --git a/app/app.go b/app/app.go
index e5a496c6b87..012cb532636 100644
--- a/app/app.go
+++ b/app/app.go
@@ -57,7 +57,6 @@ type App struct {
 	Compliance       einterfaces.ComplianceInterface
 	DataRetention    einterfaces.DataRetentionInterface
 	Elasticsearch    einterfaces.ElasticsearchInterface
-	Emoji            einterfaces.EmojiInterface
 	Ldap             einterfaces.LdapInterface
 	MessageExport    einterfaces.MessageExportInterface
 	Metrics          einterfaces.MetricsInterface
@@ -288,12 +287,6 @@ func RegisterElasticsearchInterface(f func(*App) einterfaces.ElasticsearchInterf
 	elasticsearchInterface = f
 }
 
-var emojiInterface func(*App) einterfaces.EmojiInterface
-
-func RegisterEmojiInterface(f func(*App) einterfaces.EmojiInterface) {
-	emojiInterface = f
-}
-
 var jobsDataRetentionJobInterface func(*App) ejobs.DataRetentionJobInterface
 
 func RegisterJobsDataRetentionJobInterface(f func(*App) ejobs.DataRetentionJobInterface) {
@@ -376,9 +369,6 @@ func (a *App) initEnterprise() {
 	if elasticsearchInterface != nil {
 		a.Elasticsearch = elasticsearchInterface(a)
 	}
-	if emojiInterface != nil {
-		a.Emoji = emojiInterface(a)
-	}
 	if ldapInterface != nil {
 		a.Ldap = ldapInterface(a)
 		a.AddConfigListener(func(_, cfg *model.Config) {
@@ -603,3 +593,68 @@ func (a *App) SetPhase2PermissionsMigrationStatus(isComplete bool) error {
 	a.phase2PermissionsMigrationComplete = isComplete
 	return nil
 }
+
+// func (a *App) DoEmojisPermissionsMigration() {
+// 	// If the migration is already marked as completed, don't do it again.
+// 	if result := <-a.Srv.Store.System().GetByName(EMOJIS_PERMISSIONS_MIGRATION_KEY); result.Err == nil {
+// 		return
+// 	}
+//
+// 	mlog.Info("Migrating emojisto database.")
+// 	if a.Config().ServiceSettings.RestrictCustomEmojiCreation == model.RESTRICT_EMOJI_CREATION_ALL {
+// 	}
+// 	if a.Config().ServiceSettings.RestrictCustomEmojiCreation == model.RESTRICT_EMOJI_CREATION_ALL {
+// 	}
+// 	roles := model.MakeDefaultRoles()
+// 	roles = utils.SetRolePermiemojisssionsFromConfig(roles, a.Config(), a.License() != nil)
+//
+// 	allSucceeded := true
+//
+// 	for _, role := range roles {
+// 		if result := <-a.Srv.Store.Role().Save(role); result.Err != nil {
+// 			// If this failed for reasons other than the role already existing, don't mark the migration as done.
+// 			if result2 := <-a.Srv.Store.Role().GetByName(role.Name); result2.Err != nil {
+// 				mlog.Critical("Failed to migrate role to database.")
+// 				mlog.Critical(fmt.Sprint(result.Err))
+// 				allSucceeded = false
+// 			} else {
+// 				// If the role already existed, check it is the same and update if not.
+// 				fetchedRole := result.Data.(*model.Role)
+// 				if !reflect.DeepEqual(fetchedRole.Permissions, role.Permissions) ||
+// 					fetchedRole.DisplayName != role.DisplayName ||
+// 					fetchedRole.Description != role.Description ||
+// 					fetchedRole.SchemeManaged != role.SchemeManaged {
+// 					role.Id = fetchedRole.Id
+// 					if result := <-a.Srv.Store.Role().Save(role); result.Err != nil {
+// 						// Role is not the same, but failed to update.
+// 						mlog.Critical("Failed to migrate role to database.")
+// 						mlog.Critical(fmt.Sprint(result.Err))
+// 						allSucceeded = false
+// 					}
+// 				}
+// 			}
+// 		}
+// 	}
+//
+// 	if !allSucceeded {
+// 		return
+// 	}
+//
+// 	config := a.Config()
+// 	if *config.ServiceSettings.AllowEditPost == model.ALLOW_EDIT_POST_ALWAYS {
+// 		*config.ServiceSettings.PostEditTimeLimit = -1
+// 		if err := a.SaveConfig(config, true); err != nil {
+// 			mlog.Error("Failed to update config in Advanced Permissions Phase 1 Migration.", mlog.String("error", err.Error()))
+// 		}
+// 	}
+//
+// 	system := model.System{
+// 		Name:  ADVANCED_PERMISSIONS_MIGRATION_KEY,
+// 		Value: "true",
+// 	}
+//
+// 	if result := <-a.Srv.Store.System().Save(&system); result.Err != nil {
+// 		mlog.Critical("Failed to mark advanced permissions migration as completed.")
+// 		mlog.Critical(fmt.Sprint(result.Err))
+// 	}
+//}
diff --git a/einterfaces/emoji.go b/einterfaces/emoji.go
deleted file mode 100644
index b8d61e748ff..00000000000
--- a/einterfaces/emoji.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-package einterfaces
-
-import (
-	"github.com/mattermost/mattermost-server/model"
-)
-
-type EmojiInterface interface {
-	CanUserCreateEmoji(string, []*model.TeamMember) bool
-}