GitBucket
|
Merge branch 'master' into feature/jda4
# Conflicts: # src/main/java/com/jagrosh/vortex/automod/AutoMod.java # src/main/java/com/jagrosh/vortex/automod/InviteResolver.java # src/main/java/com/jagrosh/vortex/commands/automod/AntiduplicateCmd.java # src/main/java/com/jagrosh/vortex/commands/automod/BlacklistCmd.java # src/main/java/com/jagrosh/vortex/commands/moderation/BanCmd.java # src/main/java/com/jagrosh/vortex/commands/settings/SettingsCmd.java # src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java # src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java # src/main/java/com/jagrosh/vortex/database/managers/IgnoreManager.java |
|---|
|
|
| .gitignore |
|---|
| images/NoAvatar.png |
|---|
|
|
| images/NoAvatar_old.png 0 → 100644 |
|---|
|
|
| lists/copypastas.txt |
|---|
| lists/referral_domains.txt |
|---|
| pom.xml |
|---|
| src/main/java/com/jagrosh/vortex/Constants.java |
|---|
| src/main/java/com/jagrosh/vortex/Listener.java |
|---|
| src/main/java/com/jagrosh/vortex/Vortex.java |
|---|
| src/main/java/com/jagrosh/vortex/automod/AutoMod.java |
|---|
| src/main/java/com/jagrosh/vortex/automod/Filter.java |
|---|
| src/main/java/com/jagrosh/vortex/automod/InviteResolver.java |
|---|
| src/main/java/com/jagrosh/vortex/automod/StrikeHandler.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/CommandExceptionListener.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/automod/AntiduplicateCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/automod/AutodehoistCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/automod/BlacklistCmd.java 100644 → 0 |
|---|
| src/main/java/com/jagrosh/vortex/commands/automod/FilterCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/automod/IgnoreCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/automod/UnignoreCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/general/UserinfoCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/moderation/BanCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/moderation/RaidCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/moderation/SilentbanCmd.java 0 → 100644 |
|---|
| src/main/java/com/jagrosh/vortex/commands/owner/DebugCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/owner/PremiumCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/settings/PrefixCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/settings/SettingsCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/settings/SetupCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/tools/AuditCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/tools/InvitepruneCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/commands/tools/LookupCmd.java |
|---|
| src/main/java/com/jagrosh/vortex/database/managers/AutomodManager.java |
|---|
| src/main/java/com/jagrosh/vortex/database/managers/FilterManager.java |
|---|
| src/main/java/com/jagrosh/vortex/database/managers/GuildSettingsDataManager.java |
|---|
| src/main/java/com/jagrosh/vortex/database/managers/IgnoreManager.java |
|---|
| src/main/java/com/jagrosh/vortex/database/managers/InviteWhitelistManager.java |
|---|
| src/main/java/com/jagrosh/vortex/logging/BasicLogger.java |
|---|
| src/main/java/com/jagrosh/vortex/logging/MessageCache.java |
|---|
| src/main/java/com/jagrosh/vortex/logging/ModLogger.java |
|---|
| src/main/java/com/jagrosh/vortex/utils/FormatUtil.java |
|---|
| src/main/java/com/jagrosh/vortex/utils/Usage.java 0 → 100644 |
|---|
| src/test/java/com/jagrosh/vortex/FilterTest.java 0 → 100644 |
|---|