Fascinated/Bat
1
1
Fork 2
Code Issues 1 Pull Requests Actions Activity

cleanup
All checks were successful
Deploy to Dokku / docker (ubuntu-latest) (push) Successful in 1m42s
Details

Browse Source
This commit is contained in:
Lee 2024-12-27 13:04:57 +00:00
parent 5f099a97f0
commit b3a6284e40
185 changed files with 787 additions and 1341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/cc/fascinated/bat/features/afk/AfkFeature.java → src/main/java/cc/fascinated/bat/afk/AfkFeature.java
View File

@ -1,8 +1,8 @@
package cc.fascinated.bat.features.afk;
package cc.fascinated.bat.afk;
import cc.fascinated.bat.features.Feature;
import cc.fascinated.bat.features.FeatureProfile;
import cc.fascinated.bat.features.afk.command.AfkCommand;
import cc.fascinated.bat.common.feature.Feature;
import cc.fascinated.bat.common.feature.FeatureProfile;
import cc.fascinated.bat.afk.command.AfkCommand;
import cc.fascinated.bat.service.CommandService;
import lombok.NonNull;
import org.springframework.context.ApplicationContext;

8
src/main/java/cc/fascinated/bat/features/afk/AfkMentionListener.java → src/main/java/cc/fascinated/bat/afk/AfkMentionListener.java
View File

@ -1,9 +1,9 @@
package cc.fascinated.bat.features.afk;
package cc.fascinated.bat.afk;
import cc.fascinated.bat.event.EventListener;
import cc.fascinated.bat.features.afk.profile.AfkProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.afk.profile.AfkProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.User;

8
src/main/java/cc/fascinated/bat/features/afk/AfkReturnListener.java → src/main/java/cc/fascinated/bat/afk/AfkReturnListener.java
View File

@ -1,9 +1,9 @@
package cc.fascinated.bat.features.afk;
package cc.fascinated.bat.afk;
import cc.fascinated.bat.event.EventListener;
import cc.fascinated.bat.features.afk.profile.AfkProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.afk.profile.AfkProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import org.springframework.stereotype.Component;

14
src/main/java/cc/fascinated/bat/features/afk/command/AfkCommand.java → src/main/java/cc/fascinated/bat/afk/command/AfkCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.afk.command;
package cc.fascinated.bat.afk.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.MemberUtils;
import cc.fascinated.bat.features.afk.profile.AfkProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.afk.profile.AfkProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

4
src/main/java/cc/fascinated/bat/features/afk/profile/AfkProfile.java → src/main/java/cc/fascinated/bat/afk/profile/AfkProfile.java
View File

@ -1,7 +1,7 @@
package cc.fascinated.bat.features.afk.profile;
package cc.fascinated.bat.afk.profile;
import cc.fascinated.bat.common.Serializable;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.common.model.BatGuild;
import com.google.gson.Gson;
import lombok.NoArgsConstructor;
import net.dv8tion.jda.api.entities.Guild;

8
src/main/java/cc/fascinated/bat/features/autorole/AutoRoleFeature.java → src/main/java/cc/fascinated/bat/autorole/AutoRoleFeature.java
View File

@ -1,8 +1,8 @@
package cc.fascinated.bat.features.autorole;
package cc.fascinated.bat.autorole;
import cc.fascinated.bat.features.Feature;
import cc.fascinated.bat.features.FeatureProfile;
import cc.fascinated.bat.features.autorole.command.AutoRoleCommand;
import cc.fascinated.bat.common.feature.Feature;
import cc.fascinated.bat.common.feature.FeatureProfile;
import cc.fascinated.bat.autorole.command.AutoRoleCommand;
import cc.fascinated.bat.service.CommandService;
import lombok.NonNull;
import org.springframework.beans.factory.annotation.Autowired;

8
src/main/java/cc/fascinated/bat/features/autorole/AutoRoleListener.java → src/main/java/cc/fascinated/bat/autorole/AutoRoleListener.java
View File

@ -1,9 +1,9 @@
package cc.fascinated.bat.features.autorole;
package cc.fascinated.bat.autorole;
import cc.fascinated.bat.event.EventListener;
import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.autorole.profile.AutoRoleProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.service.FeatureService;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;

12
src/main/java/cc/fascinated/bat/features/autorole/command/AddSubCommand.java → src/main/java/cc/fascinated/bat/autorole/command/AddSubCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.autorole.command;
package cc.fascinated.bat.autorole.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.common.RoleUtils;
import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.autorole.profile.AutoRoleProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

8
src/main/java/cc/fascinated/bat/features/autorole/command/AutoRoleCommand.java → src/main/java/cc/fascinated/bat/autorole/command/AutoRoleCommand.java
View File

@ -1,8 +1,8 @@
package cc.fascinated.bat.features.autorole.command;
package cc.fascinated.bat.autorole.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import lombok.NonNull;
import net.dv8tion.jda.api.Permission;
import org.springframework.context.ApplicationContext;

12
src/main/java/cc/fascinated/bat/features/autorole/command/ClearSubCommand.java → src/main/java/cc/fascinated/bat/autorole/command/ClearSubCommand.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.features.autorole.command;
package cc.fascinated.bat.autorole.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.autorole.profile.AutoRoleProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

12
src/main/java/cc/fascinated/bat/features/autorole/command/ListSubCommand.java → src/main/java/cc/fascinated/bat/autorole/command/ListSubCommand.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.features.autorole.command;
package cc.fascinated.bat.autorole.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.autorole.profile.AutoRoleProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Member;

12
src/main/java/cc/fascinated/bat/features/autorole/command/RemoveSubCommand.java → src/main/java/cc/fascinated/bat/autorole/command/RemoveSubCommand.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.features.autorole.command;
package cc.fascinated.bat.autorole.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.autorole.profile.AutoRoleProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

12
src/main/java/cc/fascinated/bat/features/autorole/command/SyncSubCommand.java → src/main/java/cc/fascinated/bat/autorole/command/SyncSubCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.autorole.command;
package cc.fascinated.bat.autorole.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.DescriptionBuilder;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.autorole.profile.AutoRoleProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
import net.dv8tion.jda.api.entities.Guild;

4
src/main/java/cc/fascinated/bat/features/autorole/profile/AutoRoleProfile.java → src/main/java/cc/fascinated/bat/autorole/profile/AutoRoleProfile.java
View File

