aboutsummaryrefslogtreecommitdiffstats
path: root/bot
diff options
context:
space:
mode:
authorGravatar Leon Sandøy <[email protected]>2018-11-20 02:19:36 +0100
committerGravatar Leon Sandøy <[email protected]>2018-11-20 02:19:36 +0100
commit42954e96c05ef4d81ac56e6fb59a30ccffa230e5 (patch)
treead8a7d00a8c142d59724e4f5665547ab1bcd41d5 /bot
parentMinor changes (diff)
It should work now.
Diffstat (limited to 'bot')
-rw-r--r--bot/__main__.py6
-rw-r--r--bot/cogs/hacktober/halloween_facts.py2
-rw-r--r--bot/cogs/hacktober/halloweenify.py2
-rw-r--r--bot/cogs/hacktober/monstersurvey.py6
-rw-r--r--bot/resources/halloween/monstersurvey.json6
5 files changed, 12 insertions, 10 deletions
diff --git a/bot/__main__.py b/bot/__main__.py
index b2b2c5fd..b74e4f54 100644
--- a/bot/__main__.py
+++ b/bot/__main__.py
@@ -17,15 +17,15 @@ else:
ghost_unicode = "\N{GHOST}"
bot = commands.Bot(command_prefix=commands.when_mentioned_or(".", f"{ghost_unicode} ", ghost_unicode))
-log.info('Start loading extensions from ./bot/cogs/evergreen/')
+log.info('Start loading extensions from ./bot/cogs/halloween/')
if __name__ == '__main__':
# Scan for files in the /cogs/ directory and make a list of the file names.
- cogs = [file.stem for file in Path('bot', 'cogs', 'halloween').glob('*.py') if not file.stem.startswith("__")]
+ cogs = [file.stem for file in Path('bot', 'cogs', 'hacktober').glob('*.py') if not file.stem.startswith("__")]
for extension in cogs:
try:
- bot.load_extension(f'bot.cogs.halloween.{extension}')
+ bot.load_extension(f'bot.cogs.hacktober.{extension}')
log.info(f'Successfully loaded extension: {extension}')
except Exception as e:
log.error(f'Failed to load extension {extension}: {repr(e)} {format_exc()}')
diff --git a/bot/cogs/hacktober/halloween_facts.py b/bot/cogs/hacktober/halloween_facts.py
index e97c80d2..304d5d94 100644
--- a/bot/cogs/hacktober/halloween_facts.py
+++ b/bot/cogs/hacktober/halloween_facts.py
@@ -26,7 +26,7 @@ class HalloweenFacts:
def __init__(self, bot):
self.bot = bot
- with open(Path("./bot/resources", "halloween_facts.json"), "r") as file:
+ with open(Path("bot", "resources", "halloween", "halloween_facts.json"), "r") as file:
self.halloween_facts = json.load(file)
self.channel = None
self.last_fact = None
diff --git a/bot/cogs/hacktober/halloweenify.py b/bot/cogs/hacktober/halloweenify.py
index a5fe45ef..9b93ac99 100644
--- a/bot/cogs/hacktober/halloweenify.py
+++ b/bot/cogs/hacktober/halloweenify.py
@@ -21,7 +21,7 @@ class Halloweenify:
"""
Change your nickname into a much spookier one!
"""
- with open(Path('./bot/resources', 'halloweenify.json'), 'r') as f:
+ with open(Path('bot', 'resources', 'halloween', 'halloweenify.json'), 'r') as f:
data = load(f)
# Choose a random character from our list we loaded above and set apart the nickname and image url.
diff --git a/bot/cogs/hacktober/monstersurvey.py b/bot/cogs/hacktober/monstersurvey.py
index 9eafcadc..9f33e31b 100644
--- a/bot/cogs/hacktober/monstersurvey.py
+++ b/bot/cogs/hacktober/monstersurvey.py
@@ -25,7 +25,7 @@ class MonsterSurvey:
def __init__(self, bot: Bot):
"""Initializes values for the bot to use within the voting commands."""
self.bot = bot
- self.registry_location = os.path.join(os.getcwd(), 'bot', 'resources', 'monstersurvey', 'monstersurvey.json')
+ self.registry_location = os.path.join(os.getcwd(), 'bot', 'resources', 'halloween', 'monstersurvey.json')
with open(self.registry_location, 'r') as jason:
self.voter_registry = json.load(jason)
@@ -91,7 +91,7 @@ class MonsterSurvey:
@monster_group.command(
name='vote'
)
- async def monster_vote(self, ctx: Context, name: Optional[Union[int, str]] = None):
+ async def monster_vote(self, ctx: Context, name = None):
"""Casts a vote for a particular monster, or displays a list of monsters that can be voted for
if one is not given."""
if name is None:
@@ -133,7 +133,7 @@ class MonsterSurvey:
@monster_group.command(
name='show'
)
- async def monster_show(self, ctx: Context, name: Optional[Union[int, str]] = None):
+ async def monster_show(self, ctx: Context, name = None):
"""
Shows the named monster. If one is not named, it sends the default voting embed instead.
:param ctx:
diff --git a/bot/resources/halloween/monstersurvey.json b/bot/resources/halloween/monstersurvey.json
index 6c62e2c1..99a3e96f 100644
--- a/bot/resources/halloween/monstersurvey.json
+++ b/bot/resources/halloween/monstersurvey.json
@@ -23,6 +23,8 @@
"full_name": "Refisio",
"summary": "Who let this guy write this? That's who the real monster is.",
"image": "https://avatars0.githubusercontent.com/u/24819750?s=460&v=4",
- "votes": []
+ "votes": [
+ 95872159741644800
+ ]
}
-}
+} \ No newline at end of file