Skip to content
Draft

v2 #237

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions src/main/java/com/eternalcode/discordapp/DiscordApp.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.eternalcode.discordapp;

import com.eternalcode.discordapp.automessages.AutoMessageService;
import com.eternalcode.discordapp.automessages.AutoMessageTask;
import com.eternalcode.discordapp.feature.automessages.AutoMessageService;
import com.eternalcode.discordapp.feature.automessages.AutoMessageTask;
import com.eternalcode.discordapp.command.AvatarCommand;
import com.eternalcode.discordapp.command.BanCommand;
import com.eternalcode.discordapp.command.BotInfoCommand;
Expand All @@ -18,39 +18,39 @@
import com.eternalcode.discordapp.config.ConfigManager;
import com.eternalcode.discordapp.config.DatabaseConfig;
import com.eternalcode.discordapp.database.DatabaseManager;
import com.eternalcode.discordapp.filter.FilterMessageEmbedController;
import com.eternalcode.discordapp.filter.FilterService;
import com.eternalcode.discordapp.filter.renovate.RenovateForcedPushFilter;
import com.eternalcode.discordapp.guildstats.GuildStatisticsService;
import com.eternalcode.discordapp.guildstats.GuildStatisticsTask;
import com.eternalcode.discordapp.leveling.LevelCommand;
import com.eternalcode.discordapp.leveling.LevelConfig;
import com.eternalcode.discordapp.leveling.LevelController;
import com.eternalcode.discordapp.leveling.LevelService;
import com.eternalcode.discordapp.leveling.experience.ExperienceChangeEvent;
import com.eternalcode.discordapp.leveling.experience.ExperienceConfig;
import com.eternalcode.discordapp.leveling.experience.ExperienceService;
import com.eternalcode.discordapp.leveling.experience.listener.ExperienceMessageListener;
import com.eternalcode.discordapp.leveling.experience.listener.ExperienceReactionListener;
import com.eternalcode.discordapp.leveling.leaderboard.LeaderboardButtonController;
import com.eternalcode.discordapp.leveling.leaderboard.LeaderboardCommand;
import com.eternalcode.discordapp.leveling.leaderboard.LeaderboardService;
import com.eternalcode.discordapp.meeting.MeetingButtonController;
import com.eternalcode.discordapp.meeting.MeetingCleanupTask;
import com.eternalcode.discordapp.meeting.MeetingCommand;
import com.eternalcode.discordapp.meeting.MeetingPollRepository;
import com.eternalcode.discordapp.meeting.MeetingService;
import com.eternalcode.discordapp.meeting.MeetingVoteRepository;
import com.eternalcode.discordapp.feature.filter.FilterMessageEmbedController;
import com.eternalcode.discordapp.feature.filter.FilterService;
import com.eternalcode.discordapp.feature.filter.renovate.RenovateForcedPushFilter;
import com.eternalcode.discordapp.feature.guildstats.GuildStatisticsService;
import com.eternalcode.discordapp.feature.guildstats.GuildStatisticsTask;
import com.eternalcode.discordapp.feature.leveling.LevelCommand;
import com.eternalcode.discordapp.feature.leveling.LevelConfig;
import com.eternalcode.discordapp.feature.leveling.LevelController;
import com.eternalcode.discordapp.feature.leveling.LevelService;
import com.eternalcode.discordapp.feature.leveling.experience.ExperienceChangeEvent;
import com.eternalcode.discordapp.feature.leveling.experience.ExperienceConfig;
import com.eternalcode.discordapp.feature.leveling.experience.ExperienceService;
import com.eternalcode.discordapp.feature.leveling.experience.listener.ExperienceMessageListener;
import com.eternalcode.discordapp.feature.leveling.experience.listener.ExperienceReactionListener;
import com.eternalcode.discordapp.feature.leveling.leaderboard.LeaderboardButtonController;
import com.eternalcode.discordapp.feature.leveling.leaderboard.LeaderboardCommand;
import com.eternalcode.discordapp.feature.leveling.leaderboard.LeaderboardService;
import com.eternalcode.discordapp.feature.meeting.MeetingButtonController;
import com.eternalcode.discordapp.feature.meeting.MeetingCleanupTask;
import com.eternalcode.discordapp.feature.meeting.MeetingCommand;
import com.eternalcode.discordapp.feature.meeting.MeetingPollRepository;
import com.eternalcode.discordapp.feature.meeting.MeetingService;
import com.eternalcode.discordapp.feature.meeting.MeetingVoteRepository;
import com.eternalcode.discordapp.observer.ObserverRegistry;
import com.eternalcode.discordapp.review.GitHubReviewReminderService;
import com.eternalcode.discordapp.review.GitHubReviewService;
import com.eternalcode.discordapp.review.GitHubReviewTask;
import com.eternalcode.discordapp.review.command.GitHubReviewCommand;
import com.eternalcode.discordapp.review.database.GitHubReviewMentionRepository;
import com.eternalcode.discordapp.review.database.GitHubReviewMentionRepositoryImpl;
import com.eternalcode.discordapp.feature.review.GitHubReviewReminderService;
import com.eternalcode.discordapp.feature.review.GitHubReviewService;
import com.eternalcode.discordapp.feature.review.GitHubReviewTask;
import com.eternalcode.discordapp.feature.review.command.GitHubReviewCommand;
import com.eternalcode.discordapp.feature.review.database.GitHubReviewMentionRepository;
import com.eternalcode.discordapp.feature.review.database.GitHubReviewMentionRepositoryImpl;
Comment on lines +49 to +50

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P0 Badge Restore deleted review database types or update imports