@ -1,7 +1,7 @@
package cc.fascinated.bat.features.autorole.profile;
package cc.fascinated.bat.autorole.profile;
import cc.fascinated.bat.common.Serializable;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.service.DiscordService;
import com.google.gson.Gson;
import lombok.Getter;

34
src/main/java/cc/fascinated/bat/features/base/BaseFeature.java → src/main/java/cc/fascinated/bat/base/BaseFeature.java
View File

@ -1,21 +1,21 @@
package cc.fascinated.bat.features.base;
package cc.fascinated.bat.base;
import cc.fascinated.bat.features.Feature;
import cc.fascinated.bat.features.FeatureProfile;
import cc.fascinated.bat.features.base.commands.botadmin.BotAdminCommand;
import cc.fascinated.bat.features.base.commands.fun.CoinFlipCommand;
import cc.fascinated.bat.features.base.commands.fun.EightBallCommand;
import cc.fascinated.bat.features.base.commands.fun.PPSizeCommand;
import cc.fascinated.bat.features.base.commands.fun.image.ImageCommand;
import cc.fascinated.bat.features.base.commands.general.*;
import cc.fascinated.bat.features.base.commands.general.avatar.AvatarCommand;
import cc.fascinated.bat.features.base.commands.general.banner.BannerCommand;
import cc.fascinated.bat.features.base.commands.server.MemberCountCommand;
import cc.fascinated.bat.features.base.commands.server.PremiumCommand;
import cc.fascinated.bat.features.base.commands.server.channel.ChannelCommand;
import cc.fascinated.bat.features.base.commands.server.feature.FeatureCommand;
import cc.fascinated.bat.features.base.commands.utility.PastebinCommand;
import cc.fascinated.bat.features.base.commands.utility.lookup.LookupCommand;
import cc.fascinated.bat.common.feature.Feature;
import cc.fascinated.bat.common.feature.FeatureProfile;
import cc.fascinated.bat.base.commands.botadmin.BotAdminCommand;
import cc.fascinated.bat.base.commands.fun.CoinFlipCommand;
import cc.fascinated.bat.base.commands.fun.EightBallCommand;
import cc.fascinated.bat.base.commands.fun.PPSizeCommand;
import cc.fascinated.bat.base.commands.fun.image.ImageCommand;
import cc.fascinated.bat.base.commands.general.*;
import cc.fascinated.bat.base.commands.general.avatar.AvatarCommand;
import cc.fascinated.bat.base.commands.general.banner.BannerCommand;
import cc.fascinated.bat.base.commands.server.MemberCountCommand;
import cc.fascinated.bat.base.commands.server.PremiumCommand;
import cc.fascinated.bat.base.commands.server.channel.ChannelCommand;
import cc.fascinated.bat.base.commands.server.feature.FeatureCommand;
import cc.fascinated.bat.base.commands.utility.PastebinCommand;
import cc.fascinated.bat.base.commands.utility.lookup.LookupCommand;
import cc.fascinated.bat.service.CommandService;
import lombok.NonNull;
import org.springframework.beans.factory.annotation.Autowired;

10
src/main/java/cc/fascinated/bat/features/base/commands/botadmin/BotAdminCommand.java → src/main/java/cc/fascinated/bat/base/commands/botadmin/BotAdminCommand.java
View File

@ -1,9 +1,9 @@
package cc.fascinated.bat.features.base.commands.botadmin;
package cc.fascinated.bat.base.commands.botadmin;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.features.base.commands.botadmin.premium.PremiumRemoveSubCommand;
import cc.fascinated.bat.features.base.commands.botadmin.premium.PremiumSetSubCommand;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.base.commands.botadmin.premium.PremiumRemoveSubCommand;
import cc.fascinated.bat.base.commands.botadmin.premium.PremiumSetSubCommand;
import lombok.NonNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;

10
src/main/java/cc/fascinated/bat/features/base/commands/botadmin/premium/PremiumRemoveSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/botadmin/premium/PremiumRemoveSubCommand.java
View File

@ -1,9 +1,9 @@
package cc.fascinated.bat.features.base.commands.botadmin.premium;
package cc.fascinated.bat.base.commands.botadmin.premium;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.premium.PremiumProfile;
import cc.fascinated.bat.service.GuildService;
import lombok.NonNull;

10
src/main/java/cc/fascinated/bat/features/base/commands/botadmin/premium/PremiumSetSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/botadmin/premium/PremiumSetSubCommand.java
View File

@ -1,9 +1,9 @@
package cc.fascinated.bat.features.base.commands.botadmin.premium;
package cc.fascinated.bat.base.commands.botadmin.premium;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.premium.PremiumProfile;
import cc.fascinated.bat.service.GuildService;
import lombok.NonNull;

10
src/main/java/cc/fascinated/bat/features/base/commands/fun/CoinFlipCommand.java → src/main/java/cc/fascinated/bat/base/commands/fun/CoinFlipCommand.java
View File

@ -1,9 +1,9 @@
package cc.fascinated.bat.features.base.commands.fun;
package cc.fascinated.bat.base.commands.fun;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

12
src/main/java/cc/fascinated/bat/features/base/commands/fun/EightBallCommand.java → src/main/java/cc/fascinated/bat/base/commands/fun/EightBallCommand.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.features.base.commands.fun;
package cc.fascinated.bat.base.commands.fun;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

12
src/main/java/cc/fascinated/bat/features/base/commands/fun/PPSizeCommand.java → src/main/java/cc/fascinated/bat/base/commands/fun/PPSizeCommand.java
View File

@ -1,13 +1,13 @@
package cc.fascinated.bat.features.base.commands.fun;
package cc.fascinated.bat.base.commands.fun;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.DescriptionBuilder;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.common.MathUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

12
src/main/java/cc/fascinated/bat/features/base/commands/fun/image/CatSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/fun/image/CatSubCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.base.commands.fun.image;
package cc.fascinated.bat.base.commands.fun.image;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.common.WebRequest;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.model.token.thecatapi.CatImageToken;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.common.model.token.thecatapi.CatImageToken;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

12
src/main/java/cc/fascinated/bat/features/base/commands/fun/image/DogSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/fun/image/DogSubCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.base.commands.fun.image;
package cc.fascinated.bat.base.commands.fun.image;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.common.WebRequest;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.model.token.dogceo.RandomImage;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.common.model.token.dogceo.RandomImage;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

