1 files changed, 52 insertions, 22 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go
index e5e0aa8ba..463bc0678 100644
--- a/store/sql_channel_store.go
+++ b/store/sql_channel_store.go
@@ -856,6 +856,58 @@ func (s SqlChannelStore) CheckOpenChannelPermissions(teamId string, channelId st
 	return storeChannel
 }
 
+func (s SqlChannelStore) SetLastViewedAt(channelId string, userId string, newLastViewedAt int64) StoreChannel {
+	storeChannel := make(StoreChannel)
+
+	go func() {
+		result := StoreResult{}
+
+		var query string
+
+		if utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_POSTGRES {
+			query = `UPDATE
+				ChannelMembers
+			SET
+			    MentionCount = 0,
+			    MsgCount = Channels.TotalMsgCount - (SELECT COUNT(*)
+			    					 FROM Posts
+			    					 WHERE ChannelId = :ChannelId
+			    					 AND CreateAt > :NewLastViewedAt),
+			    LastViewedAt = :NewLastViewedAt
+			FROM
+				Channels
+			WHERE
+			    Channels.Id = ChannelMembers.ChannelId
+			        AND UserId = :UserId
+			        AND ChannelId = :ChannelId`
+		} else if utils.Cfg.SqlSettings.DriverName == model.DATABASE_DRIVER_MYSQL {
+			query = `UPDATE
+				ChannelMembers, Channels
+			SET
+			    ChannelMembers.MentionCount = 0,
+			    ChannelMembers.MsgCount = Channels.TotalMsgCount - (SELECT COUNT(*)
+										FROM Posts
+										WHERE ChannelId = :ChannelId
+										AND CreateAt > :NewLastViewedAt),
+			    ChannelMembers.LastViewedAt = :NewLastViewedAt
+			WHERE
+			    Channels.Id = ChannelMembers.ChannelId
+			        AND UserId = :UserId
+			        AND ChannelId = :ChannelId`
+		}
+
+		_, err := s.GetMaster().Exec(query, map[string]interface{}{"ChannelId": channelId, "UserId": userId, "NewLastViewedAt": newLastViewedAt})
+		if err != nil {
+			result.Err = model.NewLocAppError("SqlChannelStore.SetLastViewedAt", "store.sql_channel.set_last_viewed_at.app_error", nil, "channel_id="+channelId+", user_id="+userId+", "+err.Error())
+		}
+
+		storeChannel <- result
+		close(storeChannel)
+	}()
+
+	return storeChannel
+}
+
 func (s SqlChannelStore) UpdateLastViewedAt(channelId string, userId string) StoreChannel {
 	storeChannel := make(StoreChannel)
 
@@ -930,28 +982,6 @@ func (s SqlChannelStore) IncrementMentionCount(channelId string, userId string)
 	return storeChannel
 }
 
-func (s SqlChannelStore) GetForExport(teamId string) StoreChannel {
-	storeChannel := make(StoreChannel)
-
-	go func() {
-		result := StoreResult{}
-
-		var data []*model.Channel
-		_, err := s.GetReplica().Select(&data, "SELECT * FROM Channels WHERE TeamId = :TeamId AND DeleteAt = 0 AND Type = 'O'", map[string]interface{}{"TeamId": teamId})
-
-		if err != nil {
-			result.Err = model.NewLocAppError("SqlChannelStore.GetAllChannels", "store.sql_channel.get_for_export.app_error", nil, "teamId="+teamId+", err="+err.Error())
-		} else {
-			result.Data = data
-		}
-
-		storeChannel <- result
-		close(storeChannel)
-	}()
-
-	return storeChannel
-}
-
 func (s SqlChannelStore) GetAll(teamId string) StoreChannel {
 	storeChannel := make(StoreChannel)