mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-12-08 10:22:31 -05:00
d.py 2.3 / pomelo changes (#6130)
Co-authored-by: Michael Oliveira <34169552+Flame442@users.noreply.github.com>
This commit is contained in:
@@ -113,7 +113,9 @@ async def global_unique_user_finder(
|
||||
return user
|
||||
|
||||
maybe_matches = []
|
||||
async for user in AsyncIter(bot.users).filter(lambda u: u.name == arg or f"{u}" == arg):
|
||||
async for user in AsyncIter(bot.users).filter(
|
||||
lambda u: u.name == arg or u.global_name == arg or f"{u}" == arg
|
||||
):
|
||||
maybe_matches.append(user)
|
||||
|
||||
if guild is not None:
|
||||
|
||||
@@ -105,32 +105,30 @@ class MiscellaneousCommands(MixinMeta, metaclass=CompositeMetaClass):
|
||||
queue_tracks = player.queue
|
||||
requesters = {"total": 0, "users": {}}
|
||||
|
||||
async def _usercount(req_username):
|
||||
if req_username in requesters["users"]:
|
||||
requesters["users"][req_username]["songcount"] += 1
|
||||
async def _usercount(req_user_handle):
|
||||
if req_user_handle in requesters["users"]:
|
||||
requesters["users"][req_user_handle]["songcount"] += 1
|
||||
requesters["total"] += 1
|
||||
else:
|
||||
requesters["users"][req_username] = {}
|
||||
requesters["users"][req_username]["songcount"] = 1
|
||||
requesters["users"][req_user_handle] = {}
|
||||
requesters["users"][req_user_handle]["songcount"] = 1
|
||||
requesters["total"] += 1
|
||||
|
||||
async for track in AsyncIter(queue_tracks):
|
||||
req_username = "{}#{}".format(track.requester.name, track.requester.discriminator)
|
||||
await _usercount(req_username)
|
||||
req_user_handle = str(track.requester)
|
||||
await _usercount(req_user_handle)
|
||||
|
||||
try:
|
||||
req_username = "{}#{}".format(
|
||||
player.current.requester.name, player.current.requester.discriminator
|
||||
)
|
||||
await _usercount(req_username)
|
||||
req_user_handle = str(player.current.requester)
|
||||
await _usercount(req_user_handle)
|
||||
except AttributeError:
|
||||
return await self.send_embed_msg(ctx, title=_("There's nothing in the queue."))
|
||||
|
||||
async for req_username in AsyncIter(requesters["users"]):
|
||||
percentage = float(requesters["users"][req_username]["songcount"]) / float(
|
||||
async for req_user_handle in AsyncIter(requesters["users"]):
|
||||
percentage = float(requesters["users"][req_user_handle]["songcount"]) / float(
|
||||
requesters["total"]
|
||||
)
|
||||
requesters["users"][req_username]["percent"] = round(percentage * 100, 1)
|
||||
requesters["users"][req_user_handle]["percent"] = round(percentage * 100, 1)
|
||||
|
||||
top_queue_users = heapq.nlargest(
|
||||
20,
|
||||
|
||||
@@ -61,7 +61,7 @@ HUMANIZED_PERM = {
|
||||
"manage_nicknames": _("Manage Nicknames"),
|
||||
"manage_roles": _("Manage Roles"),
|
||||
"manage_webhooks": _("Manage Webhooks"),
|
||||
"manage_emojis": _("Manage Emojis"),
|
||||
"manage_expressions": _("Manage Expressions"),
|
||||
"use_application_commands": _("Use Application Commands"),
|
||||
"request_to_speak": _("Request to Speak"),
|
||||
"manage_events": _("Manage Events"),
|
||||
@@ -72,6 +72,10 @@ HUMANIZED_PERM = {
|
||||
"send_messages_in_threads": _("Send Messages in Threads"),
|
||||
"start_embedded_activities": _("Start Activities"),
|
||||
"moderate_members": _("Moderate Member"),
|
||||
"use_soundboard": _("Use Soundboard"),
|
||||
"create_expressions": _("Create Expressions"),
|
||||
"use_external_sounds": _("Use External Sounds"),
|
||||
"send_voice_messages": _("Send Voice Messages"),
|
||||
}
|
||||
|
||||
DANGEROUS_COMMANDS = {
|
||||
|
||||
Reference in New Issue
Block a user