12
src/main/java/cc/fascinated/bat/features/base/commands/fun/image/DuckSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/fun/image/DuckSubCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.base.commands.fun.image;
package cc.fascinated.bat.base.commands.fun.image;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.common.WebRequest;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.model.token.randomd.RandomDuck;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.common.model.token.randomd.RandomDuck;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

12
src/main/java/cc/fascinated/bat/features/base/commands/fun/image/FoxSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/fun/image/FoxSubCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.base.commands.fun.image;
package cc.fascinated.bat.base.commands.fun.image;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.common.WebRequest;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.model.token.randomfox.RandomFoxToken;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.common.model.token.randomfox.RandomFoxToken;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

8
src/main/java/cc/fascinated/bat/features/base/commands/fun/image/ImageCommand.java → src/main/java/cc/fascinated/bat/base/commands/fun/image/ImageCommand.java
View File

@ -1,8 +1,8 @@
package cc.fascinated.bat.features.base.commands.fun.image;
package cc.fascinated.bat.base.commands.fun.image;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import lombok.NonNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;

12
src/main/java/cc/fascinated/bat/features/base/commands/general/BotStatsCommand.java → src/main/java/cc/fascinated/bat/base/commands/general/BotStatsCommand.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.features.base.commands.general;
package cc.fascinated.bat.base.commands.general;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.*;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.service.DiscordService;
import cc.fascinated.bat.service.GuildService;
import cc.fascinated.bat.service.UserService;

12
src/main/java/cc/fascinated/bat/features/base/commands/general/HelpCommand.java → src/main/java/cc/fascinated/bat/base/commands/general/HelpCommand.java
View File

@ -1,16 +1,16 @@
package cc.fascinated.bat.features.base.commands.general;
package cc.fascinated.bat.base.commands.general;
import cc.fascinated.bat.Consts;
import cc.fascinated.bat.Emojis;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.DescriptionBuilder;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.common.InteractionBuilder;
import cc.fascinated.bat.event.EventListener;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.service.CommandService;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;

12
src/main/java/cc/fascinated/bat/features/base/commands/general/InviteCommand.java → src/main/java/cc/fascinated/bat/base/commands/general/InviteCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.base.commands.general;
package cc.fascinated.bat.base.commands.general;
import cc.fascinated.bat.Consts;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

12
src/main/java/cc/fascinated/bat/features/base/commands/general/PingCommand.java → src/main/java/cc/fascinated/bat/base/commands/general/PingCommand.java
View File

@ -1,10 +1,10 @@
package cc.fascinated.bat.features.base.commands.general;
package cc.fascinated.bat.base.commands.general;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.service.DiscordService;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;

12
src/main/java/cc/fascinated/bat/features/base/commands/general/VoteCommand.java → src/main/java/cc/fascinated/bat/base/commands/general/VoteCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.base.commands.general;
package cc.fascinated.bat.base.commands.general;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.DescriptionBuilder;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

8
src/main/java/cc/fascinated/bat/features/base/commands/general/avatar/AvatarCommand.java → src/main/java/cc/fascinated/bat/base/commands/general/avatar/AvatarCommand.java
View File

@ -1,8 +1,8 @@
package cc.fascinated.bat.features.base.commands.general.avatar;
package cc.fascinated.bat.base.commands.general.avatar;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import lombok.NonNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;

12
src/main/java/cc/fascinated/bat/features/base/commands/general/avatar/GuildSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/general/avatar/GuildSubCommand.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.features.base.commands.general.avatar;
package cc.fascinated.bat.base.commands.general.avatar;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

12
src/main/java/cc/fascinated/bat/features/base/commands/general/avatar/UserSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/general/avatar/UserSubCommand.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.features.base.commands.general.avatar;
package cc.fascinated.bat.base.commands.general.avatar;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

8
src/main/java/cc/fascinated/bat/features/base/commands/general/banner/BannerCommand.java → src/main/java/cc/fascinated/bat/base/commands/general/banner/BannerCommand.java
View File

@ -1,8 +1,8 @@
package cc.fascinated.bat.features.base.commands.general.banner;
package cc.fascinated.bat.base.commands.general.banner;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import lombok.NonNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;

12
src/main/java/cc/fascinated/bat/features/base/commands/general/banner/GuildSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/general/banner/GuildSubCommand.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.features.base.commands.general.banner;
package cc.fascinated.bat.base.commands.general.banner;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

12
src/main/java/cc/fascinated/bat/features/base/commands/general/banner/UserSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/general/banner/UserSubCommand.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.features.base.commands.general.banner;
package cc.fascinated.bat.base.commands.general.banner;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

10
src/main/java/cc/fascinated/bat/features/base/commands/server/MemberCountCommand.java → src/main/java/cc/fascinated/bat/base/commands/server/MemberCountCommand.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.features.base.commands.server;
package cc.fascinated.bat.base.commands.server;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.common.NumberFormatter;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member;

10
src/main/java/cc/fascinated/bat/features/base/commands/server/PremiumCommand.java → src/main/java/cc/fascinated/bat/base/commands/server/PremiumCommand.java
View File

@ -1,10 +1,10 @@
package cc.fascinated.bat.features.base.commands.server;
package cc.fascinated.bat.base.commands.server;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.premium.PremiumProfile;
import lombok.NonNull;
import net.dv8tion.jda.api.EmbedBuilder;

8
src/main/java/cc/fascinated/bat/features/base/commands/server/channel/ChannelCommand.java → src/main/java/cc/fascinated/bat/base/commands/server/channel/ChannelCommand.java
View File

@ -1,8 +1,8 @@
package cc.fascinated.bat.features.base.commands.server.channel;
package cc.fascinated.bat.base.commands.server.channel;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import lombok.NonNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;

10
src/main/java/cc/fascinated/bat/features/base/commands/server/channel/RemoveTopicSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/server/channel/RemoveTopicSubCommand.java
View File

@ -1,10 +1,10 @@
package cc.fascinated.bat.features.base.commands.server.channel;
package cc.fascinated.bat.base.commands.server.channel;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member;

10
src/main/java/cc/fascinated/bat/features/base/commands/server/channel/SetTopicSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/server/channel/SetTopicSubCommand.java
View File

@ -1,10 +1,10 @@
package cc.fascinated.bat.features.base.commands.server.channel;
package cc.fascinated.bat.base.commands.server.channel;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member;

