Merge branch 'master' into master

Author: tweirtx

.github/workflows/main.yml

@@ -11,9 +11,9 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: '3.10.6'
 

docker-compose.yml

@@ -9,16 +9,9 @@ services:
       - "5432:5432"
     volumes:
       - database:/var/lib/postgresql/data
-  lavalink:
-    image: fredboat/lavalink:latest
-    environment:
-      LAVALINK_SERVER_PASSWORD: youshallnotpass
-      SERVER_PORT: 2333
-      SERVER_HOST: 0.0.0.0
   dozer:
     depends_on: 
       - postgres
-      - lavalink
     build: .
     volumes:
       - ".:/app"

docs/FTC.rst

@@ -0,0 +1,14 @@
+===============
+FTC Information
+===============
+ftc
++++
+Get information on an FTC team from FTC-Events.
+If no subcommand is specified, the `team` subcommand is inferred, and the argument is taken as a team number.
+::
+   `{prefix}ftc 5667` - show information on team 5667, Robominers
+team
+++++
+Get information on an FTC team by number.
+::
+   `{prefix}ftc team 7244` - show information on team 7244, OUT of the BOX Robotics

docs/Shortcuts.rst

@@ -0,0 +1,28 @@
+=========
+Shortcuts
+=========
+settings
+++++++++
+Display the shortcut settings for the current server.
+::
+   `{prefix}shortcuts settings` - display the shortcut settings for the current server
+setprefix
++++++++++
+Set the prefix to be used to respond to shortcuts for the server.
+::
+   `{prefix}shortcuts setprefix ^` - sets the server's shortcut prefix to "^"
+set
++++
+Sets the reply for a given shortcut name, creating one if doesn't exist.
+::
+   `{prefix}shortcuts set foo bar` - sets the shortcut named "foo" to send "bar"
+remove
+++++++
+Removes a shortcut from the server.
+::
+   `{prefix}shortcuts remove foo` - removes the shortcut "foo" for the server
+list
+++++
+Lists the shortcuts for the server.
+::
+   `{prefix}shortcuts list` - lists the shortcuts that exist for the server

docs/index.rst

@@ -15,6 +15,7 @@ Welcome to Dozer's documentation!
     NameGame <NameGame.rst>
     News <News.rst>
     Roles <Roles.rst>
+    Shortcuts <Shortcuts.rst>
     Starboard <Starboard.rst>
     TBA <TBA.rst>
     Teams <Teams.rst>

dozer/Components/CustomJoinLeaveMessages.py

@@ -25,15 +25,31 @@ async def send_log(member):
 def format_join_leave(template: str, member: discord.Member):
     """Formats join leave message templates
     {guild} = guild name
-    {user} = user's name plus discriminator ex. SnowPlow#5196
-    {user_name} = user's name without discriminator
+    {user} = user's name
     {user_mention} = user's mention
     {user_id} = user's ID
     """
     template = template or "{user_mention}\n{user} ({user_id})"
-    return template.format(guild=member.guild, user=str(member), user_name=member.name,
-                            user_mention=member.mention, user_id=member.id)
 
+    subst = [("{guild}", member.guild.name),
+             ("{user}", member),  
+             ("{user_mention}", member.mention),
+             ("{user_id}", member.id)]
+    
+    def helper(s: str, subst: list):
+        if not subst:
+            # base case: return self
+            return s
+        cur = subst[0]
+        # split the current string on cur[0]. 
+        # for each split segment call the helper on the rest of the substitutions.
+        # then rejoin on the substitutions (this avoids the substituted values from matching substitution keywords)
+
+        # we could make this not recursive but there's an O(1) number of possible recursions anyway
+        # recursion depth is limited to 5 since the subst list is limited
+        # breadth is limited by template size (indirectly limited by discord message size)
+        return str(cur[1]).join([helper(bit, subst[1:]) for bit in s.split(cur[0])])
+    return helper(template, subst)
 
 class CustomJoinLeaveMessages(db.DatabaseTable):
     """Holds custom join leave messages"""

dozer/__main__.py

@@ -21,6 +21,10 @@
         'key': 'Put TOA API key here',
         'app_name': 'Dozer',
     },
+    'ftc-events': {
+        'username': 'Put FTC-Events username here',
+        'token': 'Put FTC-Events token here'
+    },
     'db_url': 'postgres://dozer_user:simplepass@postgres',
     'gmaps_key': "PUT GOOGLE MAPS API KEY HERE",
     'discord_token': "Put Discord API Token here.",

dozer/cogs/actionlogs.py

@@ -300,7 +300,7 @@ async def on_raw_message_edit(self, payload: discord.RawMessageUpdateEvent):
         embed = discord.Embed(title="Message Edited",
                               description=f"[MESSAGE]({link}) From {mention}\nEdited In: {mchannel.mention}",
                               color=0xFFC400)
-        embed.set_author(name=f"{author['username']}#{author['discriminator']}", icon_url=avatar_link)
+        embed.set_author(name=f"{author['username']}{'#' + author['discriminator'] if author['discriminator'] != '0' else ''}", icon_url=avatar_link)
         embed.add_field(name="Original", value="N/A", inline=False)
         if content:
             embed.add_field(name="Edited", value=content[0:1023], inline=False)
@@ -547,8 +547,7 @@ async def help(self,
         e.set_footer(text='Triggered by ' + escape_markdown(ctx.author.display_name))
         e.description = """
         `{guild}` = guild name
-        `{user}` = user's name plus discriminator ex. SnowPlow#5196
-        `{user_name}` = user's name without discriminator
+        `{user}` = user's name
         `{user_mention}` = user's mention
         `{user_id}` = user's ID
         """

dozer/cogs/development.py

@@ -144,6 +144,7 @@ def load_function(code: str, globals_, locals_):
         try:
             exec(function_header + '\n\treturn ' + lines[0], globals_, locals_)
         except SyntaxError as err:  # Either adding the 'return' caused an error, or it's user error
+            err.offset = int(err.offset)
             if err.text[err.offset - 1] == '=' or err.text[err.offset - 3:err.offset] == 'del' \
                     or err.text[err.offset - 6:err.offset] == 'return':  # return-caused error
                 exec(function_header + '\n\t' + lines[0], globals_, locals_)