From b144a55935736fd5ed8c89dcebb7afdca4b20ee9 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sat, 5 Nov 2016 19:46:14 +0100 Subject: [PATCH] Fixed userinfo command in PM --- .../java/buttondevteam/discordplugin/DiscordPlugin.java | 3 --- .../discordplugin/commands/UserinfoCommand.java | 8 +++++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java index 61a0ebd..c87efee 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java @@ -49,9 +49,6 @@ public class DiscordPlugin extends JavaPlugin implements IListener { lastannouncementtime = getConfig().getLong("lastannouncementtime"); lastseentime = getConfig().getLong("lastseentime"); Test = getConfig().getBoolean("test", true); - getConfig().set("lastannouncementtime", lastannouncementtime); - getConfig().set("lastseentime", lastseentime); - getConfig().set("test", Test); // TODO: TMP saveConfig(); } ClientBuilder cb = new ClientBuilder(); diff --git a/src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java b/src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java index 27d9369..e1fd59d 100644 --- a/src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java +++ b/src/main/java/buttondevteam/discordplugin/commands/UserinfoCommand.java @@ -1,6 +1,7 @@ package buttondevteam.discordplugin.commands; import java.util.List; +import java.util.stream.Collectors; import buttondevteam.discordplugin.DiscordPlayer; import buttondevteam.discordplugin.DiscordPlugin; @@ -47,7 +48,12 @@ public class UserinfoCommand extends DiscordCommandBase { return; } } else { - final List targets = message.getGuild().getUsersByName(args, true); + final List targets; + if (message.getChannel().isPrivate()) + targets = DiscordPlugin.dc.getUsers().stream().filter(u -> u.getName().equalsIgnoreCase(args)) + .collect(Collectors.toList()); + else + targets = message.getGuild().getUsersByName(args, true); if (targets.size() == 0) { DiscordPlugin.sendMessageToChannel(message.getChannel(), "The user cannot be found on Discord: " + args);