fix: various bugs, closes #24 as well

Author: orangci

.gitignore

@@ -1,4 +1,4 @@
 venv
 *__pycache__*
 .env
-.ruff_cache
+*.ruff_cache*

CHANGELOG.md

@@ -49,5 +49,8 @@ Added the VERSION variable in the config and updated listeners.ping_response to
 #### 1.5.1
 Made the maintainer only command reload_exts reload the config.
 
-#### 1.6.0
-As I started using ruff and uv here, I also formatted everything and addressed the hundreds and hundreds of errors ruff so joyfully raised.
+### 1.6.0
+As I started using ruff and uv here, I also formatted everything and addressed the hundreds and hundreds of errors ruff so joyfully raised.
+
+#### 1.6.1
+Fixes various bugs introduced in 1.6.0, and also see #24.

CONTRIBUTING.md

@@ -5,7 +5,7 @@ Takina does not currently follow *all* of these standards, but as of now does fo
 First of all, thanks for considering contributing to Takina! I appreciate it. Please make sure that what you're contributing follows Discord's [Terms of Service](https://discord.com/terms). Please follow the standards after this section, and lastly, if it's a new feature, please contact me ([orangc](https://orangc.net)) or in the least open an issue before starting to write code; confirming that I'll approve your idea is better than wasting your time and finding out later that I can't merge your pull request because of x and y. 💖
 
 ### Formatting/Linting & Commits
-- `ruff format .` and `ruff check .` should be run before committing. If `ruff check` raises any errors, they must be addressed.
+- `ruff format` and `ruff check` should be run before committing. If `ruff check` raises any errors, they must be addressed.
 - Each commit should follow the Conventional Commits standard, for example: `fix(mod): mute command did not check for perms`. The scope should be the subfolder affected in the cogs dir, and if there is none, use (core) as a scope.
 - Every command should have a description and help information.
 

README.md

@@ -47,4 +47,4 @@ Please see [CONTRIBUTING.md](CONTRIBUTING.md).
 ## Specifications
 - This project follows the [Semantic Versioning 2.0.0](https://semver.org/) specification as of 14.04.2025. You may see the current version and changelog [here](./CHANGELOG.md).
 - This project follows the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) specification as of 01.10.2024.
-<!-- note to self: count takina loc with: `git ls-files | grep '\.py$' | xargs wc -l | tail -n 1`, 9,839 as of 14.04.2025 -->
+<!-- note to self: count takina loc with: `git ls-files | grep '\.py$' | xargs wc -l | tail -n 1`, 10,148 as of 25.04.2025 -->

takina/cogs/listeners/github.py

@@ -14,7 +14,7 @@
 GITHUB_BASE_URL = "https://api.github.com"
 
 REPO_PATTERN = re.compile(r"repo:([A-Za-z0-9_.-]+)/([A-Za-z0-9_.-]+)")
-PR_ISSUE_PATTERN = re.compile(r"([A-Za-z0-9_.-]+)/([A-Za-z0-9_.-]+)#(\d+)")
+PR_ISSUE_PATTERN = re.compile(r"^[a-zA-Z0-9-]+/[a-zA-Z0-9-]+#[0-9]+$")
 
 
 def format_timestamp(iso_timestamp: str) -> str:

takina/cogs/mod/reports.py

@@ -48,18 +48,16 @@ async def report(
     ):
         await interaction.response.defer()
         guild_id = interaction.guild.id
-        config = await self.get_server_config(guild_id)
+        guild_config = await self.get_server_config(guild_id)
 
-        if not config:
+        if not guild_config:
             embed = nextcord.Embed(color=config.ERROR_COLOR)
-            embed.description = (
-                ":x: Reports system is not set up. Please contact an admin."
-            )
+            embed.description = ":x: The reports system has not been configured for this server. In order to set it up, run `/admin_report`."
             await interaction.send(embed=embed, ephemeral=True)
             return
 
-        moderator_role_id = config.get("moderator_role_id")
-        reports_channel_id = config.get("reports_channel_id")
+        moderator_role_id = guild_config.get("moderator_role_id")
+        reports_channel_id = guild_config.get("reports_channel_id")
 
         reports_channel = self.bot.get_channel(reports_channel_id)
         if not reports_channel:
@@ -115,7 +113,9 @@ async def admin_report(
         await self.set_server_config(guild_id, mod_role.id, reports_channel.id)
 
         embed = nextcord.Embed(color=config.EMBED_COLOR)
-        embed.description = f"✅ Successfully set up the report system. Moderator role: {mod_role.mention}, reports channel: {reports_channel.mention}"
+        embed.description = "✅ Successfully set up the report system.\n"
+        embed.description += f"\n**Moderator role**: {mod_role.mention}"
+        embed.description += f"\n**Reports channel**: {reports_channel.mention}"
 
         await interaction.send(
             embed=embed,

takina/cogs/util/info.py

@@ -86,10 +86,10 @@ async def userinfo(self, ctx: commands.Context, *, member: str = None):
 
     @commands.command(
         name="roleinfo",
-        help="Fetch information about a role. \nUsage: `Usage: roleinfo <role>`.",
+        help="Fetch information about a role. \nUsage: `Usage: roleinfo <role>`. Note that this command is ***case-sensitive***.",
         aliases=["ri"],
     )
-    async def roleinfo(self, ctx: commands.Context, *, role: str):
+    async def roleinfo(self, ctx: commands.Context, *, role: nextcord.Role):
         emoji = await oclib.fetch_random_emoji()
         embed = nextcord.Embed(
             title=f"{emoji}{role.name}",

takina/cogs/util/reminders.py

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 # SPDX-FileCopyrightText: orangc
-from datetime import datetime, timedelta
-
+from datetime import timedelta
+import datetime
 import nextcord
 from bson.objectid import ObjectId
 import config
@@ -30,6 +30,7 @@ async def remindme(self, ctx: commands.Context):
         name="reminder",
         invoke_without_command=True,
         help="Manage your reminders. Use `reminder set`, `reminder list`, or `reminder delete`.",
+        aliases=["reminders"],
     )
     async def reminder(self, ctx: commands.Context):
         embed = nextcord.Embed(

takina/cogs/util/time.py

@@ -1,13 +1,13 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 # SPDX-FileCopyrightText: orangc
 import datetime
-
 import geopy
 import nextcord
 import pytz
 import tzfpy
 import config
 from nextcord.ext import commands
+import geopy.extra
 
 
 async def find_time(location: str):
@@ -16,7 +16,7 @@ async def find_time(location: str):
         embed.color = config.ERROR_COLOR
         embed.description = ":x: The location name you specified is too long. Please enter a shorter name."
 
-    async with geopy.geocoders.Photon(
+    async with geopy.geocoders.Nominatim(
         user_agent=config.BOT_NAME, adapter_factory=geopy.adapters.AioHTTPAdapter
     ) as geolocator:
         geocode = geopy.extra.rate_limiter.AsyncRateLimiter(

takina/cogs/util/weather.py

@@ -5,6 +5,7 @@
 import config
 from nextcord.ext import commands
 from open_meteo import OpenMeteo
+import geopy.extra
 
 
 async def find_weather(location: str):
@@ -13,7 +14,7 @@ async def find_weather(location: str):
         embed.color = config.ERROR_COLOR
         embed.description = ":x: The location specified was not recognized."
 
-    async with geopy.geocoders.Photon(
+    async with geopy.geocoders.Nominatim(
         user_agent=config.BOT_NAME, adapter_factory=geopy.adapters.AioHTTPAdapter
     ) as geolocator:
         geocode = geopy.extra.rate_limiter.AsyncRateLimiter(