Merge pull request #461 from greboid/dev2

Add a getNickname to Connection.
DMDirc · Jan 12, 2015 · 596d2e0 · 596d2e0
2 parents d6de7a6 + 69380fe
commit 596d2e0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/com/dmdirc/Server.java b/src/com/dmdirc/Server.java
@@ -43,6 +43,7 @@
 import com.dmdirc.parser.common.IgnoreList;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.common.ThreadedParser;
+import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.EncodingParser;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.ProtocolDescription;
@@ -1072,6 +1073,11 @@ public void setNickname(final String nickname) {
         parser.map(Parser::getLocalClient).ifPresent(c -> c.setNickname(nickname));
     }
 
+    @Override
+    public Optional<String> getNickname() {
+        return parser.map(Parser::getLocalClient).map(ClientInfo::getNickname);
+    }
+
     /**
      * Utility method to get a result from the parser while holding the {@link #parserLock}
      * read lock.

diff --git a/src/com/dmdirc/interfaces/Connection.java b/src/com/dmdirc/interfaces/Connection.java
@@ -410,4 +410,11 @@ public interface Connection {
      */
     void setNickname(final String nickname);
 
+    /**
+     * Returns the current nickname for this connection.
+     *
+     * @return Current nickname, or an empty if not present
+     */
+    Optional<String> getNickname();
+
 }