mirror of
https://github.com/kmein/niveum
synced 2026-03-16 10:11:08 +01:00
Compare commits
4 Commits
1d7a432bec
...
78e9bedcb4
| Author | SHA1 | Date | |
|---|---|---|---|
| 78e9bedcb4 | |||
| d5cdbf3795 | |||
| bcb5949e15 | |||
| dd61883648 |
@@ -11,6 +11,11 @@ let
|
|||||||
Server = "irc.freenode.net:6667";
|
Server = "irc.freenode.net:6667";
|
||||||
Nick = "tg_bridge";
|
Nick = "tg_bridge";
|
||||||
};
|
};
|
||||||
|
mumble.lassulus = {
|
||||||
|
Server = "lassul.us:64738";
|
||||||
|
Nick = "krebs_bridge";
|
||||||
|
SkipTLSVerify = true;
|
||||||
|
};
|
||||||
gateway = [
|
gateway = [
|
||||||
{
|
{
|
||||||
name = "krebs-bridge";
|
name = "krebs-bridge";
|
||||||
@@ -24,6 +29,10 @@ let
|
|||||||
account = "telegram.kmein";
|
account = "telegram.kmein";
|
||||||
channel = "-330372458";
|
channel = "-330372458";
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
account = "mumble.lassulus";
|
||||||
|
channel = 6; # "nixos"
|
||||||
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
@@ -44,7 +53,17 @@ let
|
|||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [ (import <niveum/overlays/toml.nix>) ];
|
nixpkgs.overlays = [
|
||||||
|
(import <niveum/overlays/toml.nix>)
|
||||||
|
(self: super: {
|
||||||
|
matterbridge = (import (super.fetchFromGitHub {
|
||||||
|
owner = "NixOS";
|
||||||
|
repo = "nixpkgs";
|
||||||
|
rev = "e45d91ee65db293a172ec506759d1248e40c35f5";
|
||||||
|
sha256 = "03cjs5xcx09lw0djyrx2kfakw7gkg4iqmy9w25azai62im39l30k";
|
||||||
|
}) {}).matterbridge;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
services.matterbridge = {
|
services.matterbridge = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ in {
|
|||||||
home-manager.users.me = {
|
home-manager.users.me = {
|
||||||
services.random-background = {
|
services.random-background = {
|
||||||
enable = true;
|
enable = true;
|
||||||
imageDirectory = "${kmein-wallpapers}/saudade";
|
imageDirectory = "${kmein-wallpapers}/meteora";
|
||||||
interval = "1h";
|
interval = "1h";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ python3Packages.buildPythonApplication rec {
|
|||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./readchar-version.patch
|
./readchar-version.patch
|
||||||
|
./telegram-format.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
propagatedBuildInputs = with python3Packages; [
|
||||||
|
|||||||
45
packages/moodle-dl/telegram-format.patch
Normal file
45
packages/moodle-dl/telegram-format.patch
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
diff --git a/moodle_dl/notification_services/telegram/telegram_formater.py b/moodle_dl/notification_services/telegram/telegram_formater.py
|
||||||
|
index 05180b6..3ae898e 100644
|
||||||
|
--- a/moodle_dl/notification_services/telegram/telegram_formater.py
|
||||||
|
+++ b/moodle_dl/notification_services/telegram/telegram_formater.py
|
||||||
|
@@ -15,10 +15,10 @@ def create_full_moodle_diff_message(changed_courses: [Course]) -> [str]:
|
||||||
|
diff_count += len(course.files)
|
||||||
|
|
||||||
|
result_list = []
|
||||||
|
- one_msg_content = '%s new Changes in the Moodle courses!' % (diff_count)
|
||||||
|
+ one_msg_content = "%s changes in Moodle!" % (diff_count)
|
||||||
|
|
||||||
|
for course in changed_courses:
|
||||||
|
- new_line = '\r\n\r\n\r\n> <b>' + course.fullname + '</b>\r\n'
|
||||||
|
+ new_line = "\r\n\r\n\r\n> <b>" + course.fullname + "</b>\r\n"
|
||||||
|
if len(one_msg_content) + len(new_line) >= 4096:
|
||||||
|
result_list.append(one_msg_content)
|
||||||
|
one_msg_content = new_line
|
||||||
|
@@ -27,16 +27,16 @@ def create_full_moodle_diff_message(changed_courses: [Course]) -> [str]:
|
||||||
|
|
||||||
|
for file in course.files:
|
||||||
|
if file.modified:
|
||||||
|
- new_line = '\r\n<i>* Modified:</i> ' + file.saved_to
|
||||||
|
+ new_line = "\r\n✍️ " + file.saved_to
|
||||||
|
elif file.moved:
|
||||||
|
if file.new_file is not None:
|
||||||
|
- new_line = '\r\n<i>* Moved:</i> ' + file.new_file.saved_to
|
||||||
|
+ new_line = "\r\n📂 " + file.new_file.saved_to
|
||||||
|
else:
|
||||||
|
- new_line = '\r\n<i>* Moved:</i> ' + file.saved_to
|
||||||
|
+ new_line = "\r\n📂 " + file.saved_to
|
||||||
|
elif file.deleted:
|
||||||
|
- new_line = '\r\n<i>- Deleted:</i> ' + file.saved_to
|
||||||
|
+ new_line = "\r\n🗑️ " + file.saved_to
|
||||||
|
else:
|
||||||
|
- new_line = '\r\n<i>+ Added:</i> ' + file.saved_to
|
||||||
|
+ new_line = "\r\n🎉 " + file.saved_to
|
||||||
|
|
||||||
|
if len(one_msg_content) + len(new_line) >= 4096:
|
||||||
|
result_list.append(one_msg_content)
|
||||||
|
@@ -52,4 +52,4 @@ def create_full_error_message(details) -> (str, {str: str}):
|
||||||
|
"""
|
||||||
|
Creates an error message
|
||||||
|
"""
|
||||||
|
- return 'The following error occurred during execution:' + details
|
||||||
|
+ return "The following error occurred during execution:" + details
|
||||||
@@ -13,6 +13,7 @@ in
|
|||||||
<niveum/configs/version.nix>
|
<niveum/configs/version.nix>
|
||||||
<niveum/configs/urlwatch.nix>
|
<niveum/configs/urlwatch.nix>
|
||||||
<niveum/configs/gitea.nix>
|
<niveum/configs/gitea.nix>
|
||||||
|
<niveum/configs/matterbridge.nix>
|
||||||
<niveum/modules/retiolum.nix>
|
<niveum/modules/retiolum.nix>
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ in {
|
|||||||
<niveum/configs/tmux.nix>
|
<niveum/configs/tmux.nix>
|
||||||
<niveum/configs/version.nix>
|
<niveum/configs/version.nix>
|
||||||
<niveum/configs/traadfri.nix>
|
<niveum/configs/traadfri.nix>
|
||||||
<niveum/configs/matterbridge.nix>
|
|
||||||
<niveum/modules/retiolum.nix>
|
<niveum/modules/retiolum.nix>
|
||||||
<niveum/modules/telegram-bot.nix>
|
<niveum/modules/telegram-bot.nix>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -9,5 +9,8 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
zramSwap.enable = true;
|
swapDevices = [{
|
||||||
|
device = "/swapfile";
|
||||||
|
size = 1024;
|
||||||
|
}];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user