diff --git a/cogs/events.py b/cogs/events.py index cb7798c..a6f62bb 100644 --- a/cogs/events.py +++ b/cogs/events.py @@ -82,7 +82,9 @@ class Events(commands.Cog): channel: discord.TextChannel = discord.utils.get(member.guild.text_channels, name="general") if channel and channel.can_send(): - await channel.send(f"{LTR} {member.mention} {f'({student.id})' if student else '(pending verification)'}") + await channel.send( + f"{LTR} {member.mention} (`{member}`, {f'{student.id}' if student else 'pending verification'})" + ) @commands.Cog.listener() async def on_member_remove(self, member: discord.Member): @@ -92,7 +94,9 @@ class Events(commands.Cog): student: Optional[Student] = await get_or_none(Student, user_id=member.id) channel: discord.TextChannel = discord.utils.get(member.guild.text_channels, name="general") if channel and channel.can_send(): - await channel.send(f"{RTL} {member.mention} {f'({student.id})' if student else '(pending verification)'}") + await channel.send( + f"{RTL} {member.mention} (`{member}`, {f'{student.id}' if student else 'pending verification'})" + ) @commands.Cog.listener() async def on_message(self, message: discord.Message): diff --git a/cogs/verify.py b/cogs/verify.py index 88c3521..ba26a01 100644 --- a/cogs/verify.py +++ b/cogs/verify.py @@ -19,8 +19,22 @@ class VerifyCog(commands.Cog): except orm.NoMatch: pass - view = VerifyView(ctx) - return await ctx.respond(view=view, ephemeral=True) + role = discord.utils.find(lambda r: r.name.lower() == "verified", ctx.guild.roles) + channel = discord.utils.get(ctx.guild.text_channels, name="verify") + if role and role < ctx.me.top_role: + await ctx.author.remove_roles(role, reason=f"Auto de-verified") + if channel: + try: + await ctx.author.send( + f"You have been automatically de-verified. Please re-verify by going to {channel.mention} and" + f" typing ." + ) + except discord.Forbidden: + pass + return + else: + view = VerifyView(ctx) + return await ctx.respond(view=view, ephemeral=True) @commands.command(name="de-verify") @commands.is_owner() diff --git a/utils/sentiment_analysis.py b/utils/sentiment_analysis.py index afd1744..af491c8 100644 --- a/utils/sentiment_analysis.py +++ b/utils/sentiment_analysis.py @@ -12,8 +12,8 @@ from nltk.sentiment.vader import SentimentIntensityAnalyzer positive_tweets = twitter_samples.strings("positive_tweets.json") negative_tweets = twitter_samples.strings("negative_tweets.json") -positive_reviews = movie_reviews.categories('pos') -negative_reviews = movie_reviews.categories('neg') +positive_reviews = movie_reviews.categories("pos") +negative_reviews = movie_reviews.categories("neg") positive_tweets += positive_reviews # negative_tweets += negative_reviews positive_tweet_tokens = twitter_samples.tokenized("positive_tweets.json")