Merge branch 'master' of github.com:alterware/aw-bot

chore(deps): bump docker/setup-buildx-action from 4.1.0 to 4.3.0

.github/workflows/docker-publish.yml

@@ -19,19 +19,19 @@ jobs:
         lfs: true
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3.7.0
+      uses: docker/setup-qemu-action@v4.2.0
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3.12.0
+      uses: docker/setup-buildx-action@v4.3.0
 
     - name: Log in to DockerHub
-      uses: docker/login-action@v3.7.0
+      uses: docker/login-action@v4.6.0
       with:
         username: ${{ secrets.DOCKERHUB_USER }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - id: meta
-      uses: docker/metadata-action@v5.10.0
+      uses: docker/metadata-action@v6.2.0
       with:
         images: |
           alterware/aw-bot
@@ -41,7 +41,7 @@ jobs:
 
     - name: Build and push Docker image
       id: build-and-push
-      uses: docker/build-push-action@v6.18.0
+      uses: docker/build-push-action@v7.3.0
       with:
         context: .
         platforms: linux/amd64,linux/arm64

README.md

@@ -5,3 +5,11 @@ Contributions are welcome! Please follow the guidelines below:
 
 - Sign [AlterWare CLA](https://alterware.dev/cla) and send a pull request or email your patch at patches@alterware.dev
 - Make sure that PRs have only one commit, and deal with one issue only
+
+## Discord gateway intents
+
+The bot explicitly enables only the gateway intents it uses: guilds, members,
+guild and DM messages, message content, guild reactions, and voice states.
+Enable the **Server Members Intent** and **Message Content Intent** under
+**Developer Portal > Application > Bot > Privileged Gateway Intents**. The
+other enabled intents are not privileged.

aw.py

@@ -12,7 +12,14 @@ BOT_LOG = 1112049391482703873
 GENERAL_CHANNEL = 1110531063744303138
 OFFTOPIC_CHANNEL = 1112048063448617142
 
-intents = discord.Intents.all()
+intents = discord.Intents.none()
+intents.guilds = True
+intents.members = True
+intents.guild_messages = True
+intents.dm_messages = True
+intents.message_content = True
+intents.guild_reactions = True
+intents.voice_states = True
 bot = commands.Bot(command_prefix="!", intents=intents)
 
 # Load environment variables from .env file (if it exists)

bot/events_handlers/message_events.py

@@ -25,12 +25,23 @@ SPAM_ROLE_ID = 1350511935677927514
 ADMIN_ROLE_ID = 1112364483915042908
 GROK_ROLE_ID = 1362837967919386916
 
+MW2_CHANNEL = 1145458108190163014
+MW3_CHANNEL = 1145459504436220014
+GHOST_CHANNEL_ID = 1145469106133401682
+AW_CHANNEL_ID = 1145469136919613551
+DEPRECATED_SUPPORT_CHANNELS = [
+    AW_CHANNEL_ID,
+    MW2_CHANNEL,
+    MW3_CHANNEL,
+]
+deprecated_support_last_response_time = None
+
 ALLOWED_CHANNELS = [
     1112048063448617142,  # off-topic
     1119371841711112314,  # vip-channel
     1382808781032914975,  # launcher-support
     1180796301953212537,  # bo3-support
-    1145459504436220014,  # mw3-support
+    MW3_CHANNEL,  # mw3-support
 ]
 
 # Discord embed limits
@@ -98,6 +109,26 @@ async def handle_at_everyone(message):
     return False
 
 
+async def handle_deprecated_support_channel(message):
+    global deprecated_support_last_response_time
+
+    if message.channel.id in DEPRECATED_SUPPORT_CHANNELS:
+        now = aware_utcnow()
+        if (
+            deprecated_support_last_response_time is None
+            or now - deprecated_support_last_response_time >= timedelta(minutes=180)
+        ):
+            deprecated_support_last_response_time = now
+            await message.reply(
+                "Do not ask for support in this channel because the client is no longer "
+                "working. See our announcement channel.",
+                mention_author=True,
+            )
+            return True
+
+    return False
+
+
 def fetch_image_from_message(message):
     image_object = None
     for attachment in message.attachments:
@@ -471,6 +502,9 @@ async def handle_message(message, bot):
 
     await is_message_a_duplicate(message)
 
+    if await handle_deprecated_support_channel(message):
+        return
+
     if (
         "http" in message.content
         and not message.embeds

bot/events_handlers/voice_events.py

@@ -5,30 +5,30 @@ import discord
 from bot.log import logger
 
 MP3_PATH = "sounds/hello.mp3"
+_locks: dict[int, asyncio.Lock] = {}
 
 
 async def handle_voice_state_update(member, before, after, bot):
-    # Ignore bot users
     if member.bot:
         return
 
-    # Check if the member joined a new voice channel
     if after.channel and (before.channel != after.channel):
         voice_channel = after.channel
+        guild_id = voice_channel.guild.id
+        lock = _locks.setdefault(guild_id, asyncio.Lock())
 
-        try:
+        if lock.locked():
-            # Join the voice channel
+            return  # a connect for this guild is already in flight
-            vc = await voice_channel.connect()
 
-            # Play the MP3 file
+        async with lock:
-            vc.play(discord.FFmpegPCMAudio(MP3_PATH))
+            # bail if we're already connected to this guild's voice
-
+            if voice_channel.guild.voice_client is not None:
-            # Wait for playback to finish
+                return
-            while vc.is_playing():
+            try:
-                await asyncio.sleep(1)
+                vc = await voice_channel.connect()
-
+                vc.play(discord.FFmpegPCMAudio(MP3_PATH))
-            # Disconnect
+                while vc.is_playing():
-            await vc.disconnect()
+                    await asyncio.sleep(1)
-
+                await vc.disconnect()
-        except Exception as e:
+            except Exception as e:
-            logger.error("Error while connecting to a voice channel: %s", e)
+                logger.error("Error while connecting to a voice channel: %s", e)

bot/tasks.py

@@ -16,10 +16,6 @@ OFFTOPIC_CHANNEL = 1112048063448617142
 SPAM_ROLE_ID = 1350511935677927514
 
 COD_GAMES = {
-    10180: {"name": "Modern Warfare 2 (2009)", "channel": 1145458108190163014},
-    42680: {"name": "Modern Warfare 3 (2011)", "channel": 1145459504436220014},
-    209160: {"name": "Call of Duty: Ghosts", "channel": 1145469106133401682},
-    209650: {"name": "Call of Duty: Advanced Warfare", "channel": 1145469136919613551},
     311210: {"name": "Call of Duty: Black Ops 3", "channel": 1180796251529293844},
 }
 

requirements.txt

@@ -1,5 +1,6 @@
 discord.py
 requests
+davey
 audioop-lts
 python-dotenv
 pynacl