1
0
Fork 0
mirror of synced 2024-06-01 18:29:38 +12:00

Removed the change Pycharm made for pep8 which caused the bot not to run, as the directoy was detected incorrectly

This commit is contained in:
phxntxm 2016-08-26 08:23:02 -05:00
parent 217407fbaa
commit b082ce5f04
3 changed files with 34 additions and 19 deletions

7
bot.py
View file

@ -1,8 +1,4 @@
#!/usr/local/bin/python3.5 #!/usr/local/bin/python3.5
from discord.ext import commands
from cogs.utils import config
import discord import discord
import traceback import traceback
import logging import logging
@ -12,6 +8,9 @@ import os
os.chdir(os.path.dirname(os.path.realpath(__file__))) os.chdir(os.path.dirname(os.path.realpath(__file__)))
from discord.ext import commands
from cogs.utils import config
extensions = ['cogs.interaction', extensions = ['cogs.interaction',
'cogs.core', 'cogs.core',
'cogs.mod', 'cogs.mod',

View file

@ -4,7 +4,6 @@ from .utils import checks
from .utils import config from .utils import config
import subprocess import subprocess
import os
import glob import glob
import random import random
import re import re
@ -21,11 +20,12 @@ class Core:
@commands.command() @commands.command()
@checks.custom_perms(send_messages=True) @checks.custom_perms(send_messages=True)
async def calendar(self, month: str=None, year: int=None): async def calendar(self, month: str = None, year: int = None):
"""Provides a printout of the current month's calendar """Provides a printout of the current month's calendar
Provide month and year to print the calendar of that year and month""" Provide month and year to print the calendar of that year and month"""
# calendar takes in a number for the month, not the words, so we need this dictionary to transform the word to the number # calendar takes in a number for the month, not the words
# so we need this dictionary to transform the word to the number
months = { months = {
"january": 1, "january": 1,
"february": 2, "february": 2,
@ -54,7 +54,7 @@ class Core:
# Here we create the actual "text" calendar that we are printing # Here we create the actual "text" calendar that we are printing
cal = calendar.TextCalendar().formatmonth(year, month) cal = calendar.TextCalendar().formatmonth(year, month)
await self.bot.say("```\n{}```".format(cal)) await self.bot.say("```\n{}```".format(cal))
@commands.command() @commands.command()
@checks.custom_perms(send_messages=True) @checks.custom_perms(send_messages=True)
async def info(self): async def info(self):
@ -62,26 +62,43 @@ class Core:
# fmt is a dictionary so we can set the key to it's output, then print both # fmt is a dictionary so we can set the key to it's output, then print both
# The only real use of doing it this way is easier editing if the info in this command is changed # The only real use of doing it this way is easier editing if the info in this command is changed
fmt = {} fmt = {}
all_members = list(self.bot.get_all_members()) all_members = list(self.bot.get_all_members())
# We can pretty safely assume that the author is going to be in at least one channel with the bot # We can pretty safely assume that the author is going to be in at least one channel with the bot
# So find the author based on that list # So find the author based on that list
authors = [] authors = []
for author_id in config.owner_ids: for author_id in config.owner_ids:
authors.append(discord.utils.get(all_members, id=author_id).name) authors.append(discord.utils.get(all_members, id=author_id).name)
fmt['Official Bot Server'] = config.dev_server fmt['Official Bot Server'] = config.dev_server
fmt['Author'] = ", ".join(authors) fmt['Author'] = ", ".join(authors)
fmt['Uptime'] = (pendulum.utcnow() - self.bot.uptime).in_words() fmt['Uptime'] = (pendulum.utcnow() - self.bot.uptime).in_words()
fmt['Total Servers'] = len(self.bot.servers) fmt['Total Servers'] = len(self.bot.servers)
fmt['Total Members'] = len(all_members) fmt['Total Members'] = len(all_members)
fmt['Description'] = self.bot.description fmt['Description'] = self.bot.description
servers_playing_music = len([server_id for server_id, state in self.bot.get_cog('Music').voice_states.items() if
state.is_playing()])
hm_games = len([server_id for server_id, game in self.bot.get_cog('Hangman').games.items()])
ttt_games = len([server_id for server_id, game in self.bot.get_cog('TicTacToe').boards.items()])
count_battles = 0
for battles in self.bot.get_cog('Interaction').battles.values():
count_battles += len(battles)
information = "\n".join("{}: {}".format(key, result) for key, result in fmt.items()) information = "\n".join("{}: {}".format(key, result) for key, result in fmt.items())
information += "\n"
if servers_playing_music:
information += "Playing songs in {} different servers\n".format(servers_playing_music)
if hm_games:
information += "{} different hangman games running\n".format(hm_games)
if ttt_games:
information += "{} different TicTacToe games running\n".format(ttt_games)
if count_battles:
information += "{} different battles going on\n".format(count_battles)
await self.bot.say("```\n{}```".format(information)) await self.bot.say("```\n{}```".format(information))
@commands.command() @commands.command()
@checks.custom_perms(send_messages=True) @checks.custom_perms(send_messages=True)
async def uptime(self): async def uptime(self):
@ -115,7 +132,7 @@ class Core:
f = glob.glob('images/doggo*')[random.SystemRandom().randint(0, len(glob.glob('images/doggo*')) - 1)] f = glob.glob('images/doggo*')[random.SystemRandom().randint(0, len(glob.glob('images/doggo*')) - 1)]
with open(f, 'rb') as f: with open(f, 'rb') as f:
await self.bot.upload(f) await self.bot.upload(f)
@commands.command(pass_context=True) @commands.command(pass_context=True)
@checks.custom_perms(send_messages=True) @checks.custom_perms(send_messages=True)
async def snek(self, ctx): async def snek(self, ctx):
@ -137,7 +154,7 @@ class Core:
@commands.command(pass_context=True) @commands.command(pass_context=True)
@checks.custom_perms(send_messages=True) @checks.custom_perms(send_messages=True)
async def roll(self, ctx, notation: str="d6"): async def roll(self, ctx, notation: str = "d6"):
"""Rolls a die based on the notation given """Rolls a die based on the notation given
Format should be #d#""" Format should be #d#"""
# Use regex to get the notation based on what was provided # Use regex to get the notation based on what was provided
@ -149,7 +166,7 @@ class Core:
except (AttributeError, ValueError): except (AttributeError, ValueError):
await self.bot.say("Please provide the die notation in #d#!") await self.bot.say("Please provide the die notation in #d#!")
return return
# Dice will be None if d# was provided, assume this means 1d# # Dice will be None if d# was provided, assume this means 1d#
dice = dice or 1 dice = dice or 1
# Since we did not try to convert to int before, do it now after we have it set # Since we did not try to convert to int before, do it now after we have it set

View file

@ -1,7 +1,6 @@
from discord.ext import commands from discord.ext import commands
from .utils import checks from .utils import checks
from .utils import config from .utils import config
import discord import discord
import re import re
import asyncio import asyncio