更新黑名单逻辑

This commit is contained in:
imhao183
2019-12-30 15:20:59 +08:00
parent 9baa1f9b23
commit 73015c7a17
@@ -1659,22 +1659,26 @@ public class MemoryMessagesStore implements IMessagesStore {
} }
@Override @Override
public ErrorCode isAllowUserMessage(String fromUser, String userId) { public ErrorCode isAllowUserMessage(String targetUser, String fromUser) {
HazelcastInstance hzInstance = m_Server.getHazelcastInstance(); HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS); MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
Collection<FriendData> friendDatas = friendsMap.get(fromUser); Collection<FriendData> friendDatas = friendsMap.get(targetUser);
if (friendDatas == null || friendDatas.size() == 0) { if (friendDatas == null || friendDatas.size() == 0) {
friendDatas = loadFriend(friendsMap, fromUser); friendDatas = loadFriend(friendsMap, targetUser);
} }
for (FriendData friendData : friendDatas) { for (FriendData friendData : friendDatas) {
if (friendData.getFriendUid().equals(userId)) { if (friendData.getFriendUid().equals(fromUser)) {
if (friendData.getBlacked() == 1) { if (friendData.getBlacked() == 1) {
return ErrorCode.ERROR_CODE_IN_BLACK_LIST; return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
} else { } else {
return ErrorCode.ERROR_CODE_SUCCESS; if (friendData.getState() == 0) {
return ErrorCode.ERROR_CODE_SUCCESS;
} else {
break;
}
} }
} }
} }