Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-11-25 12:25:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve error logging in mirroring

Browse Source
This commit is contained in:
Vankka 2024-06-21 15:54:09 +03:00
parent 501d638744
commit 5983148d1a
No known key found for this signature in database
GPG Key ID: 62E48025ED4E7EBB
3 changed files with 59 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/com/discordsrv/common/discord/util/DiscordPermissionUtil.java
View File

@ -23,7 +23,7 @@ public final class DiscordPermissionUtil {
channel = ((ThreadChannel) channel).getParentChannel();
}
EnumSet<Permission> missingPermissions = checkMissingPermissions(channel, permissions);
return format(missingPermissions, "#" + channel.getName());
return createErrorMessage(missingPermissions, "#" + channel.getName());
}
public static EnumSet<Permission> checkMissingPermissions(GuildChannel channel, Collection<Permission> permissions) {
@ -45,7 +45,7 @@ public final class DiscordPermissionUtil {
public static String missingPermissionsString(Guild guild, Collection<Permission> permissions) {
EnumSet<Permission> missingPermissions = checkMissingPermissions(guild, permissions);
return format(missingPermissions, guild.getName());
return createErrorMessage(missingPermissions, guild.getName());
}
public static EnumSet<Permission> checkMissingPermissions(Guild guild, Collection<Permission> permissions) {
@ -58,7 +58,7 @@ public final class DiscordPermissionUtil {
return missingPermissions;
}
private static String format(EnumSet<Permission> permissions, String where) {
public static String createErrorMessage(EnumSet<Permission> permissions, String where) {
if (permissions.isEmpty()) {
return null;
}

32
common/src/main/java/com/discordsrv/common/logging/impl/DiscordSRVLogger.java
View File

@ -21,9 +21,13 @@ package com.discordsrv.common.logging.impl;
import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.config.main.DebugConfig;
import com.discordsrv.common.config.main.MainConfig;
import com.discordsrv.common.discord.util.DiscordPermissionUtil;
import com.discordsrv.common.logging.LogLevel;
import com.discordsrv.common.logging.Logger;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.jetbrains.annotations.NotNull;
@ -38,10 +42,7 @@ import java.nio.file.StandardOpenOption;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Queue;
import java.util.*;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Future;
@ -125,8 +126,27 @@ public class DiscordSRVLogger implements Logger {
throwable = null;
}
if (throwable instanceof InsufficientPermissionException) {
Permission permission = ((InsufficientPermissionException) throwable).getPermission();
String msg = "The bot is missing the \"" + permission.getName() + "\" permission";
InsufficientPermissionException exception = (InsufficientPermissionException) throwable;
Permission permission = exception.getPermission();
JDA jda = discordSRV.jda();
GuildChannel guildChannel = jda != null ? exception.getChannel(jda) : null;
long channelId = exception.getChannelId();
Guild guild = jda != null ? exception.getGuild(jda) : null;
long guildId = exception.getGuildId();
String where;
if (guildChannel != null) {
where = "#" + guildChannel.getName();
} else if (channelId != 0) {
where = "Channel ID " + Long.toUnsignedString(channelId);
} else if (guild != null) {
where = guild.getName();
} else {
where = "Server ID " + Long.toUnsignedString(guildId);
}
String msg = DiscordPermissionUtil.createErrorMessage(EnumSet.of(permission), where);
if (message == null) {
message = msg;
} else {

35
common/src/main/java/com/discordsrv/common/messageforwarding/discord/DiscordMessageMirroringModule.java
View File

@ -41,11 +41,14 @@ import com.discordsrv.common.config.main.channels.MirroringConfig;
import com.discordsrv.common.config.main.channels.base.BaseChannelConfig;
import com.discordsrv.common.config.main.channels.base.IChannelConfig;
import com.discordsrv.common.config.main.generic.DiscordIgnoresConfig;
import com.discordsrv.common.discord.util.DiscordPermissionUtil;
import com.discordsrv.common.future.util.CompletableFutureUtil;
import com.discordsrv.common.logging.NamedLogger;
import com.discordsrv.common.module.type.AbstractModule;
import com.github.benmanes.caffeine.cache.Cache;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
import okhttp3.Request;
import okhttp3.Response;
import okhttp3.ResponseBody;
@ -57,6 +60,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.TimeUnit;
public class DiscordMessageMirroringModule extends AbstractModule<DiscordSRV> {
@ -171,7 +175,7 @@ public class DiscordMessageMirroringModule extends AbstractModule<DiscordSRV> {
);
}
CompletableFutureUtil.combine(futures).whenComplete((lists, t) -> {
CompletableFutureUtil.combine(futures).whenComplete((lists, v) -> {
Set<Long> channelIdsHandled = new HashSet<>();
for (MirrorOperation operation : lists) {
List<CompletableFuture<MirroredMessage>> mirrorFutures = new ArrayList<>();
@ -214,13 +218,23 @@ public class DiscordMessageMirroringModule extends AbstractModule<DiscordSRV> {
return;
}
GuildMessageChannel channel = (GuildMessageChannel) mirrorChannel.getAsJDAMessageChannel();
String missingPermissions = DiscordPermissionUtil.missingPermissionsString(channel, Permission.VIEW_CHANNEL, Permission.MANAGE_WEBHOOKS);
if (missingPermissions != null) {
logger().error("Failed to mirror message to " + describeChannel(mirrorChannel) + ": " + missingPermissions);
continue;
}
CompletableFuture<MirroredMessage> future =
mirrorChannel.sendMessage(messageBuilder.build())
.thenApply(msg -> new MirroredMessage(msg, config));
mirrorFutures.add(future);
future.exceptionally(t2 -> {
logger().error("Failed to mirror message to " + mirrorChannel, t2);
future.exceptionally(t -> {
if (t instanceof CompletionException) {
t = t.getCause();
}
logger().error("Failed to mirror message to " + describeChannel(mirrorChannel), t);
for (InputStream stream : streams) {
try {
stream.close();
@ -243,11 +257,22 @@ public class DiscordMessageMirroringModule extends AbstractModule<DiscordSRV> {
});
}
}).exceptionally(t -> {
if (t instanceof CompletionException) {
t = t.getCause();
}
logger().error("Failed to mirror message", t);
return null;
});
}
private String describeChannel(DiscordGuildMessageChannel channel) {
if (channel instanceof DiscordThreadChannel) {
return "\"" + channel.getName() + "\" in #" + ((DiscordThreadChannel) channel).getParentChannel().getName();
}
return "#" + channel.getName();
}
@Subscribe
public void onDiscordMessageUpdate(DiscordMessageUpdateEvent event) {
Cache<Long, Sync> syncs = mapping.getIfPresent(event.getChannel().getId());
@ -289,13 +314,13 @@ public class DiscordMessageMirroringModule extends AbstractModule<DiscordSRV> {
}
for (MessageReference reference : sync.mirrors) {
DiscordMessageChannel channel = reference.getMessageChannel(discordSRV);
DiscordGuildMessageChannel channel = reference.getMessageChannel(discordSRV);
if (channel == null) {
continue;
}
channel.deleteMessageById(reference.messageId, reference.webhookMessage).exceptionally(t -> {
logger().error("Failed to delete mirrored message in " + channel);
logger().error("Failed to delete mirrored message in " + describeChannel(channel));
return null;
});
}