From 2a761efc9088336a59cc4092bb45311e48591044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Sat, 12 Jun 2021 16:57:42 +0200
Subject: [PATCH] feat(telegram bots): get proverb bot from telebots

---
 configs/telegram-bots/default.nix | 26 +++++++++++++++++++++++---
 configs/telegram-bots/proverb.nix | 20 --------------------
 2 files changed, 23 insertions(+), 23 deletions(-)
 delete mode 100644 configs/telegram-bots/proverb.nix

diff --git a/configs/telegram-bots/default.nix b/configs/telegram-bots/default.nix
index 4a0fea9..25294c1 100644
--- a/configs/telegram-bots/default.nix
+++ b/configs/telegram-bots/default.nix
@@ -4,20 +4,29 @@ let
     telebots-package = pkgs.fetchFromGitHub {
       owner = "kmein";
       repo = "telebots";
-      rev = "ce613f5b298721c6eaa7af25a666bd65388a0daf";
-      sha256 = "0bl02976kxjbbbmvcnjjgpmxrmpwplw9qcldxk5h3wngzixxizhg";
+      rev = "22931c9457e092c4e413555dbe61819d77844246";
+      sha256 = "0byp3w6li3fin7ry0ki4rmgkaajdil424y5pc1j7ci9mpws0s5ik";
     };
   in pkgs.callPackage telebots-package {};
+  reverseDirectory = "/run/telegram-reverse";
+  proverbDirectory = "/run/telegram-proverb";
+  inherit (import <niveum/lib>) tmpfilesConfig;
 in {
   imports = [
     ./literature-quote.nix
     ./autorenkalender.nix
-    ./proverb.nix
     ./nachtischsatan.nix
     ./tlg-wotd.nix
     <niveum/modules/telegram-bot.nix>
   ];
 
+  systemd.tmpfiles.rules = map (path: tmpfilesConfig {
+    type = "d";
+    mode = "0750";
+    age = "1h";
+    inherit path;
+  }) [ reverseDirectory proverbDirectory ];
+
   systemd.services.telegram-reverse = {
     wantedBy = [ "multi-user.target" ];
     description = "Telegram reverse bot";
@@ -26,6 +35,7 @@ in {
     enable = true;
     script = "${telebots}/bin/telegram-reverse";
     serviceConfig.Restart = "always";
+    serviceConfig.WorkingDirectory = reverseDirectory;
   };
 
   systemd.services.telegram-betacode = {
@@ -36,4 +46,14 @@ in {
     script = "${telebots}/bin/telegram-betacode";
     serviceConfig.Restart = "always";
   };
+
+  systemd.services.telegram-proverb = {
+    wantedBy = [ "multi-user.target" ];
+    description = "Telegram proverb bot";
+    environment.TELEGRAM_BOT_TOKEN = lib.strings.fileContents <system-secrets/telegram/proverb.token>;
+    enable = true;
+    script = "${telebots}/bin/telegram-proverb";
+    serviceConfig.Restart = "always";
+    serviceConfig.WorkingDirectory = proverbDirectory;
+  };
 }
diff --git a/configs/telegram-bots/proverb.nix b/configs/telegram-bots/proverb.nix
deleted file mode 100644
index d562c53..0000000
--- a/configs/telegram-bots/proverb.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, lib, ... }:
-let
-  proverb-bot-package = pkgs.fetchFromGitHub {
-    owner = "kmein";
-    repo = "proverb-pro";
-    rev = "f4201c5419354377a26b7f7873368683efbea417";
-    sha256 = "1ixffmxy3sxy2if7fd44ps451rds14hnz4d0x9nkh8lzshqk6v4y";
-  };
-  telegram-proverb = pkgs.python3Packages.callPackage proverb-bot-package { };
-in {
-  systemd.services.telegram-proverb = {
-    wantedBy = [ "multi-user.target" ];
-    description = "Telegram bot for generating inspiring but useless proverbs";
-    environment.TELEGRAM_PROVERB_TOKEN =
-      lib.strings.fileContents <system-secrets/telegram/proverb.token>;
-    enable = true;
-    script = "${telegram-proverb}/bin/proverb_bot.py";
-    serviceConfig.Restart = "always";
-  };
-}