anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

群组标记删除

Browse Source 
(cherry picked from commit cdf4a0c011b879819c0263b84bddd2da5cb8bc7d)
This commit is contained in:
heavyrian2012
2024-04-03 10:49:46 +08:00
parent c4421fc9ed
commit ebb05351a8
17 changed files with 355 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetGroupInfoAction.java
+1
View File
@@ -60,6 +60,7 @@ public class GetGroupInfoAction extends AdminAction {
pojoGroupInfo.setMax_member_count(groupInfo.getMemberCount());
pojoGroupInfo.setHistory_message(groupInfo.getHistoryMessage());
pojoGroupInfo.setSuper_group(groupInfo.getSuperGroup()>0);
pojoGroupInfo.setDeleted(groupInfo.getDeleted()>0);
result = RestResult.ok(pojoGroupInfo);
}
setResponseContent(result, response);
broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetGroupInfoAction.java
+4
View File
@@ -56,6 +56,10 @@ public class GetGroupInfoAction extends RobotAction {
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);
pojoGroupInfo.setDeleted(groupInfo.getDeleted()>0);
result = RestResult.ok(pojoGroupInfo);
}
setResponseContent(result, response);
broker/src/main/java/io/moquette/BrokerConstants.java
+2
View File
@@ -188,6 +188,8 @@ public final class BrokerConstants {
public static final String GROUP_Disable_Stranger_Invite = "group.disable_stranger_invite";
public static final String GROUP_INFO_MARK_DELETION = "group.enable_mark_deletion";
public static final String USER_HIDE_PROPERTIES = "user.hide_properties";
public static final String USER_KEEP_DISPLAY_NAME_WHEN_DESTROY = "user.keep_display_name_when_destroy";
broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java
+2 -2
View File
@@ -27,7 +27,7 @@ public class CreateGroupHandler extends GroupHandler<WFCMessage.CreateGroupReque
if (!StringUtil.isNullOrEmpty(request.getGroup().getGroupInfo().getTargetId())) {
WFCMessage.GroupInfo existGroupInfo = m_messagesStore.getGroupInfo(request.getGroup().getGroupInfo().getTargetId());
if (existGroupInfo != null) {
if (existGroupInfo != null && existGroupInfo.getDeleted() == 0) {
return ErrorCode.ERROR_CODE_GROUP_ALREADY_EXIST;
}
}
@@ -59,7 +59,7 @@ public class CreateGroupHandler extends GroupHandler<WFCMessage.CreateGroupReque
}
WFCMessage.GroupInfo groupInfo = m_messagesStore.createGroup(fromUser, request.getGroup().getGroupInfo(), request.getGroup().getMembersList(), request.getMemberExtra(), isAdmin);
if (groupInfo != null) {
if (groupInfo != null && groupInfo.getDeleted() == 0) {
if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
} else {
broker/src/main/java/io/moquette/persistence/DatabaseStore.java
+20 -5
View File
@@ -36,6 +36,7 @@ import java.util.function.Function;
import static cn.wildfirechat.common.IMExceptionEvent.EventType.RDBS_Exception;
import static cn.wildfirechat.proto.ProtoConstants.PersistFlag.Transparent;
import static io.moquette.BrokerConstants.GROUP_INFO_MARK_DELETION;
import static io.moquette.server.Constants.MAX_MESSAGE_QUEUE;
import static cn.wildfirechat.proto.ProtoConstants.SearchUserType.*;
import static win.liyufan.im.UserSettingScope.kUserSettingPrivacySearchable;
@@ -45,6 +46,7 @@ public class DatabaseStore {
private final ThreadPoolExecutorWrapper mScheduler;
private boolean disableRemoteMessageSearch = false;
private boolean encryptMessage = false;
private boolean keepGroupInfo = false;
public void setDisableRemoteMessageSearch(boolean disableRemoteMessageSearch) {
this.disableRemoteMessageSearch = disableRemoteMessageSearch;
}
@@ -55,6 +57,11 @@ public class DatabaseStore {
public DatabaseStore(ThreadPoolExecutorWrapper scheduler) {
this.mScheduler = scheduler;
try {
keepGroupInfo = Boolean.parseBoolean(Server.getServer().getConfig().getProperty(GROUP_INFO_MARK_DELETION, "false"));
} catch (Exception e) {
}
}
TreeMap<Long, Long> reloadUserMessageMaps(String userId) {
@@ -1425,7 +1432,8 @@ public class DatabaseStore {
", `_join_type`" +
", `_private_chat`" +
", `_searchable`" +
", `_member_dt`) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" +
", `_deleted`" +
", `_member_dt`) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" +
" ON DUPLICATE KEY UPDATE " +
"`_name` = ?," +
"`_portrait` = ?," +
@@ -1436,8 +1444,9 @@ public class DatabaseStore {
"`_mute` = ?" +
", `_join_type` = ?" +
", `_private_chat` = ?" +
", `_searchable` = ?, " +
"`_member_dt` = ?";
", `_searchable` = ?" +
", `_deleted` = ?" +
", `_member_dt` = ?";
statement = connection.prepareStatement(sql);
@@ -1455,6 +1464,7 @@ public class DatabaseStore {
statement.setInt(index++, groupInfo.getJoinType());
statement.setInt(index++, groupInfo.getPrivateChat());
statement.setInt(index++, groupInfo.getSearchable());
statement.setInt(index++, groupInfo.getDeleted());
statement.setLong(index++, groupInfo.getMemberUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
statement.setString(index++, groupInfo.getName());
@@ -1467,6 +1477,7 @@ public class DatabaseStore {
statement.setInt(index++, groupInfo.getJoinType());
statement.setInt(index++, groupInfo.getPrivateChat());
statement.setInt(index++, groupInfo.getSearchable());
statement.setInt(index++, groupInfo.getDeleted());
statement.setLong(index++, groupInfo.getMemberUpdateDt() == 0 ? System.currentTimeMillis() : groupInfo.getUpdateDt());
int count = statement.executeUpdate();
LOG.info("Update rows {}", count);
@@ -3410,8 +3421,12 @@ public class DatabaseStore {
PreparedStatement statement = null;
try {
connection = DBUtil.getConnection();
String sql = "delete from t_group where _gid = ?";
String sql;
if(keepGroupInfo) {
sql = "update t_group set _deleted = 1, _dt = _dt+1, _member_count = 0, _member_dt = _member_dt+1 where _gid = ?";
} else {
sql = "delete from t_group where _gid = ?";
}
statement = connection.prepareStatement(sql);
int index = 1;
broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+4 -11
View File
@@ -1368,7 +1368,7 @@ public class MemoryMessagesStore implements IMessagesStore {
event.type = type;
PojoGroupInfo pojoGroupInfo = new PojoGroupInfo();
event.groupInfo = pojoGroupInfo;
if (groupInfo != null) {
if (groupInfo != null && groupInfo.getDeleted() == 0) {
pojoGroupInfo.setExtra(groupInfo.getExtra());
pojoGroupInfo.setName(groupInfo.getName());
pojoGroupInfo.setOwner(groupInfo.getOwner());
@@ -1900,7 +1900,7 @@ public class MemoryMessagesStore implements IMessagesStore {
WFCMessage.GroupInfo groupInfo = mIMap.get(groupId);
if (groupInfo == null) {
groupInfo = databaseStore.getPersistGroupInfo(groupId);
if (groupInfo != null) {
if (groupInfo != null && groupInfo.getDeleted() == 0) {
mIMap.set(groupId, groupInfo);
} else {
return ErrorCode.ERROR_CODE_NOT_EXIST;
@@ -1985,7 +1985,7 @@ public class MemoryMessagesStore implements IMessagesStore {
WFCMessage.GroupInfo groupInfo = mIMap.get(groupId);
if (groupInfo == null) {
groupInfo = databaseStore.getPersistGroupInfo(groupId);
if (groupInfo != null) {
if (groupInfo != null && groupInfo.getDeleted() == 0) {
mIMap.set(groupId, groupInfo);
} else {
return ErrorCode.ERROR_CODE_NOT_EXIST;
@@ -2069,13 +2069,6 @@ public class MemoryMessagesStore implements IMessagesStore {
ArrayList<WFCMessage.GroupInfo> out = new ArrayList<>();
for (WFCMessage.UserRequest request : requests) {
WFCMessage.GroupInfo groupInfo = mIMap.get(request.getUid());
if (groupInfo == null) {
groupInfo = databaseStore.getPersistGroupInfo(request.getUid());
if (groupInfo != null) {
mIMap.set(request.getUid(), groupInfo);
}
}
if (groupInfo != null && groupInfo.getUpdateDt() > request.getUpdateDt()) {
if(!isAdmin && !StringUtil.isNullOrEmpty(fromUser)) {
WFCMessage.GroupMember gm = getGroupMember(groupInfo.getTargetId(), fromUser);
@@ -2306,7 +2299,7 @@ public class MemoryMessagesStore implements IMessagesStore {
IMap<String, WFCMessage.GroupInfo> groups = hzInstance.getMap(GROUPS_MAP);
WFCMessage.GroupInfo groupInfo = groups.get(groupId);
boolean isMute = false;
if (groupInfo != null) {
if (groupInfo != null && groupInfo.getDeleted() == 0) {
if (groupInfo.getOwner().equals(memberId)) {
return ErrorCode.ERROR_CODE_SUCCESS;
}