[FIXED JENKINS-11903] Use nickname

jenkinsci · Nov 25, 2012 · 7ea7d16 · 7ea7d16
1 parent efd755e
commit 7ea7d16
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jvnet.hudson.plugins</groupId>
         <artifactId>instant-messaging-parent</artifactId>
-        <version>1.20</version>
+        <version>1.22-SNAPSHOT</version>
         <relativePath>../instant-messaging-parent-plugin/pom.xml</relativePath>
     </parent>
 

diff --git a/src/main/java/hudson/plugins/jabber/im/transport/JabberConnectionDebugger.java b/src/main/java/hudson/plugins/jabber/im/transport/JabberConnectionDebugger.java
@@ -11,7 +11,6 @@
 import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.ConnectionListener;
 import org.jivesoftware.smack.PacketListener;
-import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.debugger.SmackDebugger;
 import org.jivesoftware.smack.packet.Packet;
 import org.jivesoftware.smack.util.StringUtils;

diff --git a/src/main/java/hudson/plugins/jabber/im/transport/JabberIMConnection.java b/src/main/java/hudson/plugins/jabber/im/transport/JabberIMConnection.java
@@ -57,6 +57,7 @@
 import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smackx.muc.MultiUserChat;
 import org.jivesoftware.smackx.packet.DelayInformation;
+import org.jivesoftware.smackx.packet.Nick;
 import org.jivesoftware.smackx.packet.VCard;
 import org.springframework.util.Assert;
 
@@ -137,7 +138,7 @@ class JabberIMConnection extends AbstractIMConnection {
 		this.authentication = authentication;
 		this.hostnameOverride = desc.getHostname();
 		this.port = desc.getPort();
-		this.nick = JabberUtil.getUserPart(desc.getJabberId());
+		this.nick = desc.getNickname();
 		this.resource = JabberUtil.getResourcePart(desc.getJabberId());
 		this.passwd = desc.getPassword();
         this.enableSASL = desc.isEnableSASL();
@@ -146,8 +147,7 @@ class JabberIMConnection extends AbstractIMConnection {
 		this.proxyport = desc.getProxyPort();
 		this.proxyuser = desc.getProxyUser();
 		this.proxypass = desc.getProxyPass();
-		this.groupChatNick = desc.getGroupChatNickname() != null ?
-				desc.getGroupChatNickname() : this.nick;
+		this.groupChatNick = desc.getNickname();
 		this.botCommandPrefix = desc.getCommandPrefix();
 		this.groupChats = desc.getDefaultTargets();
 		this.impresence = desc.isExposePresence() ? IMPresence.AVAILABLE : IMPresence.UNAVAILABLE;
@@ -587,6 +587,8 @@ private void sendPresence() {
             		throw new IllegalStateException("Don't know how to handle "
             				+ impresence);
             	}
+
+            	presence.addExtension(new Nick(this.nick));
             	this.connection.sendPacket(presence);
             } finally {
                 unlock();

diff --git a/src/main/java/hudson/plugins/jabber/im/transport/JabberPublisherDescriptor.java b/src/main/java/hudson/plugins/jabber/im/transport/JabberPublisherDescriptor.java
@@ -62,7 +62,7 @@ public class JabberPublisherDescriptor extends BuildStepDescriptor<Publisher> im
     public static final String PARAMETERNAME_PRESENCE = PREFIX + "exposePresence";
     public static final String PARAMETERNAME_PASSWORD = PREFIX + "password";
     public static final String PARAMETERNAME_JABBERID = PREFIX + "jabberId";
-    public static final String PARAMETERNAME_GROUP_NICKNAME = PREFIX + "groupNick";
+    public static final String PARAMETERNAME_NICKNAME = PREFIX + "nickname";
     public static final String PARAMETERNAME_TARGETS = PREFIX + "targets";
     public static final String PARAMETERNAME_INITIAL_GROUPCHATS = PREFIX + "initialGroupChats";
     public static final String PARAMETERNAME_COMMAND_PREFIX = PREFIX + "commandPrefix";
@@ -106,6 +106,11 @@ public class JabberPublisherDescriptor extends BuildStepDescriptor<Publisher> im
     // the following 2 are actually the Jabber nick and password. For backward compatibility I cannot rename them
     private String hudsonNickname;
     private String hudsonPassword;
+    /**
+     * Nickname to be used in private chats and chat rooms.
+     * <p>
+     * For historical reason still called 'groupChatNickname'.
+     */
     private String groupChatNickname;
     private boolean exposePresence = true;
     private boolean enableSASL = true;
@@ -226,7 +231,7 @@ private void applyPassword(final HttpServletRequest req, boolean check) throws F
 
     private void applyGroupChatNickname(final HttpServletRequest req) throws FormException
     {
-        this.groupChatNickname = req.getParameter(PARAMETERNAME_GROUP_NICKNAME);
+        this.groupChatNickname = req.getParameter(PARAMETERNAME_NICKNAME);
         if (this.groupChatNickname != null && this.groupChatNickname.trim().length() == 0)
         {
             this.groupChatNickname = null;
@@ -425,11 +430,14 @@ public String getPassword() {
         return Scrambler.descramble(this.hudsonPassword);
     }
 
-    public String getGroupChatNickname()
-    {
-        return this.groupChatNickname;
+    public String getNickname() {
+        if (Util.fixEmptyAndTrim(this.groupChatNickname) != null) {
+            return this.groupChatNickname;
+        } else {
+            return JabberUtil.getUserPart(getJabberId());
+        }
     }
-
+    
     @Override
     public int getPort()
     {

diff --git a/src/main/resources/hudson/plugins/jabber/im/transport/JabberPublisher/global.jelly b/src/main/resources/hudson/plugins/jabber/im/transport/JabberPublisher/global.jelly
@@ -68,9 +68,9 @@
         <f:textbox name="${descriptor.PARAMETERNAME_COMMAND_PREFIX}"
           value="${descriptor.commandPrefix}" />
       </f:entry>
-      <f:entry title="Group chat nickname" help="${base}/help-group-nick.html">
-        <f:textbox name="${descriptor.PARAMETERNAME_GROUP_NICKNAME}"
-          value="${descriptor.groupChatNickname}" />
+      <f:entry title="Nickname" help="${base}/help-nick.html">
+        <f:textbox name="${descriptor.PARAMETERNAME_NICKNAME}"
+          value="${descriptor.nickname}" />
       </f:entry>
 
       <super:global-jenkinsLogin />

diff --git a/src/main/webapp/help-group-nick.html b/src/main/webapp/help-group-nick.html
diff --git a/src/main/webapp/help-nick.html b/src/main/webapp/help-nick.html
@@ -0,0 +1,3 @@
+<div>
+    Alternate nickname to use in chats. Leave blank to use Jabber ID from above.
+</div>