10
src/main/java/cc/fascinated/bat/features/base/commands/server/channel/ViewTopicSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/server/channel/ViewTopicSubCommand.java
View File

@ -1,10 +1,10 @@
package cc.fascinated.bat.features.base.commands.server.channel;
package cc.fascinated.bat.base.commands.server.channel;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

14
src/main/java/cc/fascinated/bat/features/base/commands/server/feature/DisableSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/server/feature/DisableSubCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.base.commands.server.feature;
package cc.fascinated.bat.base.commands.server.feature;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.Feature;
import cc.fascinated.bat.features.FeatureProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.feature.Feature;
import cc.fascinated.bat.common.feature.FeatureProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.service.FeatureService;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;

14
src/main/java/cc/fascinated/bat/features/base/commands/server/feature/EnableSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/server/feature/EnableSubCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.base.commands.server.feature;
package cc.fascinated.bat.base.commands.server.feature;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.Feature;
import cc.fascinated.bat.features.FeatureProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.feature.Feature;
import cc.fascinated.bat.common.feature.FeatureProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.service.FeatureService;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;

8
src/main/java/cc/fascinated/bat/features/base/commands/server/feature/FeatureCommand.java → src/main/java/cc/fascinated/bat/base/commands/server/feature/FeatureCommand.java
View File

@ -1,8 +1,8 @@
package cc.fascinated.bat.features.base.commands.server.feature;
package cc.fascinated.bat.base.commands.server.feature;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import lombok.NonNull;
import net.dv8tion.jda.api.Permission;
import org.springframework.beans.factory.annotation.Autowired;

14
src/main/java/cc/fascinated/bat/features/base/commands/server/feature/ListSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/server/feature/ListSubCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.base.commands.server.feature;
package cc.fascinated.bat.base.commands.server.feature;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.Feature;
import cc.fascinated.bat.features.FeatureProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.feature.Feature;
import cc.fascinated.bat.common.feature.FeatureProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.service.FeatureService;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;

12
src/main/java/cc/fascinated/bat/features/base/commands/utility/PastebinCommand.java → src/main/java/cc/fascinated/bat/base/commands/utility/PastebinCommand.java
View File

@ -1,13 +1,13 @@
package cc.fascinated.bat.features.base.commands.utility;
package cc.fascinated.bat.base.commands.utility;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.DescriptionBuilder;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.common.PasteUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

8
src/main/java/cc/fascinated/bat/features/base/commands/utility/lookup/LookupCommand.java → src/main/java/cc/fascinated/bat/base/commands/utility/lookup/LookupCommand.java
View File

@ -1,8 +1,8 @@
package cc.fascinated.bat.features.base.commands.utility.lookup;
package cc.fascinated.bat.base.commands.utility.lookup;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import lombok.NonNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;

10
src/main/java/cc/fascinated/bat/features/base/commands/utility/lookup/UserSubCommand.java → src/main/java/cc/fascinated/bat/base/commands/utility/lookup/UserSubCommand.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.features.base.commands.utility.lookup;
package cc.fascinated.bat.base.commands.utility.lookup;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.DescriptionBuilder;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.service.UserService;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;

12
src/main/java/cc/fascinated/bat/features/birthday/BirthdayFeature.java → src/main/java/cc/fascinated/bat/birthday/BirthdayFeature.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.features.birthday;
package cc.fascinated.bat.birthday;
import cc.fascinated.bat.event.EventListener;
import cc.fascinated.bat.features.Feature;
import cc.fascinated.bat.features.FeatureProfile;
import cc.fascinated.bat.features.birthday.command.BirthdayCommand;
import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.common.feature.Feature;
import cc.fascinated.bat.common.feature.FeatureProfile;
import cc.fascinated.bat.birthday.command.BirthdayCommand;
import cc.fascinated.bat.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.service.CommandService;
import cc.fascinated.bat.service.DiscordService;
import cc.fascinated.bat.service.GuildService;

2
src/main/java/cc/fascinated/bat/features/birthday/UserBirthday.java → src/main/java/cc/fascinated/bat/birthday/UserBirthday.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.features.birthday;
package cc.fascinated.bat.birthday;
import cc.fascinated.bat.common.Serializable;
import com.google.gson.Gson;

8
src/main/java/cc/fascinated/bat/features/birthday/command/BirthdayCommand.java → src/main/java/cc/fascinated/bat/birthday/command/BirthdayCommand.java
View File

@ -1,8 +1,8 @@
package cc.fascinated.bat.features.birthday.command;
package cc.fascinated.bat.birthday.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.Category;
import cc.fascinated.bat.common.command.CommandInfo;
import lombok.NonNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;

12
src/main/java/cc/fascinated/bat/features/birthday/command/ChannelSubCommand.java → src/main/java/cc/fascinated/bat/birthday/command/ChannelSubCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.birthday.command;
package cc.fascinated.bat.birthday.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.common.TextChannelUtils;
import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member;

12
src/main/java/cc/fascinated/bat/features/birthday/command/MessageSubCommand.java → src/main/java/cc/fascinated/bat/birthday/command/MessageSubCommand.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.features.birthday.command;
package cc.fascinated.bat.birthday.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member;

14
src/main/java/cc/fascinated/bat/features/birthday/command/PrivateSubCommand.java → src/main/java/cc/fascinated/bat/birthday/command/PrivateSubCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.birthday.command;
package cc.fascinated.bat.birthday.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.birthday.UserBirthday;
import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.birthday.UserBirthday;
import cc.fascinated.bat.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

12
src/main/java/cc/fascinated/bat/features/birthday/command/RemoveSubCommand.java → src/main/java/cc/fascinated/bat/birthday/command/RemoveSubCommand.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.features.birthday.command;
package cc.fascinated.bat.birthday.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

14
src/main/java/cc/fascinated/bat/features/birthday/command/SetSubCommand.java → src/main/java/cc/fascinated/bat/birthday/command/SetSubCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.birthday.command;
package cc.fascinated.bat.birthday.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.birthday.UserBirthday;
import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.birthday.UserBirthday;
import cc.fascinated.bat.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

14
src/main/java/cc/fascinated/bat/features/birthday/command/ViewSubCommand.java → src/main/java/cc/fascinated/bat/birthday/command/ViewSubCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.birthday.command;
package cc.fascinated.bat.birthday.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.birthday.UserBirthday;
import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.birthday.UserBirthday;
import cc.fascinated.bat.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.service.UserService;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;

