diff --git a/.gitignore b/.gitignore index af3fefe..84c5097 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,6 @@ # PY VENV venv/ -# Tokens and Passwwords -essentials/secrets\.py - *.log # export @@ -16,4 +13,6 @@ export/*.txt *.pyc #backup -backup/ \ No newline at end of file +backup/ + +node_modules/ \ No newline at end of file diff --git a/cogs/help.py b/cogs/help.py index c368dd8..2e3c6b8 100644 --- a/cogs/help.py +++ b/cogs/help.py @@ -47,7 +47,7 @@ def get_help_embed(self, page, pre): title = f' Pollmaster Help - React with an emoji to learn more about a topic!' embed = discord.Embed(title='', description='', colour=SETTINGS.color) embed.set_author(name=title, icon_url=SETTINGS.author_icon) - embed.set_footer(text='Use reactions to navigate the help. This message will self-destruct in 5 minutes.') + embed.set_footer(text='Use reactions to navigate the help. This message will self-destruct in 5 minutes…') if page == '🏠': # POLL CREATION SHORT diff --git a/cogs/poll_controls.py b/cogs/poll_controls.py index a0b18e1..283fd9e 100644 --- a/cogs/poll_controls.py +++ b/cogs/poll_controls.py @@ -4,6 +4,8 @@ import random import shlex import time +import os +import requests from string import ascii_lowercase import discord @@ -15,7 +17,7 @@ from essentials.multi_server import get_server_pre, ask_for_server, ask_for_channel from essentials.settings import SETTINGS from models.poll import Poll -from utils.misc import CustomFormatter +from utils.misc import CustomFormatter, proceed_to_party from utils.paginator import embed_list_paginated from utils.poll_name_generator import generate_word @@ -40,6 +42,8 @@ def cog_unload(self): # noinspection PyCallingNonCallable @tasks.loop(seconds=30) async def close_activate_polls(self): + if not proceed_to_party(): + return if hasattr(self.bot, 'db') and hasattr(self.bot.db, 'polls'): utc_now = datetime.datetime.utcnow().replace(tzinfo=pytz.utc) @@ -111,11 +115,15 @@ async def close_activate_polls(self): @close_activate_polls.before_loop async def before_close_activate_polls(self): + if not proceed_to_party(): + return # print('close task waiting...') await self.bot.wait_until_ready() @tasks.loop(seconds=5) async def refresh_queue(self): + if not proceed_to_party(): + return remove_list = [] for pid, t in self.bot.refresh_blocked.items(): if t - time.time() < 0: @@ -135,6 +143,8 @@ async def refresh_queue(self): @refresh_queue.before_loop async def before_refresh_queue(self): + if not proceed_to_party(): + return # print('refresh task waiting...') await self.bot.wait_until_ready() @@ -193,6 +203,8 @@ async def say_embed(self, ctx, say_text='', title='Pollmaster', footer_text=None @commands.command() async def activate(self, ctx, *, short=None): + if not proceed_to_party(): + return """Activate a prepared poll. Parameter: