mirror of
https://github.com/myned/modufur.git
synced 2024-12-24 14:27:27 +00:00
Remove extraneous testing code and clean formatting
This commit is contained in:
Myned
parent
33c6f8e797
commit
1a014d4e65
2 changed files with 38 additions and 146 deletions
164
src/run.py
164
src/run.py
|
|
@ -1,18 +1,11 @@
|
|||
import asyncio
|
||||
from datetime import datetime as dt
|
||||
import json
|
||||
import logging as log
|
||||
import subprocess
|
||||
import sys
|
||||
import traceback as tb
|
||||
from contextlib import suppress
|
||||
from pprint import pprint
|
||||
from hurry.filesize import size, alternative
|
||||
from urllib.parse import urlparse
|
||||
|
||||
import discord as d
|
||||
from discord import errors as err
|
||||
from discord import utils
|
||||
from discord.ext import commands as cmds
|
||||
from discord.ext.commands import errors as errext
|
||||
|
||||
|
|
@ -23,68 +16,42 @@ from utils import utils as u
|
|||
log.basicConfig(level=log.WARNING)
|
||||
|
||||
|
||||
# class HelpFormatter(cmds.HelpFormatter):
|
||||
#
|
||||
# async def format(self):
|
||||
# self._paginator = cmds.Paginator()
|
||||
#
|
||||
# # we need a padding of ~80 or so
|
||||
#
|
||||
# description = self.command.description if not self.is_cog() else inspect.getdoc(self.command)
|
||||
#
|
||||
# if description:
|
||||
# # <description> portion
|
||||
# self._paginator.add_line(description, empty=True)
|
||||
#
|
||||
# if isinstance(self.command, cmds.Command):
|
||||
# # <signature portion>
|
||||
# signature = self.get_command_signature()
|
||||
# self._paginator.add_line(signature, empty=True)
|
||||
#
|
||||
# # <long doc> section
|
||||
# if self.command.help:
|
||||
# self._paginator.add_line(self.command.help, empty=True)
|
||||
#
|
||||
# # end it here if it's just a regular command
|
||||
# if not self.has_subcommands():
|
||||
# self._paginator.close_page()
|
||||
# return self._paginator.pages
|
||||
#
|
||||
# max_width = self.max_name_size
|
||||
|
||||
|
||||
def get_prefix(bot, message):
|
||||
with suppress(AttributeError):
|
||||
return u.settings['prefixes'].get(message.guild.id, u.config['prefix'])
|
||||
return u.config['prefix']
|
||||
|
||||
bot = cmds.Bot(command_prefix=get_prefix, self_bot=u.config['selfbot'], formatter=cmds.HelpFormatter(show_check_failure=True), description='Modufur - A booru bot with a side of management and automated tasking\nMade by @Myned#3985\n\nNSFW for Not Safe For Wumpus commands\n(G) for group commands\n@permission@ for required permissions\n!notice! for important information\np for prefix\n\n\{\} for mandatory argument\n[] for optional argument\n... for one or more arguments', help_attrs={'aliases': ['h']}, pm_help=None)
|
||||
|
||||
@bot.command(help='help', brief='brief', description='description', usage='usage', hidden=True)
|
||||
async def test(ctx):
|
||||
await ctx.send('test')
|
||||
|
||||
# Send and print ready message to #testing and console after logon
|
||||
bot = cmds.Bot(
|
||||
command_prefix=get_prefix,
|
||||
self_bot=u.config['selfbot'],
|
||||
description='Modufur - A booru bot with a side of management and automated tasking'
|
||||
'\nMade by @Myned#3985',
|
||||
help_attrs={'aliases': ['h']}, pm_help=None)
|
||||
|
||||
|
||||
@bot.event
|
||||
async def on_ready():
|
||||
if not checks.ready:
|
||||
# d.opus.load_opus('opuslib')
|
||||
|
||||
from cogs import booru, info, management, owner, tools
|
||||
|
||||
for cog in (tools.Utils(bot), owner.Bot(bot), owner.Tools(bot), management.Administration(bot), info.Info(bot), booru.MsG(bot)):
|
||||
for cog in (
|
||||
tools.Utils(bot),
|
||||
owner.Bot(bot),
|
||||
owner.Tools(bot),
|
||||
management.Administration(bot),
|
||||
info.Info(bot),
|
||||
booru.MsG(bot)):
|
||||
bot.add_cog(cog)
|
||||
u.cogs[type(cog).__name__] = cog
|
||||
print(f'COG : {type(cog).__name__}')
|
||||
|
||||
# bot.loop.create_task(u.clear(booru.temp_urls, 30*60))
|
||||
|
||||
if u.config['playing'] is not '':
|
||||
await bot.change_presence(activity=d.Game(u.config['playing']))
|
||||
|
||||
print('\n> > > > > > > > >\nC O N N E C T E D : {}\n> > > > > > > > >\n'.format(bot.user.name))
|
||||
print('\n> > > > > > > > >'
|
||||
f'\nC O N N E C T E D : {bot.user.name}'
|
||||
'\n> > > > > > > > >\n')
|
||||
|
||||
try:
|
||||
if u.temp['startup']:
|
||||
|
|
@ -114,7 +81,7 @@ async def on_ready():
|
|||
for channel in u.tasks['auto_del']:
|
||||
temp = bot.get_channel(channel)
|
||||
bot.loop.create_task(u.cogs['Administration'].queue_for_deletion(temp))
|
||||
print('RESTARTED : auto-deleting in #{}'.format(temp.name))
|
||||
print(f'RESTARTED : auto-deleting in #{temp.name}')
|
||||
u.cogs['Administration'].deleting = True
|
||||
bot.loop.create_task(u.cogs['Administration'].delete())
|
||||
|
||||
|
|
@ -137,9 +104,9 @@ async def on_message(message):
|
|||
|
||||
@bot.event
|
||||
async def on_error(error, *args, **kwargs):
|
||||
print('\n! ! ! ! !\nE R R O R : {}\n! ! ! ! !\n'.format(sys.exc_info()[1].text), file=sys.stderr)
|
||||
print(f'\n! ! ! ! !\nE R R O R : {sys.exc_info()[1].text}\n! ! ! ! !\n', file=sys.stderr)
|
||||
tb.print_exc()
|
||||
await bot.get_user(u.config['owner_id']).send('**ERROR** \N{WARNING SIGN}\n```\n{}```'.format(error))
|
||||
await bot.get_user(u.config['owner_id']).send(f'**ERROR** \N{WARNING SIGN}\n```\n{error}```')
|
||||
|
||||
if u.temp['startup']:
|
||||
u.temp.clear()
|
||||
|
|
@ -171,41 +138,42 @@ async def on_command_error(ctx, error):
|
|||
await ctx.send('**Insufficient permissions**')
|
||||
await u.add_reaction(ctx.message, '\N{NO ENTRY}')
|
||||
elif isinstance(error, errext.CommandNotFound):
|
||||
print('INVALID COMMAND : {}'.format(error), file=sys.stderr)
|
||||
print(f'INVALID COMMAND : {error}', file=sys.stderr)
|
||||
await u.add_reaction(ctx.message, '\N{BLACK QUESTION MARK ORNAMENT}')
|
||||
else:
|
||||
print('\n! ! ! ! ! ! ! ! ! ! ! !\nC O M M A N D E R R O R : {}\n! ! ! ! ! ! ! ! ! ! ! !\n'.format(error), file=sys.stderr)
|
||||
print('\n! ! ! ! ! ! ! ! ! ! ! !'
|
||||
f'\nC O M M A N D E R R O R : {error}'
|
||||
'\n! ! ! ! ! ! ! ! ! ! ! !\n', file=sys.stderr)
|
||||
tb.print_exception(type(error), error, error.__traceback__, file=sys.stderr)
|
||||
await bot.get_user(u.config['owner_id']).send('**COMMAND ERROR** \N{WARNING SIGN} `{}` from {} in {}\n```\n{}```'.format(ctx.message.content, ctx.author.mention, ctx.channel.mention if isinstance(ctx.channel, d.channel.TextChannel) else 'DMs', error))
|
||||
await bot.get_user(u.config['owner_id']).send(
|
||||
'**COMMAND ERROR** \N{WARNING SIGN}'
|
||||
f'`{ctx.message.content}`'
|
||||
f'from {ctx.author.mention}'
|
||||
f'in {ctx.channel.mention if isinstance(ctx.channel, d.channel.TextChannel) else "DMs"}'
|
||||
'\n```\n'
|
||||
f'{error}```')
|
||||
await exc.send_error(ctx, error)
|
||||
await u.add_reaction(ctx.message, '\N{WARNING SIGN}')
|
||||
|
||||
# @bot.event
|
||||
# async def on_command(ctx):
|
||||
# if ctx.guild.id in u.settings['del_resp']:
|
||||
# pass
|
||||
|
||||
@bot.event
|
||||
async def on_command_completion(ctx):
|
||||
with suppress(err.NotFound):
|
||||
with suppress(AttributeError):
|
||||
if ctx.guild.id in u.settings['del_ctx'] and ctx.me.permissions_in(ctx.channel).manage_messages and isinstance(ctx.message.channel, d.TextChannel):
|
||||
if ctx.guild.id in u.settings['del_ctx'] and ctx.me.permissions_in(ctx.channel).manage_messages:
|
||||
await ctx.message.delete()
|
||||
|
||||
# with suppress(err.Forbidden):
|
||||
# await u.add_reaction(ctx.message, '\N{WHITE HEAVY CHECK MARK}')
|
||||
|
||||
for command in ('lastcommand', ',restart', ',die'):
|
||||
if ctx.command.name == command:
|
||||
return
|
||||
|
||||
u.last_commands[ctx.author.id] = ctx
|
||||
|
||||
|
||||
@bot.event
|
||||
async def on_guild_join(guild):
|
||||
if str(guild.id) in u.block['guild_ids']:
|
||||
print(f'LEAVING : {guild.name}')
|
||||
await guild.leave()
|
||||
else:
|
||||
print(f'JOINING : {guild.name}')
|
||||
|
||||
|
||||
@bot.event
|
||||
async def on_guild_remove(guild):
|
||||
|
|
@ -219,70 +187,10 @@ async def on_guild_remove(guild):
|
|||
u.dump(u.tasks, 'cogs/tasks.pkl')
|
||||
|
||||
|
||||
async def wait(voice):
|
||||
asyncio.sleep(5)
|
||||
await voice.disconnect()
|
||||
|
||||
|
||||
def after(voice, error):
|
||||
coro = voice.disconnect()
|
||||
future = asyncio.run_coroutine_threadsafe(coro, voice.loop)
|
||||
future.result()
|
||||
|
||||
# suggested = u.setdefault('cogs/suggested.pkl', {'last_update': 'None', 'tags': {}, 'total': 0})
|
||||
@bot.command(name=',test', hidden=True)
|
||||
@cmds.is_owner()
|
||||
async def test(ctx):
|
||||
post = await u.fetch('https://e621.net/post/show.json?id=1145042', json=True)
|
||||
pass
|
||||
|
||||
tags = []
|
||||
if post['tags']:
|
||||
temptags = post['tags'].split(' ')
|
||||
cis = []
|
||||
# for tag in suggested:
|
||||
# pass
|
||||
for tag in temptags:
|
||||
tags.append(f'[{tag}](https://e621.net/post?tags={tag})')
|
||||
# tags = ' '.join(tags)
|
||||
else:
|
||||
tags = 'None'
|
||||
|
||||
if post['description']:
|
||||
post_description = post['description'] if len(post['description']) < 200 else f'{post["description"][:200]}...'
|
||||
else:
|
||||
post_description = 'None'
|
||||
|
||||
title = ', '.join(post['artist'])
|
||||
description = f'posted by: *[{post["author"]}](https://e621.net/post?tags=user:{post["author"]})*'
|
||||
url = f'https://e621.net/post?tags={",".join(post["artist"])}'
|
||||
# timestamp = dt.utcnow()
|
||||
color = ctx.me.color
|
||||
footer = {'text': post['score'], 'icon_url': 'https://images-ext-1.discordapp.net/external/W2k0ZzhU7ngvN_-CdqAa3H3FmkfCNYQTxPG_DsvacB4/https/emojipedia-us.s3.amazonaws.com/thumbs/320/twitter/103/sparkles_2728.png'}
|
||||
# image = 'https://e621.net/post/show/54360'
|
||||
thumbnail = post['file_url']
|
||||
author = {'name': post['id'], 'url': f'https://e621.net/post/show/{post["id"]}', 'icon_url': ctx.author.avatar_url}
|
||||
|
||||
fields = []
|
||||
names = ('File', 'Sources', 'Description', 'tags', 'tags (ext.)')
|
||||
values = (f'[{post["md5"]}]({post["file_url"]}) | [{post["file_ext"]}](https://e621.net/post?tags=type:{post["file_ext"]})\n\n**Size** [{size(post["file_size"], system=alternative)}](https://e621.net/post?tags=filesize:{post["file_size"]})\n**Resolution** [{post["width"]} x {post["height"]}](https://e621.net/post?tags=width:{post["width"]},height:{post["height"]}) | [{u.get_aspectratio(post["width"], post["height"])}](https://e621.net/post?tags=ratio:{post["width"]/post["height"]:.2f})', '\n'.join([f'[{urlparse(source).netloc}]({source})' for source in post['sources']]), post_description, ' '.join(tags[:20]), ' '.join(tags[20:]))
|
||||
inlines = (False, False, False, True, True)
|
||||
for name, value, inline in zip(names, values, inlines):
|
||||
fields.append({'name': name, 'value': value, 'inline': inline})
|
||||
|
||||
embed = u.generate_embed(ctx, title=title, description=description, url=url, colour=color, footer=footer, thumbnail=thumbnail, author=author, fields=fields)
|
||||
|
||||
await ctx.send(embed=embed)
|
||||
# print(ctx.args)
|
||||
# print(ctx.kwargs)
|
||||
# if '<:N_:368917475531816962>' in message:
|
||||
# await ctx.send('<:N_:368917475531816962>')
|
||||
# logs = []
|
||||
# async for entry in ctx.guild.audit_logs(limit=None, action=d.AuditLogAction.message_delete):
|
||||
# logs.append(
|
||||
# f'@{entry.user.name} deleted {entry.extra.count} messages from @{entry.target.name} in #{entry.extra.channel.name}')
|
||||
# pprint(logs)
|
||||
# channel = bot.get_channel(int(cid))
|
||||
# voice = await channel.connect()
|
||||
# voice.play(d.AudioSource, after=lambda: after(voice))
|
||||
|
||||
bot.run(u.config['token'], bot=not u.config['selfbot'])
|
||||
|
|
|
|||
|
|
@ -2,11 +2,9 @@ import asyncio
|
|||
import json as jsn
|
||||
import os
|
||||
import pickle as pkl
|
||||
import subprocess
|
||||
from contextlib import suppress
|
||||
from fractions import gcd
|
||||
import math
|
||||
from pprint import pprint
|
||||
|
||||
import aiohttp
|
||||
import discord as d
|
||||
|
|
@ -97,21 +95,6 @@ async def fetch(url, *, params={}, json=False, response=False):
|
|||
return await r.read()
|
||||
|
||||
|
||||
# async def clear(obj, interval=10 * 60, replace=None):
|
||||
# if replace is None:
|
||||
# if type(obj) is list:
|
||||
# replace = []
|
||||
# elif type(obj) is dict:
|
||||
# replace = {}
|
||||
# elif type(obj) is int:
|
||||
# replace = 0
|
||||
# elif type(obj) is str:
|
||||
# replace = ''
|
||||
#
|
||||
# while True:
|
||||
# obj = replace
|
||||
# asyncio.sleep(interval)
|
||||
|
||||
def generate_embed(ctx, *, title=d.Embed.Empty, kind='rich', description=d.Embed.Empty, url=d.Embed.Empty, timestamp=d.Embed.Empty, colour=color, footer={}, image=d.Embed.Empty, thumbnail=d.Embed.Empty, author={}, fields=[]):
|
||||
embed = d.Embed(title=title, type=kind, description=description, url=url, timestamp=timestamp, colour=colour if isinstance(ctx.channel, d.TextChannel) else color)
|
||||
|
||||
|
|
@ -128,6 +111,7 @@ def generate_embed(ctx, *, title=d.Embed.Empty, kind='rich', description=d.Embed
|
|||
|
||||
return embed
|
||||
|
||||
|
||||
def kwargs(args):
|
||||
params = list(args)
|
||||
lst = 'blacklist'
|
||||
|
|
@ -145,7 +129,7 @@ def get_kwargs(ctx, args, *, limit=False):
|
|||
lim = 1
|
||||
|
||||
for flag in ('-r', '-rm', '--remove'):
|
||||
if flag in remaining and ctx.author.permissions_in(ctx.channel).manage_messages:
|
||||
if flag in remaining:
|
||||
rm = True
|
||||
|
||||
remaining.remove(flag)
|
||||
|
|
|
|||
Loading…
Reference in a new issue