mirror of
https://github.com/Fluffy-Bean/Lynxie.git
synced 2025-06-01 00:03:14 +00:00
Clean up config.py and __main__.py
This commit is contained in:
parent
960f452e4a
commit
8bcde69224
2 changed files with 21 additions and 73 deletions
|
@ -4,9 +4,9 @@ import discord
|
|||
from discord.ext import commands
|
||||
from discord.gateway import DiscordWebSocket
|
||||
|
||||
from lynxie.config import DISCORD_TOKEN, LYNXIE_PREFIX, E621_BLACKLIST
|
||||
from lynxie.config import DISCORD_TOKEN, LYNXIE_PREFIX
|
||||
from lynxie.database import CommandHistory, Database
|
||||
from lynxie.utils import mobile_status
|
||||
from lynxie.utils import mobile_status, error_message
|
||||
from lynxie.commands import Help, Ping, Hello, Music, Animals, Img, E621
|
||||
|
||||
|
||||
|
@ -23,32 +23,6 @@ lynxie = commands.Bot(
|
|||
async def on_ready():
|
||||
print(f"Logged in as {lynxie.user} (ID: {lynxie.user.id})")
|
||||
|
||||
in_guilds = "In Guilds: " + str(len(lynxie.guilds))
|
||||
commands_used = "Commands called: " + str(
|
||||
db.session.query(CommandHistory.user).count()
|
||||
)
|
||||
unique_users = "Unique Users: " + str(
|
||||
db.session.query(CommandHistory.user).distinct().count()
|
||||
)
|
||||
blacklisted_words = "Blacklisted Words: " + str(len(E621_BLACKLIST))
|
||||
|
||||
bar_len = (
|
||||
max(
|
||||
len(in_guilds),
|
||||
len(commands_used),
|
||||
len(unique_users),
|
||||
len(blacklisted_words),
|
||||
)
|
||||
+ 4
|
||||
)
|
||||
|
||||
print("---- Stats " + "-" * (bar_len - 11))
|
||||
print(f"| {in_guilds}{' ' * (bar_len - len(in_guilds) - 3)}|")
|
||||
print(f"| {commands_used}{' ' * (bar_len - len(commands_used) - 3)}|")
|
||||
print(f"| {unique_users}{' ' * (bar_len - len(unique_users) - 3)}|")
|
||||
print(f"| {blacklisted_words}{' ' * (bar_len - len(blacklisted_words) - 3)}|")
|
||||
print("-" * bar_len)
|
||||
|
||||
|
||||
@lynxie.event
|
||||
async def on_command(ctx):
|
||||
|
@ -68,13 +42,10 @@ async def on_command(ctx):
|
|||
|
||||
|
||||
@lynxie.event
|
||||
async def on_message_edit(before, after):
|
||||
if (
|
||||
before.author == lynxie.user
|
||||
or before.author.bot
|
||||
or before.content == after.content
|
||||
):
|
||||
return
|
||||
async def on_command_error(ctx, error):
|
||||
print(error)
|
||||
error = "An internal error occurred while processing your command, oopsie..."
|
||||
await ctx.reply(embed=error_message(error), delete_after=5)
|
||||
|
||||
|
||||
async def run():
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue