Skip to content

Commit 0f18d96

Browse files
committed
add gay, add scamkick, minor grammar fixes
1 parent 8db1e31 commit 0f18d96

File tree

2 files changed

+34
-2
lines changed

2 files changed

+34
-2
lines changed

cogs/kickban.py

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,26 @@ async def kick_member(self, ctx: GuildContext, member: discord.Member, *, reason
6666
await ctx.send(f"{member} is now gone. 👌")
6767
await self.bot.logs.post_action_log(ctx.author, member, 'kick', reason=reason)
6868

69+
@is_staff("HalfOP")
70+
@commands.bot_has_permissions(kick_members=True)
71+
@commands.command(name="scamkick")
72+
async def scamkick(self, ctx: GuildContext, member: discord.Member):
73+
"""Kicks a user, logs automatically, informs of reason for kick."""
74+
if await check_bot_or_staff(ctx, member, "kick"):
75+
return
76+
reason = "Sending or linking scams or spam content, and/or compromised account."
77+
msg = f"You were kicked from {ctx.guild.name}."
78+
msg += "\n\nYou were kicked because your account has been compromised and has sent spam or scams in the server."
79+
msg += "\n\nYou are able to rejoin the server, but please secure your account and consider adding two-factor authentication."
80+
await send_dm_message(member, msg, ctx)
81+
try:
82+
await member.kick(reason=reason)
83+
except discord.errors.Forbidden:
84+
await ctx.send("💢 I don't have permission to do this.")
85+
return
86+
await ctx.send(f"{member} is now gone. 👌")
87+
await self.bot.logs.post_action_log(ctx.author, member, 'kick', reason=reason)
88+
6989
@is_staff("OP")
7090
@commands.bot_has_permissions(ban_members=True)
7191
@commands.command(name="ban", aliases=["yeet"])
@@ -130,7 +150,7 @@ async def ban_member_slash(self,
130150
msg = f"You were banned from {interaction.guild.name}."
131151
if reason:
132152
msg += " The given reason is: " + reason
133-
msg += "If you think this is a mistake, contact frozenchen on discord or send a email to staff@nintendohomebrew.com"
153+
msg += "If you think this is a mistake, contact frozenchen on discord or send an email to staff@nintendohomebrew.com"
134154

135155
if duration is not None:
136156
timestamp = datetime.datetime.now(self.bot.tz)

cogs/memes.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ async def rotate(self, ctx: KurisuContext, u: discord.Member, degrees: int = Non
806806

807807
await self._meme(ctx, msg, True)
808808

809-
@commands.command(hidden=True, aliases=["degay", "ungay"])
809+
@commands.command(hidden=True, aliases=["degay", "ungay", "minusgay"])
810810
async def removegay(self, ctx: KurisuContext, u: discord.Member):
811811
"""Degays a user"""
812812
removegay_list = [f"{u.mention} has been degayed.",
@@ -818,6 +818,18 @@ async def removegay(self, ctx: KurisuContext, u: discord.Member):
818818
f"{u.mention} has been downgraded from 'yass queen' to 'yeah'."]
819819
await self._meme(ctx, random.choice(removegay_list), True)
820820

821+
@commands.command(hidden=True, aliases=["regay", "plusgay"])
822+
async def gay(self, ctx: KurisuContext, u: discord.Member):
823+
"""Gays a user"""
824+
gay_list = [f"{u.mention} has been gayed.",
825+
f"{u.mention} is now gay.",
826+
f"{u.mention} has received some gay privileges.",
827+
f"{u.mention} has been inducted into the Alphabet Mafia.",
828+
f"{u.mention} is now homo.",
829+
f"{u.mention}'s gay card has been renewed!",
830+
f"{u.mention} has been upgraded from 'yeah' to 'yasss queen'!"]
831+
await self._meme(ctx, random.choice(gay_list), True)
832+
821833
@commands.command(hidden=True, aliases=["🅱"])
822834
async def b(self, ctx: KurisuContext):
823835
"""haha, b emoji funny"""

0 commit comments

Comments
 (0)