DiscordApp now imports com.eternalcode.discordapp.feature.review.database.*, but this commit deleted the only GitHubReviewMentionRepository* sources (src/main/java/com/eternalcode/discordapp/review/database/...) and did not add replacements under feature/review/database; the same missing import appears in GitHubReviewService and GitHubReviewReminderService, so the project will not compile in any environment.

Useful? React with 👍 / 👎.

import com.eternalcode.discordapp.scheduler.Scheduler;
import com.eternalcode.discordapp.scheduler.VirtualThreadSchedulerImpl;
import com.eternalcode.discordapp.ticket.TicketConfigurer;
import com.eternalcode.discordapp.feature.ticket.TicketConfigurer;
import com.jagrosh.jdautilities.command.CommandClient;
import com.jagrosh.jdautilities.command.CommandClientBuilder;
import io.sentry.Sentry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.eternalcode.discordapp.config;

import com.eternalcode.discordapp.automessages.AutoMessagesConfig;
import com.eternalcode.discordapp.review.GitHubReviewNotificationType;
import com.eternalcode.discordapp.review.GitHubReviewUser;
import com.eternalcode.discordapp.ticket.TicketConfig;
import com.eternalcode.discordapp.feature.automessages.AutoMessagesConfig;
import com.eternalcode.discordapp.feature.review.GitHubReviewNotificationType;
import com.eternalcode.discordapp.feature.review.GitHubReviewUser;
import net.dzikoysk.cdn.entity.Contextual;
import net.dzikoysk.cdn.entity.Description;
import net.dzikoysk.cdn.source.Resource;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.automessages;
package com.eternalcode.discordapp.feature.automessages;

import com.eternalcode.commons.concurrent.FutureHandler;
import java.time.Instant;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.eternalcode.discordapp.automessages;
package com.eternalcode.discordapp.feature.automessages;

import com.eternalcode.discordapp.automessages.AutoMessageService.AutoMessageResults;
import com.eternalcode.discordapp.feature.automessages.AutoMessageService.AutoMessageResults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.automessages;
package com.eternalcode.discordapp.feature.automessages;

import java.time.Duration;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.filter;
package com.eternalcode.discordapp.feature.filter;

