diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | config.json.example | 13 | ||||
| -rw-r--r-- | deploy.sh | 3 | ||||
| -rw-r--r-- | main.py | 32 |
4 files changed, 33 insertions, 16 deletions
@@ -1 +1,2 @@ __pycache__/ +config.json
\ No newline at end of file diff --git a/config.json.example b/config.json.example new file mode 100644 index 0000000..8be5183 --- /dev/null +++ b/config.json.example @@ -0,0 +1,13 @@ +{ + "server": "irc.example.com", + "port": 6697, + "nickname": "ezlivebot", + "channels": [ + "#xxxxxxxxx", + "#yyyyyyyyy" + ], + "use_ssl": true, + "tgtoken": "xxxxxxx:xxxxxxxxxxxxxxxxxx", + "tgchat": -0000000000000, + "tgthread": 0000 +}
\ No newline at end of file @@ -1 +1,2 @@ -rsync -avz ./ root@raye:./ezlivebot/
\ No newline at end of file +rsync -avz ./ root@raye:./ezlivebot/ +ssh root@raye 'podman restart ezlivebot-c'
\ No newline at end of file @@ -4,26 +4,28 @@ from airc import Client, Message from aiogram import Bot, Dispatcher from aiogram.filters import Command from aiogram.types import Message +import json -SERVER = "raye.mistivia.com" -PORT = 6697 -NICKNAME = "ezlivebot" -CHANNELS = [ - "#xxxxxxxxx", - "#xxxxxxxxx" -] +config = None +with open('config.json', 'r') as fp: + config = json.load(fp) -TGTOKEN = 'xxxxxxxxx:xxxxxxxx' -TGCHAT = -0000000000000 -TGTHREAD = 000 +SERVER = config['server'] +PORT = config['port'] +NICKNAME = config['nickname'] +CHANNELS = config['channels'] +USE_SSL = config['use_ssl'] +TGTOKEN = config['tgtoken'] +TGCHAT = config['tgchat'] +TGTHREAD = config['tgthread'] # --- Instantiate the Client --- irc_client = Client( host=SERVER, port=PORT, nickname=NICKNAME, - realname="My Awesome Async Bot", - use_ssl=True + realname="bot", + use_ssl=USE_SSL ) tgbot = Bot(token=TGTOKEN) @@ -75,9 +77,9 @@ def get_sender(msg): if msg.from_user is None: return user = msg.from_user - if user.username is not None: - return user.username - if user.last_name is not None: + # if user.username is not None: + # return user.username + if user.last_name is None: return user.first_name + ' ' + user.last_name return user.first_name |