From 01a11fd9f490a2f6b442352d8ee6cf7f776a8e1e Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Mon, 9 Jun 2025 13:04:04 -0400
Subject: [PATCH 1/2] wip

---
 clients/quadraticserver/bridges.nix | 34 +++++++++++++++++------------
 secrets/discord.age                 |  9 ++++++++
 2 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 secrets/discord.age

diff --git a/clients/quadraticserver/bridges.nix b/clients/quadraticserver/bridges.nix
index 3bdc83c..14c1c77 100644
--- a/clients/quadraticserver/bridges.nix
+++ b/clients/quadraticserver/bridges.nix
@@ -5,18 +5,13 @@
   ...
 }: let
   settings = {
+    backfill.enabled = true;
+
     appservice = {
       as_token = "$CUSTOM_AS_TOKEN";
       hs_token = "$CUSTOM_HS_TOKEN";
     };
 
-    backfill = {
-      enabled = true;
-      max_initial_messages = 50;
-      max_catchup_messages = 20;
-      unread_hours_threshold = 300;
-    };
-
     homeserver = {
       domain = config.services.grapevine.settings.server_name;
       address = config.services.grapevine.settings.server_discovery.client.base_url;
@@ -29,7 +24,7 @@
         require = false;
       };
       permissions = {
-        "${config.services.grapevine.settings.server_name}" = "full";
+        "${config.services.grapevine.settings.server_name}" = "user";
         "@quadradical:${config.services.grapevine.settings.server_name}" = "admin";
       };
     };
@@ -37,11 +32,22 @@
 in {
   imports = [inputs.nix-matrix-appservices.nixosModule];
 
-  services.matrix-appservices.services.whatsapp = {
-    port = 29318;
-    format = "mautrix-go";
-    serviceConfig.EnvironmentFile = config.age.secrets."whatsapp.age".path;
-    package = pkgs.mautrix-whatsapp.override {withGoolm = true;};
-    inherit settings;
+  services.matrix-appservices.services = builtins.mapAttrs (name: value:
+    value
+    // {
+      inherit settings;
+      package = value.package.override {withGoolm = true;};
+    }) {
+    whatsapp = {
+      port = 29318;
+      serviceConfig.EnvironmentFile = config.age.secrets."whatsapp.age".path;
+      package = pkgs.mautrix-whatsapp;
+    };
+
+    discord = {
+      port = 29319;
+      serviceConfig.EnvironmentFile = config.age.secrets."discord.age".path;
+      package = pkgs.mautrix-discord;
+    };
   };
 }
diff --git a/secrets/discord.age b/secrets/discord.age
new file mode 100644
index 0000000..136ead9
--- /dev/null
+++ b/secrets/discord.age
@@ -0,0 +1,9 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZLUVVkUSBHSERE
+emFNL0JMcXV0dWFiVWlPaUc1UEZTTTdkUzk3QjExUDUydDdnTUhVCkZic3cvUDVr
+L2Qxemt5TkdVeVBDR3BLaDdyY1ZLZFRnWmxTTXM4bVp0UWsKLT4gdHY4Ni1ncmVh
+c2UgXW52QmhXUCAwVic3OyArUFpLUyQgYl8vZ2cKZWFSN1ZPeWNYdwotLS0gQVJh
+K0psMkE0K3Jqb09wdjUrb3IwZ2xNWllhNU45Umh6QlgxUGxwR3BHUQof+P4kC3iA
+lujH7DOZxg4xzIfivzByiTTwJauEdOrx9w7HWttZjhoYLJUCej52EWjNVRxxDyyk
+EkoiCvVGbE1RdbM=
+-----END AGE ENCRYPTED FILE-----

From 35610c49179f2e7a5df6ca7d6ceaca82e570a04d Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Mon, 9 Jun 2025 13:32:14 -0400
Subject: [PATCH 2/2] Fix bridges

---
 clients/quadraticserver/bridges.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/clients/quadraticserver/bridges.nix b/clients/quadraticserver/bridges.nix
index 14c1c77..b9587aa 100644
--- a/clients/quadraticserver/bridges.nix
+++ b/clients/quadraticserver/bridges.nix
@@ -36,18 +36,18 @@ in {
     value
     // {
       inherit settings;
-      package = value.package.override {withGoolm = true;};
+      format = "mautrix-go";
     }) {
     whatsapp = {
       port = 29318;
       serviceConfig.EnvironmentFile = config.age.secrets."whatsapp.age".path;
-      package = pkgs.mautrix-whatsapp;
+      package = pkgs.mautrix-whatsapp.override {withGoolm = true;};
     };
 
-    discord = {
-      port = 29319;
-      serviceConfig.EnvironmentFile = config.age.secrets."discord.age".path;
-      package = pkgs.mautrix-discord;
-    };
+    # discord = {
+    #   port = 29319;
+    #   serviceConfig.EnvironmentFile = config.age.secrets."discord.age".path;
+    #   package = pkgs.mautrix-discord;
+    # };
   };
 }