From 4ec26fd36c7541874405afa534bc163ca42570c6 Mon Sep 17 00:00:00 2001
From: sefidel <contact@sefidel.net>
Date: Sun, 10 Mar 2024 19:44:13 +0900
Subject: chore(modules/nitter): remove patch

Patch is now available upstream on c6edec04901d0a37799499ed4c6921db640fb5a4
---
 modules/services/nitter.nix                        | 33 ++++++++++++++++++
 .../nitter/0001-HACK-allow-non-guest-account.patch | 26 ---------------
 modules/services/nitter/default.nix                | 39 ----------------------
 3 files changed, 33 insertions(+), 65 deletions(-)
 create mode 100644 modules/services/nitter.nix
 delete mode 100644 modules/services/nitter/0001-HACK-allow-non-guest-account.patch
 delete mode 100644 modules/services/nitter/default.nix

diff --git a/modules/services/nitter.nix b/modules/services/nitter.nix
new file mode 100644
index 0000000..81fcd3e
--- /dev/null
+++ b/modules/services/nitter.nix
@@ -0,0 +1,33 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.modules.services.nitter;
+in
+{
+  options.modules.services.nitter = {
+    enable = mkEnableOption "nitter instance";
+
+    title = mkOption { type = types.str; default = "Nitter"; description = "Title of the nitter instance"; };
+
+    domain = mkOption { type = types.str; };
+    realHost = mkOption { type = types.str; default = "nitter.${cfg.domain}"; };
+    secrets = {
+      nitter-guest-accounts = mkOption { type = types.path; description = "path to the JSONL file containing guest accounts"; };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.nitter = {
+      enable = true;
+
+      server = {
+        title = cfg.title;
+        address = "127.0.0.1";
+        port = 4002;
+        hostname = cfg.realHost;
+      };
+      guestAccounts = cfg.secrets.nitter-guest-accounts;
+    };
+  };
+}
diff --git a/modules/services/nitter/0001-HACK-allow-non-guest-account.patch b/modules/services/nitter/0001-HACK-allow-non-guest-account.patch
deleted file mode 100644
index 855accb..0000000
--- a/modules/services/nitter/0001-HACK-allow-non-guest-account.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 197074221a4f6ea58362d8b2523dc4b11705c7b4 Mon Sep 17 00:00:00 2001
-From: sefidel <contact@sefidel.net>
-Date: Fri, 2 Feb 2024 23:32:13 +0900
-Subject: [PATCH] HACK: allow non-guest account
-
-Signed-off-by: sefidel <contact@sefidel.net>
----
- src/auth.nim | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/auth.nim b/src/auth.nim
-index b288c50..7acb7c3 100644
---- a/src/auth.nim
-+++ b/src/auth.nim
-@@ -202,7 +202,7 @@ proc initAccountPool*(cfg: Config; path: string) =
-     quit 1
- 
-   let accountsPrePurge = accountPool.len
--  accountPool.keepItIf(not it.hasExpired)
-+  # accountPool.keepItIf(not it.hasExpired)
- 
-   log "Successfully added ", accountPool.len, " valid accounts."
-   if accountsPrePurge > accountPool.len:
--- 
-2.43.0
-
diff --git a/modules/services/nitter/default.nix b/modules/services/nitter/default.nix
deleted file mode 100644
index 40e8be8..0000000
--- a/modules/services/nitter/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-let
-  cfg = config.modules.services.nitter;
-in
-{
-  options.modules.services.nitter = {
-    enable = mkEnableOption "nitter instance";
-
-    title = mkOption { type = types.str; default = "Nitter"; description = "Title of the nitter instance"; };
-
-    domain = mkOption { type = types.str; };
-    realHost = mkOption { type = types.str; default = "nitter.${cfg.domain}"; };
-    secrets = {
-      nitter-guest-accounts = mkOption { type = types.path; description = "path to the JSONL file containing guest accounts"; };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    services.nitter = {
-      enable = true;
-
-      package = pkgs.nitter.overrideAttrs {
-        patches = [
-          ./0001-HACK-allow-non-guest-account.patch
-        ];
-      };
-
-      server = {
-        title = cfg.title;
-        address = "127.0.0.1";
-        port = 4002;
-        hostname = cfg.realHost;
-      };
-      guestAccounts = cfg.secrets.nitter-guest-accounts;
-    };
-  };
-}
-- 
cgit 1.4.1