Make Query use Users better.

Also remove some more parseHostname calls.

src/com/dmdirc/Query.java

@@ -73,31 +73,18 @@ public class Query extends MessageTarget implements PrivateActionListener,
     private final Server server;
     /** The user associated with this query. */
     private final User user;
-    /** The full host of the client associated with this query. */
-    private String host;
-    /** The nickname of the client associated with this query. */
-    private String nickname;
 
-    /**
-     * Creates a new instance of Query.
-     *
-     * @param newHost             host of the remove client
-     * @param newServer           The server object that this Query belongs to
-     * @param tabCompleterFactory The factory to use to create tab completers.
-     * @param commandController   The controller to load commands from.
-     * @param messageSinkManager  The sink manager to use to dispatch messages.
-     * @param urlBuilder          The URL builder to use when finding icons.
-     */
     public Query(
             final Server newServer,
-            final String newHost,
+            final User user,
             final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
             final BackBufferFactory backBufferFactory) {
-        super(newServer, "query", newServer.parseHostmask(newHost)[0],
-                newServer.parseHostmask(newHost)[0],
+        super(newServer, "query",
+                user.getNickname(),
+                user.getNickname(),
                 newServer.getConfigManager(),
                 backBufferFactory,
                 new QueryCommandParser(newServer, commandController, newServer.getEventBus()),
@@ -112,9 +99,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
                         WindowComponent.INPUTFIELD.getIdentifier()));
 
         this.server = newServer;
-        this.host = newHost;
-        this.nickname = server.parseHostmask(host)[0];
-        user = server.getUser(host).get();
+        this.user = user;
         updateTitle();
     }
 
@@ -156,7 +141,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
     @Override
     public int getMaxLineLength() {
         return server.getState() == ServerState.CONNECTED ? server.getParser().get()
-                .getMaxLength("PRIVMSG", host) : -1;
+                .getMaxLength("PRIVMSG", getHost()) : -1;
     }
 
     @Override
@@ -167,7 +152,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
         }
 
         final ClientInfo client = server.getParser().get().getLocalClient();
