添加好友时,只检查对方的黑名单状态

This commit is contained in:
heavyrian2012
2023-05-27 10:15:07 +08:00
parent 26fbde676e
commit 252204a760
@@ -3101,27 +3101,16 @@ public class MemoryMessagesStore implements IMessagesStore {
} }
} }
MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS); FriendData friendData1 = getFriendData(userId, request.getTargetUid());
FriendData friendData1 = null;
Collection<FriendData> friendDatas = friendsMap.get(userId);
if (friendDatas == null || friendDatas.size() == 0) {
friendDatas = loadFriend(friendsMap, userId);
}
for (FriendData fd : friendDatas) {
if (fd.getFriendUid().equals(request.getTargetUid())) {
friendData1 = fd;
break;
}
}
if (friendData1 != null && friendData1.getBlacked() > 0 && !isAdmin) {
return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
}
if (friendData1 != null && friendData1.getState() == 0) { if (friendData1 != null && friendData1.getState() == 0) {
return ErrorCode.ERROR_CODE_ALREADY_FRIENDS; return ErrorCode.ERROR_CODE_ALREADY_FRIENDS;
} }
FriendData friendData2 = getFriendData(request.getTargetUid(), userId);
if (friendData2 != null && friendData2.getBlacked() > 0 && !isAdmin) {
return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
}
WFCMessage.FriendRequest newRequest = WFCMessage.FriendRequest WFCMessage.FriendRequest newRequest = WFCMessage.FriendRequest
.newBuilder() .newBuilder()
.setFromUid(userId) .setFromUid(userId)