群组信息变更回调中加上群组信息
This commit is contained in:
@@ -57,6 +57,9 @@ public class GetGroupInfoAction extends AdminAction {
|
|||||||
pojoGroupInfo.setJoin_type(groupInfo.getJoinType());
|
pojoGroupInfo.setJoin_type(groupInfo.getJoinType());
|
||||||
pojoGroupInfo.setPrivate_chat(groupInfo.getPrivateChat());
|
pojoGroupInfo.setPrivate_chat(groupInfo.getPrivateChat());
|
||||||
pojoGroupInfo.setSearchable(groupInfo.getSearchable());
|
pojoGroupInfo.setSearchable(groupInfo.getSearchable());
|
||||||
|
pojoGroupInfo.setMax_member_count(groupInfo.getMemberCount());
|
||||||
|
pojoGroupInfo.setHistory_message(groupInfo.getHistoryMessage());
|
||||||
|
pojoGroupInfo.setSuper_group(groupInfo.getSuperGroup()>0);
|
||||||
result = RestResult.ok(pojoGroupInfo);
|
result = RestResult.ok(pojoGroupInfo);
|
||||||
}
|
}
|
||||||
setResponseContent(result, response);
|
setResponseContent(result, response);
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import com.google.protobuf.ByteString;
|
|||||||
import com.hazelcast.core.*;
|
import com.hazelcast.core.*;
|
||||||
import com.hazelcast.util.StringUtil;
|
import com.hazelcast.util.StringUtil;
|
||||||
import com.xiaoleilu.hutool.system.UserInfo;
|
import com.xiaoleilu.hutool.system.UserInfo;
|
||||||
|
import com.xiaoleilu.loServer.RestResult;
|
||||||
import com.xiaoleilu.loServer.action.admin.AdminAction;
|
import com.xiaoleilu.loServer.action.admin.AdminAction;
|
||||||
import com.xiaoleilu.loServer.model.FriendData;
|
import com.xiaoleilu.loServer.model.FriendData;
|
||||||
import cn.wildfirechat.common.ErrorCode;
|
import cn.wildfirechat.common.ErrorCode;
|
||||||
@@ -1355,17 +1356,35 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
mIMap.set(groupId, groupInfo);
|
mIMap.set(groupId, groupInfo);
|
||||||
databaseStore.persistGroupMember(groupId, updatedMemberList, false);
|
databaseStore.persistGroupMember(groupId, updatedMemberList, false);
|
||||||
|
|
||||||
callbackGroupEvent(fromUser, groupInfo.getTargetId(), ProtoConstants.GroupUpdateEventType.Group_Event_Create);
|
callbackGroupEvent(fromUser, groupInfo.getTargetId(), ProtoConstants.GroupUpdateEventType.Group_Event_Create, groupInfo);
|
||||||
return groupInfo;
|
return groupInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void callbackGroupEvent(String operatorId, String groupId, int type) {
|
private void callbackGroupEvent(String operatorId, String groupId, int type, WFCMessage.GroupInfo groupInfo) {
|
||||||
if (!StringUtil.isNullOrEmpty(mGroupInfoUpdateCallback)) {
|
if (!StringUtil.isNullOrEmpty(mGroupInfoUpdateCallback)) {
|
||||||
GroupUpdateEvent event = new GroupUpdateEvent();
|
GroupUpdateEvent event = new GroupUpdateEvent();
|
||||||
event.operatorId = operatorId;
|
event.operatorId = operatorId;
|
||||||
event.groupId = groupId;
|
event.groupId = groupId;
|
||||||
event.type = type;
|
event.type = type;
|
||||||
|
PojoGroupInfo pojoGroupInfo = new PojoGroupInfo();
|
||||||
|
event.groupInfo = pojoGroupInfo;
|
||||||
|
if (groupInfo != null) {
|
||||||
|
pojoGroupInfo.setExtra(groupInfo.getExtra());
|
||||||
|
pojoGroupInfo.setName(groupInfo.getName());
|
||||||
|
pojoGroupInfo.setOwner(groupInfo.getOwner());
|
||||||
|
pojoGroupInfo.setPortrait(groupInfo.getPortrait());
|
||||||
|
pojoGroupInfo.setTarget_id(groupInfo.getTargetId());
|
||||||
|
pojoGroupInfo.setType(groupInfo.getType());
|
||||||
|
pojoGroupInfo.setMute(groupInfo.getMute());
|
||||||
|
pojoGroupInfo.setJoin_type(groupInfo.getJoinType());
|
||||||
|
pojoGroupInfo.setPrivate_chat(groupInfo.getPrivateChat());
|
||||||
|
pojoGroupInfo.setSearchable(groupInfo.getSearchable());
|
||||||
|
pojoGroupInfo.setMax_member_count(groupInfo.getMemberCount());
|
||||||
|
pojoGroupInfo.setHistory_message(groupInfo.getHistoryMessage());
|
||||||
|
pojoGroupInfo.setSuper_group(groupInfo.getSuperGroup()>0);
|
||||||
|
}
|
||||||
|
|
||||||
m_Server.getCallbackScheduler().execute(() -> {
|
m_Server.getCallbackScheduler().execute(() -> {
|
||||||
try {
|
try {
|
||||||
HttpUtils.httpJsonPost(mGroupInfoUpdateCallback, GsonUtil.gson.toJson(event), HttpUtils.HttpPostType.POST_TYPE_Grout_Event_Callback);
|
HttpUtils.httpJsonPost(mGroupInfoUpdateCallback, GsonUtil.gson.toJson(event), HttpUtils.HttpPostType.POST_TYPE_Grout_Event_Callback);
|
||||||
@@ -1779,7 +1798,7 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
removeFavGroup(groupId, ids);
|
removeFavGroup(groupId, ids);
|
||||||
removeGroupUserSettings(groupId, ids);
|
removeGroupUserSettings(groupId, ids);
|
||||||
|
|
||||||
callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Destroy);
|
callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Destroy, groupInfo);
|
||||||
return ErrorCode.ERROR_CODE_SUCCESS;
|
return ErrorCode.ERROR_CODE_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1864,12 +1883,12 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
|
|
||||||
if (modifyType == Modify_Group_Mute) {
|
if (modifyType == Modify_Group_Mute) {
|
||||||
if (newInfoBuilder.getMute() > 0) {
|
if (newInfoBuilder.getMute() > 0) {
|
||||||
callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Mute);
|
callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Mute, newInfoBuilder.build());
|
||||||
} else {
|
} else {
|
||||||
callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Unmute);
|
callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Unmute, newInfoBuilder.build());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Update);
|
callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Update, newInfoBuilder.build());
|
||||||
}
|
}
|
||||||
return ErrorCode.ERROR_CODE_SUCCESS;
|
return ErrorCode.ERROR_CODE_SUCCESS;
|
||||||
}
|
}
|
||||||
@@ -2216,7 +2235,7 @@ public class MemoryMessagesStore implements IMessagesStore {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Transfer);
|
callbackGroupEvent(operator, groupId, ProtoConstants.GroupUpdateEventType.Group_Event_Transfer, groupInfo);
|
||||||
|
|
||||||
return ErrorCode.ERROR_CODE_SUCCESS;
|
return ErrorCode.ERROR_CODE_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,4 +4,5 @@ public class GroupUpdateEvent {
|
|||||||
public String operatorId;
|
public String operatorId;
|
||||||
public String groupId;
|
public String groupId;
|
||||||
public int type;
|
public int type;
|
||||||
|
public PojoGroupInfo groupInfo;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user