From 91cc2af6ef48abcd8890265353bc39bafad6766e Mon Sep 17 00:00:00 2001 From: RedDaedalus <16168171+RedDaedalus@users.noreply.github.com> Date: Sat, 1 Oct 2022 13:13:24 -0600 Subject: [PATCH] fix: Rename Expert to SrHelper --- .../helpbot/bot/command/impl/other/tag/AddTagSubCommand.java | 2 +- .../helpbot/bot/command/impl/other/tag/EditTagSubCommand.java | 2 +- .../bot/command/impl/other/tag/RemoveTagSubCommand.java | 2 +- .../bot/command/impl/other/util/BulkExecuteCommand.java | 2 +- .../helpbot/bot/command/impl/stats/StaffListCommand.java | 4 ++-- .../bot/command/impl/stats/support/ExcusedStaffCommand.java | 2 +- .../bot/command/impl/stats/support/JoinBadCommand.java | 2 +- .../impl/stats/support/SupportBannedPlayersCommand.java | 2 +- .../helpbot/bot/command/permissions/Permission.java | 2 +- src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java | 2 +- .../helpbot/sys/tasks/impl/SupportUnexcuseTask.java | 4 ++-- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/AddTagSubCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/AddTagSubCommand.java index d4bd27b4..c644965a 100644 --- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/AddTagSubCommand.java +++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/AddTagSubCommand.java @@ -46,7 +46,7 @@ protected ArgumentSet compileArguments() { @Override public Permission getPermission() { - return Permission.EXPERT + return Permission.SR_HELPER .setOverrides(this, 808966728201666620L); } diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/EditTagSubCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/EditTagSubCommand.java index 8b596a97..754def3b 100644 --- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/EditTagSubCommand.java +++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/EditTagSubCommand.java @@ -46,7 +46,7 @@ protected ArgumentSet compileArguments() { @Override public Permission getPermission() { - return Permission.EXPERT + return Permission.SR_HELPER .setOverrides(this, 808966728201666620L); } diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/RemoveTagSubCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/RemoveTagSubCommand.java index 67f2581c..6b018ae9 100644 --- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/RemoveTagSubCommand.java +++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/tag/RemoveTagSubCommand.java @@ -39,7 +39,7 @@ protected ArgumentSet compileArguments() { @Override public Permission getPermission() { - return Permission.EXPERT + return Permission.SR_HELPER .setOverrides(this, 808966728201666620L); } diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/BulkExecuteCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/BulkExecuteCommand.java index 5f57a99b..80e2135a 100644 --- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/BulkExecuteCommand.java +++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/other/util/BulkExecuteCommand.java @@ -58,7 +58,7 @@ public ArgumentSet compileArguments() { @Override public Permission getPermission() { - return Permission.EXPERT; + return Permission.SR_HELPER; } @Override diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/StaffListCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/StaffListCommand.java index b86bfd7b..53e3fa5b 100644 --- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/StaffListCommand.java +++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/StaffListCommand.java @@ -60,7 +60,7 @@ public void run(CommandEvent event) { registerRank(ranks, Rank.JRHELPER, Rank.HELPER, - Rank.EXPERT, + Rank.SR_HELPER, Rank.JRMOD, Rank.MOD, Rank.SR_MOD, @@ -85,7 +85,7 @@ public void run(CommandEvent event) { } EmbedBuilder supportPage = new EmbedBuilder(); - EmbedUtil.addFields(supportPage, ranks.get(Rank.EXPERT), "", "Experts"); + EmbedUtil.addFields(supportPage, ranks.get(Rank.SR_HELPER), "", "SrHelpers"); EmbedUtil.addFields(supportPage, ranks.get(Rank.HELPER), "", "Helpers"); EmbedUtil.addFields(supportPage, ranks.get(Rank.JRHELPER), "", "JrHelpers"); builder.addPage("Support", supportPage); diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/ExcusedStaffCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/ExcusedStaffCommand.java index 76da174d..a2279402 100644 --- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/ExcusedStaffCommand.java +++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/ExcusedStaffCommand.java @@ -37,7 +37,7 @@ public ArgumentSet compileArguments() { @Override public Permission getPermission() { - return Permission.EXPERT; + return Permission.SR_HELPER; } @Override diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/JoinBadCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/JoinBadCommand.java index 1e68e442..7b0da837 100644 --- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/JoinBadCommand.java +++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/JoinBadCommand.java @@ -47,7 +47,7 @@ public ArgumentSet compileArguments() { @Override public Permission getPermission() { - return Permission.EXPERT; + return Permission.SR_HELPER; } @Override diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupportBannedPlayersCommand.java b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupportBannedPlayersCommand.java index 9b32e30e..092445c0 100644 --- a/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupportBannedPlayersCommand.java +++ b/src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/support/SupportBannedPlayersCommand.java @@ -35,7 +35,7 @@ public ArgumentSet compileArguments() { @Override public Permission getPermission() { - return Permission.EXPERT; + return Permission.SR_HELPER; } @Override diff --git a/src/main/java/com/diamondfire/helpbot/bot/command/permissions/Permission.java b/src/main/java/com/diamondfire/helpbot/bot/command/permissions/Permission.java index 8f69f446..a4afcbba 100644 --- a/src/main/java/com/diamondfire/helpbot/bot/command/permissions/Permission.java +++ b/src/main/java/com/diamondfire/helpbot/bot/command/permissions/Permission.java @@ -12,7 +12,7 @@ public enum Permission { // Ask DragonSlasher, not me. ADMINISTRATOR(180794313494495233L, 666), MODERATION(180794061429538816L, 5), - EXPERT(299109861696995329L, 4), + SR_HELPER(299109861696995329L, 4), SUPPORT(180794530398732288L, 3), RETIRED_SUPPORT(235159617108181003L, 2), USER(349434193517740033L, 1); diff --git a/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java b/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java index 8628606e..64c0658d 100644 --- a/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java +++ b/src/main/java/com/diamondfire/helpbot/df/ranks/Rank.java @@ -18,7 +18,7 @@ public enum Rank { // Support JRHELPER("JrHelper", 1, RankBranch.SUPPORT, "S_JrHelper"), HELPER("Helper", 2, RankBranch.SUPPORT, "Helper"), - EXPERT("Expert", 3, RankBranch.SUPPORT, "S_Expert"), + SR_HELPER("SrHelper", 3, RankBranch.SUPPORT, "S_Expert"), // Moderation JRMOD("JrMod", 1, RankBranch.MODERATION, "JrModerator"), MOD("Mod", 2, RankBranch.MODERATION, "Moderator"), diff --git a/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/SupportUnexcuseTask.java b/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/SupportUnexcuseTask.java index 04515a1b..dd59273c 100644 --- a/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/SupportUnexcuseTask.java +++ b/src/main/java/com/diamondfire/helpbot/sys/tasks/impl/SupportUnexcuseTask.java @@ -18,7 +18,7 @@ public class SupportUnexcuseTask implements OneTimeTask { - private static final long EXPERT_CHAT = 467729470539694091L; + private static final long SR_HELPER_CHAT = 467729470539694091L; private static final Command[] commandsToRun = new Command[]{ new StatsCommand(), new LastJoinedCommand(), @@ -41,7 +41,7 @@ public long getExecution() { @Override public void run() { PresetBuilder builder = new PresetBuilder(); - TextChannel channel = HelpBotInstance.getJda().getTextChannelById(EXPERT_CHAT); + TextChannel channel = HelpBotInstance.getJda().getTextChannelById(SR_HELPER_CHAT); new DatabaseQuery() .query(new BasicQuery("SELECT * FROM players WHERE players.uuid = ?", (statement) -> statement.setString(1, uuid)))