6
src/main/java/cc/fascinated/bat/features/birthday/profile/BirthdayProfile.java → src/main/java/cc/fascinated/bat/birthday/profile/BirthdayProfile.java
View File

@ -1,9 +1,9 @@
package cc.fascinated.bat.features.birthday.profile;
package cc.fascinated.bat.birthday.profile;
import cc.fascinated.bat.common.ChannelUtils;
import cc.fascinated.bat.common.Serializable;
import cc.fascinated.bat.features.birthday.UserBirthday;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.birthday.UserBirthday;
import cc.fascinated.bat.common.model.BatGuild;
import com.google.gson.Gson;
import lombok.Getter;
import lombok.NoArgsConstructor;

4
src/main/java/cc/fascinated/bat/common/MemberUtils.java
View File

@ -1,7 +1,7 @@
package cc.fascinated.bat.common;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.experimental.UtilityClass;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Role;

2
src/main/java/cc/fascinated/bat/common/PasteUtils.java
View File

@ -1,7 +1,7 @@
package cc.fascinated.bat.common;
import cc.fascinated.bat.BatApplication;
import cc.fascinated.bat.model.token.paste.PasteUploadToken;
import cc.fascinated.bat.common.model.token.paste.PasteUploadToken;
import lombok.SneakyThrows;
import lombok.experimental.UtilityClass;
import lombok.extern.log4j.Log4j2;

2
src/main/java/cc/fascinated/bat/common/RoleUtils.java
View File

@ -1,6 +1,6 @@
package cc.fascinated.bat.common;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.common.model.BatGuild;
import lombok.experimental.UtilityClass;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member;

22
src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/Leaderboard.java
View File

@ -1,22 +0,0 @@
package cc.fascinated.bat.common.beatsaber.leaderboard;
import lombok.AllArgsConstructor;
import lombok.Getter;
@AllArgsConstructor @Getter
public class Leaderboard {
/**
* The name of the leaderboard.
*/
private final String name;
/**
* The version of the leaderboard.
*/
private int curveVersion;
/**
* The curve of the leaderboard.
*/
private final LeaderboardCurvePoint[] curve;
}

10
src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/LeaderboardCurvePoint.java
View File

@ -1,10 +0,0 @@
package cc.fascinated.bat.common.beatsaber.leaderboard;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter @AllArgsConstructor
public class LeaderboardCurvePoint {
private final double a;
private final double b;
}

167
src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/impl/ScoreSaberLeaderboard.java
View File

@ -1,167 +0,0 @@
package cc.fascinated.bat.common.beatsaber.leaderboard.impl;
import cc.fascinated.bat.common.MathUtils;
import cc.fascinated.bat.common.beatsaber.leaderboard.Leaderboard;
import cc.fascinated.bat.common.beatsaber.leaderboard.LeaderboardCurvePoint;
import cc.fascinated.bat.model.token.beatsaber.scoresaber.ScoreSaberScoreToken;
import lombok.extern.log4j.Log4j2;
import java.util.ArrayList;
import java.util.List;
@Log4j2(topic = "ScoreSaber Leaderboard")
public class ScoreSaberLeaderboard extends Leaderboard {
public static final ScoreSaberLeaderboard INSTANCE = new ScoreSaberLeaderboard();
/**
* The base multiplier for stars.
*/
private final double starMultiplier = 42.11;
/**
* no idea, ngl
*/
private final double weightCoefficient = 0.965;
public ScoreSaberLeaderboard() {
super("ScoreSaber", 1, new LeaderboardCurvePoint[] {
new LeaderboardCurvePoint(1.0, 5.367394282890631),
new LeaderboardCurvePoint(0.9995, 5.019543595874787),
new LeaderboardCurvePoint(0.999, 4.715470646416203),
new LeaderboardCurvePoint(0.99825, 4.325027383589547),
new LeaderboardCurvePoint(0.9975, 3.996793606763322),
new LeaderboardCurvePoint(0.99625, 3.5526145337555373),
new LeaderboardCurvePoint(0.995, 3.2022017597337955),
new LeaderboardCurvePoint(0.99375, 2.9190155639254955),
new LeaderboardCurvePoint(0.9925, 2.685667856592722),
new LeaderboardCurvePoint(0.99125, 2.4902905794106913),
new LeaderboardCurvePoint(0.99, 2.324506282149922),
new LeaderboardCurvePoint(0.9875, 2.058947159052738),
new LeaderboardCurvePoint(0.985, 1.8563887693647105),
new LeaderboardCurvePoint(0.9825, 1.697536248647543),
new LeaderboardCurvePoint(0.98, 1.5702410055532239),
new LeaderboardCurvePoint(0.9775, 1.4664726399289512),
new LeaderboardCurvePoint(0.975, 1.3807102743105126),
new LeaderboardCurvePoint(0.9725, 1.3090333065057616),
new LeaderboardCurvePoint(0.97, 1.2485807759957321),
new LeaderboardCurvePoint(0.965, 1.1552120359501035),
new LeaderboardCurvePoint(0.96, 1.0871883573850478),
new LeaderboardCurvePoint(0.955, 1.0388633331418984),
new LeaderboardCurvePoint(0.95, 1.0),
new LeaderboardCurvePoint(0.94, 0.9417362980580238),
new LeaderboardCurvePoint(0.93, 0.9039994071865736),
new LeaderboardCurvePoint(0.92, 0.8728710341448851),
new LeaderboardCurvePoint(0.91, 0.8488375988124467),
new LeaderboardCurvePoint(0.9, 0.825756123560842),
new LeaderboardCurvePoint(0.875, 0.7816934560296046),
new LeaderboardCurvePoint(0.85, 0.7462290664143185),
new LeaderboardCurvePoint(0.825, 0.7150465663454271),
new LeaderboardCurvePoint(0.8, 0.6872268862950283),
new LeaderboardCurvePoint(0.75, 0.6451808210101443),
new LeaderboardCurvePoint(0.7, 0.6125565959114954),
new LeaderboardCurvePoint(0.65, 0.5866010012767576),
new LeaderboardCurvePoint(0.6, 0.18223233667439062),
new LeaderboardCurvePoint(0.0, 0.0)
});
}
/**
* Gets the modifier for the given accuracy.
*
* @param accuracy The accuracy.
* @return The modifier.
*/
public double getModifier(double accuracy) {
accuracy = MathUtils.clamp(accuracy, 0, 100) / 100;
LeaderboardCurvePoint prev = this.getCurve()[1];
for (LeaderboardCurvePoint point : this.getCurve()) {
if (point.getA() <= accuracy) {
double distance = (prev.getA() - accuracy) / (prev.getA() - point.getA());
return MathUtils.lerp(prev.getB(), point.getB(), distance);
}
prev = point;
}
return 0;
}
/**
* Gets the pp for the given accuracy and stars.
*
* @param accuracy The accuracy.
* @param stars The stars.
* @return The pp.
*/
public double getPP(double accuracy, double stars) {
double pp = stars * this.starMultiplier;
double modifier = this.getModifier(accuracy);
return modifier * pp;
}
/**
* Gets the total pp for the given scores.
*
* @param scores The scores.
* @return The total pp.
*/
private double getTotalPP(List<ScoreSaberScoreToken> scores, int startIdx) {
double totalPP = 0;
for (int i = 0; i < scores.size(); i++) {
totalPP += Math.pow(this.weightCoefficient, i + startIdx) * scores.get(i).getPp();
}
return totalPP;
}
/**
* Gets the pp at the given index for the given scores.
*
* @param bottomScores The scores.
* @param idx The index.
* @return The pp.
*/
private double getRawPPAtIdx(List<ScoreSaberScoreToken> bottomScores, int idx, double expected) {
double oldBottomPP = this.getTotalPP(bottomScores, idx);
double newBottomPP = this.getTotalPP(bottomScores, idx + 1);
return (expected + oldBottomPP - newBottomPP) / Math.pow(this.weightCoefficient, idx);
}
/**
* Gets the raw pp per global pp for the given scores.
*
* @param scores The scores.
* @param expectedPP The expected pp.
* @return The raw pp per global pp.
*/
public double getRawPerGlobalPP(List<ScoreSaberScoreToken> scores, double expectedPP) {
int left = 0;
int right = scores.size() - 1;
int boundaryIdx = -1;
// Sort by PP
scores.sort((a, b) -> Double.compare(b.getPp(), a.getPp()));
while (left <= right) {
int mid = (left + right) / 2;
double bottomPP = this.getTotalPP(scores.subList(mid, scores.size()), mid);
List<ScoreSaberScoreToken> bottomSlice = new ArrayList<>(scores.subList(mid, scores.size()));
bottomSlice.add(0, scores.get(mid));
double modifiedBottomPP = this.getTotalPP(bottomSlice, mid);
double diff = modifiedBottomPP - bottomPP;
if (diff > expectedPP) {
boundaryIdx = mid;
left = mid + 1;
} else {
right = mid - 1;
}
}
if (boundaryIdx == -1) {
return this.getRawPPAtIdx(scores, 0, expectedPP);
} else {
return this.getRawPPAtIdx(scores.subList(boundaryIdx + 1, scores.size()), boundaryIdx + 1, expectedPP);
}
}
}

