Merge pull request #58 from srobo/2026-fixes

Author: raccube

channels.yml

@@ -9,7 +9,7 @@
           read_messages: true
           send_messages: false
     - name: announcements
-      use_case: announce
+      channel_type: news
       permissions:
         everyone:
           send_messages: false
@@ -75,6 +75,7 @@
     - name: general
       topic: "General discussion about Student Robotics. Use #support for support queries and #off-topic for other things."
     - name: say-hello
+      use_case: announce
       topic: Hello there!
     - name: off-topic
       topic: Off-topic tech chat

pyproject.toml

@@ -9,13 +9,13 @@ readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
     "python-dotenv==1.0.1",
-    "discord.py==2.6.3",
+    "discord.py==2.6.4",
     "feedparser==6.0.11",
     "beautifulsoup4==4.12.3",
     "pytest==8.4.1",
     "pyyaml==6.0.2",
     "jsonschema==4.25.1",
-    "sentry-sdk==2.41.0",
+    "sentry-sdk==2.42.1",
     "backports.strenum==1.3.1 ; python_version < '3.11'",
 ]
 classifiers = [

src/sr/discord_bot/bot.py

@@ -7,7 +7,7 @@
 import yaml
 import discord
 import jsonschema
-from discord import Guild, app_commands
+from discord import Guild, app_commands, CategoryChannel
 from discord.ext import tasks
 
 from sr.discord_bot.rss import check_posts
@@ -160,8 +160,12 @@ async def setup_bot(self) -> None:
         await check_bot_messages(self, self.guild)
         self.teams_data.gen_team_memberships(self.guild, self.supervisor_role)
         await self.update_subscribed_messages()
+        await self._create_missing_welcome_channels()
 
     async def on_member_join(self, member: discord.Member) -> None:
+        if self.mode != 'run':
+            return
+
         name = member.display_name
         self.logger.info(f"Member {name} ({member.id}) joined")
         guild: discord.Guild = member.guild
@@ -188,6 +192,9 @@ async def on_member_join(self, member: discord.Member) -> None:
         self.logger.info(f"Created welcome channel for '{name}'")
 
     async def on_member_remove(self, member: discord.Member) -> None:
+        if self.mode != 'run':
+            return
+
         name = member.display_name
         self.logger.info(f"Member '{name}' left")
 
@@ -202,10 +209,15 @@ async def on_member_remove(self, member: discord.Member) -> None:
 
     async def on_member_update(self, before: discord.Member, after: discord.Member) -> None:
         """Update subscribed messages when a member's roles change."""
-        if isinstance(self.guild, discord.Guild):
+        if self.mode != 'run':
+            return
+
+        if hasattr(self, 'guild') and isinstance(self.guild, Guild) and hasattr(self, 'supervisor_role'):
             self.teams_data.gen_team_memberships(self.guild, self.supervisor_role)
 
             await self.update_subscribed_messages()
+        else:
+            self.logger.debug('Not initialized yet, ignoring on_member_update...')
 
     async def on_raw_reaction_add(self, event: discord.RawReactionActionEvent) -> None:
         """Handle message reactions."""
@@ -390,3 +402,23 @@ async def apply_changes(self) -> None:
         self.logger.info("Ensuring channels are in order... (This might take a minute)")
         await stored_set.sort_channels(guild)
         self.logger.info("Done!")
+
+    async def _create_missing_welcome_channels(self) -> None:
+        if not isinstance(self.guild, Guild):
+            return
+
+        async for guild_member in self.guild.fetch_members():
+            if len(guild_member.roles) == 0:
+                welcome_channel_found = False
+
+                for welcome_channel in self.welcome_category.channels:
+                    if isinstance(welcome_channel, CategoryChannel):
+                        # Categories can't contain categories so this shouldn't happen
+                        # However channels is a list of GuildChannel so we need to handle it
+                        continue
+
+                    if guild_member in welcome_channel.members:
+                        welcome_channel_found = True
+
+                if not welcome_channel_found:
+                    await self.on_member_join(guild_member)

src/sr/discord_bot/constants.py

@@ -1,6 +1,6 @@
-# name of the category for new welcome channels to go.
 from discord import Permissions
 
+# name of the category for new welcome channels to go.
 WELCOME_CATEGORY_NAME = "Welcome"
 
 # prefix used to identify the channels to listen to passwords in.
@@ -28,7 +28,6 @@
 FEED_CHECK_INTERVAL = 60 * 3  # in seconds
 
 VERIFIED_PERMISSION_MASK = \
-    Permissions.read_messages.flag | \
     Permissions.send_messages.flag | \
     Permissions.send_messages_in_threads.flag | \
     Permissions.create_public_threads.flag | \