Merge branch 'develop' into feat/help-thread-stats

Author: ankitsmt211

.devcontainer/devcontainer.json

@@ -8,7 +8,7 @@
   },
   "features": {
     "ghcr.io/devcontainers/features/java:1": {
-      "version": "18.0.2.1-tem",
+      "version": "25-tem",
       "jdkDistro": "tem",
       "installGradle": true
     },
@@ -35,4 +35,4 @@
   "postCreateCommand": {
     "config": "cp application/config.json.template application/config.json"
   }
-}
+}

.github/workflows/basic-checks.yml .github/workflows/basic-checks.yaml.github/workflows/basic-checks.yml renamed to .github/workflows/basic-checks.yaml

@@ -3,7 +3,7 @@ name: Basic checks
 on: [pull_request]
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 25
 
 jobs:
   spotless:
@@ -14,7 +14,7 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: ${{ env.JAVA_VERSION }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Check
         run: ./gradlew spotlessCheck
 
@@ -26,7 +26,7 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: ${{ env.JAVA_VERSION }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Check
         run: ./gradlew test
 
@@ -38,7 +38,7 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: ${{ env.JAVA_VERSION }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 2
       - name: Check

.github/workflows/code-analysis.yml

@@ -8,14 +8,14 @@ on:
     - cron: '0 20 * * 4'
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 25
 
 jobs:
   sonar:
     name: SonarCloud
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           # Shallow clones should be disabled for a better relevancy of analysis
           fetch-depth: 0
@@ -24,13 +24,13 @@ jobs:
         with:
           java-version: ${{ env.JAVA_VERSION }}
       - name: Cache SonarCloud packages
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Gradle packages
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -64,15 +64,15 @@ jobs:
       with:
         java-version: ${{ env.JAVA_VERSION }}
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can check out the head.
         fetch-depth: 2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -95,4 +95,4 @@ jobs:
        ./gradlew build
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/discord-member.yaml

@@ -0,0 +1,43 @@
+name: Comment When PR Merged
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - develop
+
+
+jobs:
+  if_merged:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const creator = context.payload.sender.login
+            const opts = github.rest.issues.listForRepo.endpoint.merge({
+              ...context.issue,
+              creator,
+              state: 'all'
+            })
+            const issues = await github.paginate(opts)
+
+            for (const issue of issues) {
+              if (issue.number === context.issue.number) {
+                continue
+              }
+
+              if (issue.pull_request) {
+                return
+              }
+            }
+            await github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: `Congratulations on your first contribution! We're excited to have you on board. Your work will be included in the next release, so stay tuned! 
+            Are you a Together-Java member on Discord? If so, please share your username here. If not, that’s perfectly fine! If you change your mind, here's the link: ${{vars.SERVER_INVITE}}.
+            Why do we need your username? We’d like to give you a shoutout to show our gratitude!`
+            })

.github/workflows/docker-publish.yaml

@@ -7,7 +7,7 @@ on:
       - 'master'
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 25
 
 jobs:
   docker:
@@ -21,7 +21,7 @@ jobs:
         shell: bash
         run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
         id: extract_branch
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Build and Publish Docker Image

.github/workflows/docker-verify.yaml

@@ -3,7 +3,7 @@ name: Docker Verify
 on: [pull_request]
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 25
 
 jobs:
   docker:
@@ -14,7 +14,7 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: ${{ env.JAVA_VERSION }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Docker Verify

.github/workflows/releases.yaml

@@ -10,7 +10,7 @@ defaults:
     shell: bash
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 25
 
 jobs:
 
@@ -23,7 +23,7 @@ jobs:
         with:
           java-version: ${{ env.JAVA_VERSION }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Build shadow jar
         run: ./gradlew shadowJar

.github/workflows/wiki-sync.yaml

@@ -0,0 +1,23 @@
+name: Wiki Sync
+
+on:
+  push:
+    branches:
+      - 'develop'
+    paths:
+      - wiki/**
+      - .github/workflows/wiki-sync.yaml
+
+concurrency:
+  group: sync-wiki
+  cancel-in-progress: true
+  
+permissions:
+  contents: write
+
+jobs:
+  sync-wiki:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: Andrew-Chen-Wang/github-wiki-action@v5.0.1

.vscode/settings.json

@@ -1,8 +1,8 @@
 {
-    //Configure the JDK to Java 18 in settings 
+    //Configure the JDK to Java 25 in settings
     "java.compile.nullAnalysis.mode": "disabled",
     "java.format.settings.url": "meta/formatting/google-style-eclipse.xml",
     "editor.formatOnSave": true,
     "editor.formatOnPaste": true,
     "java.format.enabled": true,
-}
+}

README.md

@@ -1,7 +1,7 @@
 # TJ-Bot
 
 [![codefactor](https://img.shields.io/codefactor/grade/github/together-java/tj-bot)](https://www.codefactor.io/repository/github/together-java/tj-bot)
-![Java](https://img.shields.io/badge/Java-21-ff696c)
+![Java](https://img.shields.io/badge/Java-25-ff696c)
 [![license](https://img.shields.io/github/license/Together-Java/TJ-Bot)](https://github.com/Together-Java/TJ-Bot/blob/master/LICENSE)
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/Together-Java/TJ-Bot?label=release)