diff --git a/broker/src/main/java/io/moquette/imhandler/AddFriendHandler.java b/broker/src/main/java/io/moquette/imhandler/AddFriendHandler.java index aa5a418a..6150b7c1 100644 --- a/broker/src/main/java/io/moquette/imhandler/AddFriendHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/AddFriendHandler.java @@ -21,7 +21,7 @@ import static win.liyufan.im.IMTopic.HandleFriendRequestTopic; @Handler(IMTopic.AddFriendRequestTopic) public class AddFriendHandler extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.AddFriendRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.AddFriendRequest request, Qos1PublishHandler.IMCallback callback) { long[] head = new long[1]; ErrorCode errorCode = m_messagesStore.saveAddFriendRequest(fromUser, request, head); if (errorCode == ERROR_CODE_SUCCESS) { diff --git a/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java b/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java index b50a8288..b406d3c3 100644 --- a/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java +++ b/broker/src/main/java/io/moquette/imhandler/AddGroupMember.java @@ -22,7 +22,7 @@ import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS; public class AddGroupMember extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.AddGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.AddGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode = m_messagesStore.addGroupMembers(fromUser, request.getGroupId(), request.getAddedMemberList()); if (errorCode == ERROR_CODE_SUCCESS) { if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) { diff --git a/broker/src/main/java/io/moquette/imhandler/BlackListRequestHandler.java b/broker/src/main/java/io/moquette/imhandler/BlackListRequestHandler.java index e9587937..ce9e5279 100644 --- a/broker/src/main/java/io/moquette/imhandler/BlackListRequestHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/BlackListRequestHandler.java @@ -19,7 +19,7 @@ import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.BlackListUserTopic) public class BlackListRequestHandler extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.BlackUserRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.BlackUserRequest request, Qos1PublishHandler.IMCallback callback) { long[] head = new long[1]; ErrorCode errorCode = m_messagesStore.blackUserRequest(fromUser, request.getUid(), request.getStatus(), head); if (errorCode == ERROR_CODE_SUCCESS) { diff --git a/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java b/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java index d3303afa..be5cce4e 100644 --- a/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java +++ b/broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java @@ -23,7 +23,7 @@ import static win.liyufan.im.UserSettingScope.kUserSettingListenedChannels; public class ChannelListenMember extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.ListenChannel request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ListenChannel request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode = m_messagesStore.listenChannel(fromUser, request.getChannelId(), request.getListen()>0); if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { WFCMessage.ModifyUserSettingReq modifyUserSettingReq = WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingListenedChannels).setKey(request.getChannelId()).setValue(request.getListen() > 0 ? "1" : "0").build(); diff --git a/broker/src/main/java/io/moquette/imhandler/ChannelSearchHandler.java b/broker/src/main/java/io/moquette/imhandler/ChannelSearchHandler.java index ba90c09e..98c2e9f5 100644 --- a/broker/src/main/java/io/moquette/imhandler/ChannelSearchHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/ChannelSearchHandler.java @@ -19,7 +19,7 @@ import java.util.List; @Handler(IMTopic.ChannelSearchTopic) public class ChannelSearchHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.SearchUserRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.SearchUserRequest request, Qos1PublishHandler.IMCallback callback) { List users = m_messagesStore.searchChannel(request.getKeyword(), request.getFuzzy() > 0, request.getPage()); WFCMessage.SearchChannelResult.Builder builder = WFCMessage.SearchChannelResult.newBuilder(); builder.addAllChannel(users); diff --git a/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java b/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java index ca502973..1a13de38 100644 --- a/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java @@ -25,7 +25,7 @@ import static win.liyufan.im.UserSettingScope.kUserSettingMyChannels; @Handler(value = IMTopic.CreateChannelTopic) public class CreateChannelHandler extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.ChannelInfo request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ChannelInfo request, Qos1PublishHandler.IMCallback callback) { WFCMessage.ChannelInfo.Builder builder = request.toBuilder(); if (StringUtil.isNullOrEmpty(request.getTargetId())) { builder.setTargetId(m_messagesStore.getShortUUID()); diff --git a/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java index 2f8fb631..11819303 100644 --- a/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java @@ -21,7 +21,7 @@ import static io.moquette.BrokerConstants.MESSAGE_CONTENT_TYPE_CREATE_GROUP; @Handler(value = IMTopic.CreateGroupTopic) public class CreateGroupHandler extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.CreateGroupRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.CreateGroupRequest request, Qos1PublishHandler.IMCallback callback) { WFCMessage.GroupInfo groupInfo = m_messagesStore.createGroup(fromUser, request.getGroup().getGroupInfo(), request.getGroup().getMembersList()); if (groupInfo != null) { if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) { diff --git a/broker/src/main/java/io/moquette/imhandler/DeleteFriendHandler.java b/broker/src/main/java/io/moquette/imhandler/DeleteFriendHandler.java index 4b04186b..62546750 100644 --- a/broker/src/main/java/io/moquette/imhandler/DeleteFriendHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/DeleteFriendHandler.java @@ -17,7 +17,7 @@ import win.liyufan.im.IMTopic; @Handler(IMTopic.DeleteFriendTopic) public class DeleteFriendHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) { return m_messagesStore.deleteFriend(fromUser, request.getId()); } } diff --git a/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java index c650d1ea..435c7e70 100644 --- a/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java @@ -20,7 +20,7 @@ import static win.liyufan.im.IMTopic.DismissGroupTopic; @Handler(value = DismissGroupTopic) public class DismissGroupHandler extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.DismissGroupRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.DismissGroupRequest request, Qos1PublishHandler.IMCallback callback) { WFCMessage.GroupInfo groupInfo = m_messagesStore.getGroupInfo(request.getGroupId()); ErrorCode errorCode; if (groupInfo == null) { diff --git a/broker/src/main/java/io/moquette/imhandler/DistoryChannelHandler.java b/broker/src/main/java/io/moquette/imhandler/DistoryChannelHandler.java index 15b7c7cd..ddb400cd 100644 --- a/broker/src/main/java/io/moquette/imhandler/DistoryChannelHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/DistoryChannelHandler.java @@ -20,7 +20,7 @@ import static win.liyufan.im.UserSettingScope.kUserSettingMyChannels; @Handler(value = IMTopic.DestoryChannelInfoTopic) public class DistoryChannelHandler extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode = m_messagesStore.distoryChannel(fromUser, request.getId()); if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { WFCMessage.ModifyUserSettingReq modifyUserSettingReq = WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingMyChannels).setKey(request.getId()).setValue("0").build(); diff --git a/broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java b/broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java index 9a8ac5f4..90d4001e 100644 --- a/broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java @@ -20,7 +20,7 @@ import java.util.List; @Handler(IMTopic.FriendPullTopic) public class FriendPullHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) { List friendDatas = m_messagesStore.getFriendList(fromUser, request.getVersion()); WFCMessage.GetFriendsResult.Builder builder = WFCMessage.GetFriendsResult.newBuilder(); for (FriendData data : friendDatas diff --git a/broker/src/main/java/io/moquette/imhandler/FriendRequestPullHandler.java b/broker/src/main/java/io/moquette/imhandler/FriendRequestPullHandler.java index 1641b058..f9d6babd 100644 --- a/broker/src/main/java/io/moquette/imhandler/FriendRequestPullHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/FriendRequestPullHandler.java @@ -19,7 +19,7 @@ import java.util.List; @Handler(IMTopic.FriendRequestPullTopic) public class FriendRequestPullHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) { List friendDatas = m_messagesStore.getFriendRequestList(fromUser, request.getVersion()); WFCMessage.GetFriendRequestResult.Builder builder = WFCMessage.GetFriendRequestResult.newBuilder(); builder.addAllEntry(friendDatas); diff --git a/broker/src/main/java/io/moquette/imhandler/GetChannelInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/GetChannelInfoHandler.java index 5faa172a..763ded48 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetChannelInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetChannelInfoHandler.java @@ -17,7 +17,7 @@ import win.liyufan.im.IMTopic; @Handler(IMTopic.ChannelPullTopic) public class GetChannelInfoHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.PullChannelInfo request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.PullChannelInfo request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS; WFCMessage.ChannelInfo info = m_messagesStore.getChannelInfo(request.getChannelId()); if (info == null) { diff --git a/broker/src/main/java/io/moquette/imhandler/GetChatroomInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/GetChatroomInfoHandler.java index b9096dcf..4d8a8734 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetChatroomInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetChatroomInfoHandler.java @@ -17,7 +17,7 @@ import win.liyufan.im.IMTopic; @Handler(IMTopic.GetChatroomInfoTopic) public class GetChatroomInfoHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.GetChatroomInfoRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.GetChatroomInfoRequest request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS; WFCMessage.ChatroomInfo info = m_messagesStore.getChatroomInfo(request.getChatroomId()); if (info == null) { diff --git a/broker/src/main/java/io/moquette/imhandler/GetChatroomMemberHandler.java b/broker/src/main/java/io/moquette/imhandler/GetChatroomMemberHandler.java index 15bcbadc..ea4e3786 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetChatroomMemberHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetChatroomMemberHandler.java @@ -17,7 +17,7 @@ import win.liyufan.im.IMTopic; @Handler(IMTopic.GetChatroomMemberTopic) public class GetChatroomMemberHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.GetChatroomMemberInfoRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.GetChatroomMemberInfoRequest request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS; WFCMessage.ChatroomMemberInfo info = m_messagesStore.getChatroomMemberInfo(request.getChatroomId(), request.getMaxCount()); if (info != null) { diff --git a/broker/src/main/java/io/moquette/imhandler/GetGroupInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/GetGroupInfoHandler.java index 38988499..58d3625c 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetGroupInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetGroupInfoHandler.java @@ -19,7 +19,7 @@ import java.util.List; @Handler(IMTopic.GetGroupInfoTopic) public class GetGroupInfoHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.PullUserRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.PullUserRequest request, Qos1PublishHandler.IMCallback callback) { List infos = m_messagesStore.getGroupInfos(request.getRequestList()); WFCMessage.PullGroupInfoResult result = WFCMessage.PullGroupInfoResult.newBuilder().addAllInfo(infos).build(); diff --git a/broker/src/main/java/io/moquette/imhandler/GetGroupMemberHandler.java b/broker/src/main/java/io/moquette/imhandler/GetGroupMemberHandler.java index e79ebeab..2cd3be02 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetGroupMemberHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetGroupMemberHandler.java @@ -22,7 +22,7 @@ import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.GetGroupMemberTopic) public class GetGroupMemberHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.PullGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.PullGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) { List members = new ArrayList<>(); ErrorCode errorCode = m_messagesStore.getGroupMembers(request.getTarget(), request.getHead(), members); diff --git a/broker/src/main/java/io/moquette/imhandler/GetQiniuUploadTokenHandler.java b/broker/src/main/java/io/moquette/imhandler/GetQiniuUploadTokenHandler.java index ed22cc6d..a18bdfce 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetQiniuUploadTokenHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetQiniuUploadTokenHandler.java @@ -20,7 +20,7 @@ import win.liyufan.im.IMTopic; @Handler(IMTopic.GetQiniuUploadTokenTopic) public class GetQiniuUploadTokenHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, Byte request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, Byte request, Qos1PublishHandler.IMCallback callback) { int type = request; String token; diff --git a/broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java b/broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java index c41fa7eb..f017e9c7 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java @@ -19,7 +19,7 @@ import win.liyufan.im.IMTopic; @Handler(IMTopic.GetTokenTopic) public class GetTokenHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.GetTokenRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.GetTokenRequest request, Qos1PublishHandler.IMCallback callback) { MemorySessionStore.Session session = m_sessionsStore.createUserSession(fromUser, clientID); TokenAuthenticator authenticator = new TokenAuthenticator(); String strToken = authenticator.generateToken(fromUser); diff --git a/broker/src/main/java/io/moquette/imhandler/GetUserInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/GetUserInfoHandler.java index 5aa2fa3e..67080e96 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetUserInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetUserInfoHandler.java @@ -19,7 +19,7 @@ import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.GetUserInfoTopic) public class GetUserInfoHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.PullUserRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.PullUserRequest request, Qos1PublishHandler.IMCallback callback) { WFCMessage.PullUserResult.Builder resultBuilder = WFCMessage.PullUserResult.newBuilder(); ErrorCode errorCode = m_messagesStore.getUserInfo(request.getRequestList(), resultBuilder); diff --git a/broker/src/main/java/io/moquette/imhandler/GetUserSettingHandler.java b/broker/src/main/java/io/moquette/imhandler/GetUserSettingHandler.java index 6f00768d..6e72dca2 100644 --- a/broker/src/main/java/io/moquette/imhandler/GetUserSettingHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/GetUserSettingHandler.java @@ -19,7 +19,7 @@ import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.GetUserSettingTopic) public class GetUserSettingHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) { WFCMessage.GetUserSettingResult.Builder builder = WFCMessage.GetUserSettingResult.newBuilder(); ErrorCode errorCode = m_messagesStore.getUserSettings(fromUser, request.getVersion(), builder); if (errorCode == ERROR_CODE_SUCCESS) { diff --git a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java index 15215b1f..ad8d1570 100644 --- a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java @@ -21,7 +21,7 @@ import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.HandleFriendRequestTopic) public class HandleFriendRequestHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.HandleFriendRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.HandleFriendRequest request, Qos1PublishHandler.IMCallback callback) { WFCMessage.Message.Builder builder = WFCMessage.Message.newBuilder(); builder.setFromUser(request.getTargetUid()); long[] heads = new long[2]; diff --git a/broker/src/main/java/io/moquette/imhandler/IMHandler.java b/broker/src/main/java/io/moquette/imhandler/IMHandler.java index 66e7d757..e1b2a494 100755 --- a/broker/src/main/java/io/moquette/imhandler/IMHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/IMHandler.java @@ -171,7 +171,7 @@ abstract public class IMHandler { return ErrorCode.ERROR_CODE_SUCCESS; } - public void doHandler(String clientID, String fromUser, String topic, byte[] payloadContent, Qos1PublishHandler.IMCallback callback) { + public void doHandler(String clientID, String fromUser, String topic, byte[] payloadContent, Qos1PublishHandler.IMCallback callback, boolean isAdmin) { m_imBusinessExecutor.execute(() -> { Qos1PublishHandler.IMCallback callbackWrapper = new Qos1PublishHandler.IMCallback() { @Override @@ -191,7 +191,7 @@ abstract public class IMHandler { try { LOG.debug("execute handler for topic {}", topic); - errorCode = action(ackPayload, clientID, fromUser, getDataObject(payloadContent), callbackWrapper); + errorCode = action(ackPayload, clientID, fromUser, isAdmin, getDataObject(payloadContent), callbackWrapper); } catch (IllegalAccessException e) { e.printStackTrace(); Utility.printExecption(LOG, e); @@ -234,7 +234,7 @@ abstract public class IMHandler { @ActionMethod - abstract public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, T request, Qos1PublishHandler.IMCallback callback) ; + abstract public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, T request, Qos1PublishHandler.IMCallback callback) ; public void afterAction(String clientID, String fromUser, String topic, Qos1PublishHandler.IMCallback callback) { diff --git a/broker/src/main/java/io/moquette/imhandler/JoinChatroomHandler.java b/broker/src/main/java/io/moquette/imhandler/JoinChatroomHandler.java index be3b3960..3d784e0d 100644 --- a/broker/src/main/java/io/moquette/imhandler/JoinChatroomHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/JoinChatroomHandler.java @@ -18,7 +18,7 @@ import win.liyufan.im.IMTopic; @Handler(IMTopic.JoinChatroomTopic) public class JoinChatroomHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) { return m_messagesStore.handleJoinChatroom(fromUser, clientID, request.getId()); } } diff --git a/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java b/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java index e3bb31a1..0f66d738 100644 --- a/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java +++ b/broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java @@ -19,7 +19,7 @@ import static win.liyufan.im.IMTopic.KickoffGroupMemberTopic; @Handler(value = KickoffGroupMemberTopic) public class KickoffGroupMember extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.RemoveGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.RemoveGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode; WFCMessage.GroupInfo groupInfo = m_messagesStore.getGroupInfo(request.getGroupId()); if (groupInfo == null) { diff --git a/broker/src/main/java/io/moquette/imhandler/LoadRemoteMessagesHandler.java b/broker/src/main/java/io/moquette/imhandler/LoadRemoteMessagesHandler.java index 1fb288fb..693fdbb6 100644 --- a/broker/src/main/java/io/moquette/imhandler/LoadRemoteMessagesHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/LoadRemoteMessagesHandler.java @@ -18,7 +18,7 @@ import win.liyufan.im.IMTopic; @Handler(value = IMTopic.LoadRemoteMessagesTopic) public class LoadRemoteMessagesHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.LoadRemoteMessages request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.LoadRemoteMessages request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS; WFCMessage.PullMessageResult result = m_messagesStore.loadRemoteMessages(fromUser, request.getConversation(), request.getBeforeUid(), request.getCount()); diff --git a/broker/src/main/java/io/moquette/imhandler/ModifyChannelInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/ModifyChannelInfoHandler.java index 7ce745ba..956ebdda 100644 --- a/broker/src/main/java/io/moquette/imhandler/ModifyChannelInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/ModifyChannelInfoHandler.java @@ -23,7 +23,7 @@ import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic; @Handler(value = ModifyChannelInfoTopic) public class ModifyChannelInfoHandler extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.ModifyChannelInfo request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyChannelInfo request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode= m_messagesStore.modifyChannelInfo(fromUser, request.getChannelId(), request.getType(), request.getValue()); return errorCode; } diff --git a/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java b/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java index 1f667643..775e76e4 100644 --- a/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java @@ -20,7 +20,7 @@ import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.ModifyGroupAliasTopic) public class ModifyGroupAliasHandler extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.ModifyGroupMemberAlias request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupMemberAlias request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode = m_messagesStore.modifyGroupAlias(fromUser, request.getGroupId(), request.getAlias()); if (errorCode == ERROR_CODE_SUCCESS && request.hasNotifyContent()) { if (request.hasNotifyContent()&& request.getNotifyContent().getType() > 0) { diff --git a/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java index 06a984e7..e68d0eea 100644 --- a/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java @@ -22,7 +22,7 @@ import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic; @Handler(value = ModifyGroupInfoTopic) public class ModifyGroupInfoHandler extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.ModifyGroupInfoRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupInfoRequest request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode= m_messagesStore.modifyGroupInfo(fromUser, request.getGroupId(), request.getType(), request.getValue()); if (errorCode == ERROR_CODE_SUCCESS) { if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) { diff --git a/broker/src/main/java/io/moquette/imhandler/ModifyMyInfoHandler.java b/broker/src/main/java/io/moquette/imhandler/ModifyMyInfoHandler.java index 363bc7c0..e237bfa3 100644 --- a/broker/src/main/java/io/moquette/imhandler/ModifyMyInfoHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/ModifyMyInfoHandler.java @@ -17,7 +17,7 @@ import win.liyufan.im.IMTopic; @Handler(IMTopic.ModifyMyInfoTopic) public class ModifyMyInfoHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.ModifyMyInfoRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyMyInfoRequest request, Qos1PublishHandler.IMCallback callback) { return m_messagesStore.modifyUserInfo(fromUser, request); } } diff --git a/broker/src/main/java/io/moquette/imhandler/PullMessageHandler.java b/broker/src/main/java/io/moquette/imhandler/PullMessageHandler.java index e352618c..51f8c02c 100644 --- a/broker/src/main/java/io/moquette/imhandler/PullMessageHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/PullMessageHandler.java @@ -19,7 +19,7 @@ import win.liyufan.im.IMTopic; @Handler(value = IMTopic.PullMessageTopic) public class PullMessageHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.PullMessageRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.PullMessageRequest request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS; if (request.getType() == ProtoConstants.PullType.Pull_ChatRoom && !m_messagesStore.checkUserClientInChatroom(fromUser, clientID, null)) { diff --git a/broker/src/main/java/io/moquette/imhandler/PutUserSettingHandler.java b/broker/src/main/java/io/moquette/imhandler/PutUserSettingHandler.java index 9c9577f7..262ebb44 100644 --- a/broker/src/main/java/io/moquette/imhandler/PutUserSettingHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/PutUserSettingHandler.java @@ -17,7 +17,7 @@ import win.liyufan.im.IMTopic; @Handler(IMTopic.PutUserSettingTopic) public class PutUserSettingHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.ModifyUserSettingReq request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyUserSettingReq request, Qos1PublishHandler.IMCallback callback) { long timestamp = m_messagesStore.updateUserSettings(fromUser, request); publisher.publishNotification(IMTopic.NotifyUserSettingTopic, fromUser, timestamp); return ErrorCode.ERROR_CODE_SUCCESS; diff --git a/broker/src/main/java/io/moquette/imhandler/QuitChatroomHandler.java b/broker/src/main/java/io/moquette/imhandler/QuitChatroomHandler.java index a852a478..9b83a0bf 100644 --- a/broker/src/main/java/io/moquette/imhandler/QuitChatroomHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/QuitChatroomHandler.java @@ -17,7 +17,7 @@ import win.liyufan.im.IMTopic; @Handler(IMTopic.QuitChatroomTopic) public class QuitChatroomHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) { m_messagesStore.handleQuitChatroom(fromUser, clientID, request.getId()); return ErrorCode.ERROR_CODE_SUCCESS; } diff --git a/broker/src/main/java/io/moquette/imhandler/QuitGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/QuitGroupHandler.java index d442077f..5726f8fd 100644 --- a/broker/src/main/java/io/moquette/imhandler/QuitGroupHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/QuitGroupHandler.java @@ -19,7 +19,7 @@ import static win.liyufan.im.IMTopic.QuitGroupTopic; @Handler(value = QuitGroupTopic) public class QuitGroupHandler extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.QuitGroupRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.QuitGroupRequest request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS; WFCMessage.GroupInfo groupInfo = m_messagesStore.getGroupInfo(request.getGroupId()); if (groupInfo == null) { diff --git a/broker/src/main/java/io/moquette/imhandler/RecallMessageHandler.java b/broker/src/main/java/io/moquette/imhandler/RecallMessageHandler.java index ff74f6a1..1f8534d3 100644 --- a/broker/src/main/java/io/moquette/imhandler/RecallMessageHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/RecallMessageHandler.java @@ -20,7 +20,7 @@ import java.util.Set; @Handler(value = IMTopic.RecallMessageTopic) public class RecallMessageHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.INT64Buf int64Buf, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.INT64Buf int64Buf, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode = m_messagesStore.recallMessage(int64Buf.getId(), fromUser); if(errorCode != ErrorCode.ERROR_CODE_SUCCESS) { diff --git a/broker/src/main/java/io/moquette/imhandler/RouteHandler.java b/broker/src/main/java/io/moquette/imhandler/RouteHandler.java index 353e76a6..71f9bf0e 100644 --- a/broker/src/main/java/io/moquette/imhandler/RouteHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/RouteHandler.java @@ -23,7 +23,7 @@ import static io.moquette.BrokerConstants.HZ_Cluster_Node_External_Short_Port; @Handler(IMTopic.RouteTopic) public class RouteHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.RouteRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.RouteRequest request, Qos1PublishHandler.IMCallback callback) { Member member = mServer.getHazelcastInstance().getCluster().getLocalMember(); String serverIp = member.getStringAttribute(HZ_Cluster_Node_External_IP); String longPort = member.getStringAttribute(HZ_Cluster_Node_External_Long_Port); diff --git a/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java b/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java index 3961ff29..84a06ab2 100644 --- a/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java @@ -43,7 +43,7 @@ public class SendMessageHandler extends IMHandler { } @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.Message message, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.Message message, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS; if (message != null) { int userStatus = m_messagesStore.getUserStatus(fromUser); diff --git a/broker/src/main/java/io/moquette/imhandler/SyncFriendRequestUnreadHandler.java b/broker/src/main/java/io/moquette/imhandler/SyncFriendRequestUnreadHandler.java index 6498ace6..7cec78df 100644 --- a/broker/src/main/java/io/moquette/imhandler/SyncFriendRequestUnreadHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/SyncFriendRequestUnreadHandler.java @@ -19,7 +19,7 @@ import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.RriendRequestUnreadSyncTopic) public class SyncFriendRequestUnreadHandler extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.Version request, Qos1PublishHandler.IMCallback callback) { long[] head = new long[1]; ErrorCode errorCode = m_messagesStore.SyncFriendRequestUnread(fromUser, request.getVersion(), head); if (errorCode == ERROR_CODE_SUCCESS) { diff --git a/broker/src/main/java/io/moquette/imhandler/TransferChannelHandler.java b/broker/src/main/java/io/moquette/imhandler/TransferChannelHandler.java index c6375267..f64db7e7 100644 --- a/broker/src/main/java/io/moquette/imhandler/TransferChannelHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/TransferChannelHandler.java @@ -20,7 +20,7 @@ import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.TransferChannelInfoTopic) public class TransferChannelHandler extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.TransferChannel request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.TransferChannel request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode = m_messagesStore.transferChannel(fromUser, request.getChannelId(), request.getNewOwner()); return errorCode; } diff --git a/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java b/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java index 7ba1c4d6..5a5bb6a3 100644 --- a/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java @@ -20,7 +20,7 @@ import static win.liyufan.im.ErrorCode.ERROR_CODE_SUCCESS; @Handler(IMTopic.TransferGroupTopic) public class TransferGroupHandler extends GroupHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.TransferGroupRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.TransferGroupRequest request, Qos1PublishHandler.IMCallback callback) { ErrorCode errorCode = m_messagesStore.transferGroup(fromUser, request.getGroupId(), request.getNewOwner()); if (errorCode == ERROR_CODE_SUCCESS) { if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) { diff --git a/broker/src/main/java/io/moquette/imhandler/UploadDeviceTokenHandler.java b/broker/src/main/java/io/moquette/imhandler/UploadDeviceTokenHandler.java index 79a10b40..823d3831 100644 --- a/broker/src/main/java/io/moquette/imhandler/UploadDeviceTokenHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/UploadDeviceTokenHandler.java @@ -20,7 +20,7 @@ import win.liyufan.im.IMTopic; @Handler(IMTopic.UploadDeviceTokenTopic) public class UploadDeviceTokenHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.UploadDeviceTokenRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.UploadDeviceTokenRequest request, Qos1PublishHandler.IMCallback callback) { MemorySessionStore.Session session = m_sessionsStore.getSession(clientID); session.setPlatform(request.getPlatform()); session.setAppName(request.getAppName()); diff --git a/broker/src/main/java/io/moquette/imhandler/UserSearchHandler.java b/broker/src/main/java/io/moquette/imhandler/UserSearchHandler.java index 6615f539..62cef9b7 100644 --- a/broker/src/main/java/io/moquette/imhandler/UserSearchHandler.java +++ b/broker/src/main/java/io/moquette/imhandler/UserSearchHandler.java @@ -19,7 +19,7 @@ import java.util.List; @Handler(IMTopic.UserSearchTopic) public class UserSearchHandler extends IMHandler { @Override - public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, WFCMessage.SearchUserRequest request, Qos1PublishHandler.IMCallback callback) { + public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.SearchUserRequest request, Qos1PublishHandler.IMCallback callback) { List users = m_messagesStore.searchUser(request.getKeyword(), request.getFuzzy() > 0, request.getPage()); WFCMessage.SearchUserResult.Builder builder = WFCMessage.SearchUserResult.newBuilder(); builder.addAllEntry(users); diff --git a/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java b/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java index 7f5e77aa..1deb2284 100755 --- a/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java +++ b/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java @@ -198,7 +198,7 @@ public class Qos1PublishHandler extends QosPublishHandler { IMHandler handler = m_imHandlers.get(topic); if (handler != null) { - handler.doHandler(clientID, fromUser, topic, payloadContent, wrapper); + handler.doHandler(clientID, fromUser, topic, payloadContent, wrapper, isAdmin); } else { LOG.error("imHandler unknown topic={}", topic); ByteBuf ackPayload = Unpooled.buffer();