okNick/Bat
1
0
Fork 0
forked from Fascinated/Bat
Code Pull Requests Activity

add auto roles and clean up how embeds are made

Browse Source
This commit is contained in:
Lee
2024-06-25 13:55:54 +01:00
parent 679143c331
commit 0d1eb3089a
29 changed files with 577 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/cc/fascinated/bat/service/CommandService.java
View File

@ -4,6 +4,7 @@ import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.BatSubCommand;
import cc.fascinated.bat.command.impl.PingCommand;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.autorole.command.AutoRoleCommand;
import cc.fascinated.bat.features.scoresaber.command.numberone.NumberOneFeedCommand;
import cc.fascinated.bat.features.scoresaber.command.scoresaber.ScoreSaberCommand;
import cc.fascinated.bat.features.scoresaber.command.userfeed.UserFeedCommand;
@ -56,6 +57,7 @@ public class CommandService extends ListenerAdapter {
// Guild commands
registerCommand(context.getBean(UserFeedCommand.class));
registerCommand(context.getBean(NumberOneFeedCommand.class));
registerCommand(context.getBean(AutoRoleCommand.class));
// Global commands
registerCommand(context.getBean(ScoreSaberCommand.class));
@ -127,8 +129,10 @@ public class CommandService extends ListenerAdapter {
}
} catch (Exception ex) {
log.error("An error occurred while executing command \"{}\"", commandName, ex);
event.replyEmbeds(EmbedUtils.buildErrorEmbed("An error occurred while executing the command\n\n" +
ex.getLocalizedMessage()).build()).queue();
event.replyEmbeds(EmbedUtils.buildSuccessEmbed()
.setDescription("An error occurred while executing the command\n\n" + ex.getLocalizedMessage())
.build()).queue();
}
}
}

3
src/main/java/cc/fascinated/bat/service/DiscordService.java
View File

@ -36,7 +36,8 @@ public class DiscordService {
) throws Exception {
JDA = JDABuilder.createLight(token, EnumSet.of(
GatewayIntent.GUILD_MESSAGES,
GatewayIntent.MESSAGE_CONTENT
GatewayIntent.MESSAGE_CONTENT,
GatewayIntent.GUILD_MEMBERS
)).build()
.awaitReady();
TimerUtils.scheduleRepeating(this::updateActivity, 0, 1000 * 60 * 2);

33
src/main/java/cc/fascinated/bat/service/EventService.java
View File

@ -1,12 +1,20 @@
package cc.fascinated.bat.service;
import cc.fascinated.bat.event.EventListener;
import cc.fascinated.bat.features.autorole.AutoRoleListener;
import cc.fascinated.bat.features.scoresaber.NumberOneScoreFeedListener;
import cc.fascinated.bat.features.scoresaber.UserScoreFeedListener;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Service;
import java.util.HashSet;
@ -16,17 +24,26 @@ import java.util.Set;
* @author Fascinated (fascinated7)
*/
@Service @Log4j2
public class EventService {
@DependsOn("discordService")
public class EventService extends ListenerAdapter {
private final GuildService guildService;
private final UserService userService;
/**
* The list of listeners registered
*/
public static final Set<EventListener> LISTENERS = new HashSet<>();
@Autowired
public EventService(@NonNull ApplicationContext context) {
public EventService(@NonNull GuildService guildService, @NonNull UserService userService, @NonNull ApplicationContext context) {
this.guildService = guildService;
this.userService = userService;
DiscordService.JDA.addEventListener(this);
registerListeners(
context.getBean(UserScoreFeedListener.class),
context.getBean(NumberOneScoreFeedListener.class)
context.getBean(NumberOneScoreFeedListener.class),
context.getBean(AutoRoleListener.class)
);
log.info("Registered {} listeners.", LISTENERS.size());
}
@ -39,4 +56,14 @@ public class EventService {
public void registerListeners(EventListener... listener) {
LISTENERS.addAll(Set.of(listener));
}
@Override
public void onGuildMemberJoin(@NotNull GuildMemberJoinEvent event) {
BatGuild guild = guildService.getGuild(event.getGuild().getId());
BatUser user = userService.getUser(event.getUser().getId());
for (EventListener listener : LISTENERS) {
listener.onGuildMemberJoin(guild, user, event);
}
}
}

9
src/main/java/cc/fascinated/bat/service/ScoreSaberService.java
View File

@ -6,8 +6,7 @@ import cc.fascinated.bat.common.WebRequest;
import cc.fascinated.bat.event.EventListener;
import cc.fascinated.bat.exception.BadRequestException;
import cc.fascinated.bat.exception.ResourceNotFoundException;
import cc.fascinated.bat.model.beatsaber.scoresaber.*;
import cc.fascinated.bat.features.scoresaber.profiles.UserScoreSaberProfile;
import cc.fascinated.bat.features.scoresaber.profile.UserScoreSaberProfile;
import cc.fascinated.bat.model.token.beatsaber.scoresaber.*;
import com.google.gson.JsonObject;
import lombok.NonNull;
@ -67,8 +66,8 @@ public class ScoreSaberService extends TextWebSocketHandler {
* @return The scores.
*/
public ScoreSaberScoresPageToken getPageScores(UserScoreSaberProfile profile, int page) {
log.info("Fetching scores for account '{}' from page {}.", profile.getId(), page);
ScoreSaberScoresPageToken pageToken = WebRequest.getAsEntity(String.format(GET_PLAYER_SCORES_ENDPOINT, profile.getId(), "recent", page), ScoreSaberScoresPageToken.class);
log.info("Fetching scores for account '{}' from page {}.", profile.getSteamId(), page);
ScoreSaberScoresPageToken pageToken = WebRequest.getAsEntity(String.format(GET_PLAYER_SCORES_ENDPOINT, profile.getSteamId(), "recent", page), ScoreSaberScoresPageToken.class);
if (pageToken == null) { // Check if the page doesn't exist.
return null;
}
@ -89,7 +88,7 @@ public class ScoreSaberService extends TextWebSocketHandler {
List<ScoreSaberScoresPageToken> scores = new ArrayList<>(List.of(getPageScores(profile, 1)));
ScoreSaberPageMetadataToken metadata = scores.get(0).getMetadata();
int totalPages = (int) Math.ceil((double) metadata.getTotal() / metadata.getItemsPerPage());
log.info("Fetching {} pages of scores for account '{}'.", totalPages, profile.getId());
log.info("Fetching {} pages of scores for account '{}'.", totalPages, profile.getSteamId());
for (int i = 2; i <= totalPages; i++) {
scores.add(getPageScores(profile, i));
}