Skip to content

Commit e4832e4

Browse files
authored
Merge pull request #454 from danthe1st/discordjug
adapt root package and other references to new domain
2 parents 24a9790 + 61bdcb8 commit e4832e4

File tree

257 files changed

+1116
-1016
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+1116
-1016
lines changed

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ representative at an online or offline event.
6060

6161
Instances of abusive, harassing, or otherwise unacceptable behavior may be
6262
reported to the community leaders responsible for enforcement at
63-
development@javadiscord.net.
63+
development@discordjug.net.
6464
All complaints will be reviewed and investigated promptly and fairly.
6565

6666
All community leaders are obligated to respect the privacy and security of the

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ At startup, the bot will initially start by loading just the global settings, an
2828

2929
We're using [DIH4JDA](https://github.com/DynxstyGIT/DIH4JDA) as our Command/Interaction framework, which makes it quite easy to add new commands.
3030

31-
[PingCommand.java](https://github.com/Java-Discord/JavaBot/blob/main/src/main/java/net/javadiscord/javabot/systems/user_commands/PingCommand.java)
31+
[PingCommand.java](https://github.com/Java-Discord/JavaBot/blob/main/src/main/java/net/discordjug/javabot/systems/user_commands/PingCommand.java)
3232
```java
3333
/**
3434
* <h3>This class represents the /ping command.</h3>
@@ -76,5 +76,5 @@ You can try out the API yourself on `api.discordjug.net`!
7676

7777
Inspiration we took from other communities:
7878

79-
- We designed our [Help Channel System](https://github.com/Java-Discord/JavaBot/tree/main/src/main/java/net/javadiscord/javabot/systems/help) similar to the one on the [Python Discord](https://discord.gg/python).
80-
- [`/move-conversation`](https://github.com/Java-Discord/JavaBot/blob/main/src/main/java/net/javadiscord/javabot/systems/user_commands/MoveConversationCommand.java) is heavily inspired by the [Rust Programming Language Community Server](https://discord.gg/rust-lang-community)
79+
- We designed our [Help Channel System](https://github.com/Java-Discord/JavaBot/tree/main/src/main/java/net/discordjug/javabot/systems/help) similar to the one on the [Python Discord](https://discord.gg/python).
80+
- [`/move-conversation`](https://github.com/Java-Discord/JavaBot/blob/main/src/main/java/net/discordjug/javabot/systems/user_commands/MoveConversationCommand.java) is heavily inspired by the [Rust Programming Language Community Server](https://discord.gg/rust-lang-community)

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ java {
1414
targetCompatibility = JavaVersion.VERSION_17
1515
}
1616

17-
group = "net.javadiscord"
17+
group = "net.discordjug"
1818
version = "1.0.0-SNAPSHOT"
1919

2020
repositories {
@@ -70,7 +70,7 @@ dependencies {
7070
tasks.withType<Jar> {
7171
manifest {
7272
attributes["Manifest-Version"] = "1.0"
73-
attributes["Main-Class"] = "net.javadiscord.javabot.Bot"
73+
attributes["Main-Class"] = "net.discordjug.javabot.Bot"
7474
}
7575
}
7676

src/main/java/net/javadiscord/javabot/Bot.java renamed to src/main/java/net/discordjug/javabot/Bot.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.javadiscord.javabot;
1+
package net.discordjug.javabot;
22

33
import java.time.ZoneOffset;
44
import java.util.ArrayList;
@@ -28,13 +28,13 @@
2828

2929
import io.sentry.Sentry;
3030
import lombok.RequiredArgsConstructor;
31+
import net.discordjug.javabot.annotations.AutoDetectableComponentHandler;
32+
import net.discordjug.javabot.annotations.PreRegisteredListener;
33+
import net.discordjug.javabot.data.config.BotConfig;
34+
import net.discordjug.javabot.tasks.PresenceUpdater;
3135
import net.dv8tion.jda.api.entities.Message;
3236
import net.dv8tion.jda.api.hooks.ListenerAdapter;
3337
import net.dv8tion.jda.api.utils.messages.MessageRequest;
34-
import net.javadiscord.javabot.annotations.AutoDetectableComponentHandler;
35-
import net.javadiscord.javabot.annotations.PreRegisteredListener;
36-
import net.javadiscord.javabot.data.config.BotConfig;
37-
import net.javadiscord.javabot.tasks.PresenceUpdater;
3838

3939
/**
4040
* The main class where the bot is initialized.

src/main/java/net/javadiscord/javabot/SpringConfig.java renamed to src/main/java/net/discordjug/javabot/SpringConfig.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.javadiscord.javabot;
1+
package net.discordjug.javabot;
22

33
import java.nio.file.Path;
44
import java.util.Collection;
@@ -18,18 +18,18 @@
1818
import xyz.dynxsty.dih4jda.interactions.commands.application.RegistrationType;
1919

2020
import lombok.RequiredArgsConstructor;
21+
import net.discordjug.javabot.annotations.PreRegisteredListener;
22+
import net.discordjug.javabot.data.config.BotConfig;
23+
import net.discordjug.javabot.data.config.SystemsConfig;
24+
import net.discordjug.javabot.data.h2db.DbHelper;
25+
import net.discordjug.javabot.tasks.PresenceUpdater;
2126
import net.dv8tion.jda.api.JDA;
2227
import net.dv8tion.jda.api.JDABuilder;
2328
import net.dv8tion.jda.api.OnlineStatus;
2429
import net.dv8tion.jda.api.requests.GatewayIntent;
2530
import net.dv8tion.jda.api.utils.ChunkingFilter;
2631
import net.dv8tion.jda.api.utils.MemberCachePolicy;
2732
import net.dv8tion.jda.api.utils.cache.CacheFlag;
28-
import net.javadiscord.javabot.annotations.PreRegisteredListener;
29-
import net.javadiscord.javabot.data.config.BotConfig;
30-
import net.javadiscord.javabot.data.config.SystemsConfig;
31-
import net.javadiscord.javabot.data.h2db.DbHelper;
32-
import net.javadiscord.javabot.tasks.PresenceUpdater;
3333

3434
/**
3535
* This class holds all configuration settings and {@link Bean}s.

src/main/java/net/javadiscord/javabot/annotations/AutoDetectableComponentHandler.java renamed to src/main/java/net/discordjug/javabot/annotations/AutoDetectableComponentHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.javadiscord.javabot.annotations;
1+
package net.discordjug.javabot.annotations;
22

33
import java.lang.annotation.ElementType;
44
import java.lang.annotation.Retention;

src/main/java/net/javadiscord/javabot/annotations/PreRegisteredListener.java renamed to src/main/java/net/discordjug/javabot/annotations/PreRegisteredListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.javadiscord.javabot.annotations;
1+
package net.discordjug.javabot.annotations;
22

33
import static java.lang.annotation.ElementType.TYPE;
44
import static java.lang.annotation.RetentionPolicy.RUNTIME;

src/main/java/net/javadiscord/javabot/api/TomcatConfig.java renamed to src/main/java/net/discordjug/javabot/api/TomcatConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package net.javadiscord.javabot.api;
2-
3-
import net.javadiscord.javabot.data.config.SystemsConfig;
1+
package net.discordjug.javabot.api;
42

53
import org.apache.catalina.connector.Connector;
64
import org.apache.coyote.ajp.AjpNioProtocol;
@@ -9,6 +7,8 @@
97
import org.springframework.context.annotation.Bean;
108
import org.springframework.context.annotation.Configuration;
119

10+
import net.discordjug.javabot.data.config.SystemsConfig;
11+
1212

1313
/**
1414
* Holds all configuration for the {@link org.springframework.boot.autoconfigure.web.ServerProperties.Tomcat}

src/main/java/net/javadiscord/javabot/api/exception/ErrorResponse.java renamed to src/main/java/net/discordjug/javabot/api/exception/ErrorResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.javadiscord.javabot.api.exception;
1+
package net.discordjug.javabot.api.exception;
22

33
import org.springframework.http.HttpStatus;
44

src/main/java/net/javadiscord/javabot/api/exception/InternalServerException.java renamed to src/main/java/net/discordjug/javabot/api/exception/InternalServerException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.javadiscord.javabot.api.exception;
1+
package net.discordjug.javabot.api.exception;
22

33
import org.springframework.beans.BeansException;
44

0 commit comments

Comments
 (0)