open-source/MallChat
1
0
Fork 0
mirror of https://github.com/zongzibinbin/MallChat.git synced 2026-03-23 21:33:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #129 from lingyufei/fix/replayMessage-setType-error

Browse Source 
Fix 2 errors in TextMsgHandler and CheckRecall
This commit is contained in:
zongzibinbin
2023-09-10 19:48:49 +08:00
committed by GitHub
parent 52ab70510f 099eb46fb3
commit 81d60f6453
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/ChatServiceImpl.java
View File

@@ -290,7 +290,7 @@ public class ChatServiceImpl implements ChatService {
private void checkRecall(Long uid, Message message) { private void checkRecall(Long uid, Message message) {
AssertUtil.isNotEmpty(message, "消息有误"); AssertUtil.isNotEmpty(message, "消息有误");
AssertUtil.notEqual(message.getType(), MessageTypeEnum.RECALL, "消息无法撤回"); AssertUtil.notEqual(message.getType(), MessageTypeEnum.RECALL.getType(), "消息无法撤回");
boolean hasPower = iRoleService.hasPower(uid, RoleEnum.CHAT_MANAGER); boolean hasPower = iRoleService.hasPower(uid, RoleEnum.CHAT_MANAGER);
if (hasPower) { if (hasPower) {
return; return;

2
mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/strategy/msg/TextMsgHandler.java
View File

@@ -120,7 +120,7 @@ public class TextMsgHandler extends AbstractMsgHandler {
TextMsgResp.ReplyMsg replyMsgVO = new TextMsgResp.ReplyMsg(); TextMsgResp.ReplyMsg replyMsgVO = new TextMsgResp.ReplyMsg();
replyMsgVO.setId(replyMessage.getId()); replyMsgVO.setId(replyMessage.getId());
replyMsgVO.setUid(replyMessage.getFromUid()); replyMsgVO.setUid(replyMessage.getFromUid());
replyMessage.setType(replyMessage.getType()); replyMsgVO.setType(replyMessage.getType());
replyMsgVO.setBody(MsgHandlerFactory.getStrategyNoNull(replyMessage.getType()).showReplyMsg(replyMessage)); replyMsgVO.setBody(MsgHandlerFactory.getStrategyNoNull(replyMessage.getType()).showReplyMsg(replyMessage));
User replyUser = userCache.getUserInfo(replyMessage.getFromUid()); User replyUser = userCache.getUserInfo(replyMessage.getFromUid());
replyMsgVO.setUsername(replyUser.getName()); replyMsgVO.setUsername(replyUser.getName());