CodeMirror/Brandon209-Red-bot-Cogs
1
0
Fork 0
mirror of https://github.com/brandons209/Red-bot-Cogs.git synced 2024-06-14 08:24:34 +12:00
Code Issues Projects Releases Wiki Activity

hopefully found a good solution for mentions in commands

Browse source
This commit is contained in:
brandons209 2020-02-14 01:57:49 -05:00
parent 2b8bfa7555
commit 9cffe6571f
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
roleplay/roleplay.py
View file

@ -1,18 +1,16 @@
import discord import discord
from discord.ext import commands from redbot.core.utils.chat_formatting import italics, pagify, box
from redbot.core.utils.chat_formatting import escape, italics, pagify, box
from redbot.core import Config, checks, commands from redbot.core import Config, checks, commands
import random import random
from random import randint
from random import choice from random import choice
from enum import Enum
from urllib.parse import quote_plus
import datetime
import time
import aiohttp
import asyncio import asyncio
import os import os
import json import json
import re
mention = re.compile("<@(\d{18})>")
mention_bang = re.compile("<@!(\d{18})>")
class RolePlay(commands.Cog): class RolePlay(commands.Cog):
@ -66,12 +64,11 @@ class RolePlay(commands.Cog):
user = None user = None
intensity = 1 intensity = 1
# mentions can be <@! or <@ # mentions can be <@! or <@
# user is mentioned w/ no intensity user_ment = mention.match(target)
if "<@" == target[:2] and ">" == target[-1]: user_ment_b = mention_bang.match(target)
user = guild.get_member(int(target[3:-1]))
# try with no intensity specified and not a mention # try with no intensity specified and not a mention
if not user: if not user_ment or not user_ment_b:
user = guild.get_member_named(target) user = guild.get_member_named(target)
# has intensity, could be a mention/text # has intensity, could be a mention/text
@ -84,11 +81,19 @@ class RolePlay(commands.Cog):
user = guild.get_member_named(name) user = guild.get_member_named(name)
# parse mention # parse mention
if not user: if not user:
if "<@" == name[:2] and ">" == name[-1]: user_ment = mention.match(name)
user = guild.get_member(int(name[3:-1])) user_ment_b = mention_bang.match(name)
except: except:
pass pass
if not user:
if user_ment:
user = guild.get_member(int(user_ment.group(1)))
elif user_ment_b:
user = guild.get_member(int(user_ment_b.group(1)))
else:
user = None
return user, intensity return user, intensity
@commands.command(usage="<hug_target> <intensity>") @commands.command(usage="<hug_target> <intensity>")