优化群组撤回逻辑。
This commit is contained in:
@@ -2179,9 +2179,10 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
if (isAdmin) {
|
if (isAdmin) {
|
||||||
canRecall = true;
|
canRecall = true;
|
||||||
}
|
}
|
||||||
if (!isAdmin && message.getFromUser().equals(operatorId)) {
|
boolean isExpired = false;
|
||||||
|
if (!canRecall && message.getFromUser().equals(operatorId)) {
|
||||||
if (now - message.getServerTimestamp() > mRecallTimeLimit * 1000) {
|
if (now - message.getServerTimestamp() > mRecallTimeLimit * 1000) {
|
||||||
return ErrorCode.ERROR_CODE_RECALL_TIME_EXPIRED;
|
isExpired = true;
|
||||||
} else {
|
} else {
|
||||||
canRecall = true;
|
canRecall = true;
|
||||||
}
|
}
|
||||||
@@ -2198,17 +2199,26 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
canRecall = true;
|
canRecall = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
|
if(!canRecall && !message.getFromUser().equals(operatorId)) {
|
||||||
Collection<WFCMessage.GroupMember> members = groupMembers.get(message.getConversation().getTarget());
|
boolean isOperatorManager = false;
|
||||||
if (members == null || members.size() == 0) {
|
int senderType = GroupMemberType_Normal;
|
||||||
members = loadGroupMemberFromDB(hzInstance, message.getConversation().getTarget());
|
MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
|
||||||
}
|
Collection<WFCMessage.GroupMember> members = groupMembers.get(message.getConversation().getTarget());
|
||||||
for (WFCMessage.GroupMember member : members) {
|
if (members == null || members.size() == 0) {
|
||||||
if (member.getMemberId().equals(operatorId)) {
|
members = loadGroupMemberFromDB(hzInstance, message.getConversation().getTarget());
|
||||||
if (member.getType() == GroupMemberType_Manager || member.getType() == ProtoConstants.GroupMemberType.GroupMemberType_Owner) {
|
}
|
||||||
canRecall = true;
|
for (WFCMessage.GroupMember member : members) {
|
||||||
|
if (member.getMemberId().equals(operatorId)) {
|
||||||
|
if (member.getType() == GroupMemberType_Manager || member.getType() == ProtoConstants.GroupMemberType.GroupMemberType_Owner) {
|
||||||
|
isOperatorManager = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
if(member.getMemberId().equals(message.getFromUser())) {
|
||||||
|
senderType = member.getType();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(isOperatorManager && senderType != GroupMemberType_Manager && senderType != GroupMemberType_Owner) {
|
||||||
|
canRecall = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2220,7 +2230,11 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!canRecall) {
|
if (!canRecall) {
|
||||||
return ErrorCode.ERROR_CODE_NOT_RIGHT;
|
if(isExpired) {
|
||||||
|
return ErrorCode.ERROR_CODE_RECALL_TIME_EXPIRED;
|
||||||
|
} else {
|
||||||
|
return ErrorCode.ERROR_CODE_NOT_RIGHT;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(message.getContent().getType() == 80) {
|
if(message.getContent().getType() == 80) {
|
||||||
|
|||||||
Reference in New Issue
Block a user