diff options
Diffstat (limited to 'store')
| -rw-r--r-- | store/redis_supplier.go | 6 | ||||
| -rw-r--r-- | store/sqlstore/post_store.go | 2 | ||||
| -rw-r--r-- | store/sqlstore/session_store.go | 2 | ||||
| -rw-r--r-- | store/storetest/preference_store.go | 8 |
4 files changed, 7 insertions, 11 deletions
diff --git a/store/redis_supplier.go b/store/redis_supplier.go index 167bafd6f..32dc12033 100644 --- a/store/redis_supplier.go +++ b/store/redis_supplier.go @@ -34,11 +34,7 @@ func GetBytes(key interface{}) ([]byte, error) { func DecodeBytes(input []byte, thing interface{}) error { dec := gob.NewDecoder(bytes.NewReader(input)) - err := dec.Decode(thing) - if err != nil { - return err - } - return nil + return dec.Decode(thing) } func NewRedisSupplier() *RedisSupplier { diff --git a/store/sqlstore/post_store.go b/store/sqlstore/post_store.go index 6faf51c3d..2fa8f2403 100644 --- a/store/sqlstore/post_store.go +++ b/store/sqlstore/post_store.go @@ -831,7 +831,7 @@ func (s SqlPostStore) Search(teamId string, userId string, params *model.SearchP searchQuery = strings.Replace(searchQuery, "SEARCH_CLAUSE", "", 1) } else if s.DriverName() == model.DATABASE_DRIVER_POSTGRES { // Parse text for wildcards - if wildcard, err := regexp.Compile("\\*($| )"); err == nil { + if wildcard, err := regexp.Compile(`\*($| )`); err == nil { terms = wildcard.ReplaceAllLiteralString(terms, ":* ") } diff --git a/store/sqlstore/session_store.go b/store/sqlstore/session_store.go index 1f8799cdf..57b7bbffe 100644 --- a/store/sqlstore/session_store.go +++ b/store/sqlstore/session_store.go @@ -84,7 +84,7 @@ func (me SqlSessionStore) Get(sessionIdOrToken string) store.StoreChannel { if _, err := me.GetReplica().Select(&sessions, "SELECT * FROM Sessions WHERE Token = :Token OR Id = :Id LIMIT 1", map[string]interface{}{"Token": sessionIdOrToken, "Id": sessionIdOrToken}); err != nil { result.Err = model.NewAppError("SqlSessionStore.Get", "store.sql_session.get.app_error", nil, "sessionIdOrToken="+sessionIdOrToken+", "+err.Error(), http.StatusInternalServerError) - } else if sessions == nil || len(sessions) == 0 { + } else if len(sessions) == 0 { result.Err = model.NewAppError("SqlSessionStore.Get", "store.sql_session.get.app_error", nil, "sessionIdOrToken="+sessionIdOrToken, http.StatusNotFound) } else { result.Data = sessions[0] diff --git a/store/storetest/preference_store.go b/store/storetest/preference_store.go index edd0e9549..cf5dafb5e 100644 --- a/store/storetest/preference_store.go +++ b/store/storetest/preference_store.go @@ -285,27 +285,27 @@ func testIsFeatureEnabled(t *testing.T, ss store.Store) { if result := <-ss.Preference().IsFeatureEnabled(feature1, userId); result.Err != nil { t.Fatal(result.Err) - } else if data := result.Data.(bool); data != true { + } else if data := result.Data.(bool); !data { t.Fatalf("got incorrect setting for feature1, %v=%v", true, data) } if result := <-ss.Preference().IsFeatureEnabled(feature2, userId); result.Err != nil { t.Fatal(result.Err) - } else if data := result.Data.(bool); data != false { + } else if data := result.Data.(bool); data { t.Fatalf("got incorrect setting for feature2, %v=%v", false, data) } // make sure we get false if something different than "true" or "false" has been saved to database if result := <-ss.Preference().IsFeatureEnabled(feature3, userId); result.Err != nil { t.Fatal(result.Err) - } else if data := result.Data.(bool); data != false { + } else if data := result.Data.(bool); data { t.Fatalf("got incorrect setting for feature3, %v=%v", false, data) } // make sure false is returned if a non-existent feature is queried if result := <-ss.Preference().IsFeatureEnabled("someOtherFeature", userId); result.Err != nil { t.Fatal(result.Err) - } else if data := result.Data.(bool); data != false { + } else if data := result.Data.(bool); data { t.Fatalf("got incorrect setting for non-existent feature 'someOtherFeature', %v=%v", false, data) } } |