用户关系的api

broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java

@@ -25,9 +25,9 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
             WFCMessage.Message.Builder builder = WFCMessage.Message.newBuilder();
             builder.setFromUser(request.getTargetUid());
             long[] heads = new long[2];
-            ErrorCode errorCode = m_messagesStore.handleFriendRequest(fromUser, request, builder, heads);
+            ErrorCode errorCode = m_messagesStore.handleFriendRequest(fromUser, request, builder, heads, isAdmin);
 
-            if (errorCode == ERROR_CODE_SUCCESS) {
+            if (errorCode == ERROR_CODE_SUCCESS && !isAdmin) {
                 long messageId = MessageShardingUtil.generateId();
                 long timestamp = System.currentTimeMillis();
                 builder.setMessageId(messageId);

broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java

@@ -1348,7 +1348,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         for (FriendData friendData : friendDatas) {
-            if (friendData.getUserId().equals(userId)) {
+            if (friendData.getFriendUid().equals(userId)) {
                 if (friendData.getState() == 2) {
                     return true;
                 } else {
@@ -1539,8 +1539,57 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads) {
+    public ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+
+        if (isAdmin) {
+            MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
+
+            FriendData friendData1 = null;
+            Collection<FriendData> friendDatas = friendsMap.get(userId);
+            for (FriendData fd : friendDatas) {
+                if (fd.getFriendUid().equals(request.getTargetUid())) {
+                    friendData1 = fd;
+                    break;
+                }
+            }
+            if (friendData1 == null) {
+                friendData1 = new FriendData(userId, request.getTargetUid(), "", request.getStatus(), System.currentTimeMillis());
+            } else {
+                friendsMap.remove(userId, friendData1);
+                friendData1.setState(request.getStatus());
+                friendData1.setTimestamp(System.currentTimeMillis());
+            }
+
+            friendsMap.put(userId, friendData1);
+            databaseStore.persistOrUpdateFriendData(friendData1);
+
+            FriendData friendData2 = null;
+
+            friendDatas = friendsMap.get(request.getTargetUid());
+            for (FriendData fd : friendDatas) {
+                if (fd.getFriendUid().equals(userId)) {
+                    friendData2 = fd;
+                    break;
+                }
+            }
+            if (friendData2 == null) {
+                friendData2 = new FriendData(request.getTargetUid(), userId, "", request.getStatus(), friendData1.getTimestamp());
+            } else {
+                friendsMap.remove(request.getTargetUid(), friendData2);
+                friendData2.setState(request.getStatus());
+                friendData2.setTimestamp(System.currentTimeMillis());
+            }
+
+
+            friendsMap.put(request.getTargetUid(), friendData2);
+            databaseStore.persistOrUpdateFriendData(friendData2);
+
+            heads[0] = friendData2.getTimestamp();
+            heads[1] = friendData1.getTimestamp();
+            return ErrorCode.ERROR_CODE_SUCCESS;
+        }
+
         MultiMap<String, WFCMessage.FriendRequest> requestMap = hzInstance.getMultiMap(USER_FRIENDS_REQUEST);
         Collection<WFCMessage.FriendRequest> requests = requestMap.get(userId);
         if (requests == null || requests.size() == 0) {

broker/src/main/java/io/moquette/spi/IMessagesStore.java

@@ -152,7 +152,7 @@ public interface IMessagesStore {
     List<WFCMessage.FriendRequest> getFriendRequestList(String userId, long version);
 
     ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head);
-    ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads);
+    ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads, boolean isAdmin);
     ErrorCode deleteFriend(String userId, String friendUid);
     ErrorCode blackUserRequest(String fromUser, String targetUserId, int status, long[] head);
     ErrorCode SyncFriendRequestUnread(String userId, long unreadDt, long[] head);