From daef8b79d460755869c26314bcce6e1f91444caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kmein@posteo.de>
Date: Sat, 12 Jun 2021 14:21:09 +0200
Subject: [PATCH] feat(telegram bots): update

---
 configs/telegram-bots/default.nix | 42 ++++++++-----------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/configs/telegram-bots/default.nix b/configs/telegram-bots/default.nix
index 81d7245..4a0fea9 100644
--- a/configs/telegram-bots/default.nix
+++ b/configs/telegram-bots/default.nix
@@ -4,20 +4,10 @@ let
     telebots-package = pkgs.fetchFromGitHub {
       owner = "kmein";
       repo = "telebots";
-      rev = "b4276155114ee96cd3f320e361e52952ea700db6";
-      sha256 = "08rp1pcisk4zzhxdlgrlhxa0sbza5qhxa70rjycg4r7fmixkkbz2";
+      rev = "ce613f5b298721c6eaa7af25a666bd65388a0daf";
+      sha256 = "0bl02976kxjbbbmvcnjjgpmxrmpwplw9qcldxk5h3wngzixxizhg";
     };
-  in {
-    reverse =
-      pkgs.python3Packages.callPackage "${telebots-package}/telegram-reverse"
-      { };
-    odyssey =
-      pkgs.python3Packages.callPackage "${telebots-package}/telegram-odyssey"
-      { };
-    betacode =
-      pkgs.python3Packages.callPackage "${telebots-package}/telegram-betacode"
-      { };
-  };
+  in pkgs.callPackage telebots-package {};
 in {
   imports = [
     ./literature-quote.nix
@@ -28,34 +18,22 @@ in {
     <niveum/modules/telegram-bot.nix>
   ];
 
-  systemd.services.telegram-odyssey = {
-    wantedBy = [ "multi-user.target" ];
-    description = "Telegram bot reciting the Odyssey to you";
-    environment.TELEGRAM_ODYSSEY_TOKEN =
-      lib.strings.fileContents <system-secrets/telegram/odyssey.token>;
-    enable = true;
-    script = "${telebots.odyssey}/bin/telegram-odyssey";
-    serviceConfig.Restart = "always";
-  };
-
   systemd.services.telegram-reverse = {
     wantedBy = [ "multi-user.target" ];
-    description = "Telegram bot for reversing things";
-    environment.TELEGRAM_REVERSE_TOKEN =
-      lib.strings.fileContents <system-secrets/telegram/reverse.token>;
+    description = "Telegram reverse bot";
+    path = [ pkgs.ffmpeg ];
+    environment.TELEGRAM_BOT_TOKEN = lib.strings.fileContents <system-secrets/telegram/reverse.token>;
     enable = true;
-    script = "${telebots.reverse}/bin/telegram-reverse";
+    script = "${telebots}/bin/telegram-reverse";
     serviceConfig.Restart = "always";
   };
 
   systemd.services.telegram-betacode = {
     wantedBy = [ "multi-user.target" ];
-    description =
-      "Telegram bot for converting Ancient Greek betacode into unicode";
-    environment.TELEGRAM_BETACODE_TOKEN =
-      lib.strings.fileContents <system-secrets/telegram/betacode.token>;
+    description = "Telegram beta code bot";
+    environment.TELEGRAM_BOT_TOKEN = lib.strings.fileContents <system-secrets/telegram/betacode.token>;
     enable = true;
-    script = "${telebots.betacode}/bin/telegram-betacode";
+    script = "${telebots}/bin/telegram-betacode";
     serviceConfig.Restart = "always";
   };
 }