Merge branch 'develop' into 'main'

.github/workflows/build.yml

@@ -2,19 +2,17 @@ name: .NET Core Desktop
 
 on:
   push:
-    branches: [ "main", "develop" ]
-  pull_request:
-    branches: [ "main", "develop" ]
+    branches: [ "main", "develop", "reborn" ]
 
 jobs:
 
   build:
 
     strategy:
       matrix:
-        configuration: [Debug, Release]
-        projectName: [XeniaBot.Core, XeniaBot.WebPanel]
-        runtime: [win-x64, linux-x64]
+        configuration: [ Debug, Release ]
+        projectName: [ XeniaBot.Core, XeniaBot.WebPanel ]
+        runtime: [ win-x64, linux-x64 ]
 
     runs-on: windows-latest
 
@@ -28,17 +26,18 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
-
+        dotnet-version: |
+          10.0.x
+
     - run: dotnet tool install -g dotnet-t4
 
     - name: Clean
       run: dotnet clean ./XeniaBot.sln --configuration ${{ matrix.configuration }} && dotnet nuget locals all --clear
 
     - name: Publish Windows
       run: |
-        dotnet publish ${{ matrix.projectName }} --self-contained true -c ${{ matrix.configuration }} --runtime ${{ matrix.runtime }}
-        Compress-Archive -Path ./${{ matrix.projectName }}/bin/${{ matrix.configuration }}/net8.0/${{ matrix.runtime }}/publish/* -Destination ${{ matrix.projectName }}.zip
+        dotnet publish ${{ matrix.projectName }} --self-contained true -c ${{ matrix.configuration }} --runtime ${{ matrix.runtime }} -p:PublishSingleFile=true
+        Compress-Archive -Path ./${{ matrix.projectName }}/bin/${{ matrix.configuration }}/net10.0/${{ matrix.runtime }}/publish/* -Destination ${{ matrix.projectName }}.zip
 
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4

.github/workflows/docker.yml

@@ -0,0 +1,75 @@
+name: docker
+
+on:
+  push:
+    branches: [ main, develop ]
+    tags: "v[0-9]+.[0-9]+.[0-9]+"
+
+jobs:
+  docker:
+    strategy:
+      matrix:
+        include:
+          - dockerFilename: Dockerfile
+            imageName: ktwrd/xenia-discord
+          - dockerFilename: Dockerfile
+            imageName: ghcr.io/ktwrd/xenia-discord
+          - dockerFilename: WebPanel.Dockerfile
+            imageName: ktwrd/xenia-discord-dash
+          - dockerFilename: WebPanel.Dockerfile
+            imageName: ghcr.io/ktwrd/xenia-discord-dash
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+      attestations: write
+      id-token: write
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set Environment Variables
+        run: |
+          echo "TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
+          echo "CONTAINER_VERSION=$(git describe --tags --abbrev=0).$([[ $GITHUB_REF = refs/tags/* ]] && echo 0 || echo 65534)-$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+          echo "REVISION=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+          echo "BUILD_DATE=$(date --iso-8601=s)" >> $GITHUB_ENV
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: 'Build and push (dev, ${{ matrix.imageName }}, ${{ matrix.dockerFilename }})'
+        uses: docker/build-push-action@v5
+        if: github.ref == 'refs/heads/develop'
+        with:
+          push: true
+          tags: |
+            ${{ matrix.imageName }}:dev
+            ${{ matrix.imageName }}:latest
+            ${{ matrix.imageName }}:dev-${{ env.CONTAINER_VERSION }}
+            ${{ matrix.imageName }}:latest-${{ env.CONTAINER_VERSION }}
+          file: ${{ matrix.dockerFilename }}
+
+      - name: 'Build and push (stable, ${{ matrix.imageName }}, ${{ matrix.dockerFilename }})'
+        if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/main'
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          tags: |
+            ${{ matrix.imageName }}:${{ env.TAG }}
+            ${{ matrix.imageName }}:${{ env.CONTAINER_VERSION }}
+            ${{ matrix.imageName }}:stable
+            ${{ matrix.imageName }}:stable-${{ env.CONTAINER_VERSION }}
+          file: ${{ matrix.dockerFilename }}

.wakatime-project

@@ -0,0 +1 @@
+Xenia Bot

CHANGELOG.md

@@ -0,0 +1,16 @@
+## v1.15 (2nd Nov, 2025)
+
+>[!IMPORTANT]
+> I am aware of some issues in Xenia, like Ban Sync records not being visible (ones that were created before 2025).
+> This should be fixed in the next update, since it's more of a database issue.
+>
+> In the "reborn" branch, this is mostly mitigated by using an actual database like PostgreSQL instead of MongoDB.
+> To help with this transition to a new DB engine, I will will slowly move features across to the PostgreSQL instead of MongoDB.
+>
+> This may take a while to do since I have a full-time job and I spend a lot of my spare time working on [Open Fortress](https://openfortress.fun). When it comes to what projects are more important, Xenia has taken a bit of a backseat since it's fairly stable, and only requires some occasional maintenance.
+
+- Replaced custom logging system with [NLog](https://nlog-project.org/) 6.x
+- Use GZip Compression with Web Panel (for images, styles, javascript, and fonts)
+- Removed e621/e926 commands
+- The package `fonts-recommended` is now installed in bot/web panel dockerfile.
+  - This should fix non-ASCII characters like Emoji's and Kanji looking like boxes with hexadecimal characters in them.

Directory.Packages.props

@@ -0,0 +1,43 @@
+<Project>
+  <PropertyGroup>
+    <!-- Enable central package management, https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="AspNet.Security.OAuth.Discord" Version="10.0.0" />
+    <PackageVersion Include="CSharpFunctionalExtensions" Version="3.7.0" />
+    <PackageVersion Include="DiffPlex" Version="1.9.0" />
+    <PackageVersion Include="Discord.Net" Version="3.19.1" />
+    <PackageVersion Include="FastCloner" Version="3.5.2" />
+    <PackageVersion Include="Google.Cloud.Translation.V2" Version="3.5.0" />
+    <PackageVersion Include="IdGen" Version="3.0.7" />
+    <PackageVersion Include="Iminetsoft.CronNET" Version="8.0.2" />
+    <PackageVersion Include="kate.shared" Version="1.7.0" />
+    <PackageVersion Include="Magick.NET-Q16-HDRI-AnyCPU" Version="14.11.0" />
+    <PackageVersion Include="Markdig" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.IdentityModel.Logging" Version="8.16.0" />
+    <PackageVersion Include="MimeTypesMap" Version="1.0.9" />
+    <PackageVersion Include="MongoDB.Bson" Version="3.3.0" />
+    <PackageVersion Include="MongoDB.Driver" Version="3.3.0" />
+    <PackageVersion Include="NeoSmart.PrettySize" Version="3.1.1" />
+    <PackageVersion Include="NetVips" Version="3.2.0" />
+    <PackageVersion Include="NetVips.Extensions" Version="3.2.0" />
+    <PackageVersion Include="NetVips.Native.linux-x64" Version="8.16.1" />
+    <PackageVersion Include="NetVips.Native.win-x64" Version="8.16.1" />
+    <PackageVersion Include="NLog" Version="6.1.1" />
+    <PackageVersion Include="NLog.Web.AspNetCore" Version="6.1.2" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.1" />
+    <PackageVersion Include="prometheus-net" Version="8.2.1" />
+    <PackageVersion Include="prometheus-net.AspNetCore" Version="8.2.1" />
+    <PackageVersion Include="Sentry" Version="6.2.0" />
+    <PackageVersion Include="Sentry.AspNetCore" Version="6.2.0" />
+    <PackageVersion Include="Sentry.NLog" Version="6.2.0" />
+    <PackageVersion Include="System.Resources.Extensions" Version="10.0.3" />
+  </ItemGroup>
+</Project>

Dockerfile

@@ -1,21 +1,36 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base-pkg
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+    gnupg \
+    apt-transport-https \
+    ca-certificates \
+    adduser \
+    curl \
+    fonts-recommended fontconfig fonts-noto-cjk fonts-noto-cjk-extra fonts-liberation fonts-dejavu \
+    && rm -rf /var/lib/apt/lists/*
+ADD localfonts.conf /etc/fonts/local.conf
+RUN fc-cache -f -v
+
+FROM base-pkg AS base
 WORKDIR /app
 
 # Creates a non-root user with an explicit UID and adds permission to access the /app folder
 # For more info, please refer to https://aka.ms/vscode-docker-dotnet-configure-containers
-RUN adduser -u 5678 --disabled-password --gecos "" appuser && chown -R appuser /app
+RUN /usr/sbin/adduser -u 5678 --disabled-password --gecos "" appuser && chown -R appuser /app
 USER appuser
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+# --- compile project ---
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 RUN dotnet tool install -g dotnet-t4
 ENV PATH="/root/.dotnet/tools:${PATH}"
 WORKDIR /src
-COPY ["./XeniaBot.Core/XeniaBot.Core.csproj", "./"]
-RUN dotnet restore "XeniaBot.Core.csproj"
-COPY . .
+COPY . ./
+RUN dotnet restore "XeniaBot.Core/XeniaBot.Core.csproj"
 WORKDIR "/src/."
 RUN dotnet build "./XeniaBot.Core/XeniaBot.Core.csproj" -c Release -o /app/build
 
+# --- publish project ---
 FROM build AS publish
 RUN dotnet publish "./XeniaBot.Core/XeniaBot.Core.csproj" -c Release -o /app/publish
 

WebPanel.Dockerfile

@@ -1,23 +1,38 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base-pkg
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+    gnupg \
+    apt-transport-https \
+    ca-certificates \
+    adduser \
+    curl \
+    fonts-recommended fontconfig fonts-noto-cjk fonts-noto-cjk-extra fonts-liberation fonts-dejavu \
+    && rm -rf /var/lib/apt/lists/*
+ADD localfonts.conf /etc/fonts/local.conf
+RUN fc-cache -f -v
+
+FROM base-pkg AS base
 WORKDIR /app
 
 EXPOSE 80 8080
 
 # Creates a non-root user with an explicit UID and adds permission to access the /app folder
 # For more info, please refer to https://aka.ms/vscode-docker-dotnet-configure-containers
-RUN adduser -u 5678 --disabled-password --gecos "" appuser && chown -R appuser /app
+RUN /usr/sbin/adduser -u 5678 --disabled-password --gecos "" appuser && chown -R appuser /app
 USER appuser
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+# --- compile project ---
+FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
 RUN dotnet tool install -g dotnet-t4
 ENV PATH="/root/.dotnet/tools:${PATH}"
 WORKDIR /src
-COPY ["./XeniaBot.WebPanel/XeniaBot.WebPanel.csproj", "./"]
-RUN dotnet restore "XeniaBot.WebPanel.csproj"
-COPY . .
+COPY . ./
+RUN dotnet restore "XeniaBot.WebPanel/XeniaBot.WebPanel.csproj"
 WORKDIR "/src/."
 RUN dotnet build "./XeniaBot.WebPanel/XeniaBot.WebPanel.csproj" -c Release -o /app/build
 
+# --- publish project ---
 FROM build AS publish
 RUN dotnet publish "./XeniaBot.WebPanel/XeniaBot.WebPanel.csproj" -c Release -o /app/publish