[xmpp] add group nickname to settings

openhab · Dec 20, 2024 · 8f38009 · 8f38009
1 parent 0a41a0e
commit 8f38009
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/...g.xmppclient/src/main/java/org/openhab/binding/xmppclient/internal/client/XMPPClient.java b/...g.xmppclient/src/main/java/org/openhab/binding/xmppclient/internal/client/XMPPClient.java
@@ -62,7 +62,7 @@ public class XMPPClient implements IncomingChatMessageListener, ConnectionListen
     private @Nullable HttpFileUploadManager httpFileUploadManager;
     private Set<XMPPClientMessageSubscriber> subscribers = new HashSet<>();
     private final XMPPClientEventlistener eventListener;
-    private String username = "";
+    private String nickname = "";
 
     public XMPPClient(XMPPClientEventlistener eventListener) {
         this.eventListener = eventListener;
@@ -78,15 +78,20 @@ public void unsubscribe(XMPPClientMessageSubscriber channel) {
         subscribers.remove(channel);
     }
 
-    public void connect(String host, Integer port, String login, String domain, String password,
+    public void connect(String host, Integer port, String login, String nick, String domain, String password,
             SecurityMode securityMode) throws XMPPClientConfigException, XMPPClientException {
         disconnect();
         String serverHost = domain;
         if (!host.isBlank()) {
             serverHost = host;
         }
 
-        username = login;
+        if (!nick.isEmpty()) {
+            nickname = nick;
+        } else {
+            nickname = login;
+        }
+
         XMPPTCPConnectionConfiguration config;
         try {
             config = XMPPTCPConnectionConfiguration.builder() //
@@ -171,7 +176,7 @@ public void sendGroupMessage(String to, String message) {
             MultiUserChat chat = multiUserChatManager.getMultiUserChat(jid);
 
             if (!chat.isJoined()) {
-                chat.join(Resourcepart.from(username));
+                chat.join(Resourcepart.from(nickname));
             }
 
             chat.sendMessage(message);

diff --git a/...rc/main/java/org/openhab/binding/xmppclient/internal/handler/XMPPClientConfiguration.java b/...rc/main/java/org/openhab/binding/xmppclient/internal/handler/XMPPClientConfiguration.java
@@ -26,6 +26,7 @@ public class XMPPClientConfiguration {
     public @Nullable String host;
     public Integer port = 5222;
     public String username = "";
+    public String nickname = "";
     public String password = "";
     public String domain = "";
     public String securityMode = SecurityMode.required.toString();

diff --git a/...ient/src/main/java/org/openhab/binding/xmppclient/internal/handler/XMPPClientHandler.java b/...ient/src/main/java/org/openhab/binding/xmppclient/internal/handler/XMPPClientHandler.java
@@ -95,8 +95,8 @@ private void doConnect() {
         }
 
         try {
-            xmppClient.connect(Objects.requireNonNullElse(config.host, ""), config.port, config.username, config.domain,
-                    config.password, SecurityMode.valueOf(config.securityMode));
+            xmppClient.connect(Objects.requireNonNullElse(config.host, ""), config.port, config.username,
+                    config.nickname, config.domain, config.password, SecurityMode.valueOf(config.securityMode));
             updateStatus(ThingStatus.ONLINE);
         } catch (XMPPClientConfigException e) {
             logger.debug("XMPP connection error", e);

diff --git a/bundles/org.openhab.binding.xmppclient/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.xmppclient/src/main/resources/OH-INF/thing/thing-types.xml
@@ -12,6 +12,11 @@
 				<label>Username</label>
 				<description>The XMPP Username (the left side of JID, e.g. user for JID [email protected])</description>
 			</parameter>
+			<parameter name="nickname" type="text" required="false">
+				<label>Nickname</label>
+				<description>The XMPP Nickname to use in multi user chats. (Defaults to Username)</description>
+				<advanced>true</advanced>
+			</parameter>
 			<parameter name="domain" type="text" required="true">
 				<label>Domain</label>
 				<description>The XMPP Domain (the right side of JID, e.g. example.com for JID [email protected])</description>