addition to commands

.gitignore

@@ -49,3 +49,4 @@ Temporary Items
 #login details
 token
 clientid
+clcreds

feubot.py

@@ -5,37 +5,144 @@
 import random
 import os
 from sys import argv
+# from feubotFormatter import FeubotFormatter
+from discord.ext.commands import DefaultHelpCommand
+
+import messageManager as msgManager
+
+async def setupBot(bot):
+    import helpful, memes, reactions, other#, undelete
+    await reactions.setup(bot)
+    await memes.setup(bot)
+    await helpful.setup(bot)
+    # undelete.setup(bot)
+    await other.setup(bot)
+    #TODO: Stuff like bot.other = bot.get_cog("Other") and such. Then initialize debug's "self" to be bot.
+
+    bot.remove_command('debug')
+    #Reload this as part of reload due to use of other.developerCheck
+    @bot.command(pass_context=True, hidden = True, aliases = ['exec'])
+    @other.developerCheck
+    async def debug(ctx, *, arg):
+        # https://stackoverflow.com/questions/3906232/python-get-the-print-output-in-an-exec-statement
+        from io import StringIO
+        import sys
+        old_stdout = sys.stdout
+        redirected_output = sys.stdout = StringIO()
+        bot = ctx.bot
+        try:
+            exec(arg)
+        except SystemExit:
+            await bot.send("I tried to quit().")
+        finally:
+            sys.stdout = old_stdout
+        output = redirected_output.getvalue()
+        output = "No output." if not output else output
+        await bot.send(output)
 
-import helpful, memes, reactions
-from feubotFormatter import FeubotFormatter
 
 if __name__ == "__main__":
+
+    intents = discord.Intents.all()
+    intents.members = True
+
     if "--debug" in argv:
-        bot = commands.Bot(command_prefix=['##', 'feubeta '], description='this is feubot beta.', formatter = FeubotFormatter()) 
+        bot = commands.Bot(command_prefix=['##', 'feubeta '], description='this is feubot beta.', intents=intents, help_command = DefaultHelpCommand(dm_help=True))
     else:
-        bot = commands.Bot(command_prefix=['!', '>>', 'feubot '], description='this is feubot.', formatter = FeubotFormatter())
+        bot = commands.Bot(command_prefix=['!', '>>', 'feubot '], description='this is feubot.', intents=intents, help_command = DefaultHelpCommand(dm_help=True))
 
     @bot.event
     async def on_ready():
+        await setupBot(bot)
         print('Logged in as')
         print(bot.user.name)
         print(bot.user.id)
         print('------')
