ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-24 03:54:20 +00:00
Code Activity

Immagino di aver fixato il bot veramente

Browse source
This commit is contained in:
Steffo 2018-04-15 13:50:51 +02:00
parent c28888c375
commit 47487afb56
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
discordbot.py
View file

@ -98,12 +98,14 @@ class Video:
if __debug__: if __debug__:
version = "Dev" version = "Dev"
commit_msg = "_in sviluppo_"
else: else:
# Find the latest git tag # Find the latest git tag
old_wd = os.getcwd() old_wd = os.getcwd()
try: try:
os.chdir(os.path.dirname(__file__)) os.chdir(os.path.dirname(__file__))
version = str(subprocess.check_output(["git", "describe", "--tags"]), encoding="utf8").strip() version = str(subprocess.check_output(["git", "describe", "--tags"]), encoding="utf8").strip()
commit_msg = str(subprocess.check_output(["git", "log", "-1", "--pretty=%B"]), encoding="utf8").strip()
except Exception: except Exception:
version = "❓" version = "❓"
finally: finally:
@ -155,7 +157,8 @@ async def on_error(event, *args, **kwargs):
@client.event @client.event
async def on_ready(): async def on_ready():
await client.send_message(client.get_channel(config["Discord"]["main_channel"]), await client.send_message(client.get_channel(config["Discord"]["main_channel"]),
f"ℹ Royal Bot {version} avviato e pronto a ricevere comandi!") f"ℹ Royal Bot avviato e pronto a ricevere comandi!\n"
f"Ultimo aggiornamento: `{version}: {commit_msg}`")
await client.change_presence(game=None, status=discord.Status.online) await client.change_presence(game=None, status=discord.Status.online)

6
telegrambot.py
View file

@ -22,12 +22,14 @@ discord_connection = None
# Find the latest git tag # Find the latest git tag
if __debug__: if __debug__:
version = "Dev" version = "Dev"
commit_msg = "_in sviluppo_"
else: else:
# Find the latest git tag # Find the latest git tag
old_wd = os.getcwd() old_wd = os.getcwd()
try: try:
os.chdir(os.path.dirname(__file__)) os.chdir(os.path.dirname(__file__))
version = str(subprocess.check_output(["git", "describe", "--tags"]), encoding="utf8").strip() version = str(subprocess.check_output(["git", "describe", "--tags"]), encoding="utf8").strip()
commit_msg = str(subprocess.check_output(["git", "log", "-1", "--pretty=%B"]), encoding="utf8").strip()
except Exception: except Exception:
version = "❓" version = "❓"
finally: finally:
@ -376,7 +378,9 @@ def process(arg_discord_connection):
u.dispatcher.add_handler(CommandHandler("vote", cmd_vote)) u.dispatcher.add_handler(CommandHandler("vote", cmd_vote))
u.dispatcher.add_handler(CommandHandler("ban", cmd_ban)) u.dispatcher.add_handler(CommandHandler("ban", cmd_ban))
u.dispatcher.add_handler(CallbackQueryHandler(on_callback_query)) u.dispatcher.add_handler(CallbackQueryHandler(on_callback_query))
u.bot.send_message(config["Telegram"]["main_group"], f"ℹ Royal Bot {version} avviato e pronto a ricevere comandi!") u.bot.send_message(config["Telegram"]["main_group"],
f"ℹ Royal Bot avviato e pronto a ricevere comandi!\n"
f"Ultimo aggiornamento: `{version}: {commit_msg}`")
while True: while True:
try: try:
u.start_polling() u.start_polling()