Remove orga role and permission deployment

Author: rainbowdashlabs

bot/src/main/java/de/chojo/gamejam/Bot.java

@@ -42,7 +42,6 @@
 import javax.sql.DataSource;
 import java.io.IOException;
 import java.sql.SQLException;
-import java.util.Collections;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -122,21 +121,19 @@ private void buildLocale() {
     }
 
     private void buildCommands() {
-        var settings = new Settings(jamData, guildData);
         commandHub = CommandHub.builder(shardManager)
-                .withManagerRole(guild -> Collections.singletonList(guildData.getSettings(guild).join().orgaRole()))
                 .withLocalizer(localizer)
                 .useGuildCommands()
                 .withCommands(new JamAdmin(jamData),
                         new Register(jamData),
-                        settings,
+                        new Settings(jamData, guildData),
                         new Team(teamData, jamData),
                         new Unregister(jamData, teamData),
                         new Votes(jamData, teamData))
+                .withPermissionCheck((event, meta) -> true)
                 .withPagination(builder -> builder.withLocalizer(localizer).withCache(cache -> cache.expireAfterAccess(30, TimeUnit.MINUTES)))
                 .withButtonService(builder -> builder.withLocalizer(localizer).withCache(cache -> cache.expireAfterAccess(30, TimeUnit.MINUTES)))
                 .build();
-        settings.init(commandHub);
     }
 
     private void initBot() throws LoginException {

bot/src/main/java/de/chojo/gamejam/commands/Settings.java

@@ -9,7 +9,6 @@
 import de.chojo.gamejam.commands.settings.Info;
 import de.chojo.gamejam.commands.settings.JamRole;
 import de.chojo.gamejam.commands.settings.Locale;
-import de.chojo.gamejam.commands.settings.OrgaRole;
 import de.chojo.gamejam.commands.settings.TeamSize;
 import de.chojo.gamejam.data.GuildData;
 import de.chojo.gamejam.data.JamData;
@@ -27,7 +26,6 @@
 
 public class Settings extends SimpleCommand {
     private final JamData jamData;
-    private final OrgaRole orgaRole;
     private final Locale locale;
 
     private final Map<String, SubCommand<JamSettings>> subCommandMap;
@@ -46,12 +44,10 @@ public Settings(JamData jamData, GuildData guildData) {
                 .addSubCommand("info", "command.settings.info.description")
                 .build());
         this.jamData = jamData;
-        orgaRole = new OrgaRole(guildData);
         locale = new Locale(guildData);
         subCommandMap = new MapBuilder<String, SubCommand<JamSettings>>()
                 .add("jam_role", new JamRole(jamData))
                 .add("team_size", new TeamSize(jamData))
-                .add("orga_role", orgaRole)
                 .add("locale", locale)
                 .add("info", new Info(guildData))
                 .build();
@@ -67,9 +63,4 @@ public void onSlashCommand(SlashCommandInteractionEvent event, SlashCommandConte
                     }
                 }).whenComplete(Future.handleComplete());
     }
-
-    public void init(CommandHub<?> commandHub) {
-        orgaRole.setCommandHub(commandHub);
-        locale.setCommandHub(commandHub);
-    }
 }

bot/src/main/java/de/chojo/gamejam/commands/settings/Locale.java

@@ -15,7 +15,6 @@
 
 public final class Locale implements SubCommand<JamSettings> {
     private final GuildData guildData;
-    private CommandHub<?> commandHub;
 
     public Locale(GuildData guildData) {
         this.guildData = guildData;
@@ -31,12 +30,8 @@ public void execute(SlashCommandInteractionEvent event, SlashCommandContext cont
                     guildData.updateSettings(guildSettings)
                             .thenRun(() -> {
                                 event.reply(context.localize("command.settings.locale.updated")).setEphemeral(true).queue();
-                                commandHub.refreshGuildCommands(event.getGuild());
+                                context.commandHub().refreshGuildCommands(event.getGuild());
                             });
                 }, () -> event.reply(context.localize("command.settings.locale.invalid")).setEphemeral(true).queue());
     }
-
-    public void setCommandHub(CommandHub<?> commandHub) {
-        this.commandHub = commandHub;
-    }
 }

bot/src/main/java/de/chojo/gamejam/commands/settings/OrgaRole.java

@@ -36,7 +36,6 @@ command.settings.locale.invalid=
 command.settings.locale.updated=
 command.settings.orgaRole.arg.role=
 command.settings.orgaRole.description=
-command.settings.orgaRole.updated=
 command.settings.teamSize.arg.size=
 command.settings.teamSize.description=
 command.settings.teamSize.updated=

bot/src/main/resources/locale.properties

@@ -36,7 +36,6 @@ command.settings.locale.invalid=Ungültiges Gebietsschema
 command.settings.locale.updated=Lokale aktualisiert
 command.settings.orgaRole.arg.role=Die Rolle, die den Bot verwalten kann
 command.settings.orgaRole.description=Definiere die Rolle des Organisationsteams
-command.settings.orgaRole.updated=Die Organisationsrolle wird aktualisiert.
 command.settings.teamSize.arg.size=Die maximale Teamgröße.
 command.settings.teamSize.description=Definiere die maximale Teamgröße.
 command.settings.teamSize.updated=Aktualisierte maximale Teamgröße.

bot/src/main/resources/locale_de_DE.properties

@@ -36,7 +36,6 @@ command.settings.locale.invalid=Invalid locale
 command.settings.locale.updated=Locale updated
 command.settings.orgaRole.arg.role=The role which can manage the bot
 command.settings.orgaRole.description=Define the organisation team role
-command.settings.orgaRole.updated=Updated the organization role.
 command.settings.teamSize.arg.size=The max team size.
 command.settings.teamSize.description=Define the max team size.
 command.settings.teamSize.updated=Updated max team size.