Friend list uses presence service for online status, Staff join notids should resolve.....

Author: petethepossum

service.friend/src/main/java/net/swofty/service/friend/FriendCache.java

@@ -304,14 +304,13 @@ public static void handleListRequest(FriendListRequestEvent event) {
                 .map(Friend::getUuid)
                 .toList());
         List<UUID> friendUuids = pageFriends.stream().map(Friend::getUuid).toList();
-        Map<UUID, Boolean> onlineStatus = PresenceStorage.getOnlineStatus(friendUuids);
         Map<UUID, net.swofty.commons.presence.PresenceInfo> presenceInfo = PresenceStorage.getMap(friendUuids);
 
         List<FriendListResponseEvent.FriendListEntry> entries = new ArrayList<>();
         for (Friend friend : pageFriends) {
             String name = playerNames.getOrDefault(friend.getUuid(), "Unknown");
-            boolean isOnline = onlineStatus.getOrDefault(friend.getUuid(), false);
             net.swofty.commons.presence.PresenceInfo pInfo = presenceInfo.get(friend.getUuid());
+            boolean isOnline = pInfo != null && pInfo.isOnline();
             long lastSeen = pInfo != null ? pInfo.getLastSeen() : 0L;
             String server = (pInfo != null && pInfo.isOnline() && pInfo.getServerType() != null)
                     ? formatServerDisplay(pInfo)

type.generic/src/main/java/net/swofty/type/generic/redis/service/RedisStaffBroadcast.java

@@ -30,11 +30,14 @@ public JSONObject onMessage(JSONObject message) {
             StaffBroadcastProtocolObject.StaffBroadcastMessage msg =
                     proto.getSerializer().deserialize(payload);
 
-            String resolvedName;
+            String resolvedName = msg.senderName();
             try {
-                resolvedName = net.swofty.type.generic.user.HypixelPlayer.getDisplayName(msg.sender());
-            } catch (Exception e) {
-                resolvedName = msg.senderName(); // fallback to provided name
+                String dn = net.swofty.type.generic.user.HypixelPlayer.getDisplayName(msg.sender());
+                if (dn != null && !dn.isEmpty()) {
+                    resolvedName = dn;
+                }
+            } catch (Exception ignored) {
+                // fallback to provided name
             }
 
             String serverLabel = msg.server() == null ? "" : msg.server();