From 275731578e72d2c6e12cfb2fc315d3446474faec Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Mon, 16 Jul 2018 15:49:26 -0400
Subject: MM-10254 Add plugin APIs for getting/updating user statuses (#9101)

* Add plugin APIs for getting/updating user statuses

* Add and update tests

* Updates per feedback
---
 api4/post.go           | 2 +-
 api4/status.go         | 2 +-
 api4/status_test.go    | 6 +++---
 api4/user_test.go      | 2 +-
 api4/websocket_test.go | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'api4')

diff --git a/api4/post.go b/api4/post.go
index 27ecd1584..b76e89964 100644
--- a/api4/post.go
+++ b/api4/post.go
@@ -64,7 +64,7 @@ func createPost(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	c.App.SetStatusOnline(c.Session.UserId, c.Session.Id, false)
+	c.App.SetStatusOnline(c.Session.UserId, false)
 	c.App.UpdateLastActivityAtIfNeeded(c.Session)
 
 	w.WriteHeader(http.StatusCreated)
diff --git a/api4/status.go b/api4/status.go
index 627ddaca6..30e2140f1 100644
--- a/api4/status.go
+++ b/api4/status.go
@@ -78,7 +78,7 @@ func updateUserStatus(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	switch status.Status {
 	case "online":
-		c.App.SetStatusOnline(c.Params.UserId, "", true)
+		c.App.SetStatusOnline(c.Params.UserId, true)
 	case "offline":
 		c.App.SetStatusOffline(c.Params.UserId, true)
 	case "away":
diff --git a/api4/status_test.go b/api4/status_test.go
index 7049bedef..9b3583c1e 100644
--- a/api4/status_test.go
+++ b/api4/status_test.go
@@ -17,7 +17,7 @@ func TestGetUserStatus(t *testing.T) {
 		t.Fatal("Should return offline status")
 	}
 
-	th.App.SetStatusOnline(th.BasicUser.Id, "", true)
+	th.App.SetStatusOnline(th.BasicUser.Id, true)
 	userStatus, resp = Client.GetUserStatus(th.BasicUser.Id, "")
 	CheckNoError(t, resp)
 	if userStatus.Status != "online" {
@@ -80,8 +80,8 @@ func TestGetUsersStatusesByIds(t *testing.T) {
 		}
 	}
 
-	th.App.SetStatusOnline(th.BasicUser.Id, "", true)
-	th.App.SetStatusOnline(th.BasicUser2.Id, "", true)
+	th.App.SetStatusOnline(th.BasicUser.Id, true)
+	th.App.SetStatusOnline(th.BasicUser2.Id, true)
 	usersStatuses, resp = Client.GetUsersStatusesByIds(usersIds)
 	CheckNoError(t, resp)
 	for _, userStatus := range usersStatuses {
diff --git a/api4/user_test.go b/api4/user_test.go
index 4cbaf449a..78693e05f 100644
--- a/api4/user_test.go
+++ b/api4/user_test.go
@@ -1501,7 +1501,7 @@ func TestGetRecentlyActiveUsersInTeam(t *testing.T) {
 	Client := th.Client
 	teamId := th.BasicTeam.Id
 
-	th.App.SetStatusOnline(th.BasicUser.Id, "", true)
+	th.App.SetStatusOnline(th.BasicUser.Id, true)
 
 	rusers, resp := Client.GetRecentlyActiveUsersInTeam(teamId, 0, 60, "")
 	CheckNoError(t, resp)
diff --git a/api4/websocket_test.go b/api4/websocket_test.go
index 9e4c1da73..8ca194133 100644
--- a/api4/websocket_test.go
+++ b/api4/websocket_test.go
@@ -404,7 +404,7 @@ func TestWebSocketStatuses(t *testing.T) {
 	time.Sleep(1500 * time.Millisecond)
 
 	th.App.SetStatusAwayIfNeeded(th.BasicUser.Id, false)
-	th.App.SetStatusOnline(th.BasicUser.Id, "junk", false)
+	th.App.SetStatusOnline(th.BasicUser.Id, false)
 
 	time.Sleep(1500 * time.Millisecond)
 
-- 
cgit v1.2.3-1-g7c22