From b59f20e5466f6c746bf01a6a24903a4a8aa84f06 Mon Sep 17 00:00:00 2001
From: Till Faelligen <tfaelligen@gmail.com>
Date: Wed, 19 Jan 2022 17:41:57 +0100
Subject: [PATCH] Remove PresenceStatus to avoid confusion

---
 userapi/api/api.go      | 3 +--
 userapi/internal/api.go | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/userapi/api/api.go b/userapi/api/api.go
index 15c500ff4..7ad010e13 100644
--- a/userapi/api/api.go
+++ b/userapi/api/api.go
@@ -361,8 +361,7 @@ type QueryPresenceForUserRequest struct {
 // QueryPresenceForUserResponse is the response for QueryPresenceForUserRequest
 type QueryPresenceForUserResponse struct {
 	UserID          string                      `json:"user_id"`
-	PresenceStatus  types.PresenceStatus        `json:"presence_status"`
-	Presence        string                      `json:"presence"`
+	Presence        types.PresenceStatus        `json:"presence"`
 	StatusMsg       *string                     `json:"status_msg"`
 	LastActiveTS    gomatrixserverlib.Timestamp `json:"last_active_ts"`
 	LastActiveAgo   int64                       `json:"last_active_ago"`
diff --git a/userapi/internal/api.go b/userapi/internal/api.go
index d9271ba4c..dae4bd102 100644
--- a/userapi/internal/api.go
+++ b/userapi/internal/api.go
@@ -505,7 +505,7 @@ func (a *UserInternalAPI) QueryPresenceForUser(ctx context.Context, req *api.Que
 		return err
 	}
 
-	res.PresenceStatus = p.Presence
+	res.Presence = p.Presence
 	res.StatusMsg = p.StatusMsg
 	res.LastActiveTS = p.LastActiveTS
 	res.UserID = p.UserID
@@ -526,11 +526,10 @@ func (a *UserInternalAPI) QueryPresenceAfter(ctx context.Context, req *api.Query
 	for _, x := range p {
 		var y api.QueryPresenceForUserResponse
 		y.UserID = x.UserID
-		y.Presence = x.Presence.String()
+		y.Presence = x.Presence
 		y.StreamPos = int64(x.StreamPos)
 		y.LastActiveTS = x.LastActiveTS
 		y.LastActiveAgo = x.LastActiveAgo
-		y.PresenceStatus = x.Presence
 		y.StatusMsg = x.StatusMsg
 		presences = append(presences, y)
 	}