8
src/main/java/cc/fascinated/bat/command/BatCommand.java → src/main/java/cc/fascinated/bat/common/command/BatCommand.java
View File

@ -1,8 +1,8 @@
package cc.fascinated.bat.command;
package cc.fascinated.bat.common.command;
import cc.fascinated.bat.features.Feature;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.feature.Feature;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.*;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Member;

2
src/main/java/cc/fascinated/bat/command/Category.java → src/main/java/cc/fascinated/bat/common/command/Category.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.command;
package cc.fascinated.bat.common.command;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
src/main/java/cc/fascinated/bat/command/CommandInfo.java → src/main/java/cc/fascinated/bat/common/command/CommandInfo.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.command;
package cc.fascinated.bat.common.command;
import net.dv8tion.jda.api.Permission;

2
src/main/java/cc/fascinated/bat/command/InternalCommandInfo.java → src/main/java/cc/fascinated/bat/common/command/InternalCommandInfo.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.command;
package cc.fascinated.bat.common.command;
import lombok.AccessLevel;
import lombok.Getter;

4
src/main/java/cc/fascinated/bat/features/Feature.java → src/main/java/cc/fascinated/bat/common/feature/Feature.java
View File

@ -1,6 +1,6 @@
package cc.fascinated.bat.features;
package cc.fascinated.bat.common.feature;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.service.CommandService;
import lombok.Getter;
import lombok.NonNull;

2
src/main/java/cc/fascinated/bat/features/FeatureProfile.java → src/main/java/cc/fascinated/bat/common/feature/FeatureProfile.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.features;
package cc.fascinated.bat.common.feature;
import cc.fascinated.bat.common.Serializable;
import com.google.gson.Gson;

22
src/main/java/cc/fascinated/bat/model/BatGuild.java → src/main/java/cc/fascinated/bat/common/model/BatGuild.java
View File

@ -1,18 +1,18 @@
package cc.fascinated.bat.model;
package cc.fascinated.bat.common.model;
import cc.fascinated.bat.BatApplication;
import cc.fascinated.bat.common.ProfileHolder;
import cc.fascinated.bat.common.Serializable;
import cc.fascinated.bat.features.FeatureProfile;
import cc.fascinated.bat.features.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.features.counter.CounterProfile;
import cc.fascinated.bat.features.leveling.LevelingProfile;
import cc.fascinated.bat.features.logging.LogProfile;
import cc.fascinated.bat.features.moderation.punish.PunishmentProfile;
import cc.fascinated.bat.features.namehistory.profile.guild.NameHistoryProfile;
import cc.fascinated.bat.features.reminder.ReminderProfile;
import cc.fascinated.bat.features.statschannel.StatsChannelProfile;
import cc.fascinated.bat.features.welcomer.WelcomerProfile;
import cc.fascinated.bat.common.feature.FeatureProfile;
import cc.fascinated.bat.birthday.profile.BirthdayProfile;
import cc.fascinated.bat.counter.CounterProfile;
import cc.fascinated.bat.leveling.LevelingProfile;
import cc.fascinated.bat.logging.LogProfile;
import cc.fascinated.bat.moderation.punish.PunishmentProfile;
import cc.fascinated.bat.namehistory.profile.guild.NameHistoryProfile;
import cc.fascinated.bat.reminder.ReminderProfile;
import cc.fascinated.bat.statschannel.StatsChannelProfile;
import cc.fascinated.bat.welcomer.WelcomerProfile;
import cc.fascinated.bat.premium.PremiumProfile;
import cc.fascinated.bat.service.DiscordService;
import cc.fascinated.bat.service.MongoService;

