add megacheck as makefile target (#9288)

Fix code issues in channel_test.go

Fix Channel Test Issues detected by Megacheck

Fix API Emoji Test Issues detected by Megacheck

Fixed API Issues Reported by Megacheck

Fixed App issues reported by megacheck

Remaining fixes

removed test added by mistake from old HEAD

gofmt

Store Fixes

simplified returns

Fix test for multi member channel delete

revert to delete unused function

2 files changed, 2 insertions, 6 deletions

diff --git a/cmd/mattermost/commands/permissions.go b/cmd/mattermost/commands/permissions.go
index 9d9962ce5..01d933a98 100644
--- a/cmd/mattermost/commands/permissions.go
+++ b/cmd/mattermost/commands/permissions.go
@@ -124,9 +124,5 @@ func importPermissionsCmdF(command *cobra.Command, args []string) error {
 	}
 	defer file.Close()
 
-	if err := a.ImportPermissions(file); err != nil {
-		return err
-	}
-
-	return nil
+	return a.ImportPermissions(file)
 }
diff --git a/cmd/mattermost/commands/permissions_test.go b/cmd/mattermost/commands/permissions_test.go
index eeaa17109..54ccbddb8 100644
--- a/cmd/mattermost/commands/permissions_test.go
+++ b/cmd/mattermost/commands/permissions_test.go
@@ -30,7 +30,7 @@ func permissionsLicenseRequiredTest(t *testing.T, subcommand string) {
 		t.Fail()
 	}
 	args := []string{"-test.run", "ExecCommand", "--", "--disableconfigwatch", "permissions", subcommand}
-	output, err := exec.Command(path, args...).CombinedOutput()
+	output, _ := exec.Command(path, args...).CombinedOutput()
 
 	actual := string(output)
 	expected := utils.T("cli.license.critical")