SteamWar/SteamWar
9
0
Fork 0
Code Issues 34 Pull Requests 12 Packages Projects 3 Releases Wiki Activity

Fixes
All checks were successful
SteamWarCI Build successful
Details

Browse Source
This commit is contained in:
Lixfel
2025-01-20 16:56:59 +01:00
parent 90ebc93b14
commit af79ef544b
7 changed files with 115 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java
View File

@ -24,10 +24,7 @@ import de.steamwar.messages.Chatter;
import de.steamwar.sql.Event;
import de.steamwar.velocitycore.VelocityCore;
import de.steamwar.velocitycore.discord.channels.*;
import de.steamwar.velocitycore.discord.listeners.ChannelListener;
import de.steamwar.velocitycore.discord.listeners.DiscordSchemUpload;
import de.steamwar.velocitycore.discord.listeners.DiscordTeamEvent;
import de.steamwar.velocitycore.discord.listeners.DiscordTicketHandler;
import de.steamwar.velocitycore.discord.listeners.*;
import de.steamwar.velocitycore.discord.util.AuthManager;
import lombok.Getter;
import net.dv8tion.jda.api.EmbedBuilder;
@ -38,7 +35,6 @@ import net.dv8tion.jda.api.entities.Activity;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Role;
import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
import net.dv8tion.jda.api.entities.emoji.Emoji;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.exceptions.ErrorResponseException;
@ -166,6 +162,7 @@ public class DiscordBot {
.setComponents(actionRows), DiscordTicketHandler::openTicket);
eventChannel = new StaticMessageChannel(config.channel("events"), EventChannel::get);
checklistChannel = new ChecklistChannel(config.channel("checklist"));
config.getCouncilThread().forEach((roleId, threadId) -> new CouncilChannel(DiscordBot.getGuild().getRoleById(roleId), DiscordBot.getGuild().getThreadChannelById(threadId)));
announcementChannel = new DiscordChannel(config.channel("announcement")) {
@Override
@ -191,17 +188,9 @@ public class DiscordBot {
new DiscordTeamEvent(),
new ChannelListener(),
new DiscordSchemUpload(),
new RatsChannel.RastChannelListener()
new RoleListener()
);
config.getRatsRoleToThread().forEach((roleId, threadId) -> {
Role role = DiscordBot.getGuild().getRoleById(roleId);
if (role == null) return;
ThreadChannel threadChannel = DiscordBot.getGuild().getThreadChannelById(threadId);
if (threadChannel == null) return;
new RatsChannel(role, threadChannel);
});
commandSetup(jda.retrieveCommands().complete(), jda.updateCommands());
}

2
VelocityCore/src/de/steamwar/velocitycore/discord/DiscordConfig.java
View File