4
src/main/java/cc/fascinated/bat/model/BatUser.java → src/main/java/cc/fascinated/bat/common/model/BatUser.java
View File

@ -1,10 +1,10 @@
package cc.fascinated.bat.model;
package cc.fascinated.bat.common.model;
import cc.fascinated.bat.BatApplication;
import cc.fascinated.bat.common.ProfileHolder;
import cc.fascinated.bat.common.Serializable;
import cc.fascinated.bat.common.UserUtils;
import cc.fascinated.bat.features.namehistory.profile.user.NameHistoryProfile;
import cc.fascinated.bat.namehistory.profile.user.NameHistoryProfile;
import cc.fascinated.bat.service.DiscordService;
import cc.fascinated.bat.service.MongoService;
import com.mongodb.client.model.ReplaceOptions;

2
src/main/java/cc/fascinated/bat/model/DiscordMessage.java → src/main/java/cc/fascinated/bat/common/model/DiscordMessage.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.model;
package cc.fascinated.bat.common.model;
import cc.fascinated.bat.common.ChannelUtils;
import cc.fascinated.bat.common.UserUtils;

2
src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberAccountToken.java → src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberAccountToken.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.model.token.beatsaber.scoresaber;
package cc.fascinated.bat.common.model.token.beatsaber.scoresaber;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberLeaderboardToken.java → src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberLeaderboardToken.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.model.token.beatsaber.scoresaber;
package cc.fascinated.bat.common.model.token.beatsaber.scoresaber;
import lombok.Getter;
import lombok.ToString;

2
src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberPageMetadataToken.java → src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberPageMetadataToken.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.model.token.beatsaber.scoresaber;
package cc.fascinated.bat.common.model.token.beatsaber.scoresaber;
import lombok.Getter;
import lombok.ToString;

2
src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberPlayerScoreToken.java → src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberPlayerScoreToken.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.model.token.beatsaber.scoresaber;
package cc.fascinated.bat.common.model.token.beatsaber.scoresaber;
import lombok.Getter;
import lombok.ToString;

2
src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberScoreToken.java → src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberScoreToken.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.model.token.beatsaber.scoresaber;
package cc.fascinated.bat.common.model.token.beatsaber.scoresaber;
import lombok.Getter;
import lombok.ToString;

2
src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberScoresPageToken.java → src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberScoresPageToken.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.model.token.beatsaber.scoresaber;
package cc.fascinated.bat.common.model.token.beatsaber.scoresaber;
import lombok.Getter;
import lombok.Setter;

2
src/main/java/cc/fascinated/bat/model/token/dogceo/RandomImage.java → src/main/java/cc/fascinated/bat/common/model/token/dogceo/RandomImage.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.model.token.dogceo;
package cc.fascinated.bat.common.model.token.dogceo;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
src/main/java/cc/fascinated/bat/model/token/paste/PasteUploadToken.java → src/main/java/cc/fascinated/bat/common/model/token/paste/PasteUploadToken.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.model.token.paste;
package cc.fascinated.bat.common.model.token.paste;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
src/main/java/cc/fascinated/bat/model/token/randomd/RandomDuck.java → src/main/java/cc/fascinated/bat/common/model/token/randomd/RandomDuck.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.model.token.randomd;
package cc.fascinated.bat.common.model.token.randomd;
import lombok.Getter;

2
src/main/java/cc/fascinated/bat/model/token/randomfox/RandomFoxToken.java → src/main/java/cc/fascinated/bat/common/model/token/randomfox/RandomFoxToken.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.model.token.randomfox;
package cc.fascinated.bat.common.model.token.randomfox;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
src/main/java/cc/fascinated/bat/model/token/thecatapi/CatImageToken.java → src/main/java/cc/fascinated/bat/common/model/token/thecatapi/CatImageToken.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.model.token.thecatapi;
package cc.fascinated.bat.common.model.token.thecatapi;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
src/main/java/cc/fascinated/bat/features/counter/CounterChannel.java → src/main/java/cc/fascinated/bat/counter/CounterChannel.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.features.counter;
package cc.fascinated.bat.counter;
import cc.fascinated.bat.common.ChannelUtils;
import cc.fascinated.bat.common.NumberUtils;

8
src/main/java/cc/fascinated/bat/features/counter/CounterFeature.java → src/main/java/cc/fascinated/bat/counter/CounterFeature.java
View File

@ -1,8 +1,8 @@
package cc.fascinated.bat.features.counter;
package cc.fascinated.bat.counter;
import cc.fascinated.bat.features.Feature;
import cc.fascinated.bat.features.FeatureProfile;
import cc.fascinated.bat.features.counter.command.CounterCommand;
import cc.fascinated.bat.common.feature.Feature;
import cc.fascinated.bat.common.feature.FeatureProfile;
import cc.fascinated.bat.counter.command.CounterCommand;
import cc.fascinated.bat.service.CommandService;
import lombok.NonNull;
import org.springframework.beans.factory.annotation.Autowired;

2
src/main/java/cc/fascinated/bat/features/counter/CounterProfile.java → src/main/java/cc/fascinated/bat/counter/CounterProfile.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.features.counter;
package cc.fascinated.bat.counter;
import cc.fascinated.bat.common.Serializable;
import com.google.gson.Gson;

2
src/main/java/cc/fascinated/bat/features/counter/CounterResult.java → src/main/java/cc/fascinated/bat/counter/CounterResult.java
View File