-        await bot.change_presence(game=discord.Game(name="Reading the doc!"))
+        await bot.change_presence(activity=discord.Game(name="Reading the doc!"))
+
+    @bot.event
+    async def on_raw_reaction_add(payload):
+        messageID = payload.message_id
+        reaction  = payload.emoji.name
+        role_name = msgManager.find_role(str(messageID), reaction)
+        msg_properties = msgManager.get_properties(str(messageID))
+
+        guild  = bot.get_guild(payload.guild_id)
+        member = payload.member
+        role   = discord.utils.get(guild.roles, name=role_name)
+
+        #Extra check for management uses
+        if member == guild.owner and "ignoreOwner" in msg_properties:
+            print("Ignoring owner")
+            return
+
+        if role:
+            #If roles are exclusive, remove all other roles from the user
+            if "exclusiveRoles" in msg_properties:
+                reactRoles = msgManager.load_roles()[str(messageID)].values()
+                for x in member.roles:
+                    if x.name in reactRoles:
+                        await member.remove_roles(x)
+
+                #Remove other reactions on the message from this user
+                message = await guild.get_channel(payload.channel_id).fetch_message(messageID)
+                for x in message.reactions:
+                    if x.emoji != reaction:
+                        await x.remove(member)
+
+            await member.add_roles(role)
+
+    @bot.event
+    async def on_raw_reaction_remove(payload):
+        messageID = payload.message_id
+        reaction  = payload.emoji.name
+        role_name = msgManager.find_role(str(messageID), reaction)
+        msg_properties = msgManager.get_properties(str(messageID))
+
+        guild  = bot.get_guild(payload.guild_id)
+        #Use guild.get_member since payload.member is None on ReactionRemove
+        member = guild.get_member(payload.user_id)
+        role   = discord.utils.get(guild.roles, name=role_name)
+
+        #Extra check for management uses
+        if member == guild.owner and "ignoreOwner" in msg_properties:
+            print("Ignoring owner")
+            return
+
+        if role:
+            await member.remove_roles(role)
+
+    @bot.add_listener
+    async def on_command_error(ctx, error):
+        if type(error) == commands.CheckFailure:
+            pass
+        elif type(error) == commands.CommandNotFound:
+            pass
+        else:
+            await ctx.message.channel.send(error)
+
+    @bot.add_listener
+    async def on_message(message):
+        soldier_spellings = ['soldier', 'solider', 'soilder', 'solidier', 'soldeir']
+        if message.channel.id == 746515160377851997: #prep_screen id
+            bot_member = message.guild.get_member(bot.user.id)
+            bot_role = discord.utils.get(message.guild.roles, name="Conscripter")
+            if bot_role in bot_member.roles:
+                if any(word in message.content.lower() for word in soldier_spellings):
+                    role = discord.utils.get(message.guild.roles, name="Soldier")
+                    await message.author.add_roles(role)
 
     @bot.command()
-    async def donate():
+    async def donate(ctx):
         """you know it"""
-        await bot.say("https://donorbox.org/donate-to-circles")
+        await ctx.send("https://donate.tiltify.com/+fire-emblem-universe/fire-emblem-e3-2021")
+        await ctx.send("https://www.patreon.com/theFEUfund")
+        # await ctx.send("https://donorbox.org/donate-to-circles")
 
     token = os.environ.get('TOKEN', default=None)
     if token is None:
         token = open('./token').read().replace('\n','')
 
-    reactions.setup(bot)
-    memes.setup(bot)
-    helpful.setup(bot)
+    bot.reload = lambda: setupBot(bot)
 
     bot.run(token)
-
-

feubotFormatter.py

@@ -1,6 +1,6 @@
-from discord.ext.commands import HelpFormatter
+from discord.ext.commands import HelpCommand
 
-class FeubotFormatter(HelpFormatter):
+class FeubotFormatter(HelpCommand):
     def filter_command_list(self):
         return sorted(super().filter_command_list(), key=lambda e: str.lower(e[0]))
 

helpful.py

@@ -62,55 +62,85 @@ def create_embed(posts, threads, term):
                 text="Truncated %d result(s)." % (len(posts)-numresults))
     return result
 
-class Helpful:
+class Helpful(bot.Cog):
     """Actually Helpful commands"""
 
     def __init__(self, bot):
         self.bot = bot
+        # ctx = bot
+        # self.port = bot.listen('on_message')(self.port)
 
+    @bot.command()
+    async def mod(self, ctx, rule_num, *, link):
+        """!mod <rule number> <link to objectionable message>"""
+        FEU_id = 144670830150811649
+        if ctx.message.guild is None or ctx.message.guild.id == FEU_id:
+            await ctx.message.author.send("Your request for moderation was successful.")
+            if ctx.message.guild is not None:
+                await ctx.message.delete
+            mod_channel = self.bot.get_channel(650911156277477377)
+            paladins = discord.utils.get(ctx.message.guild.roles, id=145992793796378624).mention
+            await ctx.mod_channel.send("%s, moderation request received by user %s: Rule %s, at <%s>." % (paladins, ctx.message.author.name, rule_num, link))
+        else:
+            await ctx.send("Moderation features are for FEU only.")
+
+    @bot.command()
+    async def howtomod(self, ctx):
+        """Gives information on how to use the !mod command."""
+        await ctx.send("First, have Developer Mode enabled (Settings -> Appearance -> Developer Mode).")
+        await ctx.send("Then, click the `...` by the offending message, and click \"Copy Link\".")
+        await ctx.send("Then simple say !mod <n> <link>, where <n> is the rule it violates, and <link> is the pasted link to the message.")
+        await ctx.send("If you do not have Developer Mode, you may instead of a link, write a short description of where the infraction took place, and by who.")
+        await ctx.send("Note that after requesting moderation, the message requesting moderation will be removed.")
 
     @bot.command()
