Compare commits
No commits in common. "1a8f84b33313ff90f4bb07d2b5a64dbbbc158f8b" and "5c030a0557bf263abca77f03c65035c2eb8b7d43" have entirely different histories.
1a8f84b333
...
5c030a0557
@ -8,7 +8,7 @@ import audio
|
|||||||
import commands
|
import commands
|
||||||
import utils
|
import utils
|
||||||
from constants import EMBED_COLOR
|
from constants import EMBED_COLOR
|
||||||
from state import client, players, trusted_users
|
from state import client, players
|
||||||
|
|
||||||
from .playback import resume
|
from .playback import resume
|
||||||
from .utils import command_allowed, ensure_joined, play_next
|
from .utils import command_allowed, ensure_joined, play_next
|
||||||
@ -147,7 +147,6 @@ async def queue_or_play(message, edited=False):
|
|||||||
)
|
)
|
||||||
>= 5
|
>= 5
|
||||||
and not len(message.guild.voice_client.channel.members) == 2
|
and not len(message.guild.voice_client.channel.members) == 2
|
||||||
and message.author.id not in trusted_users
|
|
||||||
):
|
):
|
||||||
await utils.reply(
|
await utils.reply(
|
||||||
message,
|
message,
|
||||||
|
27
core.py
27
core.py
@ -3,7 +3,6 @@ import contextlib
|
|||||||
import importlib
|
import importlib
|
||||||
import inspect
|
import inspect
|
||||||
import io
|
import io
|
||||||
import signal
|
|
||||||
import textwrap
|
import textwrap
|
||||||
import time
|
import time
|
||||||
import traceback
|
import traceback
|
||||||
@ -60,8 +59,17 @@ async def on_message(message, edited=False):
|
|||||||
|
|
||||||
match matched:
|
match matched:
|
||||||
case C.RELOAD if message.author.id in OWNERS:
|
case C.RELOAD if message.author.id in OWNERS:
|
||||||
|
reloaded_modules = set()
|
||||||
start = time.time()
|
start = time.time()
|
||||||
reloaded_modules = reload()
|
|
||||||
|
rreload(reloaded_modules, __import__("core"))
|
||||||
|
rreload(reloaded_modules, __import__("extra"))
|
||||||
|
for module in filter(
|
||||||
|
lambda v: inspect.ismodule(v) and v.__name__ in RELOADABLE_MODULES,
|
||||||
|
globals().values(),
|
||||||
|
):
|
||||||
|
rreload(reloaded_modules, module)
|
||||||
|
|
||||||
end = time.time()
|
end = time.time()
|
||||||
debug(
|
debug(
|
||||||
f"reloaded {len(reloaded_modules)} modules in {round(end - start, 2)}s",
|
f"reloaded {len(reloaded_modules)} modules in {round(end - start, 2)}s",
|
||||||
@ -178,18 +186,3 @@ def rreload(reloaded_modules, module):
|
|||||||
|
|
||||||
if "__reload_module__" in dir(module):
|
if "__reload_module__" in dir(module):
|
||||||
module.__reload_module__()
|
module.__reload_module__()
|
||||||
|
|
||||||
|
|
||||||
def reload(*_):
|
|
||||||
reloaded_modules = set()
|
|
||||||
rreload(reloaded_modules, __import__("core"))
|
|
||||||
rreload(reloaded_modules, __import__("extra"))
|
|
||||||
for module in filter(
|
|
||||||
lambda v: inspect.ismodule(v) and v.__name__ in RELOADABLE_MODULES,
|
|
||||||
globals().values(),
|
|
||||||
):
|
|
||||||
rreload(reloaded_modules, module)
|
|
||||||
return reloaded_modules
|
|
||||||
|
|
||||||
|
|
||||||
signal.signal(signal.SIGUSR1, reload)
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user