Merge branch 'main' into fix/adjust-bit-manipulation

Signed-off-by: ispik <ispik@ispik.dev>

.github/workflows/docker-cleanup.yaml

@@ -0,0 +1,46 @@
+name: Docker PR Image Cleanup
+
+on:
+  pull_request:
+    types:
+      - closed
+
+permissions:
+  contents: read
+  packages: write
+
+concurrency:
+  group: docker-cleanup-${{ github.event.pull_request.number }}
+  cancel-in-progress: false
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    if: ${{ !github.event.pull_request.head.repo.fork }}
+    strategy:
+      fail-fast: false
+      matrix:
+        package:
+          - base
+          - api
+          - events
+          - file-server
+          - proxy
+          - gifbox
+          - crond
+          - pushd
+          - voice-ingress
+    steps:
+      - env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ORG: stoatchat
+          PACKAGE: ${{ matrix.package }}
+          TAG: pr-${{ github.event.pull_request.number }}
+        run: |
+          set -euo pipefail
+          gh api --paginate \
+            "/orgs/${ORG}/packages/container/${PACKAGE}/versions" \
+            --jq ".[] | select(.metadata.container.tags | index(\"${TAG}\")) | .id" \
+          | while read -r id; do
+              gh api -X DELETE "/orgs/${ORG}/packages/container/${PACKAGE}/versions/${id}"
+            done

.github/workflows/docker.yaml

@@ -5,8 +5,6 @@ on:
     tags:
       - "*"
   pull_request:
-    paths:
-      - "Dockerfile"
   workflow_dispatch:
 
 permissions:
@@ -19,9 +17,9 @@ concurrency:
 
 jobs:
   base:
-    name: Test base image build
+    name: Test base image build (fork)
     runs-on: arc-runner-set
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork
     steps:
       # Configure build environment
       - name: Checkout
@@ -42,7 +40,7 @@ jobs:
 
   publish:
     runs-on: arc-runner-set
-    if: github.event_name != 'pull_request'
+    if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork }}
     name: Publish Docker images
     steps:
       # Configure build environment
@@ -59,6 +57,15 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Determine base image tag
+        id: base
+        run: |
+          if [ "${{ github.event_name }}" = "pull_request" ]; then
+            echo "tag=pr-${{ github.event.number }}" >> "$GITHUB_OUTPUT"
+          else
+            echo "tag=latest" >> "$GITHUB_OUTPUT"
+          fi
+
       # Build the image
       - name: Build base image
         uses: docker/build-push-action@v4
@@ -66,7 +73,9 @@ jobs:
           context: .
           push: true
           platforms: linux/amd64,linux/arm64
-          tags: ghcr.io/${{ github.repository_owner }}/base:latest
+          tags: ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
+          cache-from: type=gha,scope=buildx-base-multi-arch
+          cache-to: type=gha,scope=buildx-base-multi-arch,mode=max
 
       # stoatchat/api
       - name: Docker meta