-    async def goldmine(self):
+    async def goldmine(self, ctx):
         """everything you ever wanted"""
         embed=discord.Embed(title="Unified FE Hacking Dropbox", url='https://www.dropbox.com/sh/xl73trcck2la799/AAAMdpNSGQWEzYkLEQEiEhGFa?dl=0', description="All the hacking resources you could ever need, in one place", color=0xefba01)
         # embed.set_thumbnail(url='http://i.imgur.com/Bg5NSga.png')
-        await self.bot.say(embed=embed)
+        await ctx.send(embed=embed)
+
+    # @bot.command() # removed aliases=["repo"]
+    # async def repository(self, ctx):
+    #     """graphics for you"""
+    #     embed=discord.Embed(title="Emblem Anims", url='https://emblem-anims.herokuapp.com/', description="Get your animations here (credits missing on some, check just in case!)", color=0x4286f4)
+    #     await ctx.send(embed=embed)
 
     @bot.command()
-    async def mugs(self):
+    async def mugs(self, ctx):
         """Link to image of all GBAFE mugs."""
-        await self.bot.say("http://doc.feuniverse.us/static/resources/mugs.png")
+        await ctx.send("http://doc.feuniverse.us/static/resources/mugs.png")
 
     @bot.command()
-    async def hit(self, number, type="2RN"):
+    async def hit(self, ctx, number, type="2RN"):
         """Convert 2RN/fates hit to actual chance"""
         try:
             num = int(number)
         except ValueError:
-            await self.bot.say("Specify an integer 0-100")
+            await ctx.send("Specify an integer 0-100")
             return
         if (num < 0) or (num > 100):
-            await self.bot.say("Specify an integer 0-100")
+            await ctx.send("Specify an integer 0-100")
             return
         if type.upper()=="2RN":
             table = [0.00, 0.03, 0.10, 0.21, 0.36, 0.55, 0.78, 1.05, 1.36, 1.71, 2.10, 2.53, 3.00, 3.51, 4.06, 4.65, 5.28, 5.95, 6.66, 7.41, 8.20, 9.03, 9.90, 10.81, 11.76, 12.75, 13.78, 14.85, 15.96, 17.11, 18.30, 19.53, 20.80, 22.11, 23.46, 24.85, 26.28, 27.75, 29.26, 30.81, 32.40, 34.03, 35.70, 37.41, 39.16, 40.95, 42.78, 44.65, 46.56, 48.51, 50.50, 52.47, 54.40, 56.29, 58.14, 59.95, 61.72, 63.45, 65.14, 66.79, 68.40, 69.97, 71.50, 72.99, 74.44, 75.85, 77.22, 78.55, 79.84, 81.09, 82.30, 83.47, 84.60, 85.69, 86.74, 87.75, 88.72, 89.65, 90.54, 91.39, 92.20, 92.97, 93.70, 94.39, 95.04, 95.65, 96.22, 96.75, 97.24, 97.69, 98.10, 98.47, 98.80, 99.09, 99.34, 99.55, 99.72, 99.85, 99.94, 99.99, 100.00]
         elif type.upper()=="FATES":
             table = [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50.5,51.83,53.17,54.5,55.83,57.17,58.5,59.83,61.17,62.5,63.83,65.17,66.5,67.83,69.17,70.5,71.83,73.17,74.5,75.83,77.17,78.5,79.83,81.17,82.5,83.83,85.12,86.35,87.53,88.66,89.73,90.75,91.72,92.63,93.49,94.3,95.05,95.75,96.4,96.99,97.53,98.02,98.45,98.83,99.16,99.43,99.65,99.82,99.93,99.99,100]
         else:
