Added LINK_INVITE .env variable, added invite and support emojis, rem…

…oved navi lite emoji

.gitignore

@@ -102,7 +102,7 @@ celerybeat.pid
 *.sage.py
 
 # Environments
-.env
+.env*
 .venv
 env/
 venv/

cogs/main.py

@@ -2,6 +2,7 @@
 """Contains error handling and the help and about commands"""
 
 import discord
+from discord import slash_command
 from discord.ext import bridge, commands
 
 from content import main
@@ -35,21 +36,28 @@ async def about(self, ctx: bridge.BridgeContext) -> None:
         """About command"""
         await main.command_about(self.bot, ctx)
 
+    # Slash commands
+    if settings.LINK_INVITE is not None:
+        @slash_command(name='invite', description='Invite Navi to your server!')
+        async def invite(self, ctx: discord.ApplicationContext) -> None:
+            """Sends and invite link"""
+            await ctx.respond(f'Click [here]({settings.LINK_INVITE}) to invite me!')
+
     # Text commands
     @commands.command(name='invite', aliases=('inv',))
     @commands.bot_has_permissions(send_messages=True)
-    async def invite(self, ctx: commands.Context) -> None:
+    async def invite_prefix(self, ctx: commands.Context) -> None:
         """Invite command"""
-        invite_link = 'https://canary.discord.com/api/oauth2/authorize?client_id=1213487623688167494&permissions=378944&scope=bot'
-        if ctx.guild.me.id == 1213487623688167494: # Navi Lite#9605
+        if settings.LINK_INVITE is not None:
             answer = (
-                f'Click [here]({invite_link}) to invite me!'
+                f'Click [here]({settings.LINK_INVITE}) to invite me!'
             )
         else:
+            navi_lite_invite = 'https://canary.discord.com/api/oauth2/authorize?client_id=1213487623688167494&permissions=378944&scope=bot'
             answer = (
                 f'Sorry, you can\'t invite this Navi.\n\n'
                 f'However, you have 2 options:\n'
-                f'1. [Invite Navi Lite]({invite_link}), a global version of Navi with a few limitations.\n'
+                f'1. [Invite Navi Lite]({navi_lite_invite}), a global version of Navi with a few limitations.\n'
                 f'2. [Run Navi yourself](https://github.com/MirielCH/Navi). Navi is free and open source.\n'
             )
         await ctx.reply(answer)

content/main.py

@@ -16,16 +16,13 @@
 from resources import emojis, functions, settings, strings
 
 
