diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-09-02 12:50:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-02 12:50:15 -0400 |
| commit | f32eb525f3fa0828a23f589d765c267e3b2aea86 (patch) | |
| tree | d4b76aecf89143029af080b3e1b4d87398e0adc5 /store | |
| parent | eb0111f6bbe2b0bf160a674dfe1b4d089f905cb9 (diff) | |
| download | chat-f32eb525f3fa0828a23f589d765c267e3b2aea86.tar.gz chat-f32eb525f3fa0828a23f589d765c267e3b2aea86.tar.bz2 chat-f32eb525f3fa0828a23f589d765c267e3b2aea86.zip | |
Do not send push notifications for channels being actively viewed (#3931)
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_status_store.go | 1 | ||||
| -rw-r--r-- | store/sql_status_store_test.go | 8 | ||||
| -rw-r--r-- | store/sql_upgrade.go | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/store/sql_status_store.go b/store/sql_status_store.go index 9b82484f4..9f7441796 100644 --- a/store/sql_status_store.go +++ b/store/sql_status_store.go @@ -24,6 +24,7 @@ func NewSqlStatusStore(sqlStore *SqlStore) StatusStore { table := db.AddTableWithName(model.Status{}, "Status").SetKeys(false, "UserId") table.ColMap("UserId").SetMaxSize(26) table.ColMap("Status").SetMaxSize(32) + table.ColMap("ActiveChannel").SetMaxSize(26) } return s diff --git a/store/sql_status_store_test.go b/store/sql_status_store_test.go index 52759a4b1..dff4db55e 100644 --- a/store/sql_status_store_test.go +++ b/store/sql_status_store_test.go @@ -12,7 +12,7 @@ import ( func TestSqlStatusStore(t *testing.T) { Setup() - status := &model.Status{model.NewId(), model.STATUS_ONLINE, false, 0} + status := &model.Status{model.NewId(), model.STATUS_ONLINE, false, 0, ""} if err := (<-store.Status().SaveOrUpdate(status)).Err; err != nil { t.Fatal(err) @@ -28,12 +28,12 @@ func TestSqlStatusStore(t *testing.T) { t.Fatal(err) } - status2 := &model.Status{model.NewId(), model.STATUS_AWAY, false, 0} + status2 := &model.Status{model.NewId(), model.STATUS_AWAY, false, 0, ""} if err := (<-store.Status().SaveOrUpdate(status2)).Err; err != nil { t.Fatal(err) } - status3 := &model.Status{model.NewId(), model.STATUS_OFFLINE, false, 0} + status3 := &model.Status{model.NewId(), model.STATUS_OFFLINE, false, 0, ""} if err := (<-store.Status().SaveOrUpdate(status3)).Err; err != nil { t.Fatal(err) } @@ -81,7 +81,7 @@ func TestSqlStatusStore(t *testing.T) { func TestActiveUserCount(t *testing.T) { Setup() - status := &model.Status{model.NewId(), model.STATUS_ONLINE, false, model.GetMillis()} + status := &model.Status{model.NewId(), model.STATUS_ONLINE, false, model.GetMillis(), ""} Must(store.Status().SaveOrUpdate(status)) if result := <-store.Status().GetTotalActiveUsersCount(); result.Err != nil { diff --git a/store/sql_upgrade.go b/store/sql_upgrade.go index 954139128..302d7fc12 100644 --- a/store/sql_upgrade.go +++ b/store/sql_upgrade.go @@ -180,7 +180,9 @@ func UpgradeDatabaseToVersion33(sqlStore *SqlStore) { func UpgradeDatabaseToVersion34(sqlStore *SqlStore) { if shouldPerformUpgrade(sqlStore, VERSION_3_3_0, VERSION_3_4_0) { + sqlStore.CreateColumnIfNotExists("Status", "Manual", "BOOLEAN", "BOOLEAN", "0") + sqlStore.CreateColumnIfNotExists("Status", "ActiveChannel", "varchar(26)", "varchar(26)", "") // TODO XXX FIXME should be removed before release //saveSchemaVersion(sqlStore, VERSION_3_4_0) |