Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/aggregator.service
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Unit]
Description=Makerspace Leiden Aggregator
After=network.target redis.service signal.service
After=network.target redis.service

[Service]
Type=simple
Expand Down
5 changes: 0 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ aiocron==1.6
# Development tools
croniter==1.0.13

# Signal BOT
dbussy==1.3

# Human-readable time deltas
humanize==3.5.0

Expand All @@ -19,8 +16,6 @@ pytest
pytest-cov
python-daemon==2.3.0

# Telegram BOT
python-telegram-bot==13.5
quart==0.15.1
redis==3.5.3
requests==2.31.0
5 changes: 0 additions & 5 deletions server-dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,6 @@
"email": {
"from_address": "MakerSpace BOT <noc@makerspaceleiden.nl>",
},
# 'telegram_bot': {
# 'api_token': os.environ['TELEGRAM_BOT_API'],
# },
# 'signal_bot': {
# },
}


Expand Down
7 changes: 0 additions & 7 deletions server-prod.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"key_prefix": "msl",
"users_expiration_time_in_sec": 60,
"pending_machine_activation_timeout_in_sec": 90,
"telegram_token_expiration_in_sec": 5 * 60, # 5 minutes
"machine_state_timeout_in_minutes": 60, # 1 hour
"history_lines_expiration_in_days": 7,
},
Expand Down Expand Up @@ -68,12 +67,6 @@
"email": {
"from_address": "MakerSpace BOT <noc@makerspaceleiden.nl>",
},
"telegram_bot": {
"api_token": os.environ["TELEGRAM_BOT_API"],
},
"signal_bot": {
"some": "config",
},
}


Expand Down
128 changes: 0 additions & 128 deletions src/aggregator/bots/bot_logic.py

This file was deleted.

76 changes: 0 additions & 76 deletions src/aggregator/bots/signal_bot.py

This file was deleted.

125 changes: 0 additions & 125 deletions src/aggregator/bots/telegram_bot.py

This file was deleted.

Loading