feat: add support for user-installable app

Author: astra1dev

README.md

@@ -45,5 +45,12 @@
 - Install the required packages with `python -m pip install -r requirements.txt`
 - Edit the file `/settings/.env` and add the following:
   - Your bot's token, which can be found on the Discord developer portal
-  - (Optional, required by some commands) Your SomeRandomAPI API key can be obtained [here](https://docs.some-random-api.com/authorization).
+  - Your SomeRandomAPI API key, which can be obtained [here](https://docs.some-random-api.com/authorization). It is required for `/lyrics` to work, and lowers rate limits for some other commands.
 - Run the bot with `python3 bot.py`
+
+You can now add the bot in two ways:
+
+- Invite the bot **to your server** (or any server where you have "Manage Server" permission) using the OAuth2 URL generator on the Discord developer portal.
+- Add the bot directly **to your account**. This allows you to use the bot in *any* server.
+  If you have "Use External Apps" permission in a server, the bot's messages will be visible to everyone, otherwise, they will only be visible to you.
+  You won't be able to use the economy system in servers that don't have the bot added.

bot.py

@@ -233,6 +233,9 @@ async def on_reaction_add(reaction, user) -> None:
 
 
 @bot.tree.command(name="info", description="Shows the bot's status and latency")
+@app_commands.allowed_installs(guilds=True, users=True)
+@app_commands.allowed_contexts(guilds=True, dms=True, private_channels=True)
+@app_commands.user_install()
 async def info(interaction):
     # Calculate uptime
     uptime_seconds = time.time() - start_time

commands/anime.py

@@ -98,4 +98,7 @@ async def waifu(self, interaction: discord.Interaction, category: discord.app_co
 
 
 async def setup(bot):
-    bot.tree.add_command(AnimeCommands(name="anime", description="Anime commands"))
+    bot.tree.add_command(AnimeCommands(name="anime", description="Anime commands",
+                                       allowed_installs=app_commands.AppInstallationType(guild=True, user=True),
+                                       allowed_contexts=app_commands.AppCommandContext(guild=True, dm_channel=True,
+                                                                                       private_channel=True)))

commands/fun.py

@@ -142,4 +142,7 @@ async def joke(self, interaction: discord.Interaction):
 
 
 async def setup(bot):
-    bot.tree.add_command(FunCommands(name="fun", description="Fun commands"))
+    bot.tree.add_command(FunCommands(name="fun", description="Fun commands",
+                                     allowed_installs=app_commands.AppInstallationType(guild=True, user=True),
+                                     allowed_contexts=app_commands.AppCommandContext(guild=True, dm_channel=True,
+                                                                                     private_channel=True)))

commands/games.py

@@ -44,4 +44,7 @@ async def connect4(self, interaction: discord.Interaction):
 
 
 async def setup(bot):
-    bot.tree.add_command(GameCommands(name="game", description="Game commands"))
+    bot.tree.add_command(GameCommands(name="game", description="Game commands",
+                                      allowed_installs=app_commands.AppInstallationType(guild=True, user=True),
+                                      allowed_contexts=app_commands.AppCommandContext(guild=True, dm_channel=True,
+                                                                                      private_channel=True)))

commands/image.py

@@ -120,4 +120,7 @@ async def compose(self, interaction: discord.Interaction, member: discord.Member
 
 
 async def setup(bot):
-    bot.tree.add_command(ImageCommands(name="image", description="Image commands"))
+    bot.tree.add_command(ImageCommands(name="image", description="Image commands",
+                                       allowed_installs=app_commands.AppInstallationType(guild=True, user=True),
+                                       allowed_contexts=app_commands.AppCommandContext(guild=True, dm_channel=True,
+                                                                                       private_channel=True)))

commands/music.py

@@ -40,4 +40,7 @@ async def lyrics(self, interaction: discord.Interaction, search: str):
 
 
 async def setup(bot):
-    bot.tree.add_command(MusicCommands(name="music", description="Music commands"))
+    bot.tree.add_command(MusicCommands(name="music", description="Music commands",
+                                       allowed_installs=app_commands.AppInstallationType(guild=True, user=True),
+                                       allowed_contexts=app_commands.AppCommandContext(guild=True, dm_channel=True,
+                                                                                       private_channel=True)))