mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-02-11 05:58:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where Categories were being seen as channels.

Browse Source
This commit is contained in:
NovaFox161
2019-06-08 22:18:24 -05:00
parent cd80d43902
commit 299481b43f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/java/org/dreamexposure/discal/client/message/AnnouncementMessageFormatter.java
View File

@@ -247,7 +247,7 @@ public class AnnouncementMessageFormatter {
try {
if (guild != null)
channel = (TextChannel)guild.getChannelById(Snowflake.of(announcement.getAnnouncementChannelId())).block();
channel = guild.getChannelById(Snowflake.of(announcement.getAnnouncementChannelId())).ofType(TextChannel.class).block();
} catch (Exception e) {
Logger.getLogger().exception(null, "An error occurred when looking for announcement channel! | Announcement: " + announcement.getAnnouncementId() + " | TYPE: " + announcement.getAnnouncementType() + " | Guild: " + announcement.getGuildId().asString(), e, true, AnnouncementMessageFormatter.class);
}

16
core/src/main/java/org/dreamexposure/discal/core/utils/ChannelUtils.java
View File

@@ -2,7 +2,7 @@ package org.dreamexposure.discal.core.utils;
import discord4j.core.event.domain.message.MessageCreateEvent;
import discord4j.core.object.entity.Guild;
import discord4j.core.object.entity.GuildChannel;
import discord4j.core.object.entity.TextChannel;
/**
* Created by Nova Fox on 3/29/2017.
@@ -22,7 +22,7 @@ public class ChannelUtils {
if (nameOrId.contains("#"))
nameOrId = nameOrId.replace("#", "");
for (GuildChannel c : event.getGuild().block().getChannels().toIterable()) {
for (TextChannel c : event.getGuild().block().getChannels().ofType(TextChannel.class).toIterable()) {
if (c.getName().equalsIgnoreCase(nameOrId) || c.getId().asString().equals(nameOrId))
return true;
}
@@ -33,7 +33,7 @@ public class ChannelUtils {
if (nameOrId.contains("#"))
nameOrId = nameOrId.replace("#", "");
for (GuildChannel c : guild.getChannels().toIterable()) {
for (TextChannel c : guild.getChannels().ofType(TextChannel.class).toIterable()) {
if (c.getName().equalsIgnoreCase(nameOrId) || c.getId().asString().equals(nameOrId))
return true;
}
@@ -47,11 +47,11 @@ public class ChannelUtils {
* @param event The event received.
* @return the IChannel if successful, else <code>null</code>.
*/
public static GuildChannel getChannelFromNameOrId(String nameOrId, MessageCreateEvent event) {
public static TextChannel getChannelFromNameOrId(String nameOrId, MessageCreateEvent event) {
if (nameOrId.contains("#"))
nameOrId = nameOrId.replace("#", "");
for (GuildChannel c : event.getGuild().block().getChannels().toIterable()) {
for (TextChannel c : event.getGuild().block().getChannels().ofType(TextChannel.class).toIterable()) {
if (c.getName().equalsIgnoreCase(nameOrId) || c.getId().asString().equals(nameOrId))
return c;
}
@@ -64,11 +64,11 @@ public class ChannelUtils {
* @param nameOrId The channel name or ID.
* @return the IChannel if successful, else <code>null</code>.
*/
public static GuildChannel getChannelFromNameOrId(String nameOrId, Guild guild) {
public static TextChannel getChannelFromNameOrId(String nameOrId, Guild guild) {
if (nameOrId.contains("#"))
nameOrId = nameOrId.replace("#", "");
for (GuildChannel c : guild.getChannels().toIterable()) {
for (TextChannel c : guild.getChannels().ofType(TextChannel.class).toIterable()) {
if (c.getName().equalsIgnoreCase(nameOrId) || c.getId().asString().equals(nameOrId))
return c;
}
@@ -85,7 +85,7 @@ public class ChannelUtils {
if (nameOrId.contains("#"))
nameOrId = nameOrId.replace("#", "");
for (GuildChannel c : guild.getChannels().toIterable()) {
for (TextChannel c : guild.getChannels().ofType(TextChannel.class).toIterable()) {
if (c.getName().equalsIgnoreCase(nameOrId) || c.getId().asString().equals(nameOrId))
return c.getName();
}