Use User in Invite.

src/com/dmdirc/Invite.java

@@ -23,6 +23,7 @@
 package com.dmdirc;
 
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.User;
 
 import java.util.Date;
 
@@ -38,7 +39,7 @@ public class Invite {
     /** The time this invite was created. */
     private final long timestamp;
     /** The source of this invite. */
-    private final String source;
+    private final User source;
 
     /**
      * Creates a new instance of Invite.
@@ -47,7 +48,7 @@ public class Invite {
      * @param channel    The channel that this invite is for
      * @param source     The source of this invite
      */
-    public Invite(final Connection connection, final String channel, final String source) {
+    public Invite(final Connection connection, final String channel, final User source) {
         this.connection = connection;
         this.channel = channel;
         this.source = source;
@@ -66,11 +67,9 @@ public class Invite {
      * Retrieves the source of this invite.
      *
      * @return This invite's source
-     *
-     * @see Server#parseHostmask(String)
      */
-    public String[] getSource() {
-        return connection.parseHostmask(source);
+    public User getSource() {
+        return source;
     }
 
     /**

src/com/dmdirc/ServerEventHandler.java

@@ -532,7 +532,7 @@ public class ServerEventHandler extends EventHandler implements
         checkParser(parser);
 
         final ClientInfo client = owner.getParser().get().getClient(userHost);
-        owner.addInvite(new Invite(owner, channel, userHost));
+        owner.addInvite(new Invite(owner, channel, owner.getUser(userHost).orElse(null)));
         final ServerInviteReceivedEvent event = new ServerInviteReceivedEvent(owner,
                 userFactory.getUser(client.getNickname(), owner.getConnection().get(),
                         Optional.ofNullable(client.getUsername()),

test/com/dmdirc/InviteTest.java

@@ -22,28 +22,33 @@
 
 package com.dmdirc;
 
+import com.dmdirc.interfaces.User;
+
 import java.util.Date;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.verify;
 
+@RunWith(MockitoJUnitRunner.class)
 public class InviteTest {
 
+    @Mock
     private Server server;
+    @Mock
+    private User user;
     private Invite invite;
     private long ts;
 
     @Before
     public void setUp() {
-        server = mock(Server.class);
-
-        when(server.parseHostmask("nick!ident@host"))
-                .thenReturn(new String[] {"nick", "ident", "host"});
-
-        invite = new Invite(server, "#channel", "nick!ident@host");
+        invite = new Invite(server, "#channel", user);
         ts = new Date().getTime();
     }
 
@@ -60,10 +65,7 @@ public class InviteTest {
 
     @Test
     public void testGetSource() {
-        assertEquals(3, invite.getSource().length);
-        assertEquals("nick", invite.getSource()[0]);
-        assertEquals("ident", invite.getSource()[1]);
-        assertEquals("host", invite.getSource()[2]);
+        assertEquals(user, invite.getSource());
     }
 
     @Test

test/com/dmdirc/ServerTest.java

@@ -25,14 +25,15 @@ package com.dmdirc;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.config.profiles.Profile;
+import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterFactory;
+import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.sink.MessageSinkManager;
 import com.dmdirc.util.URLBuilder;
 
@@ -73,6 +74,7 @@ public class ServerTest {
     @Mock private MessageEncoderFactory messageEncoderFactory;
     @Mock private BackBufferFactory backBufferFactory;
     @Mock private UserFactory userFactory;
+    @Mock private User user;
 
     private Server server;
 
@@ -126,16 +128,16 @@ public class ServerTest {
 
     @Test
     public void testDuplicateInviteRemoval() {
-        server.addInvite(new Invite(server, "#chan1", "a!b@c"));
-        server.addInvite(new Invite(server, "#chan1", "d!e@f"));
+        server.addInvite(new Invite(server, "#chan1", user));
+        server.addInvite(new Invite(server, "#chan1", user));
 
         assertEquals(1, server.getInvites().size());
     }
 
     @Test
     public void testRemoveInvites() {
-        server.addInvite(new Invite(server, "#chan1", "a!b@c"));
-        server.addInvite(new Invite(server, "#chan2", "d!e@f"));
+        server.addInvite(new Invite(server, "#chan1", user));
+        server.addInvite(new Invite(server, "#chan2", user));
 
         server.removeInvites("#chan1");
         assertEquals(1, server.getInvites().size());