-LINK_INVITE_NAVI_LITE = 'https://canary.discord.com/api/oauth2/authorize?client_id=1213487623688167494&permissions=378944&scope=bot'
-
-
 class LinksView(discord.ui.View):
     """View with link buttons."""
     def __init__(self):
         super().__init__(timeout=None)
         if settings.LINK_SUPPORT is not None:
             self.add_item(discord.ui.Button(label="Support", style=discord.ButtonStyle.link,
-                                            url=settings.LINK_SUPPORT, emoji=emojis.NAVI, row=0))
+                                            url=settings.LINK_SUPPORT, emoji=emojis.SUPPORT, row=0))
         self.add_item(discord.ui.Button(label="Changelog", style=discord.ButtonStyle.link,
                                         url=strings.LINK_CHANGELOG, emoji=emojis.GITHUB, row=0))
         self.add_item(discord.ui.Button(label="Github", style=discord.ButtonStyle.link,
@@ -36,10 +33,11 @@ def __init__(self):
         if settings.LINK_TERMS is not None:
             self.add_item(discord.ui.Button(label="Terms of Service", style=discord.ButtonStyle.link,
                                             url=settings.LINK_TERMS, emoji=emojis.TERMS, row=1))
+        if settings.LINK_INVITE is not None:
+            self.add_item(discord.ui.Button(label="Invite", style=discord.ButtonStyle.link,
+                          url=settings.LINK_INVITE, emoji=emojis.INVITE, row=2))
 
 
-
-
 # --- Commands ---
 async def command_event_reduction(bot: bridge.AutoShardedBot, ctx: bridge.BridgeContext) -> None:
     """Help command"""
@@ -51,9 +49,6 @@ async def command_event_reduction(bot: bridge.AutoShardedBot, ctx: bridge.Bridge
 async def command_help(bot: bridge.AutoShardedBot, ctx: Union[bridge.BridgeContext, discord.Message]) -> None:
     """Help command"""
     view = LinksView()
-    if ctx.guild.me.id == 1213487623688167494: # Navi Lite#9605
-        view.add_item(discord.ui.Button(label="Invite", style=discord.ButtonStyle.link,
-                      url=LINK_INVITE_NAVI_LITE, emoji='<:invite:1215733334542385265>', row=2))
     embed = await embed_help(bot, ctx)
     if isinstance(ctx, discord.Message):
         await ctx.reply(embed=embed, view=view)
@@ -69,9 +64,6 @@ async def command_about(bot: bridge.AutoShardedBot, ctx: bridge.BridgeContext) -
     api_latency = end_time - start_time
     img_navi, embed = await embed_about(bot, api_latency)
     view = LinksView()
-    if ctx.guild.me.id == 1213487623688167494: # Navi Lite#9605
-        view.add_item(discord.ui.Button(label="Invite", style=discord.ButtonStyle.link,
-                      url=LINK_INVITE_NAVI_LITE, emoji='<:invite:1215733334542385265>', row=2))
     channel_permissions = ctx.channel.permissions_for(ctx.guild.me)
     if not channel_permissions.attach_files:
         await interaction.edit(content=None, embed=embed, view=view)

default.env

@@ -30,14 +30,18 @@ DEV_IDS=
 # Use hex format (e.g. 00FFAA).
 EMBED_COLOR=000000
 
-# Optional. Sets a link to your Navi support server or channel. If this is set, Navi will show a link button in /help and /about.
-# Example: LINK_SUPPORT=https://discord.com/channels/1234/1234
-LINK_SUPPORT=
+# Optional. Sets a link with which your Navi can be invited if you choose to let people do so. If this is set, Navi will show an invite button in /help and /about.
+# Example: https://canary.discord.com/api/oauth2/authorize?client_id=1213487623688167494&permissions=378944&scope=bot
+LINK_INVITE=
 
 # Optional. Sets a link to your privacy policy. If this is set, Navi will show a link button in /help and /about.
 # Example: LINK_PRIVACY_POLICY=https://github.com/YourName/Navi/blob/master/PRIVACY.md
 LINK_PRIVACY_POLICY=
 
+# Optional. Sets a link to your Navi support server or channel. If this is set, Navi will show a link button in /help and /about.
+# Example: LINK_SUPPORT=https://discord.com/channels/1234/1234
+LINK_SUPPORT=
+
 # Optional. Sets a link to your terms of service. If this is set, Navi will show a link button in /help and /about.
 # Example: LINK_TERMS=https://github.com/YourName/Navi/blob/master/TERMS.md
 LINK_TERMS=

resources/emojis.py

@@ -185,12 +185,12 @@
 ENABLED = '<:enabled:1065722838935412797>'
 ERROR = '❌'
 GITHUB = '<:github:1010927917297053707>'
+INVITE = '<:invite:1215733334542385265>'
 NAVI = '<:navi:1214997490533662762>'
-NAVI_LITE = '<:navi_lite:1214642272524828742>'
-NAVI = NAVI_LITE if settings.LITE_MODE else NAVI
 PARTNER_ALERT = '💌'
 PRIVACY_POLICY = '<:privacy:1213508477285048360>s'
 REMOVE = '<:remove:1214996418696183938>'
+SUPPORT = '<:support:1216056995971338361>'
 TERMS = '<:terms:1213494032215314513>'
 WARNING = '⚠️'
 

resources/settings.py

@@ -88,6 +88,12 @@
         print(f'Can\'t convert value "{EMBED_COLOR}" of variable EMBED_COLOR in the .env file to an integer.')
         sys.exit()
 
+LINK_INVITE = os.getenv('LINK_INVITE')
+if LINK_INVITE != '' and LINK_INVITE is not None:
+    LINK_INVITE = LINK_INVITE.strip('" ')
+else:
+    LINK_INVITE = None
+
 LINK_SUPPORT = os.getenv('LINK_SUPPORT')
 if LINK_SUPPORT != '' and LINK_SUPPORT is not None:
     LINK_SUPPORT = LINK_SUPPORT.strip('" ')