From 7c424f56baec0c8387a7ae226d991a8353a1fc71 Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Fri, 28 Jul 2023 13:26:12 +0200
Subject: [PATCH] clan-merge: add clan-bot to allowed users

---
 modules/web01/clan-merge.nix           | 2 +-
 pkgs/clan-merge/clan_merge/__init__.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/web01/clan-merge.nix b/modules/web01/clan-merge.nix
index 0d63b69..9c17c7a 100644
--- a/modules/web01/clan-merge.nix
+++ b/modules/web01/clan-merge.nix
@@ -16,7 +16,7 @@
     script = ''
       while sleep 10; do
         ${self.packages.${pkgs.system}.clan-merge}/bin/clan-merge \
-          --allowed-users DavHau lassulus Mic92 \
+          --allowed-users clan-bot DavHau lassulus Mic92 \
           --repos clan-infra clan-core clan-homepage \
           --bot-name clan-bot
       done
diff --git a/pkgs/clan-merge/clan_merge/__init__.py b/pkgs/clan-merge/clan_merge/__init__.py
index 9216132..62c6d5f 100644
--- a/pkgs/clan-merge/clan_merge/__init__.py
+++ b/pkgs/clan-merge/clan_merge/__init__.py
@@ -120,7 +120,9 @@ def clan_merge(
                     f"Would merge PR {pr['number']} in repo {repo} from user {pr['user']['login']}"
                 )
             else:
-                print("Merging PR " + str(pr["id"]))
+                print(
+                    f"Merging PR {pr['number']} in repo {repo} from user {pr['user']['login']}"
+                )
                 data = dict(
                     Do="merge",
                 )