myned/modufur
1
0
Fork 0
mirror of https://github.com/myned/modufur.git synced 2024-11-01 21:02:38 +00:00
Code Issues Activity

Merge branch 'dev'

Browse source
This commit is contained in:
Myned 2017-09-24 15:17:06 -04:00
commit 0ec0293675
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/cogs/booru.py
View file

@ -395,7 +395,7 @@ class MsG:
@commands.is_owner() @commands.is_owner()
async def __clear_global_blacklist(self, ctx): async def __clear_global_blacklist(self, ctx):
global global_blacklist global global_blacklist
global_blacklist = [] del global_blacklist
with open('global_blacklist.json', 'w') as outfile: with open('global_blacklist.json', 'w') as outfile:
json.dump(global_blacklist, outfile, indent=4, sort_keys=True) json.dump(global_blacklist, outfile, indent=4, sort_keys=True)
await ctx.send('✅ **Global blacklist cleared.**', delete_after=5) await ctx.send('✅ **Global blacklist cleared.**', delete_after=5)
@ -408,7 +408,7 @@ class MsG:
else: else:
guild = ctx.message.channel guild = ctx.message.channel
channel = ctx.message.channel channel = ctx.message.channel
guild_blacklist.get(str(guild.id), {})[str(channel.id)] = [] del guild_blacklist.get(str(guild.id), {})[str(channel.id)]
with open('guild_blacklist.json', 'w') as outfile: with open('guild_blacklist.json', 'w') as outfile:
json.dump(guild_blacklist, outfile, indent=4, sort_keys=True) json.dump(guild_blacklist, outfile, indent=4, sort_keys=True)
await ctx.send('✅ <#' + str(channel.id) + '> **blacklist cleared.**', delete_after=5) await ctx.send('✅ <#' + str(channel.id) + '> **blacklist cleared.**', delete_after=5)
@ -416,7 +416,7 @@ class MsG:
async def __clear_user_blacklist(self, ctx): async def __clear_user_blacklist(self, ctx):
global user_blacklist global user_blacklist
user = ctx.message.author user = ctx.message.author
user_blacklist[str(user.id)] = [] del user_blacklist[str(user.id)]
with open('user_blacklist.json', 'w') as outfile: with open('user_blacklist.json', 'w') as outfile:
json.dump(user_blacklist, outfile, indent=4, sort_keys=True) json.dump(user_blacklist, outfile, indent=4, sort_keys=True)
await ctx.send('✅ ' + user.mention + '**\'s blacklist cleared.**', delete_after=5) await ctx.send('✅ ' + user.mention + '**\'s blacklist cleared.**', delete_after=5)

8
src/main/run.py
View file

@ -6,7 +6,7 @@ try:
print('\"config.json\" loaded.') print('\"config.json\" loaded.')
except FileNotFoundError: except FileNotFoundError:
with open('config.json', 'w') as outfile: with open('config.json', 'w') as outfile:
json.dump({'client_id': 0, 'owner_id': 0, 'permissions': 0, 'shutdown_channel': 0, 'startup_channel': 0, 'token': 'str'}, outfile, indent=4, sort_keys=True) json.dump({'client_id': 0, 'owner_id': 0, 'permissions': 388160, 'prefix': ',', 'shutdown_channel': 0, 'startup_channel': 0, 'token': 'str'}, outfile, indent=4, sort_keys=True)
raise FileNotFoundError('Config file not found: \"config.json\" created with abstract values. Restart \"run.py\" with correct values.') raise FileNotFoundError('Config file not found: \"config.json\" created with abstract values. Restart \"run.py\" with correct values.')
import asyncio import asyncio
@ -18,11 +18,12 @@ from cogs import booru, info, tools
from misc import checks from misc import checks
from misc import exceptions as exc from misc import exceptions as exc
bot = commands.Bot(command_prefix=commands.when_mentioned_or(','), description='Experimental booru bot') bot = commands.Bot(command_prefix=commands.when_mentioned_or(config['prefix']), description='Experimental booru bot')
# Send and print ready message to #testing and console after logon # Send and print ready message to #testing and console after logon
@bot.event @bot.event
async def on_ready(): async def on_ready():
if isinstance(bot.get_channel(config['startup_channel']), discord.TextChannel):
await bot.get_channel(config['startup_channel']).send('Hello how are? **Have day.** 🌈\n<embed>[STARTUP-INFO]</embed>') await bot.get_channel(config['startup_channel']).send('Hello how are? **Have day.** 🌈\n<embed>[STARTUP-INFO]</embed>')
print('Connected.') print('Connected.')
print('Username: ' + bot.user.name) print('Username: ' + bot.user.name)
@ -34,8 +35,7 @@ async def on_ready():
@commands.is_owner() @commands.is_owner()
async def die(ctx): async def die(ctx):
try: try:
await ctx.send('Am go bye. **Have night.** 💤') await bot.get_channel(config['shutdown_channel']).send('Am go bye. **Have night.** 💤\n<embed>[SHUTDOWN-INFO]</embed>')
# await bot.get_channel(config['shutdown_channel']).send('<embed>[SHUTDOWN-INFO]</embed>')
await bot.close() await bot.close()
print('-------') print('-------')
print('Closed.') print('Closed.')