@@ -84,7 +93,7 @@ jobs:
           file: crates/delta/Dockerfile
           tags: ${{ steps.meta-delta.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
           labels: ${{ steps.meta-delta.outputs.labels }}
 
       # stoatchat/events
@@ -103,7 +112,7 @@ jobs:
           file: crates/bonfire/Dockerfile
           tags: ${{ steps.meta-bonfire.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
           labels: ${{ steps.meta-bonfire.outputs.labels }}
 
       # stoatchat/file-server
@@ -122,7 +131,7 @@ jobs:
           file: crates/services/autumn/Dockerfile
           tags: ${{ steps.meta-autumn.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
           labels: ${{ steps.meta-autumn.outputs.labels }}
 
       # stoatchat/proxy
@@ -141,7 +150,7 @@ jobs:
           file: crates/services/january/Dockerfile
           tags: ${{ steps.meta-january.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
           labels: ${{ steps.meta-january.outputs.labels }}
 
       # stoatchat/gifbox
@@ -160,7 +169,7 @@ jobs:
           file: crates/services/gifbox/Dockerfile
           tags: ${{ steps.meta-gifbox.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
           labels: ${{ steps.meta-gifbox.outputs.labels }}
 
       # stoatchat/crond
@@ -179,7 +188,7 @@ jobs:
           file: crates/daemons/crond/Dockerfile
           tags: ${{ steps.meta-crond.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
           labels: ${{ steps.meta-crond.outputs.labels }}
 
       # stoatchat/pushd
@@ -198,7 +207,7 @@ jobs:
           file: crates/daemons/pushd/Dockerfile
           tags: ${{ steps.meta-pushd.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
           labels: ${{ steps.meta-pushd.outputs.labels }}
 
       # stoatchat/voice-ingress
@@ -217,5 +226,5 @@ jobs:
           file: crates/daemons/voice-ingress/Dockerfile
           tags: ${{ steps.meta-voice-ingress.outputs.tags }}
           build-args: |
-            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:${{ steps.base.outputs.tag }}
           labels: ${{ steps.meta-voice-ingress.outputs.labels }}

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "0.13.6"
+    ".": "0.13.7"
 }

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.13.7](https://github.com/stoatchat/stoatchat/compare/v0.13.6...v0.13.7) (2026-05-21)
+
+
+### Bug Fixes
+
+* sanitize emoji input to handle variation selectors ([#774](https://github.com/stoatchat/stoatchat/issues/774)) ([2d308e0](https://github.com/stoatchat/stoatchat/commit/2d308e03d58c19f27b5b4d65dc2a15ef20b56190))
+* update mention count badge for channel acks ([#769](https://github.com/stoatchat/stoatchat/issues/769)) ([0d9ae50](https://github.com/stoatchat/stoatchat/commit/0d9ae508d9d2199f0e408b8ca634d20489be6f61))
+
 ## [0.13.6](https://github.com/stoatchat/stoatchat/compare/v0.13.5...v0.13.6) (2026-05-18)
 
 

Cargo.lock

@@ -7488,7 +7488,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-autumn"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "axum",
  "axum-macros",
@@ -7529,7 +7529,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-bonfire"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "async-channel 2.5.0",
  "async-std",
@@ -7560,7 +7560,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-coalesced"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "indexmap 2.13.1",
  "lru",
@@ -7569,7 +7569,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-config"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "async-std",
  "cached",
@@ -7586,7 +7586,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-crond"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "futures-lite",
  "iso8601-timestamp",
@@ -7606,7 +7606,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-database"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "async-lock 2.8.0",
  "async-recursion",
@@ -7657,7 +7657,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-delta"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "async-channel 2.5.0",
  "async-std",
@@ -7706,7 +7706,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-files"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "aes-gcm",
  "anyhow",
@@ -7734,7 +7734,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-gifbox"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "axum",
  "axum-extra",
@@ -7757,7 +7757,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-january"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "async-recursion",
  "axum",
@@ -7787,7 +7787,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-models"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "indexmap 2.13.1",
  "iso8601-timestamp",
@@ -7806,14 +7806,14 @@ dependencies = [
 
 [[package]]
 name = "revolt-parser"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "logos",
 ]
 
 [[package]]
 name = "revolt-permissions"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "async-std",
  "async-trait",
@@ -7828,7 +7828,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-presence"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "async-std",
  "log",
@@ -7840,7 +7840,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-pushd"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -7871,7 +7871,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-ratelimits"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "async-trait",
  "authifier",
@@ -7888,7 +7888,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-result"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "axum",
  "log",
@@ -7904,7 +7904,7 @@ dependencies = [
 
 [[package]]
 name = "revolt-voice-ingress"
-version = "0.13.6"
+version = "0.13.7"
 dependencies = [
  "async-std",
  "chrono",

Cargo.toml

@@ -191,13 +191,13 @@ futures-lite = "2.6.1"
 vergen = "7.5.0"
 
 # Local packages
-revolt-coalesced = { version = "0.13.6", path = "crates/core/coalesced" }
-revolt-config = { version = "0.13.6", path = "crates/core/config" }
-revolt-database = { version = "0.13.6", path = "crates/core/database" }
-revolt-files = { version = "0.13.6", path = "crates/core/files" }
-revolt-models = { version = "0.13.6", path = "crates/core/models" }
-revolt-parser = { version = "0.13.6", path = "crates/core/parser" }
-revolt-permissions = { version = "0.13.6", path = "crates/core/permissions" }
-revolt-presence = { version = "0.13.6", path = "crates/core/presence" }
-revolt-ratelimits = { version = "0.13.6", path = "crates/core/ratelimits" }
-revolt-result = { version = "0.13.6", path = "crates/core/result" }
+revolt-coalesced = { version = "0.13.7", path = "crates/core/coalesced" }
+revolt-config = { version = "0.13.7", path = "crates/core/config" }
+revolt-database = { version = "0.13.7", path = "crates/core/database" }
+revolt-files = { version = "0.13.7", path = "crates/core/files" }
+revolt-models = { version = "0.13.7", path = "crates/core/models" }
+revolt-parser = { version = "0.13.7", path = "crates/core/parser" }
+revolt-permissions = { version = "0.13.7", path = "crates/core/permissions" }
+revolt-presence = { version = "0.13.7", path = "crates/core/presence" }
+revolt-ratelimits = { version = "0.13.7", path = "crates/core/ratelimits" }
+revolt-result = { version = "0.13.7", path = "crates/core/result" }

crates/bonfire/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-bonfire"
-version = "0.13.6"
+version = "0.13.7"
 license = "AGPL-3.0-or-later"
 edition = "2021"
 publish = false

crates/core/coalesced/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-coalesced"
-version = "0.13.6"
+version = "0.13.7"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>", "Zomatree <me@zomatree.live>"]

crates/core/config/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-config"
-version = "0.13.6"
+version = "0.13.7"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]

crates/core/database/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-database"
-version = "0.13.6"
+version = "0.13.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]

crates/core/database/src/models/emojis/model.rs

@@ -12,7 +12,7 @@ use crate::Database;
 static PERMISSIBLE_EMOJIS: Lazy<HashSet<String>> = Lazy::new(|| {
     include_str!("unicode_emoji.txt")
         .split('\n')
-        .map(|x| x.into())
+        .map(|x| x.replace('\u{FE0F}', ""))
         .collect()
 });
 
@@ -108,7 +108,8 @@ impl Emoji {
             db.fetch_emoji(emoji).await?;
             Ok(true)
         } else {
-            Ok(PERMISSIBLE_EMOJIS.contains(emoji))
+            let sanitized_emoji = emoji.replace('\u{FE0F}', "");
+            Ok(PERMISSIBLE_EMOJIS.contains(&sanitized_emoji))
         }
     }
 }

crates/core/database/src/models/emojis/unicode_emoji.txt

@@ -1,4 +1,3 @@
-
 *️⃣
 0️⃣
 1️⃣
@@ -242,6 +241,7 @@
 🆘
 🆙
 🆚
+🇦
 🇦🇨
 🇦🇩
 🇦🇪
@@ -259,6 +259,7 @@
 🇦🇼
 🇦🇽
 🇦🇿
+🇧
 🇧🇦
 🇧🇧
 🇧🇩
@@ -280,6 +281,7 @@
 🇧🇼
 🇧🇾
 🇧🇿
+🇨
 🇨🇦
 🇨🇨
 🇨🇩
@@ -301,6 +303,7 @@
 🇨🇽
 🇨🇾
 🇨🇿
+🇩
 🇩🇪
 🇩🇬
 🇩🇯
@@ -308,6 +311,7 @@
 🇩🇲
 🇩🇴
 🇩🇿
+🇪
 🇪🇦
 🇪🇨
 🇪🇪
@@ -317,12 +321,14 @@
 🇪🇸
 🇪🇹
 🇪🇺
+🇫
 🇫🇮
 🇫🇯
 🇫🇰
 🇫🇲
 🇫🇴
 🇫🇷
+🇬
 🇬🇦
 🇬🇧
 🇬🇩
@@ -342,12 +348,14 @@
 🇬🇺
 🇬🇼
 🇬🇾
+🇭
 🇭🇰
 🇭🇲
 🇭🇳
 🇭🇷
 🇭🇹
 🇭🇺
+🇮
 🇮🇨
 🇮🇩
 🇮🇪
@@ -359,10 +367,12 @@
 🇮🇷
 🇮🇸
 🇮🇹
+🇯
 🇯🇪
 🇯🇲
 🇯🇴
 🇯🇵
+🇰
 🇰🇪
 🇰🇬
 🇰🇭
@@ -374,6 +384,7 @@
 🇰🇼
 🇰🇾
 🇰🇿
+🇱
 🇱🇦
 🇱🇧
 🇱🇨
@@ -385,6 +396,7 @@
 🇱🇺
 🇱🇻
 🇱🇾
+🇲
 🇲🇦
 🇲🇨
 🇲🇩
@@ -408,6 +420,7 @@
 🇲🇽
 🇲🇾
 🇲🇿
+🇳
 🇳🇦
 🇳🇨
 🇳🇪
@@ -420,7 +433,9 @@
 🇳🇷
 🇳🇺
 🇳🇿
+🇴
 🇴🇲
+🇵
 🇵🇦
 🇵🇪
 🇵🇫
@@ -435,12 +450,15 @@
 🇵🇹
 🇵🇼
 🇵🇾
+🇶
 🇶🇦
+🇷
 🇷🇪
 🇷🇴
 🇷🇸
 🇷🇺
 🇷🇼
+🇸
 🇸🇦
 🇸🇧
 🇸🇨
@@ -462,6 +480,7 @@
 🇸🇽
 🇸🇾
 🇸🇿
+🇹
 🇹🇦
 🇹🇨
 🇹🇩
@@ -479,6 +498,7 @@
 🇹🇻
 🇹🇼
 🇹🇿
+🇺
 🇺🇦
 🇺🇬
 🇺🇲
@@ -486,6 +506,7 @@
 🇺🇸
 🇺🇾
 🇺🇿
+🇻
 🇻🇦
 🇻🇨
 🇻🇪
@@ -493,11 +514,15 @@
 🇻🇮
 🇻🇳
 🇻🇺
+🇼
 🇼🇫
 🇼🇸
+🇽
 🇽🇰
+🇾
 🇾🇪
 🇾🇹
+🇿
 🇿🇦
 🇿🇲
 🇿🇼

crates/core/database/src/models/messages/model.rs

@@ -219,7 +219,7 @@ impl MessageFlagsValue {
         self.has_value(flag as u32)
     }
     pub fn has_value(&self, bit: u32) -> bool {
-        let mask = 1 << bit;
+        let mask = 1 << (bit - 1);
         self.0 & mask == mask
     }
 
@@ -227,10 +227,11 @@ impl MessageFlagsValue {
         self.set_value(flag as u32, toggle)
     }
     pub fn set_value(&mut self, bit: u32, toggle: bool) -> &mut Self {
+        let mask = 1 << (bit - 1);
         if toggle {
-            self.0 |= 1 << bit;
+            self.0 |= mask;
         } else {
-            self.0 &= !(1 << bit);
+            self.0 &= !mask;
         }
         self
     }

crates/core/files/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-files"
-version = "0.13.6"
+version = "0.13.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]

crates/core/models/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-models"
-version = "0.13.6"
+version = "0.13.7"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]

crates/core/parser/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-parser"
-version = "0.13.6"
+version = "0.13.7"
 edition = "2021"
 license = "MIT"
 authors = ["Zomatree <me@zomatree.live>", "Paul Makles <me@insrt.uk>"]

crates/core/permissions/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-permissions"
-version = "0.13.6"
+version = "0.13.7"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]

crates/core/presence/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-presence"
-version = "0.13.6"
+version = "0.13.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]

crates/core/ratelimits/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-ratelimits"
-version = "0.13.6"
+version = "0.13.7"
 edition = "2024"
 license = "MIT"
 authors = ["Zomatree <me@zomatree.live>", "Paul Makles <me@insrt.uk>"]

crates/core/result/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-result"
-version = "0.13.6"
+version = "0.13.7"
 edition = "2021"
 license = "MIT"
 authors = ["Paul Makles <me@insrt.uk>"]

crates/daemons/crond/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-crond"
-version = "0.13.6"
+version = "0.13.7"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <me@insrt.uk>"]
 edition = "2021"

crates/daemons/crond/src/main.rs

@@ -1,5 +1,5 @@
 use revolt_config::configure;
-use revolt_database::DatabaseInfo;
+use revolt_database::{DatabaseInfo, AMQP};
 use revolt_result::Result;
 use tasks::{acks, file_deletion, prune_dangling_files, prune_members};
 use tokio::try_join;
@@ -11,11 +11,13 @@ async fn main() -> Result<()> {
     configure!(crond);
 
     let db = DatabaseInfo::Auto.connect().await.expect("database");
+    let amqp = AMQP::new_auto().await;
+
     try_join!(
         file_deletion::task(db.clone()),
         prune_dangling_files::task(db.clone()),
         prune_members::task(db.clone()),
-        acks::task(db.clone())
+        acks::task(db.clone(), amqp.clone()),
     )
     .map(|_| ())
 }

crates/daemons/crond/src/tasks/acks.rs

@@ -5,14 +5,14 @@ use lapin::{
     uri::{AMQPAuthority, AMQPQueryString, AMQPUri, AMQPUserInfo},
     ConnectionBuilder, ConnectionProperties, ExchangeKind,
 };
-use log::info;
+use log::{debug, info};
 use redis_kiss::{get_connection, AsyncCommands, Conn as RedisConnection};
 use revolt_config::config;
-use revolt_database::{events::rabbit::AckEventPayload, Database};
+use revolt_database::{events::rabbit::AckEventPayload, Database, AMQP};
 use revolt_result::{Result, ToRevoltError};
 use serde_json;
 
-pub async fn task(db: Database) -> Result<()> {
+pub async fn task(db: Database, amqp: AMQP) -> Result<()> {
     let config = config().await;
 
     let mut redis = get_connection()
@@ -94,12 +94,14 @@ pub async fn task(db: Database) -> Result<()> {
 
     while let Some(delivery) = consumer.next().await {
         if let Ok(delivery) = delivery {
-            let payload: std::result::Result<AckEventPayload, _> =
-                serde_json::from_slice(&delivery.data);
+            let payload = serde_json::from_slice::<AckEventPayload>(&delivery.data);
+
             if let Ok(payload) = payload {
-                info!("{:?}", payload);
+                debug!("Received ack event: {payload:?}");
+
                 if let Err(e) = process_channel_ack(
                     &db,
+                    &amqp,
                     payload.user_id,
                     payload.channel_id.unwrap(),
                     &mut redis,
@@ -125,6 +127,7 @@ pub async fn task(db: Database) -> Result<()> {
 #[allow(clippy::disallowed_methods)]
 async fn process_channel_ack(
     db: &Database,
+    amqp: &AMQP,
     user: String,
     channel: String,
     redis: &mut RedisConnection,
@@ -135,28 +138,24 @@ async fn process_channel_ack(
         .to_internal_error()?;
 
     if let Some(message_id) = message_id {
-        // This will be uncommented eventually, but we need to sort out the transition to lapin first. For now we'll simply disable the badge update logic.
-        // We also drop a db request as a bonus.
+        let unread = db.fetch_unread(&user, &channel).await?;
+        let updated = db.acknowledge_message(&channel, &user, &message_id).await?;
 
-        //let unread = db.fetch_unread(&user, &channel).await?;
-        let _updated = db.acknowledge_message(&channel, &user, &message_id).await?;
         info!("Set new state for ack: {}:{}:{}", channel, user, message_id);
 
-        // if let (Some(before), Some(after)) = (unread, updated) {
-        //     let before_mentions = before.mentions.unwrap_or_default().len();
-        //     let after_mentions = after.mentions.unwrap_or_default().len();
+        if let (Some(before), Some(after)) = (unread, updated) {
+            let before_mentions = before.mentions.unwrap_or_default().len();
+            let after_mentions = after.mentions.unwrap_or_default().len();
 
-        //     let mentions_acked = before_mentions - after_mentions;
-
-        //     if mentions_acked > 0 {
-        //         if let Err(err) = amqp
-        //             .ack_message(user.to_string(), channel.to_string(), payload.message_id)
-        //             .await
-        //         {
-        //             revolt_config::capture_error(&err);
-        //         }
-        //     };
-        // }
+            if after_mentions < before_mentions {
+                if let Err(err) = amqp
+                    .ack_notification_message(user.to_string(), channel.to_string(), message_id)
+                    .await
+                {
+                    revolt_config::capture_error(&err);
+                }
+            };
+        }
 
         Ok(())
     } else {

crates/daemons/pushd/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-pushd"
-version = "0.13.6"
+version = "0.13.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 publish = false

crates/daemons/voice-ingress/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-voice-ingress"
-version = "0.13.6"
+version = "0.13.7"
 license = "AGPL-3.0-or-later"
 edition = "2021"
 publish = false

crates/delta/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-delta"
-version = "0.13.6"
+version = "0.13.7"
 license = "AGPL-3.0-or-later"
 authors = ["Paul Makles <paulmakles@gmail.com>"]
 edition = "2018"

crates/services/autumn/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-autumn"
-version = "0.13.6"
+version = "0.13.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 publish = false

crates/services/gifbox/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-gifbox"
-version = "0.13.6"
+version = "0.13.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 publish = false

crates/services/january/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "revolt-january"
-version = "0.13.6"
+version = "0.13.7"
 edition = "2021"
 license = "AGPL-3.0-or-later"
 publish = false

version.txt

@@ -1 +1 @@
-0.13.6
+0.13.7