Merge branch 'release/2022.30.0' into main

CHANGELOG.md

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [2021.30.0] - 2022-07-25
+### Changed
+- Everything! We now have slash commands. 
+
+
 ## [2021.43.0] - 2021-10-28
 ### Changed
 - Fix an issue where an error might happen when approving a user that the bot can't DM
@@ -169,7 +174,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
   - `[p]progress (mention)`
 - Settings commands
 
-[Unreleased]: https://github.com/TrainerDex/DiscordBot/compare/v2020.48.0...HEAD
+[Unreleased]: https://github.com/TrainerDex/  DiscordBot/compare/v2022.30.0...develop
+[2022.30.0]: https://github.com/TrainerDex/DiscordBot/compare/v2021.43.0...v2022.30.0
+[2021.43.0]: https://github.com/TrainerDex/DiscordBot/compare/v2020.48.0...v2021.43.0
 [2020.48.0]: https://github.com/TrainerDex/DiscordBot/compare/v2020.40.2...v2020.48.0
 [2020.40.2]: https://github.com/TrainerDex/DiscordBot/compare/v2020.40.0...v2020.40.2
 [2020.40.0]: https://github.com/TrainerDex/DiscordBot/compare/v2020.38.0...v2020.40.0

docs/faq.md

@@ -0,0 +1,51 @@
+# Freqently Asked Questions
+
+- **Is this bot available for other Discord servers?**
+  - Very soon.
+
+- **Can I donate to TrainerDex?**
+  - Yes, over at [Patreon](https://www.patreon.com/TrainerDexApp) or [PayPal](https://www.paypal.com/paypalme/TrainerDexApp).
+
+- **How do I update my experience on the leaderboard?**
+  - With the `/update` command on Discord, you can update most stats, or all via [the website](https://trainerdex.app/new/).
+  ![](./slash-update.png)
+
+- **Can I hide my experience on the leaderboard?**
+  - With the `/edit-profile visible` command, proving a True/False response. True for visible, False for hiding. 
+
+- **Can I view any trainers stats or experience on the leaderboard?**
+  - With the `/profile` command, you can supply a users In Game Trainer Name, or their Discord mention.
+
+- **What if I have recently changed my team color or in-game trainer name?**
+  - Visit the [`#support`](https://discord.com/channels/364313717720219651/364316724918484993) channel in the [Discord Server](https://discord.gg/Anz3UpM), please post what your old trainer name or team used to be, and then post a screenshot of your new team color or trainer name.
+
+- **How do I log in to the website?**
+  - Tap the Discord button on the log-in screen and use the same Discord account you use with the bot.
+
+- **Is there a leaderboard for _x_?**
+  - There are leaderboards for most stats. Use the `/leaderboard` command and explore the options. Unfortunately due to limitations in the Discord API, we can only provide a limited number of options. We are working on bringing more to the the website though. As of writing this document, these are the options:
+    - Total XP
+    - Backpacker | _Spin Stops_
+    - Collector | _Catch Pokemon_
+    - Jogger | _KM walked_
+    - Gold Gym Badges
+    - Sightseer | _Spin Unique Stops_
+    - Battle Legend | _Win Legendary Raids_
+    - Champion | _Win Raids_
+    - Gym Leader | _Gym Defense_
+    - Pokémon Ranger | _Research Tasks_
+    - Scientist | _Evolves_
+    - Pilot | _KM Traded_
+    - Breeder | _Hatch Eggs_
+    - Hero | _Team Rocket Battles_
+    - Gentleman | _Trades_
+    - Battle Girl | _Gym Battles_
+    - Wayfarer | _Wayfarer Agreements_
+    - Berry Master | _Feed Berries at Gym_
+    - Best Buddy | _Best Buddy Pokemon_
+    - Great League Veteran | _GL Battles_
+    - Ultra League Veteran | _UL Battles_
+    - Master League Veteran | _ML Battles_
+    - Successor | _Mega Evolves_
+    - Triathlete | _7-day streak_
+    - Ultra Hero | _Giovanni Battles_

docs/migrating.md

@@ -0,0 +1,14 @@
+# Migrating
+
+We recently updated the bot to use slash commands. They're fairly self explanitary but heres were you can find them
+
+
+ - `.approve`/`.ap` has moved to `/approve`
+ - `.trnr`/`.trainer`/`.profile`/`.whois`/`.progress` -> `/profile`
+ - `.lb`/`.leaderboard` -> `/leaderboard`
+
+### Welcome messages
+The bot no longer handles welcome messages and logging. It's just out of the scope of what I want to do. [Dyno](https://dyno.gg/) is a great alternative to that.
+
+### Pokecord
+Pokecord is no longer supported. It's just out of the scope of what I want to do. Find their dedicated bot [here](https://pokecord.xyz/)

trainerdex_discord_bot/__init__.py

@@ -9,6 +9,6 @@
 
 """
 
-VERSION = (2022, 23, 2, "alpha", 1)
+VERSION = (2022, 30, 0, "final", 0)
 
 __version__ = f"{VERSION[0]}.{VERSION[1]}.{VERSION[2]}-{VERSION[3]}.{VERSION[4]}"

trainerdex_discord_bot/cogs/settings.py

@@ -11,6 +11,7 @@
 
 from trainerdex_discord_bot.checks import check_member_privilage
 from trainerdex_discord_bot.cogs.interface import Cog
+
 # from trainerdex_discord_bot.datatypes import GlobalConfig
 from trainerdex_discord_bot.utils.chat_formatting import error, info, success
 from trainerdex_discord_bot.utils.general import send
@@ -38,7 +39,9 @@ class SettingsCog(Cog):
     # )
 
     @guild_config.command(name="assign-roles-on-join", checks=[check_member_privilage])
-    async def guild_config__assign_roles_on_join(self, ctx: ApplicationContext, value: bool) -> None:
+    async def guild_config__assign_roles_on_join(
+        self, ctx: ApplicationContext, value: bool
+    ) -> None:
         """Modify the roles of members when they're approved.
 
         This is useful for granting users access to the rest of the server.
@@ -54,7 +57,9 @@ async def guild_config__assign_roles_on_join(self, ctx: ApplicationContext, valu
         )
 
     @guild_config.command(name="set-nickname-on-join", checks=[check_member_privilage])
-    async def guild_config__set_nickname_on_join(self, ctx: ApplicationContext, value: bool) -> None:
+    async def guild_config__set_nickname_on_join(
+        self, ctx: ApplicationContext, value: bool
+    ) -> None:
         """Modify the nickname of members when they're approved.
 
         This is useful for ensuring players can be easily identified.
@@ -167,7 +172,7 @@ async def guild_config__access_roles(
         elif array == "revoke":
             guild_config.roles_to_assign_on_approval.remove = list(set(role_list))
         await self.config.set_guild(guild_config)
-        
+
     @guild_config.command(
         name="mod-roles",
         options=[