From f9572d4cd28a8a48f667492735f80dbcff4499fb Mon Sep 17 00:00:00 2001 From: Jocadbz Date: Thu, 19 Jan 2023 22:03:35 -0300 Subject: [PATCH 1/4] Add feature to display who reported the message --- bot.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bot.py b/bot.py index 91604b9..7718a5f 100644 --- a/bot.py +++ b/bot.py @@ -94,6 +94,7 @@ async def report_message(interaction: discord.Interaction, message: discord.Mess embed.timestamp = message.created_at url_view = discord.ui.View() url_view.add_item(discord.ui.Button(label='Go to Message', style=discord.ButtonStyle.url, url=message.jump_url)) + embed.add_field(name="Reported by:", value=interaction.user, inline=False) await log_channel.send(embed=embed, view=url_view) From 280188cc9ff56c2b1e0a80df64e6af6e6a1e5a93 Mon Sep 17 00:00:00 2001 From: Jocadbz Date: Thu, 19 Jan 2023 22:15:19 -0300 Subject: [PATCH 2/4] Rewrite the status command --- bot.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bot.py b/bot.py index 7718a5f..846c6d4 100644 --- a/bot.py +++ b/bot.py @@ -101,9 +101,12 @@ async def report_message(interaction: discord.Interaction, message: discord.Mess @client.tree.command(name="status") async def status(interaction: discord.Interaction): embed = discord.Embed(title='System Stats') - embed.description = f"""Uptime: {seconds_elapsed()} -System: {sys.platform}""" + embed.add_field(name="Uptime:", value=seconds_elapsed(), inline=True) + embed.add_field(name="System:", value=sys.platform, inline=True) + embed.add_field(name="Version:", value="v1.2.0", inline=True) url_view = discord.ui.View() + url_view.add_item(discord.ui.Button(label='See the source code', style=discord.ButtonStyle.url, url="https://lostcave.ddnss.de/git/jocadbz/os-release-bot")) + url_view.add_item(discord.ui.Button(label='Report a issue', style=discord.ButtonStyle.url, url="https://lostcave.ddnss.de/git/jocadbz/os-release-bot/issues")) await interaction.response.send_message(embed=embed, view=url_view) print("Status queried.") From b9b2c050c3e20760beddc6c090f6ef1b69d2694b Mon Sep 17 00:00:00 2001 From: Jan Danielzick Date: Sat, 21 Jan 2023 19:57:45 +0000 Subject: [PATCH 3/4] Remove useless information from status command and make it configurable --- bot.py | 9 ++++----- config.json | 6 +++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bot.py b/bot.py index 846c6d4..87ad6cc 100644 --- a/bot.py +++ b/bot.py @@ -100,13 +100,12 @@ async def report_message(interaction: discord.Interaction, message: discord.Mess @client.tree.command(name="status") async def status(interaction: discord.Interaction): - embed = discord.Embed(title='System Stats') + embed = discord.Embed(title='/etc/os-release bot by jocadbz') embed.add_field(name="Uptime:", value=seconds_elapsed(), inline=True) - embed.add_field(name="System:", value=sys.platform, inline=True) - embed.add_field(name="Version:", value="v1.2.0", inline=True) + embed.add_field(name="Version:", value=config["bot version"], inline=True) + embed.set_footer(text=config["bot issues"]) url_view = discord.ui.View() - url_view.add_item(discord.ui.Button(label='See the source code', style=discord.ButtonStyle.url, url="https://lostcave.ddnss.de/git/jocadbz/os-release-bot")) - url_view.add_item(discord.ui.Button(label='Report a issue', style=discord.ButtonStyle.url, url="https://lostcave.ddnss.de/git/jocadbz/os-release-bot/issues")) + url_view.add_item(discord.ui.Button(label='View source...', style=discord.ButtonStyle.url, url=config["bot source url"])) await interaction.response.send_message(embed=embed, view=url_view) print("Status queried.") diff --git a/config.json b/config.json index c93c520..ebc5717 100644 --- a/config.json +++ b/config.json @@ -4,5 +4,9 @@ "assign0": 1063506453308125274, "assign1": 1063506544962064414 }, - "report channel": 1063507041697677312 + "report channel": 1063507041697677312, + + "bot version": "v1.3", + "bot issues": "Please report issues to BodgeMaster or jocadbz.", + "bot source url": "https://lostcave.ddnss.de/git/jocadbz/os-release-bot" } From a22bbdc1c5acc32330be701e008ed32c6493b8d9 Mon Sep 17 00:00:00 2001 From: Jan Danielzick Date: Sat, 21 Jan 2023 19:58:24 +0000 Subject: [PATCH 4/4] Make uptime readable --- bot.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bot.py b/bot.py index 87ad6cc..51eff1e 100644 --- a/bot.py +++ b/bot.py @@ -2,7 +2,7 @@ # Code revised by BodgeMaster # Code Licensed under GPL 3.0 -import sys, time, json +import sys, time, json, datetime import discord from discord import app_commands @@ -16,8 +16,8 @@ config_file = open("config.json", "r") config = json.loads(config_file.read()); config_file.close() -def seconds_elapsed(): - return int(time.time() - BOOT_TIME) +def uptime(): + return str(datetime.timedelta(seconds=int(time.time() - BOOT_TIME))) class MyClient(discord.Client): @@ -101,7 +101,7 @@ async def report_message(interaction: discord.Interaction, message: discord.Mess @client.tree.command(name="status") async def status(interaction: discord.Interaction): embed = discord.Embed(title='/etc/os-release bot by jocadbz') - embed.add_field(name="Uptime:", value=seconds_elapsed(), inline=True) + embed.add_field(name="Uptime:", value=uptime(), inline=True) embed.add_field(name="Version:", value=config["bot version"], inline=True) embed.set_footer(text=config["bot issues"]) url_view = discord.ui.View()