From d1781c634e5192b2dc1718fe72b55ba5c35585b8 Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Thu, 3 Nov 2022 13:51:14 +0100
Subject: [PATCH] Fix sytest again

---
 clientapi/routing/presence.go | 13 ++++---------
 syncapi/consumers/presence.go | 14 ++++++--------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/clientapi/routing/presence.go b/clientapi/routing/presence.go
index b7a9b5bf4..e92551f9b 100644
--- a/clientapi/routing/presence.go
+++ b/clientapi/routing/presence.go
@@ -103,18 +103,10 @@ func GetPresence(
 			JSON: jsonerror.InternalServerError(),
 		}
 	}
-
+	log.Debugf("XXX: 1")
 	statusMsg := presence.Header.Get("status_msg")
 	e := presence.Header.Get("error")
 	if e != "" {
-		log.Errorf("received error msg from nats: %s", e)
-		if code := presence.Header.Get("error_code"); code == "404" {
-			return util.JSONResponse{
-				Code: http.StatusNotFound,
-				JSON: jsonerror.NotFound("No status for user found."),
-			}
-		}
-
 		return util.JSONResponse{
 			Code: http.StatusOK,
 			JSON: types.PresenceClientResponse{
@@ -122,14 +114,17 @@ func GetPresence(
 			},
 		}
 	}
+	log.Debugf("XXX: 2")
 	lastActive, err := strconv.Atoi(presence.Header.Get("last_active_ts"))
 	if err != nil {
+		log.WithError(err).Errorf("WTF?!")
 		return util.JSONResponse{
 			Code: http.StatusInternalServerError,
 			JSON: jsonerror.InternalServerError(),
 		}
 	}
 
+	log.Debugf("XXX: 3")
 	p := types.PresenceInternal{LastActiveTS: gomatrixserverlib.Timestamp(lastActive)}
 	currentlyActive := p.CurrentlyActive()
 	return util.JSONResponse{
diff --git a/syncapi/consumers/presence.go b/syncapi/consumers/presence.go
index 617a9ad0a..6e3150c29 100644
--- a/syncapi/consumers/presence.go
+++ b/syncapi/consumers/presence.go
@@ -89,15 +89,13 @@ func (s *PresenceConsumer) Start() error {
 			}
 			return
 		}
-		if len(presences) == 0 {
-			m.Header.Set("error", "presence does not exist")
-			m.Header.Set("error_code", "404")
-			if err = msg.RespondMsg(msg); err != nil {
-				logrus.WithError(err).Error("Unable to respond to messages")
-			}
-			return
+
+		presence := &types.PresenceInternal{
+			UserID: userID,
+		}
+		if len(presences) > 0 {
+			presence = presences[0]
 		}
-		presence := presences[0]
 
 		deviceRes := api.QueryDevicesResponse{}
 		if err = s.deviceAPI.QueryDevices(s.ctx, &api.QueryDevicesRequest{UserID: userID}, &deviceRes); err != nil {