-            await self.bot.say("Valid types are 2RN, Fates")
+            await ctx.send("Valid types are 2RN, Fates")
             return
-        await self.bot.say(str(table[num]))
+        await ctx.send(str(table[num]))
 
     @bot.command()
-    async def roll(self, number, type="2RN"):
+    async def roll(self, ctx, number, type="2RN"):
         """rolls hit or miss (e.g. >>hit 50 1rn/2rn[default]/fates)"""
         try:
             num = int(number)
         except ValueError:
-            await self.bot.say("Specify an integer 0-100")
+            await ctx.send("Specify an integer 0-100")
             return
         if (num < 0) or (num > 100):
-            await self.bot.say("Specify an integer 0-100")
+            await ctx.send("Specify an integer 0-100")
             return
         if type.upper()=="1RN":
             rolled = random.randint(1,100)
@@ -121,13 +151,21 @@ async def roll(self, number, type="2RN"):
             if rolled > 50:
                 rolled = ((rolled*3) + random.randint(1,100))>>2
         else:
-            await self.bot.say("Valid types are 1RN, 2RN, Fates")
+            await ctx.send("Valid types are 1RN, 2RN, Fates")
             return
-        if rolled <= num: await self.bot.say("HIT (%d)" % rolled)
-        else: await self.bot.say("MISS (%d)" % rolled)
+        if rolled <= num: await ctx.send("HIT (%d)" % rolled)
+        else: await ctx.send("MISS (%d)" % rolled)
 
-    @bot.command()
-    async def search(self, *, term):
+    @bot.command() # removed aliases = ['die']
+    async def rollDie(self, ctx, n : int):
+        if n <= 0:
+            await ctx.send("Specify a positive integer.")
+            return
+        res = random.randrange(n) + 1
+        await ctx.send(str(res))
+
+    @bot.command(aliases=['s'])
+    async def search(self, ctx, *, term):
         """search feu"""
         root = "http://feuniverse.us/search.json?q=%s"
         payload = urllib.parse.quote(term)
@@ -143,22 +181,27 @@ async def search(self, *, term):
                 # data = json.loads(js.read().decode())
                 posts = data["posts"]
                 threads = data["topics"]
-                await self.bot.say(embed=create_embed(posts, threads, payload))
+                await ctx.send(embed=create_embed(posts, threads, payload))
             except urllib.error.URLError:
-                await self.bot.say("Error accessing FEU server, please try again later.")
+                await ctx.send("Error accessing FEU server, please try again later.")
             except KeyError:
                 embedded=create_embed(posts, [], payload)
                 try:
-                    await self.bot.say(embed=embedded)
+                    await ctx.send(embed=embedded)
                 except discord.errors.HTTPException:
                     print(embedded.title)
 
-    @bot.command(aliases=["UT2"])
-    async def ut2(self):
+    @bot.command() #aliases=["UT2"]
+    async def ut2(self, ctx):
         """links ultimate tutorial v2"""
         embed=discord.Embed(title="Fire Emblem Hacking Ultimate Tutorial v2", url='https://tutorial.feuniverse.us/', description="How to do everything with Event Assembler buildfiles", color=0x40caf2)
-        await self.bot.say(embed=embed)
+        await ctx.send(embed=embed)
 
+    async def port(self, ctx, msg):
+        if str(msg.author.id) != 149576374984638464: return
+        if 'PORT' in msg.content.upper():
+            pass
+            # await ctx.send(msg.channel, '```I think you mean MUG```')
 
-def setup(bot):
-    bot.add_cog(Helpful(bot))
+async def setup(bot):
+    await bot.add_cog(Helpful(bot))