Skip to content

Commit a3babda

Browse files
Removed Channel Reservations
1 parent 3c5d4da commit a3babda

17 files changed

+60
-1412
lines changed

src/main/java/net/javadiscord/javabot/listener/StateListener.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
import net.dv8tion.jda.api.hooks.ListenerAdapter;
1313
import net.javadiscord.javabot.annotations.PreRegisteredListener;
1414
import net.javadiscord.javabot.data.config.BotConfig;
15-
import net.javadiscord.javabot.data.config.guild.HelpConfig;
1615
import net.javadiscord.javabot.data.h2db.DbActions;
1716
import net.javadiscord.javabot.systems.help.ChannelSemanticCheck;
18-
import net.javadiscord.javabot.systems.help.HelpChannelUpdater;
1917
import net.javadiscord.javabot.systems.help.HelpExperienceService;
2018
import net.javadiscord.javabot.systems.notification.NotificationService;
2119
import net.javadiscord.javabot.systems.staff_commands.tags.CustomTagManager;
@@ -27,7 +25,6 @@
2725
import java.time.Instant;
2826
import java.util.List;
2927
import java.util.concurrent.ScheduledExecutorService;
30-
import java.util.concurrent.TimeUnit;
3128
import java.util.stream.Collectors;
3229

3330
/**
@@ -53,14 +50,6 @@ public void onReady(@NotNull ReadyEvent event) {
5350
log.info("Logged in as " + event.getJDA().getSelfUser().getAsTag());
5451
log.info("Guilds: " + event.getJDA().getGuilds().stream().map(Guild::getName).collect(Collectors.joining(", ")));
5552
for (Guild guild : event.getJDA().getGuilds()) {
56-
// Schedule the help channel updater to run periodically for each guild.
57-
HelpConfig helpConfig = botConfig.get(guild).getHelpConfig();
58-
asyncPool.scheduleAtFixedRate(
59-
new HelpChannelUpdater(guild, botConfig, dbActions, asyncPool, channelSemanticChecks, helpExperienceService),
60-
5,
61-
helpConfig.getUpdateIntervalSeconds(),
62-
TimeUnit.SECONDS
63-
);
6453
notificationService.withGuild(guild).sendToModerationLog(c -> c.sendMessageEmbeds(buildBootedUpEmbed()));
6554
}
6655
try {

src/main/java/net/javadiscord/javabot/listener/UserLeaveListener.java

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,9 @@
22

33
import net.dv8tion.jda.api.entities.Guild;
44
import net.dv8tion.jda.api.entities.User;
5-
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
65
import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent;
76
import net.dv8tion.jda.api.hooks.ListenerAdapter;
87
import net.javadiscord.javabot.data.config.BotConfig;
9-
import net.javadiscord.javabot.data.h2db.DbActions;
10-
import net.javadiscord.javabot.systems.help.HelpChannelManager;
11-
import net.javadiscord.javabot.systems.help.HelpExperienceService;
12-
import net.javadiscord.javabot.util.ExceptionLogger;
13-
14-
import java.sql.SQLException;
15-
import java.util.concurrent.ScheduledExecutorService;
168

179
import lombok.RequiredArgsConstructor;
1810

@@ -22,9 +14,6 @@
2214
@RequiredArgsConstructor
2315
public class UserLeaveListener extends ListenerAdapter {
2416
private final BotConfig botConfig;
25-
private final DbActions dbActions;
26-
private final ScheduledExecutorService asyncPool;
27-
private final HelpExperienceService helpExperienceService;
2817

2918
@Override
3019
public void onGuildMemberRemove(GuildMemberRemoveEvent event) {
@@ -41,13 +30,6 @@ public void onGuildMemberRemove(GuildMemberRemoveEvent event) {
4130
* @param guild The guild they're leaving.
4231
*/
4332
private void unreserveAllChannels(User user, Guild guild) {
44-
try {
45-
HelpChannelManager manager = new HelpChannelManager(botConfig, guild, dbActions, asyncPool, helpExperienceService);
46-
manager.unreserveAllOwnedChannels(user);
47-
} catch (SQLException e) {
48-
ExceptionLogger.capture(e, getClass().getSimpleName());
49-
TextChannel logChannel = botConfig.get(guild).getModerationConfig().getLogChannel();
50-
logChannel.sendMessage("Database error while unreserving channels for a user who left: " + e.getMessage()).queue();
51-
}
33+
// TODO: Implement Forum
5234
}
5335
}

src/main/java/net/javadiscord/javabot/systems/help/HelpChannelInteractionManager.java

Lines changed: 0 additions & 230 deletions
This file was deleted.

src/main/java/net/javadiscord/javabot/systems/help/HelpChannelListener.java

Lines changed: 0 additions & 81 deletions
This file was deleted.

0 commit comments

Comments
 (0)