mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-29 09:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove PresenceStatus to avoid confusion

Browse source
This commit is contained in:
Till Faelligen 2022-01-19 17:41:57 +01:00
parent 4efb3477fb
commit b59f20e546
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
userapi/api/api.go
View file

@ -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"`

5
userapi/internal/api.go
View file

@ -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)
}