mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-10-29 19:57:28 +00:00
Code Issues Projects Releases Wiki Activity

use fullJid only for private chat in MUC

Browse Source
This commit is contained in:
ilya khlevnoy 2022-12-05 21:20:55 +03:00
parent 84022715e6
commit 632e3d611f
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
core/src/main/java/org/jivesoftware/sparkimpl/plugin/transcripts/ChatTranscriptPlugin.java
View File

@ -39,10 +39,13 @@ import org.jivesoftware.resource.Default;
import org.jivesoftware.resource.Res;
import org.jivesoftware.resource.SparkRes;
import org.jivesoftware.smack.ConnectionListener;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smackx.jiveproperties.packet.JivePropertiesExtension;
import org.jivesoftware.spark.SessionManager;
import org.jivesoftware.smackx.muc.MultiUserChatManager;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.plugin.ContextMenuListener;
import org.jivesoftware.spark.ui.ChatRoom;
@ -53,14 +56,11 @@ import org.jivesoftware.spark.ui.ContactItem;
import org.jivesoftware.spark.ui.ContactList;
import org.jivesoftware.spark.ui.rooms.ChatRoomImpl;
import org.jivesoftware.spark.util.UIComponentRegistry;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.plugin.manager.Enterprise;
import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import org.jxmpp.jid.BareJid;
import org.jxmpp.jid.EntityBareJid;
import org.jxmpp.jid.EntityJid;
import org.jxmpp.jid.Jid;
import org.jxmpp.jid.parts.Domainpart;
import org.jxmpp.jid.*;
/**
* The <code>ChatTranscriptPlugin</code> is responsible for transcript handling within Spark.
@ -222,7 +222,6 @@ public class ChatTranscriptPlugin implements ChatRoomListener {
public void persistChatRoom(final ChatRoom room) {
LocalPreferences pref = SettingsManager.getLocalPreferences();
final Domainpart domainServer = SparkManager.getSessionManager().getServerAddress().getDomain();
if (!pref.isChatHistoryEnabled()) {
return;
}
@ -231,12 +230,10 @@ public class ChatTranscriptPlugin implements ChatRoomListener {
return;
}
EntityJid jid = room.getJid();
EntityJid jid = room.getBareJid();
//If this is a one-to-one chat( "user@domain.local" )
if(jid.hasResource() && jid.getDomain().equals(domainServer)){
jid = room.getBareJid();
if(isPrivateChatInMUC(jid)){
jid = room.getJid();
}
final List<Message> transcripts = room.getTranscripts();
@ -314,6 +311,26 @@ public class ChatTranscriptPlugin implements ChatRoomListener {
Frame.setVisible(true);
}
private static boolean isPrivateChatInMUC(EntityJid jid){
List<DomainBareJid> domainMUC = null;
try {
domainMUC = MultiUserChatManager.getInstanceFor( SparkManager.getConnection() ).getMucServiceDomains();
}catch (XMPPException | SmackException | InterruptedException e) {
Log.error("Unable to load MUC Service Names.", e);
}
if(domainMUC != null){
for(DomainBareJid domain : domainMUC){
if(jid.getDomain().equals(domain.getDomain())){
return true;
}
}
}
return false;
}
private class ChatRoomDecorator implements ActionListener, ChatRoomClosingListener {
private ChatRoom chatRoom;
private ChatRoomButton chatHistoryButton;