@ -56,7 +56,7 @@ public class DiscordConfig {
private String ticketcategory;
private Map<String, String> ratsRoleToThread;
private Map<String, String> councilThread;
@NoArgsConstructor
public static class DiscordRole {

68
VelocityCore/src/de/steamwar/velocitycore/discord/channels/CouncilChannel.java Normal file
View File

@ -0,0 +1,68 @@
/*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2025 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.velocitycore.discord.channels;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.velocitycore.discord.DiscordBot;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Role;
import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class CouncilChannel extends StaticMessageChannel {
private static final Map<Role, CouncilChannel> channels = new HashMap<>();
public static void update(List<Role> roles) {
for(Role role : roles) {
if (channels.containsKey(role)) {
channels.get(role).update();
}
}
}
public CouncilChannel(Role role, ThreadChannel threadChannel) {
super(threadChannel, () -> {
MessageCreateBuilder messageCreateBuilder = new MessageCreateBuilder();
messageCreateBuilder.setContent("# Ratsmitglieder");
for (Member member : DiscordBot.getGuild().getMembersWithRoles(role)) {
SteamwarUser steamwarUser = SteamwarUser.get(member.getIdLong());
if (steamwarUser == null)
continue;
messageCreateBuilder.addEmbeds(new EmbedBuilder()
.setTitle(steamwarUser.getUserName())
.setImage("api.steamwar.de/data/skin/" + steamwarUser.getUUID().toString())
.build());
}
return messageCreateBuilder;
}, event -> {});
channels.put(role, this);
}
}

3
VelocityCore/src/de/steamwar/velocitycore/discord/channels/DiscordChannel.java
View File

@ -52,8 +52,7 @@ public class DiscordChannel extends Chatter.PlayerlessChatter {
}
public DiscordChannel(String channel) {
this(SteamwarUser.get(-1), DiscordBot.getGuild().getTextChannelById(channel));
ChannelListener.getChannels().put(this.channel, this);
this(DiscordBot.getGuild().getTextChannelById(channel));
}
public DiscordChannel(MessageChannel channel) {

63
VelocityCore/src/de/steamwar/velocitycore/discord/channels/RatsChannel.java
View File

@ -1,63 +0,0 @@
package de.steamwar.velocitycore.discord.channels;
import de.steamwar.sql.SteamwarUser;
import de.steamwar.velocitycore.discord.DiscordBot;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Role;
import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleAddEvent;
import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleRemoveEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class RatsChannel extends StaticMessageChannel {
private static Map<Role, RatsChannel> listener = new HashMap<>();
public RatsChannel(Role role, ThreadChannel threadChannel) {
super(threadChannel, () -> {
MessageCreateBuilder messageCreateBuilder = new MessageCreateBuilder();
messageCreateBuilder.setContent("# Ratsmitglieder");
for (Member member : DiscordBot.getGuild().getMembersWithRoles(role)) {
SteamwarUser steamwarUser = SteamwarUser.get(member.getIdLong());
if (steamwarUser == null) continue;
messageCreateBuilder.addEmbeds(new EmbedBuilder()
.setTitle(steamwarUser.getUserName())
.setImage("api.steamwar.de/data/skin/" + steamwarUser.getUUID().toString())
.build());
}
return messageCreateBuilder;
}, genericComponentInteractionCreateEvent -> {});
listener.put(role, this);
}
public static class RastChannelListener extends ListenerAdapter {
@Override
public void onGuildMemberRoleAdd(@NotNull GuildMemberRoleAddEvent event) {
updateRatsChannel(event.getRoles());
}
@Override
public void onGuildMemberRoleRemove(@NotNull GuildMemberRoleRemoveEvent event) {
updateRatsChannel(event.getRoles());
}
private void updateRatsChannel(List<Role> roles) {
roles.forEach(role -> {
if (listener.containsKey(role)) {
listener.get(role).update();
}
});
}
}
}

9
VelocityCore/src/de/steamwar/velocitycore/discord/channels/StaticMessageChannel.java
View File

@ -49,18 +49,17 @@ public class StaticMessageChannel extends DiscordChannel {
super(channel);
this.supplier = supplier;
this.interaction = interaction;
if(getChannel().getLatestMessageIdLong() != 0)
message = getChannel().getIterableHistory().complete().stream().filter(m -> m.getAuthor().isBot()).findFirst().orElse(null);
update();
init();
}
public StaticMessageChannel(MessageChannel channel, Supplier<MessageCreateBuilder> supplier, Consumer<GenericComponentInteractionCreateEvent> interaction) {
super(channel);
this.supplier = supplier;
this.interaction = interaction;
init();
}
private void init() {
if(getChannel().getLatestMessageIdLong() != 0)
message = getChannel().getIterableHistory().complete().stream().filter(m -> m.getAuthor().isBot()).findFirst().orElse(null);

38
VelocityCore/src/de/steamwar/velocitycore/discord/listeners/RoleListener.java Normal file
View File

@ -0,0 +1,38 @@
/*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2025 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.velocitycore.discord.listeners;
import de.steamwar.velocitycore.discord.channels.CouncilChannel;
import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleAddEvent;
import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleRemoveEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
public class RoleListener extends ListenerAdapter {
@Override
public void onGuildMemberRoleAdd(@NotNull GuildMemberRoleAddEvent event) {
CouncilChannel.update(event.getRoles());
}
@Override
public void onGuildMemberRoleRemove(@NotNull GuildMemberRoleRemoveEvent event) {
CouncilChannel.update(event.getRoles());
}
}