@FunctionalInterface
public interface Filter {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.filter;
package com.eternalcode.discordapp.feature.filter;

import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.filter;
package com.eternalcode.discordapp.feature.filter;

public final class FilterResult {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.filter;
package com.eternalcode.discordapp.feature.filter;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.eternalcode.discordapp.filter.renovate;
package com.eternalcode.discordapp.feature.filter.renovate;

import com.eternalcode.discordapp.filter.Filter;
import com.eternalcode.discordapp.filter.FilterResult;
import com.eternalcode.discordapp.feature.filter.Filter;
import com.eternalcode.discordapp.feature.filter.FilterResult;

import java.util.Set;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.guildstats;
package com.eternalcode.discordapp.feature.guildstats;

import com.eternalcode.commons.concurrent.FutureHandler;
import com.eternalcode.discordapp.config.AppConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.guildstats;
package com.eternalcode.discordapp.feature.guildstats;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling;
package com.eternalcode.discordapp.feature.leveling;

public class Level {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling;
package com.eternalcode.discordapp.feature.leveling;

import com.jagrosh.jdautilities.command.SlashCommand;
import com.jagrosh.jdautilities.command.SlashCommandEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling;
package com.eternalcode.discordapp.feature.leveling;

import com.eternalcode.discordapp.config.CdnConfig;
import net.dzikoysk.cdn.entity.Contextual;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.eternalcode.discordapp.leveling;
package com.eternalcode.discordapp.feature.leveling;

import com.eternalcode.discordapp.leveling.experience.Experience;
import com.eternalcode.discordapp.leveling.experience.ExperienceChangeEvent;
import com.eternalcode.discordapp.feature.leveling.experience.Experience;
import com.eternalcode.discordapp.feature.leveling.experience.ExperienceChangeEvent;
import com.eternalcode.discordapp.observer.Observer;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.User;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling;
package com.eternalcode.discordapp.feature.leveling;

import java.util.List;
import java.util.concurrent.CompletableFuture;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling;
package com.eternalcode.discordapp.feature.leveling;

import com.eternalcode.discordapp.database.DataAccessException;
import com.eternalcode.discordapp.database.DatabaseManager;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling;
package com.eternalcode.discordapp.feature.leveling;

import com.eternalcode.discordapp.database.DatabaseManager;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling;
package com.eternalcode.discordapp.feature.leveling;

public final class LevelUtil {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling;
package com.eternalcode.discordapp.feature.leveling;

import com.j256.ormlite.field.DatabaseField;
import com.j256.ormlite.table.DatabaseTable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling.experience;
package com.eternalcode.discordapp.feature.leveling.experience;

public class Experience {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling.experience;
package com.eternalcode.discordapp.feature.leveling.experience;

import java.util.function.LongSupplier;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling.experience;
package com.eternalcode.discordapp.feature.leveling.experience;

import com.eternalcode.discordapp.config.CdnConfig;
import net.dzikoysk.cdn.entity.Contextual;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling.experience;
package com.eternalcode.discordapp.feature.leveling.experience;

import java.util.List;
import java.util.concurrent.CompletableFuture;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling.experience;
package com.eternalcode.discordapp.feature.leveling.experience;

import com.eternalcode.discordapp.database.DataAccessException;
import com.eternalcode.discordapp.database.DatabaseManager;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling.experience;
package com.eternalcode.discordapp.feature.leveling.experience;

import com.eternalcode.discordapp.database.DatabaseManager;
import com.eternalcode.discordapp.observer.ObserverRegistry;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.leveling.experience;
package com.eternalcode.discordapp.feature.leveling.experience;

import com.j256.ormlite.field.DatabaseField;
import com.j256.ormlite.table.DatabaseTable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.eternalcode.discordapp.leveling.experience.listener;
package com.eternalcode.discordapp.feature.leveling.experience.listener;

import com.eternalcode.discordapp.leveling.experience.ExperienceConfig;
import com.eternalcode.discordapp.leveling.experience.ExperienceService;
import com.eternalcode.discordapp.feature.leveling.experience.ExperienceConfig;
import com.eternalcode.discordapp.feature.leveling.experience.ExperienceService;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.eternalcode.discordapp.leveling.experience.listener;
package com.eternalcode.discordapp.feature.leveling.experience.listener;

import com.eternalcode.discordapp.leveling.experience.ExperienceConfig;
import com.eternalcode.discordapp.leveling.experience.ExperienceService;
import com.eternalcode.discordapp.feature.leveling.experience.ExperienceConfig;
import com.eternalcode.discordapp.feature.leveling.experience.ExperienceService;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.eternalcode.discordapp.leveling.leaderboard;
package com.eternalcode.discordapp.feature.leveling.leaderboard;

import com.eternalcode.discordapp.leveling.Level;
import com.eternalcode.discordapp.feature.leveling.Level;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.components.actionrow.ActionRow;
import net.dv8tion.jda.api.components.buttons.Button;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.eternalcode.discordapp.leveling.leaderboard;
package com.eternalcode.discordapp.feature.leveling.leaderboard;

import com.eternalcode.discordapp.leveling.Level;
import com.eternalcode.discordapp.feature.leveling.Level;
import com.jagrosh.jdautilities.command.SlashCommand;
import com.jagrosh.jdautilities.command.SlashCommandEvent;
import net.dv8tion.jda.api.EmbedBuilder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.eternalcode.discordapp.leveling.leaderboard;
package com.eternalcode.discordapp.feature.leveling.leaderboard;

import com.eternalcode.discordapp.leveling.Level;
import com.eternalcode.discordapp.leveling.LevelService;
import com.eternalcode.discordapp.feature.leveling.Level;
import com.eternalcode.discordapp.feature.leveling.LevelService;
import net.dv8tion.jda.api.EmbedBuilder;

import java.awt.Color;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.eternalcode.discordapp.meeting;
package com.eternalcode.discordapp.feature.meeting;

import com.eternalcode.discordapp.meeting.MeetingService.MeetingButtonUpdater;
import com.eternalcode.discordapp.feature.meeting.MeetingService.MeetingButtonUpdater;
import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import net.dv8tion.jda.api.utils.messages.MessageEditData;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.meeting;
package com.eternalcode.discordapp.feature.meeting;

import java.time.Instant;
import net.dv8tion.jda.api.JDA;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.meeting;
package com.eternalcode.discordapp.feature.meeting;

import com.jagrosh.jdautilities.command.SlashCommand;
import com.jagrosh.jdautilities.command.SlashCommandEvent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.meeting;
package com.eternalcode.discordapp.feature.meeting;

import com.eternalcode.discordapp.database.DatabaseManager;
import com.eternalcode.discordapp.database.repository.AbstractRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.meeting;
package com.eternalcode.discordapp.feature.meeting;

import com.j256.ormlite.field.DatabaseField;
import com.j256.ormlite.table.DatabaseTable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.meeting;
package com.eternalcode.discordapp.feature.meeting;

import com.eternalcode.discordapp.config.AppConfig;
import net.dv8tion.jda.api.EmbedBuilder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.meeting;
package com.eternalcode.discordapp.feature.meeting;

public enum MeetingStatus {
YES,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.meeting;
package com.eternalcode.discordapp.feature.meeting;

import com.eternalcode.discordapp.database.DatabaseManager;
import com.eternalcode.discordapp.database.repository.AbstractRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.meeting;
package com.eternalcode.discordapp.feature.meeting;

import com.j256.ormlite.field.DatabaseField;
import com.j256.ormlite.table.DatabaseTable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.review;
package com.eternalcode.discordapp.feature.review;

import java.util.Objects;
import java.util.regex.Matcher;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.review;
package com.eternalcode.discordapp.feature.review;

import java.io.IOException;
import java.time.Duration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.review;
package com.eternalcode.discordapp.feature.review;

import java.io.IOException;
import okhttp3.Interceptor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.review;
package com.eternalcode.discordapp.feature.review;

public record GitHubReviewMention(
String pullRequest,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.eternalcode.discordapp.review;
package com.eternalcode.discordapp.feature.review;

public enum GitHubReviewNotificationType {

Expand Down
Loading
Loading