@ -1,4 +1,4 @@
package cc.fascinated.bat.features.counter;
package cc.fascinated.bat.counter;
/**
* @author Fascinated (fascinated7)

8
src/main/java/cc/fascinated/bat/features/counter/CountingListener.java → src/main/java/cc/fascinated/bat/counter/CountingListener.java
View File

@ -1,9 +1,9 @@
package cc.fascinated.bat.features.counter;
package cc.fascinated.bat.counter;
import cc.fascinated.bat.event.EventListener;
import cc.fascinated.bat.features.FeatureProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.common.feature.FeatureProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.emoji.Emoji;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;

6
src/main/java/cc/fascinated/bat/features/counter/command/CounterCommand.java → src/main/java/cc/fascinated/bat/counter/command/CounterCommand.java
View File

@ -1,7 +1,7 @@
package cc.fascinated.bat.features.counter.command;
package cc.fascinated.bat.counter.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import lombok.NonNull;
import net.dv8tion.jda.api.Permission;
import org.springframework.beans.factory.annotation.Autowired;

14
src/main/java/cc/fascinated/bat/features/counter/command/RemoveSubCommand.java → src/main/java/cc/fascinated/bat/counter/command/RemoveSubCommand.java
View File

@ -1,14 +1,14 @@
package cc.fascinated.bat.features.counter.command;
package cc.fascinated.bat.counter.command;
import cc.fascinated.bat.Emojis;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.common.NumberFormatter;
import cc.fascinated.bat.features.counter.CounterChannel;
import cc.fascinated.bat.features.counter.CounterProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.counter.CounterChannel;
import cc.fascinated.bat.counter.CounterProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

14
src/main/java/cc/fascinated/bat/features/counter/command/SetBreakingSubCommand.java → src/main/java/cc/fascinated/bat/counter/command/SetBreakingSubCommand.java
View File

@ -1,13 +1,13 @@
package cc.fascinated.bat.features.counter.command;
package cc.fascinated.bat.counter.command;
import cc.fascinated.bat.Emojis;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.counter.CounterChannel;
import cc.fascinated.bat.features.counter.CounterProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.counter.CounterChannel;
import cc.fascinated.bat.counter.CounterProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

14
src/main/java/cc/fascinated/bat/features/counter/command/SetSubCommand.java → src/main/java/cc/fascinated/bat/counter/command/SetSubCommand.java
View File

@ -1,13 +1,13 @@
package cc.fascinated.bat.features.counter.command;
package cc.fascinated.bat.counter.command;
import cc.fascinated.bat.Emojis;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.counter.CounterChannel;
import cc.fascinated.bat.features.counter.CounterProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.counter.CounterChannel;
import cc.fascinated.bat.counter.CounterProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

12
src/main/java/cc/fascinated/bat/features/counter/command/SetupSubCommand.java → src/main/java/cc/fascinated/bat/counter/command/SetupSubCommand.java
View File

@ -1,12 +1,12 @@
package cc.fascinated.bat.features.counter.command;
package cc.fascinated.bat.counter.command;
import cc.fascinated.bat.Emojis;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.CommandInfo;
import cc.fascinated.bat.common.command.BatCommand;
import cc.fascinated.bat.common.command.CommandInfo;
import cc.fascinated.bat.common.EmbedUtils;
import cc.fascinated.bat.features.counter.CounterProfile;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.counter.CounterProfile;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;

12
src/main/java/cc/fascinated/bat/event/EventListener.java
View File

@ -1,11 +1,11 @@
package cc.fascinated.bat.event;
import cc.fascinated.bat.model.BatGuild;
import cc.fascinated.bat.model.BatUser;
import cc.fascinated.bat.model.DiscordMessage;
import cc.fascinated.bat.model.token.beatsaber.scoresaber.ScoreSaberLeaderboardToken;
import cc.fascinated.bat.model.token.beatsaber.scoresaber.ScoreSaberPlayerScoreToken;
import cc.fascinated.bat.model.token.beatsaber.scoresaber.ScoreSaberScoreToken;
import cc.fascinated.bat.common.model.BatGuild;
import cc.fascinated.bat.common.model.BatUser;
import cc.fascinated.bat.common.model.DiscordMessage;
import cc.fascinated.bat.common.model.token.beatsaber.scoresaber.ScoreSaberLeaderboardToken;
import cc.fascinated.bat.common.model.token.beatsaber.scoresaber.ScoreSaberPlayerScoreToken;
import cc.fascinated.bat.common.model.token.beatsaber.scoresaber.ScoreSaberScoreToken;
import lombok.NonNull;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Invite;

23
src/main/java/cc/fascinated/bat/features/drag/DragFeature.java
View File

@ -1,23 +0,0 @@
package cc.fascinated.bat.features.drag;
import cc.fascinated.bat.features.Feature;
import cc.fascinated.bat.features.FeatureProfile;
import cc.fascinated.bat.features.drag.command.DragCommand;
import cc.fascinated.bat.service.CommandService;
import lombok.NonNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;
/**
* @author Fascinated (fascinated7)
*/
@Component
public class DragFeature extends Feature {
@Autowired
public DragFeature(@NonNull ApplicationContext context, @NonNull CommandService commandService) {
super("Drag", FeatureProfile.FeatureState.DISABLED, true);
super.registerCommand(commandService, context.getBean(DragCommand.class));
}
}

48
src/main/java/cc/fascinated/bat/features/drag/DragRequest.java
View File

@ -1,48 +0,0 @@
package cc.fascinated.bat.features.drag;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
import net.dv8tion.jda.api.interactions.InteractionHook;
import java.util.Date;
/**
* @author Fascinated (fascinated7)
*/
@RequiredArgsConstructor
@Getter @Setter
public class DragRequest {
/**
* The date the request was made
*/
private final Date requestDate = new Date();
/**
* The user that wants to join the voice channel
*/
private final Member member;
/**
* The user that the member wants to join
*/
private final Member target;
/**
* The voice channel the user wants to join
*/
private final VoiceChannel voiceChannel;
/**
* The interaction hook that the request was made from
*/
private final InteractionHook interactionHook;
/**
* The request message sent in the voice channel
*/
private Message requestMessage;
}

21
src/main/java/cc/fascinated/bat/features/drag/command/DragCommand.java
View File

@ -1,21 +0,0 @@
package cc.fascinated.bat.features.drag.command;
import cc.fascinated.bat.command.BatCommand;
import cc.fascinated.bat.command.Category;
import cc.fascinated.bat.command.CommandInfo;
import lombok.NonNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;
/**
* @author Fascinated (fascinated7)
*/
@Component
@CommandInfo(name = "drag", description = "Drag command", category = Category.GENERAL)
public class DragCommand extends BatCommand {
@Autowired
public DragCommand(@NonNull ApplicationContext context) {
super.addSubCommands(context.getBean(RequestSubCommand.class));
}
}

Some files were not shown because too many files have changed in this diff Show More