From 2cc70193df64b4dd3bbb6dab005f0879e0f0d825 Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Thu, 3 Nov 2022 15:05:25 +0100
Subject: [PATCH] Remove debug logs

---
 clientapi/routing/presence.go             |  6 ++---
 syncapi/storage/sqlite3/presence_table.go |  4 +--
 syncapi/streams/stream_presence.go        | 30 ++++++++++++-----------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/clientapi/routing/presence.go b/clientapi/routing/presence.go
index e92551f9b..093a62464 100644
--- a/clientapi/routing/presence.go
+++ b/clientapi/routing/presence.go
@@ -103,10 +103,11 @@ 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)
 		return util.JSONResponse{
 			Code: http.StatusOK,
 			JSON: types.PresenceClientResponse{
@@ -114,17 +115,14 @@ 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/storage/sqlite3/presence_table.go b/syncapi/storage/sqlite3/presence_table.go
index 4296f80e6..c4fc24f76 100644
--- a/syncapi/storage/sqlite3/presence_table.go
+++ b/syncapi/storage/sqlite3/presence_table.go
@@ -20,8 +20,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/sirupsen/logrus"
-
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/dendrite/syncapi/types"
@@ -148,7 +146,7 @@ func (p *presenceStatements) GetPresenceForUsers(
 		return nil, err
 	}
 	defer internal.CloseAndLogIfError(ctx, prepStmt, "GetPresenceForUsers: stmt.close() failed")
-	logrus.Debugf("XXX: getting users: %v", userIDs)
+
 	params := make([]interface{}, len(userIDs))
 	for i := range userIDs {
 		params[i] = userIDs[i]
diff --git a/syncapi/streams/stream_presence.go b/syncapi/streams/stream_presence.go
index 132ff1a00..39d88eaa8 100644
--- a/syncapi/streams/stream_presence.go
+++ b/syncapi/streams/stream_presence.go
@@ -161,21 +161,23 @@ func (p *PresenceStreamProvider) getNeededUsersFromRequest(ctx context.Context,
 
 	// add newly joined rooms user presences
 	newlyJoined := joinedRooms(req.Response, req.Device.UserID)
-	if len(newlyJoined) > 0 {
-		// TODO: Check if this is working better than before.
-		if err := p.notifier.LoadRooms(ctx, p.DB, newlyJoined); err != nil {
-			req.Log.WithError(err).Error("unable to refresh notifier lists")
-			return getPresenceForUsers, err
-		}
-		for _, roomID := range newlyJoined {
-			roomUsers := p.notifier.JoinedUsers(roomID)
-			for i := range roomUsers {
-				// we already got a presence from this user
-				if _, ok := presences[roomUsers[i]]; ok {
-					continue
-				}
-				getPresenceForUsers = append(getPresenceForUsers, roomUsers[i])
+	if len(newlyJoined) == 0 {
+		return getPresenceForUsers, nil
+	}
+
+	// TODO: Check if this is working better than before.
+	if err := p.notifier.LoadRooms(ctx, p.DB, newlyJoined); err != nil {
+		req.Log.WithError(err).Error("unable to refresh notifier lists")
+		return getPresenceForUsers, err
+	}
+	for _, roomID := range newlyJoined {
+		roomUsers := p.notifier.JoinedUsers(roomID)
+		for i := range roomUsers {
+			// we already got a presence from this user
+			if _, ok := presences[roomUsers[i]]; ok {
+				continue
 			}
+			getPresenceForUsers = append(getPresenceForUsers, roomUsers[i])
 		}
 	}
 	return getPresenceForUsers, nil