Merge pull request #25 from MinecraftCommands/feeds-fixes

Fixed jar feed

Author: Ersatz77

commanderbot/ext/feeds/feeds_state.py

@@ -180,7 +180,7 @@ async def _on_mcje_release(self, update_info: MinecraftJavaUpdateInfo):
         embed = Embed(
             title=update_info.title,
             url=update_info.url,
-            color=Color.minecraft_green(),
+            color=Color.minecraft_dark_green(),
             timestamp=update_info.published,
         )
         embed.set_author(
@@ -281,23 +281,26 @@ async def _on_mcje_release_jar(self, jar_update_info: MinecraftJavaJarUpdateInfo
         embed.set_thumbnail(
             url=self.options.minecraft_java_jar_updates.release_jar_icon_url
         )
-
         embed.add_field(name="Java Version", value=f"`{jar_update_info.java_version}`")
-        embed.add_field(
-            name="Client Mappings",
-            value=f"[Link]({jar_update_info.client_mappings_url})",
-        )
-        embed.add_field(
-            name="Server Mappings",
-            value=f"[Link]({jar_update_info.server_mappings_url})",
-        )
+
+        if jar_update_info.client_mappings_url:
+            embed.add_field(
+                name="Client Mappings",
+                value=f"[Link]({jar_update_info.client_mappings_url})",
+            )
+
+        if jar_update_info.server_mappings_url:
+            embed.add_field(
+                name="Server Mappings",
+                value=f"[Link]({jar_update_info.server_mappings_url})",
+            )
 
         # Send update to subscribers
         await self._send_to_subscribers(
             FeedType.MINECRAFT_JAVA_RELEASE_JARS,
             embed,
             self._create_mcje_jar_update_buttons(jar_update_info),
-            f"A jar has been released for Minecraft: Java Edition {jar_update_info.version}! 🎉",
+            f"A jar for Minecraft: Java Edition {jar_update_info.version} has been released! 🎉",
         )
 
     # @@ Minecraft: Java Edition Snapshot Jars
@@ -314,23 +317,26 @@ async def _on_mcje_snapshot_jar(self, jar_update_info: MinecraftJavaJarUpdateInf
         embed.set_thumbnail(
             url=self.options.minecraft_java_jar_updates.snapshot_jar_icon_url
         )
-
         embed.add_field(name="Java Version", value=f"`{jar_update_info.java_version}`")
-        embed.add_field(
-            name="Client Mappings",
-            value=f"[Link]({jar_update_info.client_mappings_url})",
-        )
-        embed.add_field(
-            name="Server Mappings",
-            value=f"[Link]({jar_update_info.server_mappings_url})",
-        )
+
+        if jar_update_info.client_mappings_url:
+            embed.add_field(
+                name="Client Mappings",
+                value=f"[Link]({jar_update_info.client_mappings_url})",
+            )
+
+        if jar_update_info.server_mappings_url:
+            embed.add_field(
+                name="Server Mappings",
+                value=f"[Link]({jar_update_info.server_mappings_url})",
+            )
 
         # Send update to subscribers
         await self._send_to_subscribers(
             FeedType.MINECRAFT_JAVA_SNAPSHOT_JARS,
             embed,
             self._create_mcje_jar_update_buttons(jar_update_info),
-            f"A jar has been released for Minecraft: Java Edition {jar_update_info.version}! 📸",
+            f"A jar for Minecraft: Java Edition {jar_update_info.version} has been released! 📸",
         )
 
     # @@ COMMANDS

commanderbot/ext/feeds/providers/minecraft_java_jar_updates.py

@@ -27,8 +27,8 @@ class MinecraftJavaJarUpdateInfo:
     java_version: int
     client_jar_url: str
     server_jar_url: str
-    client_mappings_url: str
-    server_mappings_url: str
+    client_mappings_url: Optional[str]
+    server_mappings_url: Optional[str]
 
 
 @dataclass

commanderbot/ext/feeds/providers/utils.py

@@ -66,8 +66,8 @@ class MinecraftJavaVersion(FromDataMixin):
     java_version: int
     client_jar_url: str
     server_jar_url: str
-    client_mappings_url: str
-    server_mappings_url: str
+    client_mappings_url: Optional[str]
+    server_mappings_url: Optional[str]
 
     url: Optional[str] = None
 
@@ -76,6 +76,12 @@ class MinecraftJavaVersion(FromDataMixin):
     def try_from_data(cls, data: Any) -> Optional[Self]:
         if isinstance(data, dict):
             release_time = datetime.fromisoformat(data["releaseTime"])
+            client_mappings_url = (
+                data["downloads"].get("client_mappings", {}).get("url")
+            )
+            server_mappings_url = (
+                data["downloads"].get("server_mappings", {}).get("url")
+            )
             return cls(
                 id=data["id"],
                 type=data["type"],
@@ -85,8 +91,8 @@ def try_from_data(cls, data: Any) -> Optional[Self]:
                 java_version=data["javaVersion"]["majorVersion"],
                 client_jar_url=data["downloads"]["client"]["url"],
                 server_jar_url=data["downloads"]["server"]["url"],
-                client_mappings_url=data["downloads"]["client_mappings"]["url"],
-                server_mappings_url=data["downloads"]["server_mappings"]["url"],
+                client_mappings_url=client_mappings_url,
+                server_mappings_url=server_mappings_url,
             )
 
     @property

commanderbot/ext/moderation/moderation_cog.py

@@ -34,7 +34,7 @@ def __init__(self, bot: Bot):
 
         # Create context menu command
         self.ctx_cmd_kick_compromised = ContextMenu(
-            name="Kick compromised account", callback=self.cmd_kick_compromised
+            name="Kick Compromised Account", callback=self.cmd_kick_compromised
         )
 
     async def cog_load(self):

commanderbot/lib/color.py

@@ -90,7 +90,7 @@ def mojang_red(cls) -> Self:
         return cls(0xF0313B)
 
     @classmethod
-    def minecraft_green(cls) -> Self:
+    def minecraft_dark_green(cls) -> Self:
         """A factory method that returns a :class:`Color` with a value of ``0x00AA00``.
 
         .. color:: #00AA00

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "commanderbot"
 description = "A collection of utilities and extensions for discord.py bots."
-version = "0.21.0"
+version = "0.21.1"
 requires-python = ">=3.14,<3.15"
 authors = [
     { name = "Ersatz", email = "ersatz0077@gmail.com" },