-        final int maxLineLength = server.getParser().get().getMaxLength("PRIVMSG", host);
+        final int maxLineLength = server.getParser().get().getMaxLength("PRIVMSG", getHost());
 
         if (maxLineLength >= action.length() + 2) {
             server.getParser().get().sendAction(getNickname(), action);
@@ -257,8 +242,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
             addLine(format, oldNick, client.getUsername(),
                     client.getHostname(), client.getNickname());
-            host = client.getNickname() + '!' + client.getUsername() + '@' + client.getHostname();
-            nickname = client.getNickname();
+            user.setNickname(client.getNickname());
             updateTitle();
 
             setName(client.getNickname());
@@ -308,17 +292,18 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
     @Override
     public String getHost() {
-        return host;
+        // TODO: Icky, IRC specific. Kill with fire.
+        return user.getNickname() + '!' + user.getUsername() + '@' + user.getHostname();
     }
 
     @Override
     public String getNickname() {
-        return nickname;
+        return user.getNickname();
     }
 
     @Override
     public void setCompositionState(final CompositionState state) {
-        server.getParser().get().setCompositionState(host, state);
+        server.getParser().get().setCompositionState(getHost(), state);
     }
 
     @Override

src/com/dmdirc/QueryFactory.java

@@ -23,6 +23,7 @@
 package com.dmdirc;
 
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.User;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
@@ -54,8 +55,8 @@ public class QueryFactory {
         this.backBufferFactory = backBufferFactory;
     }
 
-    public Query getQuery(final Server server, final String host) {
-        return new Query(server, host, tabCompleterFactory, commandController,
+    public Query getQuery(final Server server, final User user) {
+        return new Query(server, user, tabCompleterFactory, commandController,
                 messageSinkManager, urlBuilder, backBufferFactory);
     }
 

src/com/dmdirc/Server.java

@@ -509,7 +509,7 @@ public class Server extends FrameContainer implements Connection {
         return queries.containsKey(converter.toLowerCase(parseHostmask(host)[0]));
     }
 
-    private User getUserFromClientInfo(final ClientInfo client) {
+    public User getUserFromClientInfo(final ClientInfo client) {
         return userFactory.getUser(client.getNickname(), this,
                 Optional.ofNullable(client.getUsername()),
                 Optional.ofNullable(client.getHostname()),
@@ -546,7 +546,7 @@ public class Server extends FrameContainer implements Connection {
         final String lnick = converter.toLowerCase(nick);
 
         if (!queries.containsKey(lnick)) {
-            final Query newQuery = queryFactory.getQuery(this, host);
+            final Query newQuery = queryFactory.getQuery(this, getUser(host).orElse(null));
             if (!getState().isDisconnected()) {
                 newQuery.reregister();
             }

src/com/dmdirc/ServerEventHandler.java

@@ -52,6 +52,7 @@ import com.dmdirc.events.ServerWallusersEvent;
 import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.User;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.common.CallbackManager;
@@ -219,7 +220,11 @@ public class ServerEventHandler extends EventHandler implements
         final String format = EventUtils.postDisplayable(eventBus, event, "privateCTCP");
         owner.doNotification(format, owner.getParser().get().getClient(host), type, message);
         if (!event.isHandled()) {
-            owner.sendCTCPReply(owner.parseHostmask(host)[0], type, message);
+            owner.sendCTCPReply(
+                    owner.getUser(host)
+                            .map(User::getNickname)
+                            .orElseThrow(() -> new IllegalStateException("Couldn't get nickname")),
+                    type, message);
         }
     }
 

test/com/dmdirc/ServerEventHandlerTest.java

@@ -87,6 +87,10 @@ public class ServerEventHandlerTest {
         when(server.getLocalUser()).thenReturn(Optional.of(user));
         final ServerEventHandler handler = new ServerEventHandler(server, eventBus);
         handler.registerCallbacks();
+
+        when(user.getNickname()).thenReturn("ho");
+        when(user.getUsername()).thenReturn(Optional.of("st"));
+        when(user.getHostname()).thenReturn(Optional.of("name"));
     }
 
     @Test
@@ -209,10 +213,10 @@ public class ServerEventHandlerTest {
 
     @Test
     public void testOnPrivateCTCPRaisesEvent() {
-        when(server.parseHostmask("host!na@me")).thenReturn(new String[]{"host", "na", "me"});
+        when(server.getUser("ho!st@name")).thenReturn(Optional.of(user));
 
         final PrivateCtcpListener listener = getCallback(PrivateCtcpListener.class);
-        listener.onPrivateCTCP(parser, date, "type", "message", "host!na@me");
+        listener.onPrivateCTCP(parser, date, "type", "message", "ho!st@name");
 
         final ServerCtcpEvent event = getEvent(ServerCtcpEvent.class);
         assertEquals("type", event.getType());
@@ -222,12 +226,12 @@ public class ServerEventHandlerTest {
 
     @Test
     public void testOnPrivateCTCPSendsReplyIfEventUnhandled() {
-        when(server.parseHostmask("host!na@me")).thenReturn(new String[]{"host", "na", "me"});
+        when(server.getUser("ho!st@name")).thenReturn(Optional.of(user));
 
         final PrivateCtcpListener listener = getCallback(PrivateCtcpListener.class);
-        listener.onPrivateCTCP(parser, date, "type", "message", "host!na@me");
+        listener.onPrivateCTCP(parser, date, "type", "message", "ho!st@name");
 
-        verify(server).sendCTCPReply("host", "type", "message");
+        verify(server).sendCTCPReply("ho", "type", "message");
     }
 
     private <T extends CallbackInterface> T getCallback(final Class<T> type) {