Browse Source

Remove some uses of parser LocalUser.

pull/241/head
Greg Holmes 9 years ago
parent
commit
7af13d9fb1

+ 1
- 1
dcc/src/com/dmdirc/addons/dcc/DCCCommand.java View File

116
             final String target = args.getArguments()[1];
116
             final String target = args.getArguments()[1];
117
             final Connection connection = ((ServerCommandContext) context).getConnection();
117
             final Connection connection = ((ServerCommandContext) context).getConnection();
118
             final Parser parser = connection.getParser().get();
118
             final Parser parser = connection.getParser().get();
119
-            final String myNickname = parser.getLocalClient().getNickname();
119
+            final String myNickname = connection.getLocalUser().getNickname();
120
 
120
 
121
             if (parser.isValidChannelName(target)
121
             if (parser.isValidChannelName(target)
122
                     || parser.getStringConverter().equalsIgnoreCase(target,
122
                     || parser.getStringConverter().equalsIgnoreCase(target,

+ 2
- 2
identd/src/com/dmdirc/addons/identd/IdentClient.java View File

184
                 != null && !customName.isEmpty() && customName.length() < 513) {
184
                 != null && !customName.isEmpty() && customName.length() < 513) {
185
             username = customName;
185
             username = customName;
186
         } else if (connection != null && config.getOptionBool(domain, "general.useNickname")) {
186
         } else if (connection != null && config.getOptionBool(domain, "general.useNickname")) {
187
-            username = connection.getParser().get().getLocalClient().getNickname();
187
+            username = connection.getLocalUser().getNickname();
188
         } else if (connection != null && config.getOptionBool(domain, "general.useUsername")) {
188
         } else if (connection != null && config.getOptionBool(domain, "general.useUsername")) {
189
-            username = connection.getParser().get().getLocalClient().getUsername();
189
+            username = connection.getLocalUser().getUsername().orElse(System.getProperty("user.name"));
190
         } else {
190
         } else {
191
             username = System.getProperty("user.name");
191
             username = System.getProperty("user.name");
192
         }
192
         }

+ 5
- 0
identd/test/com/dmdirc/addons/identd/IdentClientTest.java View File

25
 import com.dmdirc.DMDircMBassador;
25
 import com.dmdirc.DMDircMBassador;
26
 import com.dmdirc.interfaces.Connection;
26
 import com.dmdirc.interfaces.Connection;
27
 import com.dmdirc.interfaces.ConnectionManager;
27
 import com.dmdirc.interfaces.ConnectionManager;
28
+import com.dmdirc.interfaces.User;
28
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
29
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
29
 import com.dmdirc.parser.irc.IRCClientInfo;
30
 import com.dmdirc.parser.irc.IRCClientInfo;
30
 import com.dmdirc.parser.irc.IRCParser;
31
 import com.dmdirc.parser.irc.IRCParser;
50
     @Mock private Connection connection;
51
     @Mock private Connection connection;
51
     @Mock private IRCParser parser;
52
     @Mock private IRCParser parser;
52
     @Mock private IRCClientInfo client;
53
     @Mock private IRCClientInfo client;
54
+    @Mock private User user;
53
     @Mock private AggregateConfigProvider config;
55
     @Mock private AggregateConfigProvider config;
54
     @Mock private DMDircMBassador eventBus;
56
     @Mock private DMDircMBassador eventBus;
55
 
57
 
59
 
61
 
60
         when(sm.getConnections()).thenReturn(servers);
62
         when(sm.getConnections()).thenReturn(servers);
61
         when(connection.getParser()).thenReturn(Optional.of(parser));
63
         when(connection.getParser()).thenReturn(Optional.of(parser));
64
+        when(connection.getLocalUser()).thenReturn(user);
62
         when(parser.getLocalPort()).thenReturn(60);
65
         when(parser.getLocalPort()).thenReturn(60);
63
         when(parser.getLocalClient()).thenReturn(client);
66
         when(parser.getLocalClient()).thenReturn(client);
64
         when(client.getNickname()).thenReturn("nickname");
67
         when(client.getNickname()).thenReturn("nickname");
65
         when(client.getUsername()).thenReturn("username");
68
         when(client.getUsername()).thenReturn("username");
69
+        when(user.getNickname()).thenReturn("nickname");
70
+        when(user.getUsername()).thenReturn(Optional.of("username"));
66
 
71
 
67
         return new IdentClient(eventBus, null, null, sm, config, "plugin-Identd");
72
         return new IdentClient(eventBus, null, null, sm, config, "plugin-Identd");
68
     }
73
     }

Loading…
Cancel
Save