Change channel lookups to use numeric IDs, allows channels in categories to be used

Closes #112, #113, #115

Author: shadowfacts

core/src/main/java/net/shadowfacts/discordchat/api/IConfig.java

@@ -16,9 +16,9 @@ public interface IConfig {
 
 	String getToken();
 
-	String getServerID();
+	Long getServerID();
 
-	List<String> getChannels();
+	List<Long> getChannelIDs();
 
 	String getCommandPrefix();
 

core/src/main/java/net/shadowfacts/discordchat/core/Config.java

@@ -1,9 +1,6 @@
 package net.shadowfacts.discordchat.core;
 
-import com.typesafe.config.ConfigFactory;
-import com.typesafe.config.ConfigObject;
-import com.typesafe.config.ConfigRenderOptions;
-import com.typesafe.config.ConfigValueFactory;
+import com.typesafe.config.*;
 import net.shadowfacts.discordchat.api.IConfig;
 import net.shadowfacts.discordchat.api.permission.Permission;
 import net.shadowfacts.shadowlib.util.IOUtils;
@@ -66,13 +63,17 @@ public String getToken() {
 	}
 
 	@Override
-	public String getServerID() {
-		return config.getString("discordchat.discord.server");
+	public Long getServerID() {
+		return config.getLong("discordchat.discord.server");
 	}
 
 	@Override
-	public List<String> getChannels() {
-		return config.getStringList("discordchat.discord.channels");
+	public List<Long> getChannelIDs() {
+		try {
+			return config.getLongList("discordchat.discord.channels");
+		} catch (ConfigException.WrongType e) {
+			throw new RuntimeException("Unable to get channel IDs, update the config to use numeric channel IDs.", e);
+		}
 	}
 
 	@Override

core/src/main/java/net/shadowfacts/discordchat/core/DiscordChat.java

@@ -102,10 +102,13 @@ public void connect() {
 			if (guild == null) {
 				throw new RuntimeException("Invalid server ID");
 			}
-			for (String channel : config.getChannels()) {
-				List<TextChannel> channels = guild.getTextChannelsByName(channel, true);
-				if (channels.isEmpty()) {
-					throw new RuntimeException("Invalid channel ID: " + channel);
+			if (config.getChannelIDs().isEmpty()) {
+				throw new RuntimeException("No channel IDs");
+			} else {
+				for (long channelID : config.getChannelIDs()) {
+					if (guild.getTextChannelById(channelID) == null) {
+						throw new RuntimeException("Invalid channel ID: " + channelID);
+					}
 				}
 			}
 		}, "DiscordChat-initializer").start();
@@ -237,13 +240,8 @@ public void sendMessage(String message) {
 			}
 			Guild guild = jda.getGuildById(config.getServerID());
 			channels = new ArrayList<>();
-			for (String channel : config.getChannels()) {
-				List<TextChannel> channels = guild.getTextChannelsByName(channel, false);
-				if (channels.size() < 1) {
-					throw new RuntimeException("No such channel: " + channel);
-				} else {
-					this.channels.addAll(channels);
-				}
+			for (long channelID : config.getChannelIDs()) {
+				channels.add(guild.getTextChannelById(channelID));
 			}
 		}
 		sendMessage(message, channels);

core/src/main/java/net/shadowfacts/discordchat/core/Listener.java

@@ -41,8 +41,8 @@ public void onPrivateMessageReceived(PrivateMessageReceivedEvent event) {
 	@Override
 	public void onGuildMessageReceived(GuildMessageReceivedEvent event) {
 		if (event.getAuthor().equals(event.getJDA().getSelfUser())) return;
-		if (!event.getGuild().getId().equals(config.getServerID())) return;
-		if (!config.getChannels().contains(event.getChannel().getName())) return;
+		if (event.getGuild().getIdLong() != config.getServerID()) return;
+		if (!config.getChannelIDs().contains(event.getChannel().getIdLong())) return;
 
 		String raw = event.getMessage().getRawContent();
 		if (raw.startsWith(config.getCommandPrefix())) {