From fa568e1ab51f1cfc82c4b8dfc68402deea5b9a02 Mon Sep 17 00:00:00 2001
From: server-06u <server-06u@demb.uk>
Date: Thu, 8 Jun 2023 18:44:55 +0000
Subject: [PATCH] Matterbridge set up

---
 .gitignore                     |  1 +
 docker-compose.yml             | 22 ++++++++++++++++++----
 matterbridge/matterbridge.toml | 24 ++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 matterbridge/matterbridge.toml

diff --git a/.gitignore b/.gitignore
index 970afa1..ead592e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 id_ed25516
+.env
diff --git a/docker-compose.yml b/docker-compose.yml
index 99b48b3..f5dfb93 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,8 @@
 version: "2.1"
 services:
   ssh-chat:
-    build: https://gitea.demb.uk/a31/ssh-chat.git
+    build: https://gitea.demb.uk/a31/ssh-chat.git#v1.11-rc5
     image: ssh-chat
-    container_name: ssh-chat
     restart: unless-stopped
     ports:
       - 2022:2022
@@ -12,10 +11,25 @@ services:
       - admins  # Not so secret
       - motd  # Also not a secret
     command: "/usr/local/bin/ssh-chat --identity /run/secrets/chatkey --admin=/run/secrets/admins --log=/dev/stdout --motd=/run/secrets/motd"
+
+  matterbridge:
+    build: https://gitea.demb.uk/a31/matterbridge.git#v1.26.0
+    image: matterbridge
+    restart: unless-stopped
+    secrets:
+      - source: matterbridge-config
+        target: /etc/matterbridge/matterbridge.toml
+    environment:
+      - MATTERBRIDGE_DISCORD_MYDISCORD_TOKEN  # Expected to be found in ./.env
+    depends_on:
+      - ssh-chat
+
 secrets:
   chatkey:
     file: ./id_ed25516
   admins:
-    file: ./admins
+    file: ./ssh-chat/admins
   motd:
-    file: ./motd
+    file: ./ssh-chat/motd
+  matterbridge-config:
+    file: ./matterbridge/matterbridge.toml
diff --git a/matterbridge/matterbridge.toml b/matterbridge/matterbridge.toml
new file mode 100644
index 0000000..da2e16a
--- /dev/null
+++ b/matterbridge/matterbridge.toml
@@ -0,0 +1,24 @@
+[sshchat.mychat]
+Server="ssh-chat:2022"
+Nick="bridge0"
+#RemoteNickFormat="{NICK}[{PROTOCOL}] "
+RemoteNickFormat="[{NICK}] "
+
+[discord.mydiscord]
+Token=""
+Server="DEMB corporation"
+#RemoteNickFormat="{NICK}[{PROTOCOL}] "
+RemoteNickFormat="{NICK} "
+AutoWebHooks=true
+UseLocalAvatar=["sshchat.mychat"]
+
+[[gateway]]
+name="gateway1"
+enable=true
+        [[gateway.inout]]
+        account="sshchat.mychat"
+        channel="sshchat"
+
+        [[gateway.inout]]
+        account="discord.mydiscord"
+        channel="main"