From 9bb6a87b9288c404b92a56bdc9d4b727bab81985 Mon Sep 17 00:00:00 2001
From: chayleaf <chayleaf-git@pavluk.org>
Date: Sun, 9 Jun 2024 15:27:42 +0700
Subject: [PATCH] pkgs.matrix-appservice-discord: more patches

---
 pkgs/default.nix | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index edeeed6..8103880 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -29,21 +29,44 @@ in
   matrix-appservice-discord = pkgs.matrix-appservice-discord.overrideAttrs (old: {
     doCheck = false;
     patches = (old.patches or []) ++ [
+      # https://github.com/matrix-org/matrix-appservice-discord/pull/917
       (pkgs.fetchpatch {
         url = "https://github.com/matrix-org/matrix-appservice-discord/commit/eb989fa710e8db4ebc8f2ce36c6679ee6cbc1a44.patch";
         hash = "sha256-GPeFDw3XujqXHJveHSsBHwHuG51vad50p55FX1Esq58=";
+        name = "set-missing-config-defaults.patch";
       })
+      # https://github.com/matrix-org/matrix-appservice-discord/pull/918
       (pkgs.fetchpatch {
         url = "https://github.com/matrix-org/matrix-appservice-discord/commit/a4cd5e3a6a2d544adac2a263e164671c8a9009d9.patch";
         hash = "sha256-qQJ4V6/Ns2Msu8+X8JoEycuQ2Jc90TXulsuLLmPecGU=";
+        name = "dont-send-filenames.patch";
       })
+      # https://github.com/matrix-org/matrix-appservice-discord/pull/878/
       (pkgs.fetchpatch {
         url = "https://github.com/matrix-org/matrix-appservice-discord/commit/fc850ba2473973e28858449ec4020380470d78b2.patch";
         hash = "sha256-Lq0FWmR08wLsoq4APRTokZzb7U2po98pgyxH4UR/9/M=";
+        name = "bridge-discord-replies-1.patch";
       })
       (pkgs.fetchpatch {
-        url = "https://github.com/matrix-org/matrix-appservice-discord/commit/7f3d41d86ebce057cfdc82ce3aaab64b533e8f0b.patch";
-        hash = "sha256-HmQ1KASZS+a78fe5yOCVXAnXLRmJUglzc6OxNJazOSk=";
+        url = "https://github.com/matrix-org/matrix-appservice-discord/commit/86388901fa44d5d0f9d3dec8727c18cc00d613e7.patch";
+        hash = "sha256-XcLbKJPmFZElzwU4YS8Md8dNLajddJPKmau0U65bp00=";
+        name = "bridge-discord-replies-2.patch";
+      })
+      (pkgs.fetchpatch {
+        url = "https://github.com/matrix-org/matrix-appservice-discord/commit/8299c626188e676723a708e49635d2c4afa26ffa.patch";
+        hash = "sha256-ZfUwpJ21/m3QbktbxxHyO8Lcl/IuDhaSKQRXBEPeJBo=";
+        name = "bridge-discord-replies-3.patch";
+      })
+      # https://github.com/matrix-org/matrix-appservice-discord/pull/819
+      (pkgs.fetchpatch {
+        url = "https://github.com/matrix-org/matrix-appservice-discord/commit/1c3223387aaf78ba5637f58ca57bd8206ad0446c.patch";
+        hash = "sha256-3hxyqjI9F4j/XBq/59b7c2PorYRN2mR4XZJjpygs9dI=";
+        name = "bridge-matrix-edits-1.patch";
+      })
+      (pkgs.fetchpatch {
+        url = "https://github.com/matrix-org/matrix-appservice-discord/commit/f8e9449908b332d97f11932fb835552adca0aa5b.patch";
+        hash = "sha256-1qb4Zah1XKzxTpVJqOOqz+TiXMFmnsIMZeuqJQdqSIA=";
+        name = "bridge-matrix-edits-2.patch";
       })
       ./matrix-appservice-discord/disable-attachment-forwarding-to-matrix.patch
     ];