From 9f7f16542112254aefa910cafcb1daba14a5a728 Mon Sep 17 00:00:00 2001
From: WrenIX <dev@wrenix.eu>
Date: Wed, 13 Nov 2024 20:33:04 +0100
Subject: [PATCH] fix(mycloud-matrix): move mautrix-signal to mautrix-bridge

---
 mycloud-matrix/templates/bridge/signal.yaml  | 14 ++++---
 mycloud-matrix/templates/bridge/slack.yaml   | 42 ++++----------------
 mycloud-matrix/templates/server/synapse.yaml |  4 +-
 3 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/mycloud-matrix/templates/bridge/signal.yaml b/mycloud-matrix/templates/bridge/signal.yaml
index d8ad61f..94ee97c 100644
--- a/mycloud-matrix/templates/bridge/signal.yaml
+++ b/mycloud-matrix/templates/bridge/signal.yaml
@@ -3,7 +3,7 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
-  name: "{{ .Release.Name }}-mautrix-signal"
+  name: "{{ .Release.Name }}-mautrix-bridge-signal"
 spec:
   chart:
     spec:
@@ -11,7 +11,10 @@ spec:
         kind: GitRepository
         name: "wrenix-helm-charts"
         namespace: "flux-system"
-      chart: "./mautrix-signal"
+      chart: "./mautrix-bridge"
+      valuesFiles:
+        - "./mautrix-bridge/values.yaml"
+        - "./mautrix-bridge/values-signal.yaml"
       reconcileStrategy: "Revision"
   install:
     {{- toYaml .Values.commons.helm.release.install | nindent 4 }}
@@ -24,12 +27,12 @@ spec:
   interval: 10m
   valuesFrom:
     - kind: Secret
-      name: "{{ .Release.Name }}-mautrix-signal"
+      name: "{{ .Release.Name }}-mautrix-bridge-signal"
       valuesKey: as_token
       targetPath: config.appservice.as_token
       optional: true
     - kind: Secret
-      name: "{{ .Release.Name }}-mautrix-signal"
+      name: "{{ .Release.Name }}-mautrix-bridge-signal"
       valuesKey: hs_token
       targetPath: config.appservice.hs_token
       optional: true
@@ -50,9 +53,8 @@ spec:
         address: https://{{ include "mycloud-matrix.host.server" . }}
         domain: {{ include "mycloud-matrix.domain" . }}
       appservice:
-        address: http://{{ .Release.Name }}-mautrix-signal:29328
+        address: http://{{ .Release.Name }}-mautrix-bridge-signal:29328
       bridge:
-        personal_filtering_spaces: true
         relay:
           enabled: true
         permissions:
diff --git a/mycloud-matrix/templates/bridge/slack.yaml b/mycloud-matrix/templates/bridge/slack.yaml
index c595fee..5b1fff3 100644
--- a/mycloud-matrix/templates/bridge/slack.yaml
+++ b/mycloud-matrix/templates/bridge/slack.yaml
@@ -3,7 +3,7 @@
 apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
-  name: "{{ .Release.Name }}-mautrix-slack"
+  name: "{{ .Release.Name }}-mautrix-bridge-slack"
 spec:
   chart:
     spec:
@@ -11,7 +11,10 @@ spec:
         kind: GitRepository
         name: "wrenix-helm-charts"
         namespace: "flux-system"
-      chart: "./mautrix-signal"
+      chart: "./mautrix-bridge"
+      valuesFiles:
+        - "./mautrix-bridge/values.yaml"
+        - "./mautrix-bridge/values-slack.yaml"
       reconcileStrategy: "Revision"
   install:
     {{- toYaml .Values.commons.helm.release.install | nindent 4 }}
@@ -24,12 +27,12 @@ spec:
   interval: 10m
   valuesFrom:
     - kind: Secret
-      name: "{{ .Release.Name }}-mautrix-slack-mautrix-signal"
+      name: "{{ .Release.Name }}-mautrix-bridge-slack"
       valuesKey: as_token
       targetPath: config.appservice.as_token
       optional: true
     - kind: Secret
-      name: "{{ .Release.Name }}-mautrix-slack-mautrix-signal"
+      name: "{{ .Release.Name }}-mautrix-bridge-slack"
       valuesKey: hs_token
       targetPath: config.appservice.hs_token
       optional: true
@@ -38,9 +41,6 @@ spec:
       valuesKey: as_token_code
       targetPath: config.double_puppet.secrets.{{ include "mycloud-matrix.domain" . | replace "." "\\." }}
   values:
-    image:
-      repository: "mautrix/slack"
-      tag: "v0.1.2"
     config:
       database:
         type: postgres
@@ -53,18 +53,8 @@ spec:
         address: https://{{ include "mycloud-matrix.host.server" . }}
         domain: {{ include "mycloud-matrix.domain" . }}
       appservice:
-        address: http://{{ .Release.Name }}-mautrix-slack-mautrix-signal:29328
-        id: slack
-        {{`
-        username_template: "slack_{{.}}"
-        `}}
-        bot:
-          avatar: "mxc://maunium.net/pVtzLmChZejGxLqmXtQjFxem"
-          username: slackbot
-          displayname: "Slack bridge bot"
+        address: http://{{ .Release.Name }}-mautrix-bridge-slack:29328
       bridge:
-        personal_filtering_spaces: true
-        command_prefix: "!slack"
         relay:
           enabled: true
         permissions:
@@ -74,8 +64,6 @@ spec:
           {{- range $user := .Values.bridge.slack.admins }}
           {{ $user | quote }}: admin
           {{- end }}
-      management_room_text:
-        welcome: "Hello, I’m a Slack bridge bot."
       matrix:
         sync_direct_chat_list: true
       double_puppet:
@@ -92,20 +80,6 @@ spec:
         delete_keys:
           periodically_delete_expired: true
       {{- end }}
-      signal: null
-      {{`
-      slack:
-        displayname_template: '{{or .Profile.DisplayName .Profile.RealName .Name}}{{if .IsBot}} (bot){{end}}'
-        channel_name_template: '{{if and .IsChannel (not .IsPrivate)}}#{{end}}{{.Name}}{{if .IsNoteToSelf}} (you){{end}}'
-        team_name_template: "{{ .Name }}"
-        custom_emoji_reactions: true
-        workspace_avatar_in_rooms: false
-        participant_sync_count: 5
-        participant_sync_only_on_create: true
-        mute_channels_by_default: false
-        backfill:
-          conversation_count: -1
-      `}}
   
     registration:
       namespaces:
diff --git a/mycloud-matrix/templates/server/synapse.yaml b/mycloud-matrix/templates/server/synapse.yaml
index c234081..87689aa 100644
--- a/mycloud-matrix/templates/server/synapse.yaml
+++ b/mycloud-matrix/templates/server/synapse.yaml
@@ -182,7 +182,7 @@ spec:
         {{- if .signal.enabled }}
         - name: bridge-signal
           secret:
-            secretName: "{{ $.Release.Name }}-mautrix-signal"
+            secretName: "{{ $.Release.Name }}-mautrix-bridge-signal"
             items:
               - key: "registration.yaml"
                 path: "bridge-signal.yaml"
@@ -190,7 +190,7 @@ spec:
         {{- if .slack.enabled }}
         - name: bridge-slack
           secret:
-            secretName: "{{ $.Release.Name }}-mautrix-slack-mautrix-signal"
+            secretName: "{{ $.Release.Name }}-mautrix-bridge-slack"
             items:
               - key: "registration.yaml"
                 path: "bridge-slack.yaml"