diff --git a/payphone/cogs/admin/cog.py b/payphone/cogs/admin/cog.py index f424f6e..1eeb3ea 100644 --- a/payphone/cogs/admin/cog.py +++ b/payphone/cogs/admin/cog.py @@ -49,7 +49,7 @@ class Admin(base.Cog): for call in calls: for rs in call.call_rss: if rs.channel.server_id in servers_count_map: - servers_count_map[rs.channel.server.id] += 1 + servers_count_map[rs.channel.server_id] += 1 else: servers_count_map[rs.channel.server_id] = 0 diff --git a/payphone/core/converters.py b/payphone/core/converters.py index cf18bac..e34c589 100644 --- a/payphone/core/converters.py +++ b/payphone/core/converters.py @@ -48,18 +48,13 @@ class DiscordUserID(converter.Converter): return int(argument) if len(argument) > 17 and argument[2:-1].isdecimal(): - return int(argument) + return int(argument[2:-1]) if argument.startswith("https://discord.com/users/") or argument.startswith( "discord://-/users/" ): return int(argument.split("?", 1)[0].rsplit("/", 1)[1]) - user = await models.User.get_or_none(username=argument) - - if user is not None: - return user.id - if argument.lower() in ["reply", "."]: if ctx.message.reference is not None: ref = ctx.message.reference @@ -79,5 +74,10 @@ class DiscordUserID(converter.Converter): raise converter.BadArgument() return msg.author.id + + user = await models.User.get_or_none(username=argument) + + if user is not None: + return user.id raise converter.BadArgument()