diff options
author | Chris <ccbrown112@gmail.com> | 2017-10-30 11:57:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-30 11:57:24 -0500 |
commit | c5e8cb25caa39ed018ede5270e1566e8f7448396 (patch) | |
tree | 80f9f8957d4ff8458ecf9631135c916df25544bd /utils | |
parent | 63df41b91110bac06baffef87fe0c1952b47ac93 (diff) | |
download | chat-c5e8cb25caa39ed018ede5270e1566e8f7448396.tar.gz chat-c5e8cb25caa39ed018ede5270e1566e8f7448396.tar.bz2 chat-c5e8cb25caa39ed018ede5270e1566e8f7448396.zip |
simplify things (#7735)
Diffstat (limited to 'utils')
-rw-r--r-- | utils/authorization.go | 22 | ||||
-rw-r--r-- | utils/config_test.go | 2 | ||||
-rw-r--r-- | utils/emoji.go | 4 | ||||
-rw-r--r-- | utils/extract.go | 2 | ||||
-rw-r--r-- | utils/inbucket.go | 6 | ||||
-rw-r--r-- | utils/lru_test.go | 4 |
6 files changed, 8 insertions, 32 deletions
diff --git a/utils/authorization.go b/utils/authorization.go index 1dc0c5da4..37ca2c7ff 100644 --- a/utils/authorization.go +++ b/utils/authorization.go @@ -18,13 +18,11 @@ func SetDefaultRolesBasedOnConfig() { model.ROLE_TEAM_USER.Permissions, model.PERMISSION_CREATE_PUBLIC_CHANNEL.Id, ) - break case model.PERMISSIONS_TEAM_ADMIN: model.ROLE_TEAM_ADMIN.Permissions = append( model.ROLE_TEAM_ADMIN.Permissions, model.PERMISSION_CREATE_PUBLIC_CHANNEL.Id, ) - break } } else { model.ROLE_TEAM_USER.Permissions = append( @@ -40,7 +38,6 @@ func SetDefaultRolesBasedOnConfig() { model.ROLE_TEAM_USER.Permissions, model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES.Id, ) - break case model.PERMISSIONS_CHANNEL_ADMIN: model.ROLE_TEAM_ADMIN.Permissions = append( model.ROLE_TEAM_ADMIN.Permissions, @@ -50,13 +47,11 @@ func SetDefaultRolesBasedOnConfig() { model.ROLE_CHANNEL_ADMIN.Permissions, model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES.Id, ) - break case model.PERMISSIONS_TEAM_ADMIN: model.ROLE_TEAM_ADMIN.Permissions = append( model.ROLE_TEAM_ADMIN.Permissions, model.PERMISSION_MANAGE_PUBLIC_CHANNEL_PROPERTIES.Id, ) - break } } else { model.ROLE_TEAM_USER.Permissions = append( @@ -72,7 +67,6 @@ func SetDefaultRolesBasedOnConfig() { model.ROLE_TEAM_USER.Permissions, model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, ) - break case model.PERMISSIONS_CHANNEL_ADMIN: model.ROLE_TEAM_ADMIN.Permissions = append( model.ROLE_TEAM_ADMIN.Permissions, @@ -82,13 +76,11 @@ func SetDefaultRolesBasedOnConfig() { model.ROLE_CHANNEL_ADMIN.Permissions, model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, ) - break case model.PERMISSIONS_TEAM_ADMIN: model.ROLE_TEAM_ADMIN.Permissions = append( model.ROLE_TEAM_ADMIN.Permissions, model.PERMISSION_DELETE_PUBLIC_CHANNEL.Id, ) - break } } else { model.ROLE_TEAM_USER.Permissions = append( @@ -104,13 +96,11 @@ func SetDefaultRolesBasedOnConfig() { model.ROLE_TEAM_USER.Permissions, model.PERMISSION_CREATE_PRIVATE_CHANNEL.Id, ) - break case model.PERMISSIONS_TEAM_ADMIN: model.ROLE_TEAM_ADMIN.Permissions = append( model.ROLE_TEAM_ADMIN.Permissions, model.PERMISSION_CREATE_PRIVATE_CHANNEL.Id, ) - break } } else { model.ROLE_TEAM_USER.Permissions = append( @@ -126,7 +116,6 @@ func SetDefaultRolesBasedOnConfig() { model.ROLE_TEAM_USER.Permissions, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES.Id, ) - break case model.PERMISSIONS_CHANNEL_ADMIN: model.ROLE_TEAM_ADMIN.Permissions = append( model.ROLE_TEAM_ADMIN.Permissions, @@ -136,13 +125,11 @@ func SetDefaultRolesBasedOnConfig() { model.ROLE_CHANNEL_ADMIN.Permissions, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES.Id, ) - break case model.PERMISSIONS_TEAM_ADMIN: model.ROLE_TEAM_ADMIN.Permissions = append( model.ROLE_TEAM_ADMIN.Permissions, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_PROPERTIES.Id, ) - break } } else { model.ROLE_TEAM_USER.Permissions = append( @@ -158,7 +145,6 @@ func SetDefaultRolesBasedOnConfig() { model.ROLE_TEAM_USER.Permissions, model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, ) - break case model.PERMISSIONS_CHANNEL_ADMIN: model.ROLE_TEAM_ADMIN.Permissions = append( model.ROLE_TEAM_ADMIN.Permissions, @@ -168,13 +154,11 @@ func SetDefaultRolesBasedOnConfig() { model.ROLE_CHANNEL_ADMIN.Permissions, model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, ) - break case model.PERMISSIONS_TEAM_ADMIN: model.ROLE_TEAM_ADMIN.Permissions = append( model.ROLE_TEAM_ADMIN.Permissions, model.PERMISSION_DELETE_PRIVATE_CHANNEL.Id, ) - break } } else { model.ROLE_TEAM_USER.Permissions = append( @@ -191,7 +175,6 @@ func SetDefaultRolesBasedOnConfig() { model.ROLE_CHANNEL_USER.Permissions, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id, ) - break case model.PERMISSIONS_CHANNEL_ADMIN: model.ROLE_TEAM_ADMIN.Permissions = append( model.ROLE_TEAM_ADMIN.Permissions, @@ -201,13 +184,11 @@ func SetDefaultRolesBasedOnConfig() { model.ROLE_CHANNEL_ADMIN.Permissions, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id, ) - break case model.PERMISSIONS_TEAM_ADMIN: model.ROLE_TEAM_ADMIN.Permissions = append( model.ROLE_TEAM_ADMIN.Permissions, model.PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id, ) - break } } else { model.ROLE_CHANNEL_USER.Permissions = append( @@ -268,14 +249,12 @@ func SetDefaultRolesBasedOnConfig() { model.PERMISSION_DELETE_POST.Id, model.PERMISSION_DELETE_OTHERS_POSTS.Id, ) - break case model.PERMISSIONS_DELETE_POST_TEAM_ADMIN: model.ROLE_TEAM_ADMIN.Permissions = append( model.ROLE_TEAM_ADMIN.Permissions, model.PERMISSION_DELETE_POST.Id, model.PERMISSION_DELETE_OTHERS_POSTS.Id, ) - break } } else { model.ROLE_CHANNEL_USER.Permissions = append( @@ -295,5 +274,4 @@ func SetDefaultRolesBasedOnConfig() { model.PERMISSION_CREATE_TEAM.Id, ) } - } diff --git a/utils/config_test.go b/utils/config_test.go index 366e85c84..527718bbb 100644 --- a/utils/config_test.go +++ b/utils/config_test.go @@ -37,7 +37,7 @@ func TestConfigFromEnviroVars(t *testing.T) { t.Fatal("Couldn't read config from enviroment var") } - if *Cfg.ServiceSettings.EnableCommands != false { + if *Cfg.ServiceSettings.EnableCommands { t.Fatal("Couldn't read config from enviroment var") } diff --git a/utils/emoji.go b/utils/emoji.go index ced3c4ddd..d7e8a8b12 100644 --- a/utils/emoji.go +++ b/utils/emoji.go @@ -27,8 +27,8 @@ func CreateTestAnimatedGif(t *testing.T, width int, height int, frames int) []by var buffer bytes.Buffer img := gif.GIF{ - Image: make([]*image.Paletted, frames, frames), - Delay: make([]int, frames, frames), + Image: make([]*image.Paletted, frames), + Delay: make([]int, frames), } for i := 0; i < frames; i++ { img.Image[i] = image.NewPaletted(image.Rect(0, 0, width, height), color.Palette{color.Black}) diff --git a/utils/extract.go b/utils/extract.go index bc8e07f75..12f21da86 100644 --- a/utils/extract.go +++ b/utils/extract.go @@ -23,7 +23,7 @@ func ExtractTarGz(gzipStream io.Reader, dst string) error { tarReader := tar.NewReader(uncompressedStream) - for true { + for { header, err := tarReader.Next() if err == io.EOF { diff --git a/utils/inbucket.go b/utils/inbucket.go index 3aef34d9f..46011989b 100644 --- a/utils/inbucket.go +++ b/utils/inbucket.go @@ -102,10 +102,8 @@ func GetMessageFromMailbox(email, id string) (results JSONMessageInbucket, err e } defer resp.Body.Close() - if err := json.NewDecoder(resp.Body).Decode(&record); err != nil { - return record, err - } - return record, nil + err = json.NewDecoder(resp.Body).Decode(&record) + return record, err } func DeleteMailBox(email string) (err error) { diff --git a/utils/lru_test.go b/utils/lru_test.go index ab7d0e50a..987163cd3 100644 --- a/utils/lru_test.go +++ b/utils/lru_test.go @@ -85,10 +85,10 @@ func TestLRUAdd(t *testing.T) { t.Fatalf("err: %v", err) } - if l.Add(1, 1) == true || evictCounter != 0 { + if l.Add(1, 1) || evictCounter != 0 { t.Errorf("should not have an eviction") } - if l.Add(2, 2) == false || evictCounter != 1 { + if !l.Add(2, 2) || evictCounter != 1 { t.Errorf("should have an eviction") } } |