forked from SteamWar/SteamWar
Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -26,6 +26,7 @@ import de.steamwar.velocitycore.discord.DiscordBot;
|
||||
import de.steamwar.velocitycore.discord.listeners.ChannelListener;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import net.dv8tion.jda.api.entities.Member;
|
||||
import net.dv8tion.jda.api.entities.User;
|
||||
import net.dv8tion.jda.api.entities.Webhook;
|
||||
import net.dv8tion.jda.api.entities.WebhookClient;
|
||||
@@ -104,10 +105,16 @@ public class DiscordChannel extends Chatter.PlayerlessChatter {
|
||||
return;
|
||||
}
|
||||
|
||||
String avatarUrl;
|
||||
String avatarUrl = null;
|
||||
if (user.getDiscordId() != null) {
|
||||
avatarUrl = DiscordBot.getGuild().retrieveMemberById(user.getDiscordId()).complete().getEffectiveAvatarUrl();
|
||||
} else {
|
||||
Member member = DiscordBot.getGuild().retrieveMemberById(user.getDiscordId())
|
||||
.onErrorMap(throwable -> null)
|
||||
.complete();
|
||||
if (member != null) {
|
||||
avatarUrl = member.getEffectiveAvatarUrl();
|
||||
}
|
||||
}
|
||||
if (avatarUrl == null) {
|
||||
avatarUrl = DiscordBot.getInstance().getJda().getSelfUser().getAvatarUrl();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user