Domain update

Together-Java · Dec 12, 2022 · ec8f08c · ec8f08c
1 parent 96de17f
commit ec8f08c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 17 deletions.
diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml
@@ -31,4 +31,4 @@ jobs:
           BRANCH_NAME: ${{ steps.extract_branch.outputs.branch }}
         run: ./gradlew jib
       - name: Re-Deploy
-        run: "curl -H 'Authorization: Bearer ${{ secrets.WATCHTOWER_TOKEN }}' https://togetherjava.duckdns.org:5003/v1/update"
+        run: "curl -H 'Authorization: Bearer ${{ secrets.WATCHTOWER_TOKEN }}' https://togetherjava.org:5003/v1/update"
diff --git a/application/build.gradle b/application/build.gradle
@@ -15,7 +15,7 @@ repositories {
     mavenCentral()
 }
 
-var outputImage = 'togetherjava.duckdns.org:5001/togetherjava/tjbot:' + System.getenv('BRANCH_NAME') ?: 'latest'
+var outputImage = 'togetherjava.org:5001/togetherjava/tjbot:' + System.getenv('BRANCH_NAME') ?: 'latest'
 
 jib {
     from.image = 'eclipse-temurin:18'

diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/Features.java b/application/src/main/java/org/togetherjava/tjbot/commands/Features.java
@@ -72,7 +72,7 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
         ModerationActionsStore actionsStore = new ModerationActionsStore(database);
         ModAuditLogWriter modAuditLogWriter = new ModAuditLogWriter(config);
         ScamHistoryStore scamHistoryStore = new ScamHistoryStore(database);
-        HelpSystemHelper helpSystemHelper = new HelpSystemHelper(jda, config, database);
+        HelpSystemHelper helpSystemHelper = new HelpSystemHelper(config, database);
         CodeMessageHandler codeMessageHandler = new CodeMessageHandler();
 
         // NOTE The system can add special system relevant commands also by itself,
@@ -143,8 +143,6 @@ public static Collection<Feature> createFeatures(JDA jda, Database database, Con
         features.add(new ReportCommand(config));
         features.add(new BookmarksCommand(bookmarksSystem));
 
-        // Mixtures
-
         return features;
     }
 }
diff --git a/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpSystemHelper.java b/application/src/main/java/org/togetherjava/tjbot/commands/help/HelpSystemHelper.java
@@ -1,8 +1,10 @@
 package org.togetherjava.tjbot.commands.help;
 
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.channel.attribute.IThreadContainer;
 import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel;
 import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel;
@@ -50,17 +52,14 @@ public final class HelpSystemHelper {
     private final Set<String> threadActivityTagNames;
     private final String categoryRoleSuffix;
     private final Database database;
-    private final JDA jda;
 
     /**
      * Creates a new instance.
      *
-     * @param jda the JDA instance to use
      * @param config the config to use
      * @param database the database to store help thread metadata in
      */
-    public HelpSystemHelper(JDA jda, Config config, Database database) {
-        this.jda = jda;
+    public HelpSystemHelper(Config config, Database database) {
         HelpSystemConfig helpConfig = config.getHelpSystem();
         this.database = database;
 

diff --git a/docker-compose.yml.example b/docker-compose.yml.example
@@ -1,7 +1,7 @@
 version: "3.9"
 services:
   tjbot-develop:
-    image: "togetherjava.duckdns.org:5001/togetherjava/tjbot:develop"
+    image: "togetherjava.org:5001/togetherjava/tjbot:develop"
     command: ["/home/bot/config/config.json"]
     volumes:
       - database:/home/bot/database
@@ -11,7 +11,7 @@ services:
       - develop-bot
 
   tj-develop-website:
-    image: "togetherjava.duckdns.org:5001/togetherjava/website:develop"
+    image: "togetherjava.org:5001/togetherjava/website:develop"
     ports:
       - "127.0.0.1:5051:5051"
     networks:

diff --git a/website/build.gradle b/website/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
 }
 
-var outputImage = 'togetherjava.duckdns.org:5001/togetherjava/website:' + System.getenv('BRANCH_NAME') ?: 'latest'
+var outputImage = 'togetherjava.org:5001/togetherjava/website:' + System.getenv('BRANCH_NAME') ?: 'latest'
 
 jib {
     from.image = 'eclipse-temurin:18'

diff --git a/website/src/main/resources/public/index.html b/website/src/main/resources/public/index.html
@@ -17,16 +17,16 @@
     <meta name="keywords" content="Java, Discord, Programming, Coding, Help, Q&A"/>
 
     <meta property="og:title" content="Together Java - Learn Java, together - Discord"/>
-    <meta property="og:image" content="https://togetherjava.duckdns.org/images/logo_frame.png"/>
-    <meta property="og:url" content="https://togetherjava.duckdns.org"/>
+    <meta property="og:image" content="https://togetherjava.org/images/logo_frame.png"/>
+    <meta property="og:url" content="https://togetherjava.org"/>
     <meta property="og:type" content="website"/>
     <meta property="og:site_name" content="Together Java"/>
     <meta property=“og:description“ content="
         Need Java help? We got plenty! Join our Discord community.
         We have lots of friendly volunteers to help you learn Java or chat about everyday things."/>
 
     <meta name="twitter:title" content="Together Java - Learn Java, together - Discord"/>
-    <meta name="twitter:image" content="https://togetherjava.duckdns.org/images/logo_frame.png"/>
+    <meta name="twitter:image" content="https://togetherjava.org/images/logo_frame.png"/>
     <meta name="twitter:card" content="summary_large_image"/>
     <meta name="twitter:description" content="
         Need Java help? We got plenty! Join our Discord community.