.gitea/workflows/container.yaml

@@ -1,12 +0,0 @@
-name: Build Multiarch Container Image
-on: [push]
-jobs:
-  call-reusable-workflow:
-    uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main
-    with:
-      repository: ${{ gitea.repository }}
-      ref_name: ${{ gitea.ref_name }}
-      sha: ${{ gitea.sha }}
-      registry_url: ${{ secrets.REGISTRY_URL }}
-      registry_user: ${{ secrets.REGISTRY_USER }}
-      registry_pw: ${{ secrets.REGISTRY_PW }}

.woodpecker.yml

@@ -0,0 +1,11 @@
+pipeline:
+  publish-docker-image:
+    image: plugins/kaniko
+    settings:
+      repo: docker.io/thallian/matrix-appservice-discord
+      tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre}
+      dockerfile: Dockerfile
+      username:
+        from_secret: DOCKER_USER
+      password:
+        from_secret: DOCKER_PW

Dockerfile

@@ -1,6 +1,6 @@
-FROM docker.io/golang:1.23-alpine3.21 as builder
+FROM docker.io/golang:1.19.3-alpine3.17 as builder
 
-ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
+ENV VERSION=v0.2.0
 
 RUN apk --no-cache add \
   git \
@@ -12,15 +12,13 @@ RUN apk --no-cache add \
 RUN ln -s /usr/lib/libstdc++.so.6 /usr/lib/libstdc++.so
 
 WORKDIR /build
-
-ENV VERSION=v0.7.2
 RUN git clone https://github.com/mautrix/discord.git
 WORKDIR /build/discord
 RUN git checkout $VERSION
 
 RUN go build -o /build/bin/mautrix-discord
 
-FROM docker.io/thallian/confd-env:3.21-3.2.0.2
+FROM docker.io/thallian/confd-env:3.17-3.1.3.0
 
 RUN addgroup -g 2222 matrix-bridge
 RUN adduser -h /var/lib/matrix-bridge -u 2222 -D -G matrix-bridge matrix-bridge
@@ -30,7 +28,7 @@ COPY --from=builder /build/bin/mautrix-discord /bin/mautrix-discord
 RUN apk --no-cache add \
   ca-certificates \
   libstdc++ \
-  olm
+	olm
 
 WORKDIR /var/lib/matrix-bridge
 

rootfs/etc/confd/templates/config.yaml.tmpl

@@ -83,7 +83,7 @@ bridge:
     #   .Discriminator - The 4 numbers after the name on Discord
     #   .Bot - Whether the user is a bot
     #   .System - Whether the user is an official system user
-    displayname_template: '{{"{{"}}or .GlobalName .Username{{"}}"}}{{"{{"}}if .Bot{{"}}"}} (bot){{"{{"}}end{{"}}"}}'
+    displayname_template: '{{"{{"}}.Username{{"}}"}}#{{"{{"}}.Discriminator{{"}}"}}{{"{{"}}if .Bot{{"}}"}} (bot){{"{{"}}end{{"}}"}}'
     # Displayname template for Discord channels (bridged as rooms, or spaces when type=4).
     # Available variables:
     #   .Name - Channel name, or user displayname (pre-formatted with displayname_template) in DMs.