jarvis/jarvis-bot
jarvis/jarvis-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bad merge headers remaining in file

Browse source
This commit is contained in:
Zeva Rose 2021-07-20 08:43:35 -06:00
parent 578789f152
commit 7d50992023
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
jarvis/__init__.py
View file

@ -194,25 +194,15 @@ async def on_message(message: Message):
if autopurge: if autopurge:
await message.delete(delay=autopurge["delay"]) await message.delete(delay=autopurge["delay"])
content = re.sub(r"\s+", "", message.content) content = re.sub(r"\s+", "", message.content)
<<<<<<< HEAD
content = re.sub(r"[^\w\d./]+", "", content) content = re.sub(r"[^\w\d./]+", "", content)
match = invites.search(content) match = invites.search(content)
if match: if match:
=======
content = re.sub(r"[^\w\s]", "", content)
matches = invites.match(content)
if matches:
>>>>>>> d2cf3549ece5640fd7e215a75e12421c8f19fa10
guild_invites = await message.guild.invites() guild_invites = await message.guild.invites()
allowed = [x.code for x in guild_invites] + [ allowed = [x.code for x in guild_invites] + [
"dbrand", "dbrand",
"VtgZntXcnZ", "VtgZntXcnZ",
] ]
<<<<<<< HEAD
if match.group(6) not in allowed: if match.group(6) not in allowed:
=======
if matches.group(6) not in allowed:
>>>>>>> d2cf3549ece5640fd7e215a75e12421c8f19fa10
await message.delete() await message.delete()
db.jarvis.warns.insert_one( db.jarvis.warns.insert_one(
{ {