当接受好友邀请时，如果已经是好友，返回“已经是好友”的错误码

2020-05-06 20:50:15 +08:00
parent 4179788899
commit 69f28bd35b
2 changed files with 17 additions and 0 deletions
@@ -2147,6 +2147,21 @@ public class MemoryMessagesStore implements IMessagesStore {
    public ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads, boolean isAdmin) {
        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();

+        if(request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted) {
+            Collection<FriendData> friendDatas = getFriendDatas(hzInstance, userId);
+            for (FriendData fd : friendDatas) {
+                if (fd.getFriendUid().equals(request.getTargetUid())) {
+                    if (fd.getState() == 0) {
+                        return ErrorCode.ERROR_CODE_ALREADY_FRIENDS;
+                    } else {
+                        break;
+                    }
+                }
+            }
+        }
+
+        IMap<String, Boolean> friendEmpty = hzInstance.getMap(USER_FRIENDS_EMPTY);
+
        if (isAdmin) {
            MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);