Skip to content

Commit 303444f

Browse files
danthe1stdanthe1st
committed
fix merge conflicts
1 parent 8528af1 commit 303444f

File tree

5 files changed

+16
-20
lines changed

5 files changed

+16
-20
lines changed

‎src/main/java/net/javadiscord/javabot/systems/help/HelpChannelUpdater.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,9 @@ private RestAction<?> semanticMessageCheck(TextChannel channel, User owner, List
382382
}
383383

384384
private void updateHelpOverview() {
385-
HelpForumConfig forumConfig = Bot.getConfig().get(config.getGuild()).getHelpForumConfig();
386-
config.getHelpOverviewMessageIds().forEach((channelId, messageId) -> {
387-
TextChannel channel = config.getGuild().getTextChannelById(channelId);
385+
HelpForumConfig forumConfig = botConfig.get(helpConfig.getGuild()).getHelpForumConfig();
386+
helpConfig.getHelpOverviewMessageIds().forEach((channelId, messageId) -> {
387+
TextChannel channel = helpConfig.getGuild().getTextChannelById(channelId);
388388
if (channel == null) {
389389
log.error("Could not find Help Overview Channel with id '{}'", channelId);
390390
return;
@@ -436,7 +436,7 @@ private void updateHelpOverview() {
436436
e -> ExceptionLogger.capture(e, getClass().getSimpleName())
437437
);
438438
}
439-
ForumChannel forum = Bot.getConfig().get(config.getGuild()).getHelpForumConfig().getHelpForumChannel();
439+
ForumChannel forum = botConfig.get(helpConfig.getGuild()).getHelpForumConfig().getHelpForumChannel();
440440
EmbedBuilder builder = new EmbedBuilder()
441441
.setTitle("Help Overview")
442442
.setColor(Responses.Type.DEFAULT.getColor())

‎src/main/java/net/javadiscord/javabot/systems/help/commands/HelpPingSubcommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
6161
Responses.warning(event, WRONG_CHANNEL_MSG).queue();
6262
return;
6363
}
64-
GuildConfig config = Bot.getConfig().get(guild);
64+
GuildConfig config = botConfig.get(guild);
6565
if (event.getChannelType() == ChannelType.TEXT) {
6666
handleTextBasedHelpPing(event, config);
6767
} else if (event.getChannelType() == ChannelType.GUILD_PUBLIC_THREAD) {
@@ -99,7 +99,7 @@ private void handleForumBasedHelpPing(@NotNull SlashCommandInteractionEvent even
9999
}
100100

101101
private void handleTextBasedHelpPing(@NotNull SlashCommandInteractionEvent event, @NotNull GuildConfig config) {
102-
HelpChannelManager channelManager = new HelpChannelManager(config.getHelpConfig());
102+
HelpChannelManager channelManager = new HelpChannelManager(botConfig, event.getGuild(), dbActions, asyncPool, helpExperienceService);
103103
if (channelManager.isReserved(event.getChannel().asTextChannel())) {
104104
Optional<ChannelReservation> optionalReservation = channelManager.getReservationForChannel(event.getChannel().getIdLong());
105105
if (optionalReservation.isEmpty()) {

‎src/main/java/net/javadiscord/javabot/systems/help/commands/UnreserveCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private void handleForumBasedHelp(SlashCommandInteractionEvent event, @NotNull T
7979
replyInvalidChannel(event);
8080
}
8181
ForumHelpManager manager = new ForumHelpManager(postThread, dbActions, botConfig, dbActions.getDataSource(), helpAccountRepository, helpTransactionRepository);
82-
if (isForumEligibleToBeUnreserved(event, postThread)) {
82+
if (manager.isForumEligibleToBeUnreserved(event.getInteraction())) {
8383
manager.close(event, event.getUser().getIdLong() == postThread.getOwnerIdLong(),
8484
event.getOption("reason", null, OptionMapping::getAsString)
8585
);

‎src/main/java/net/javadiscord/javabot/systems/help/forum/ForumHelpListener.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,8 @@
2020
import net.dv8tion.jda.api.interactions.components.ActionRow;
2121
import net.dv8tion.jda.api.interactions.components.buttons.Button;
2222
import net.javadiscord.javabot.data.config.BotConfig;
23-
import net.javadiscord.javabot.data.config.GuildConfig;
2423
import net.javadiscord.javabot.data.config.guild.HelpConfig;
2524
import net.javadiscord.javabot.data.h2db.DbActions;
26-
import net.javadiscord.javabot.Bot;
27-
import net.javadiscord.javabot.data.config.guild.HelpConfig;
2825
import net.javadiscord.javabot.data.config.guild.HelpForumConfig;
2926
import net.javadiscord.javabot.systems.help.HelpChannelManager;
3027
import net.javadiscord.javabot.systems.help.HelpExperienceService;
@@ -58,6 +55,7 @@ public class ForumHelpListener extends ListenerAdapter implements ButtonHandler
5855
private final DataSource dataSource;
5956
private final HelpAccountRepository helpAccountRepository;
6057
private final HelpTransactionRepository helpTransactionRepository;
58+
private final UserPreferenceService userPreferenceService;
6159
private final DbActions dbActions;
6260

6361
@Override
@@ -87,7 +85,7 @@ public void onChannelCreate(@NotNull ChannelCreateEvent event) {
8785
if (event.getGuild() == null || isInvalidForumPost(event.getChannel())) {
8886
return;
8987
}
90-
HelpForumConfig config = Bot.getConfig().get(event.getGuild()).getHelpForumConfig();
88+
HelpForumConfig config = botConfig.get(event.getGuild()).getHelpForumConfig();
9189
ThreadChannel post = event.getChannel().asThreadChannel();
9290
if (isInvalidHelpForumChannel(post.getParentChannel().asForumChannel())) {
9391
return;
@@ -98,8 +96,7 @@ public void onChannelCreate(@NotNull ChannelCreateEvent event) {
9896
Button.secondary(ComponentIdBuilder.build(ForumHelpManager.HELP_GUIDELINES_IDENTIFIER), "View Help Guidelines")
9997
)).queue(success -> {
10098
// send /close reminder (if enabled)
101-
UserPreferenceService service = new UserPreferenceService(Bot.getDataSource());
102-
UserPreference preference = service.getOrCreate(post.getOwnerIdLong(), Preference.FORUM_CLOSE_REMINDER);
99+
UserPreference preference = userPreferenceService.getOrCreate(post.getOwnerIdLong(), Preference.FORUM_CLOSE_REMINDER);
103100
if (Boolean.parseBoolean(preference.getState())) {
104101
post.sendMessageFormat(config.getCloseReminderText(), UserSnowflake.fromId(post.getOwnerIdLong()).getAsMention()).queue();
105102
}
@@ -115,9 +112,8 @@ public void handleButton(@NotNull ButtonInteractionEvent event, @NotNull Button
115112
Responses.error(event, "This button may only be used inside help forum threads.").queue();
116113
return;
117114
}
118-
ForumHelpManager manager = new ForumHelpManager(event.getChannel().asThreadChannel(), dbActions, botConfig, dataSource, helpAccountRepository, helpTransactionRepository);
119115
ThreadChannel post = event.getChannel().asThreadChannel();
120-
ForumHelpManager manager = new ForumHelpManager(post);
116+
ForumHelpManager manager = new ForumHelpManager(post, dbActions, botConfig, dataSource, helpAccountRepository, helpTransactionRepository);
121117
switch (id[0]) {
122118
case ForumHelpManager.HELP_THANKS_IDENTIFIER -> handleHelpThanksInteraction(event, manager, id);
123119
case ForumHelpManager.HELP_GUIDELINES_IDENTIFIER -> handleReplyGuidelines(event, post.getParentChannel().asForumChannel());
@@ -131,7 +127,7 @@ private boolean isInvalidForumPost(@NotNull Channel channel) {
131127
}
132128

133129
private boolean isInvalidHelpForumChannel(@NotNull ForumChannel forum) {
134-
HelpForumConfig config = Bot.getConfig().get(forum.getGuild()).getHelpForumConfig();
130+
HelpForumConfig config = botConfig.get(forum.getGuild()).getHelpForumConfig();
135131
return config.getHelpForumChannelId() != forum.getIdLong();
136132
}
137133

@@ -178,7 +174,7 @@ private void handleReplyGuidelines(@NotNull IReplyCallback callback, @NotNull Fo
178174

179175
private void handlePostClose(ButtonInteractionEvent event, @NotNull ForumHelpManager manager) {
180176
if (manager.isForumEligibleToBeUnreserved(event)) {
181-
manager.close(event, event.getUser().getIdLong() == manager.postThread().getOwnerIdLong(), null);
177+
manager.close(event, event.getUser().getIdLong() == manager.getPostThread().getOwnerIdLong(), null);
182178
} else {
183179
Responses.warning(event, "Could not close this post", "You're not allowed to close this post.").queue();
184180
}

‎src/main/java/net/javadiscord/javabot/systems/help/forum/ForumHelpManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class ForumHelpManager {
7575
* @return The {@link ReplyCallbackAction}.
7676
*/
7777
public ReplyCallbackAction replyHelpThanks(IReplyCallback callback, @NotNull List<Member> helpers) {
78-
HelpForumConfig config = Bot.getConfig().get(callback.getGuild()).getHelpForumConfig();
78+
HelpForumConfig config = botConfig.get(callback.getGuild()).getHelpForumConfig();
7979
List<ItemComponent> helperThanksButtons = new ArrayList<>(20);
8080
for (Member helper : helpers.subList(0, Math.min(helpers.size(), 20))) {
8181
helperThanksButtons.add(Button.success(ComponentIdBuilder.build(HELP_THANKS_IDENTIFIER, postThread.getId(), helper.getId()), helper.getEffectiveName())
@@ -159,11 +159,11 @@ public boolean isForumEligibleToBeUnreserved(@NotNull Interaction interaction) {
159159
}
160160

161161
private boolean hasMemberStaffRole(@NotNull Guild guild, @Nullable Member member) {
162-
return member != null && member.getRoles().contains(Bot.getConfig().get(guild).getModerationConfig().getStaffRole());
162+
return member != null && member.getRoles().contains(botConfig.get(guild).getModerationConfig().getStaffRole());
163163
}
164164

165165
private boolean hasMemberHelperRole(@NotNull Guild guild, @Nullable Member member) {
166-
return member != null && member.getRoles().contains(Bot.getConfig().get(guild).getHelpConfig().getHelperRole());
166+
return member != null && member.getRoles().contains(botConfig.get(guild).getHelpConfig().getHelperRole());
167167
}
168168

169169
private @NotNull List<Member> getPostHelpers() {

0 commit comments

Comments
 (0)