|
@@ -42,12 +42,13 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
|
42
|
42
|
import com.dmdirc.commandparser.commands.context.ServerCommandContext;
|
43
|
43
|
import com.dmdirc.interfaces.CommandController;
|
44
|
44
|
import com.dmdirc.interfaces.Connection;
|
|
45
|
+import com.dmdirc.interfaces.User;
|
45
|
46
|
import com.dmdirc.parser.interfaces.Parser;
|
46
|
47
|
import com.dmdirc.ui.WindowManager;
|
47
|
|
-import com.dmdirc.ui.messages.BackBufferFactory;
|
48
|
48
|
import com.dmdirc.ui.input.AdditionalTabTargets;
|
49
|
49
|
import com.dmdirc.ui.input.TabCompleterFactory;
|
50
|
50
|
import com.dmdirc.ui.input.TabCompletionType;
|
|
51
|
+import com.dmdirc.ui.messages.BackBufferFactory;
|
51
|
52
|
import com.dmdirc.ui.messages.sink.MessageSinkManager;
|
52
|
53
|
import com.dmdirc.util.URLBuilder;
|
53
|
54
|
|
|
@@ -116,7 +117,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
|
116
|
117
|
final String target = args.getArguments()[1];
|
117
|
118
|
final Connection connection = ((ServerCommandContext) context).getConnection();
|
118
|
119
|
final Parser parser = connection.getParser().get();
|
119
|
|
- final String myNickname = connection.getLocalUser().getNickname();
|
|
120
|
+ final String myNickname = connection.getLocalUser().map(User::getNickname).orElse("Unknown");
|
120
|
121
|
|
121
|
122
|
if (parser.isValidChannelName(target)
|
122
|
123
|
|| parser.getStringConverter().equalsIgnoreCase(target,
|