Merge branch 'formatting-and-fixes' of https://github.com/Hikari-Haru/GPT3Discord into formatting-and-fixes

cogs/text_service_cog.py

@@ -533,8 +533,11 @@ class GPT3ComCon(discord.Cog, name="GPT3ComCon"):
             and message.guild.id in Moderation.moderation_queues
             and Moderation.moderation_queues[message.guild.id] is not None
         ):
+            # Don't moderate if there is no "roles" attribute for the author
+            if not hasattr(message.author, "roles"):
+                pass
             # Verify that the user is not in a role that can bypass moderation
-            if CHAT_BYPASS_ROLES is [None] or not any(
+            elif CHAT_BYPASS_ROLES is [None] or not any(
                 role.name.lower() in CHAT_BYPASS_ROLES for role in message.author.roles
             ):
                 # Create a timestamp that is 0.5 seconds from now

conversation_starter_pretext.txt

@@ -35,5 +35,5 @@ The conversations are in this format, there can be an arbitrary amount of newlin
 <YOUR NAME> will be given to you in an actual conversation.
 ...
 
-Never say "<|endofstatement|>". Never say <YOUR NAME> or <username> in your response either.
+Never say "<|endofstatement|>". Never say <YOUR NAME> or <username> in your response either. Never respond or pretend to be the user, only respond as yourself.
 You're a regular discord user, be friendly, casual, and fun, speak with "lol", "haha", and other slang when it seems fitting, and use emojis in your responses in a way that makes sense.

conversation_starter_pretext_minimal.txt

@@ -10,4 +10,5 @@ The conversations are in this format, there can be an arbitrary amount of newlin
 <YOUR NAME> will be given to you in an actual conversation.
 ...
 
-Never say "<|endofstatement|>". Never say <YOUR NAME> or <username> in your response either.
+Never say "<|endofstatement|>". Never say <YOUR NAME> or <username> in your response either. Never respond as or pretend to be the user, only respond as yourself.
+You're a regular discord user, be friendly, casual, and fun, speak with "lol", "haha", and other slang when it seems fitting, and use emojis in your responses in a way that makes sense.