From f8700dd37677278500fccaa97cd03ac272a45778 Mon Sep 17 00:00:00 2001
From: Grayson Adams <51373669+GraysonCAdams@users.noreply.github.com>
Date: Sun, 1 Mar 2026 00:38:28 -0600
Subject: [PATCH 01/10] feat: add mentions column to notification preferences
 schema

---
 .../db/migrations/0020_concerned_toad_men.sql |    2 +
 .../db/migrations/meta/0020_snapshot.json     | 1211 +++++++++++++++++
 .../server/db/migrations/meta/_journal.json   |    7 +
 src/lib/server/db/schema.ts                   |    1 +
 4 files changed, 1221 insertions(+)
 create mode 100644 src/lib/server/db/migrations/0020_concerned_toad_men.sql
 create mode 100644 src/lib/server/db/migrations/meta/0020_snapshot.json

diff --git a/src/lib/server/db/migrations/0020_concerned_toad_men.sql b/src/lib/server/db/migrations/0020_concerned_toad_men.sql
new file mode 100644
index 0000000..9251222
--- /dev/null
+++ b/src/lib/server/db/migrations/0020_concerned_toad_men.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `notification_preferences` ADD `mentions` integer DEFAULT true NOT NULL;--> statement-breakpoint
+ALTER TABLE `groups` DROP COLUMN `max_duration_seconds`;
\ No newline at end of file
diff --git a/src/lib/server/db/migrations/meta/0020_snapshot.json b/src/lib/server/db/migrations/meta/0020_snapshot.json
new file mode 100644
index 0000000..bb5d0c3
--- /dev/null
+++ b/src/lib/server/db/migrations/meta/0020_snapshot.json
@@ -0,0 +1,1211 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "9beecb53-a092-49a5-b7bf-caddbb66474c",
+  "prevId": "56623836-95ff-4543-9b4b-c6687d4d9d24",
+  "tables": {
+    "clips": {
+      "name": "clips",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "group_id": {
+          "name": "group_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "added_by": {
+          "name": "added_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "original_url": {
+          "name": "original_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "video_path": {
+          "name": "video_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "thumbnail_path": {
+          "name": "thumbnail_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "duration_seconds": {
+          "name": "duration_seconds",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "platform": {
+          "name": "platform",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'downloading'"
+        },
+        "content_type": {
+          "name": "content_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'video'"
+        },
+        "audio_path": {
+          "name": "audio_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "artist": {
+          "name": "artist",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "album_art": {
+          "name": "album_art",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "spotify_url": {
+          "name": "spotify_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "apple_music_url": {
+          "name": "apple_music_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "youtube_music_url": {
+          "name": "youtube_music_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "file_size_bytes": {
+          "name": "file_size_bytes",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "clips_group_url": {
+          "name": "clips_group_url",
+          "columns": [
+            "group_id",
+            "original_url"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "clips_group_id_groups_id_fk": {
+          "name": "clips_group_id_groups_id_fk",
+          "tableFrom": "clips",
+          "tableTo": "groups",
+          "columnsFrom": [
+            "group_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "clips_added_by_users_id_fk": {
+          "name": "clips_added_by_users_id_fk",
+          "tableFrom": "clips",
+          "tableTo": "users",
+          "columnsFrom": [
+            "added_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "comment_hearts": {
+      "name": "comment_hearts",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "comment_id": {
+          "name": "comment_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "comment_hearts_unique": {
+          "name": "comment_hearts_unique",
+          "columns": [
+            "comment_id",
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "comment_hearts_comment_id_comments_id_fk": {
+          "name": "comment_hearts_comment_id_comments_id_fk",
+          "tableFrom": "comment_hearts",
+          "tableTo": "comments",
+          "columnsFrom": [
+            "comment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "comment_hearts_user_id_users_id_fk": {
+          "name": "comment_hearts_user_id_users_id_fk",
+          "tableFrom": "comment_hearts",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "comment_views": {
+      "name": "comment_views",
+      "columns": {
+        "clip_id": {
+          "name": "clip_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "viewed_at": {
+          "name": "viewed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "comment_views_unique": {
+          "name": "comment_views_unique",
+          "columns": [
+            "clip_id",
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "comment_views_clip_id_clips_id_fk": {
+          "name": "comment_views_clip_id_clips_id_fk",
+          "tableFrom": "comment_views",
+          "tableTo": "clips",
+          "columnsFrom": [
+            "clip_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "comment_views_user_id_users_id_fk": {
+          "name": "comment_views_user_id_users_id_fk",
+          "tableFrom": "comment_views",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "comments": {
+      "name": "comments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "clip_id": {
+          "name": "clip_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "parent_id": {
+          "name": "parent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "text": {
+          "name": "text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "gif_url": {
+          "name": "gif_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "comments_clip_id_clips_id_fk": {
+          "name": "comments_clip_id_clips_id_fk",
+          "tableFrom": "comments",
+          "tableTo": "clips",
+          "columnsFrom": [
+            "clip_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "comments_user_id_users_id_fk": {
+          "name": "comments_user_id_users_id_fk",
+          "tableFrom": "comments",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "favorites": {
+      "name": "favorites",
+      "columns": {
+        "clip_id": {
+          "name": "clip_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "favorites_clip_id_clips_id_fk": {
+          "name": "favorites_clip_id_clips_id_fk",
+          "tableFrom": "favorites",
+          "tableTo": "clips",
+          "columnsFrom": [
+            "clip_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "favorites_user_id_users_id_fk": {
+          "name": "favorites_user_id_users_id_fk",
+          "tableFrom": "favorites",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "groups": {
+      "name": "groups",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "invite_code": {
+          "name": "invite_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "retention_days": {
+          "name": "retention_days",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "max_storage_mb": {
+          "name": "max_storage_mb",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "max_file_size_mb": {
+          "name": "max_file_size_mb",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": 500
+        },
+        "accent_color": {
+          "name": "accent_color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'coral'"
+        },
+        "download_provider": {
+          "name": "download_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "platform_filter_mode": {
+          "name": "platform_filter_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'all'"
+        },
+        "platform_filter_list": {
+          "name": "platform_filter_list",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "shortcut_token": {
+          "name": "shortcut_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "shortcut_url": {
+          "name": "shortcut_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "groups_invite_code_unique": {
+          "name": "groups_invite_code_unique",
+          "columns": [
+            "invite_code"
+          ],
+          "isUnique": true
+        },
+        "groups_shortcut_token_unique": {
+          "name": "groups_shortcut_token_unique",
+          "columns": [
+            "shortcut_token"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "notification_preferences": {
+      "name": "notification_preferences",
+      "columns": {
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "new_adds": {
+          "name": "new_adds",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "reactions": {
+          "name": "reactions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "comments": {
+          "name": "comments",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "mentions": {
+          "name": "mentions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "daily_reminder": {
+          "name": "daily_reminder",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "notification_preferences_user_id_users_id_fk": {
+          "name": "notification_preferences_user_id_users_id_fk",
+          "tableFrom": "notification_preferences",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "notifications": {
+      "name": "notifications",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "clip_id": {
+          "name": "clip_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "actor_id": {
+          "name": "actor_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "emoji": {
+          "name": "emoji",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "comment_preview": {
+          "name": "comment_preview",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "read_at": {
+          "name": "read_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "notifications_user_created": {
+          "name": "notifications_user_created",
+          "columns": [
+            "user_id",
+            "created_at"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "notifications_user_id_users_id_fk": {
+          "name": "notifications_user_id_users_id_fk",
+          "tableFrom": "notifications",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "notifications_clip_id_clips_id_fk": {
+          "name": "notifications_clip_id_clips_id_fk",
+          "tableFrom": "notifications",
+          "tableTo": "clips",
+          "columnsFrom": [
+            "clip_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "notifications_actor_id_users_id_fk": {
+          "name": "notifications_actor_id_users_id_fk",
+          "tableFrom": "notifications",
+          "tableTo": "users",
+          "columnsFrom": [
+            "actor_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "push_subscriptions": {
+      "name": "push_subscriptions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "endpoint": {
+          "name": "endpoint",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "keys_p256dh": {
+          "name": "keys_p256dh",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "keys_auth": {
+          "name": "keys_auth",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "push_subscriptions_user_id_users_id_fk": {
+          "name": "push_subscriptions_user_id_users_id_fk",
+          "tableFrom": "push_subscriptions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "reactions": {
+      "name": "reactions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "clip_id": {
+          "name": "clip_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "emoji": {
+          "name": "emoji",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "reactions_unique": {
+          "name": "reactions_unique",
+          "columns": [
+            "clip_id",
+            "user_id",
+            "emoji"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "reactions_clip_id_clips_id_fk": {
+          "name": "reactions_clip_id_clips_id_fk",
+          "tableFrom": "reactions",
+          "tableTo": "clips",
+          "columnsFrom": [
+            "clip_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "reactions_user_id_users_id_fk": {
+          "name": "reactions_user_id_users_id_fk",
+          "tableFrom": "reactions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "phone": {
+          "name": "phone",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "group_id": {
+          "name": "group_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "theme_preference": {
+          "name": "theme_preference",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'system'"
+        },
+        "auto_scroll": {
+          "name": "auto_scroll",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "muted_by_default": {
+          "name": "muted_by_default",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": true
+        },
+        "avatar_path": {
+          "name": "avatar_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "removed_at": {
+          "name": "removed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "users_phone_unique": {
+          "name": "users_phone_unique",
+          "columns": [
+            "phone"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "users_group_id_groups_id_fk": {
+          "name": "users_group_id_groups_id_fk",
+          "tableFrom": "users",
+          "tableTo": "groups",
+          "columnsFrom": [
+            "group_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "verification_codes": {
+      "name": "verification_codes",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "phone": {
+          "name": "phone",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "code": {
+          "name": "code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "attempts": {
+          "name": "attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "verified_at": {
+          "name": "verified_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "verification_codes_user_id_users_id_fk": {
+          "name": "verification_codes_user_id_users_id_fk",
+          "tableFrom": "verification_codes",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "watched": {
+      "name": "watched",
+      "columns": {
+        "clip_id": {
+          "name": "clip_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "watch_percent": {
+          "name": "watch_percent",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "watched_at": {
+          "name": "watched_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "watched_clip_user": {
+          "name": "watched_clip_user",
+          "columns": [
+            "clip_id",
+            "user_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "watched_clip_id_clips_id_fk": {
+          "name": "watched_clip_id_clips_id_fk",
+          "tableFrom": "watched",
+          "tableTo": "clips",
+          "columnsFrom": [
+            "clip_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "watched_user_id_users_id_fk": {
+          "name": "watched_user_id_users_id_fk",
+          "tableFrom": "watched",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/src/lib/server/db/migrations/meta/_journal.json b/src/lib/server/db/migrations/meta/_journal.json
index 56490aa..ed74af1 100644
--- a/src/lib/server/db/migrations/meta/_journal.json
+++ b/src/lib/server/db/migrations/meta/_journal.json
@@ -141,6 +141,13 @@
       "when": 1772318561461,
       "tag": "0019_small_edwin_jarvis",
       "breakpoints": true
+    },
+    {
+      "idx": 20,
+      "version": "6",
+      "when": 1772347099686,
+      "tag": "0020_concerned_toad_men",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts
index 2bb2c00..1cbfe98 100644
--- a/src/lib/server/db/schema.ts
+++ b/src/lib/server/db/schema.ts
@@ -199,5 +199,6 @@ export const notificationPreferences = sqliteTable('notification_preferences', {
 	newAdds: integer('new_adds', { mode: 'boolean' }).notNull().default(true),
 	reactions: integer('reactions', { mode: 'boolean' }).notNull().default(true),
 	comments: integer('comments', { mode: 'boolean' }).notNull().default(true),
+	mentions: integer('mentions', { mode: 'boolean' }).notNull().default(true),
 	dailyReminder: integer('daily_reminder', { mode: 'boolean' }).notNull().default(false)
 });

From 72c8ce044119a2c70bb337e47aa304ec545714f0 Mon Sep 17 00:00:00 2001
From: Grayson Adams <51373669+GraysonCAdams@users.noreply.github.com>
Date: Sun, 1 Mar 2026 00:34:07 -0600
Subject: [PATCH 02/10] feat: add @mention notification system with server-side
 extraction

- Create mentions.ts utility with extractMentions() and notifyMentions()
- Accept message field in POST /api/clips, auto-post as first comment
- Add @mention dispatch to comments API with duplicate prevention
- Update notification preferences API to include mentions toggle
---
 src/lib/server/mentions.ts                    | 80 +++++++++++++++++++
 src/lib/server/push.ts                        |  2 +-
 src/routes/api/clips/+server.ts               | 32 +++++++-
 src/routes/api/clips/[id]/comments/+server.ts | 30 ++++++-
 .../api/notifications/preferences/+server.ts  | 12 ++-
 5 files changed, 149 insertions(+), 7 deletions(-)
 create mode 100644 src/lib/server/mentions.ts

diff --git a/src/lib/server/mentions.ts b/src/lib/server/mentions.ts
new file mode 100644
index 0000000..dfad705
--- /dev/null
+++ b/src/lib/server/mentions.ts
@@ -0,0 +1,80 @@
+import { db } from '$lib/server/db';
+import { users, notificationPreferences, notifications } from '$lib/server/db/schema';
+import { eq, and, isNull } from 'drizzle-orm';
+import { sendNotification } from '$lib/server/push';
+import { v4 as uuid } from 'uuid';
+import { createLogger } from '$lib/server/logger';
+
+const log = createLogger('mentions');
+
+/**
+ * Extract @username mentions from text.
+ * Returns an array of unique lowercase usernames.
+ */
+export function extractMentions(text: string): string[] {
+	const regex = /@(\w+)/g;
+	const mentions = new Set<string>();
+	let match;
+	while ((match = regex.exec(text)) !== null) {
+		mentions.add(match[1].toLowerCase());
+	}
+	return [...mentions];
+}
+
+/**
+ * Send mention notifications to all mentioned users.
+ * Checks preferences, skips self-mentions and excluded users, sends push + in-app.
+ */
+export async function notifyMentions(opts: {
+	mentionedUsernames: string[];
+	actorId: string;
+	actorUsername: string;
+	clipId: string;
+	groupId: string;
+	commentPreview: string;
+	excludeUserIds?: string[];
+}): Promise<void> {
+	if (opts.mentionedUsernames.length === 0) return;
+
+	const excludeSet = new Set(opts.excludeUserIds ?? []);
+	excludeSet.add(opts.actorId); // never notify self
+
+	// Look up all active members in the group
+	const groupMembers = await db.query.users.findMany({
+		where: and(eq(users.groupId, opts.groupId), isNull(users.removedAt))
+	});
+
+	// Match mentioned usernames to actual users (case-insensitive)
+	const mentionedSet = new Set(opts.mentionedUsernames);
+	const matchedUsers = groupMembers.filter(
+		(m) => mentionedSet.has(m.username.toLowerCase()) && !excludeSet.has(m.id)
+	);
+
+	for (const recipient of matchedUsers) {
+		// Check notification preferences
+		const prefs = await db.query.notificationPreferences.findFirst({
+			where: eq(notificationPreferences.userId, recipient.id)
+		});
+
+		// Send push if preference allows (default true if no prefs row)
+		if (!prefs || prefs.mentions) {
+			sendNotification(recipient.id, {
+				title: `${opts.actorUsername} mentioned you`,
+				body: opts.commentPreview,
+				url: '/',
+				tag: `mention-${opts.clipId}`
+			}).catch((err) => log.error({ err }, 'mention push notification failed'));
+		}
+
+		// Insert in-app notification
+		await db.insert(notifications).values({
+			id: uuid(),
+			userId: recipient.id,
+			type: 'mention',
+			clipId: opts.clipId,
+			actorId: opts.actorId,
+			commentPreview: opts.commentPreview,
+			createdAt: new Date()
+		});
+	}
+}
diff --git a/src/lib/server/push.ts b/src/lib/server/push.ts
index 8979675..3cd8ec0 100644
--- a/src/lib/server/push.ts
+++ b/src/lib/server/push.ts
@@ -95,7 +95,7 @@ export async function notifyNewClip(clipId: string): Promise<void> {
 export async function sendGroupNotification(
 	groupId: string,
 	payload: NotificationPayload,
-	preferenceKey: 'newAdds' | 'reactions' | 'comments' | 'dailyReminder',
+	preferenceKey: 'newAdds' | 'reactions' | 'comments' | 'mentions' | 'dailyReminder',
 	excludeUserId?: string
 ): Promise<void> {
 	const groupUsers = await db.query.users.findMany({
diff --git a/src/routes/api/clips/+server.ts b/src/routes/api/clips/+server.ts
index 99c6e4c..6a5c5d3 100644
--- a/src/routes/api/clips/+server.ts
+++ b/src/routes/api/clips/+server.ts
@@ -31,6 +31,7 @@ import {
 	mapUsersByIds,
 	safeInt
 } from '$lib/server/api-utils';
+import { extractMentions, notifyMentions } from '$lib/server/mentions';
 import { createLogger } from '$lib/server/logger';
 
 const log = createLogger('clips');
@@ -179,11 +180,13 @@ export const POST: RequestHandler = withAuth(async ({ request }, { user, group }
 		);
 	}
 
-	const body = await parseBody<{ url?: string; title?: string }>(request);
+	const body = await parseBody<{ url?: string; title?: string; message?: string }>(request);
 	if (isResponse(body)) return body;
 
 	const { url: videoUrl } = body;
 	const title = typeof body.title === 'string' ? body.title.trim().slice(0, 500) || null : null;
+	const message =
+		typeof body.message === 'string' ? body.message.trim().slice(0, 500) || null : null;
 
 	if (!videoUrl) return json({ error: 'URL required' }, { status: 400 });
 
@@ -266,5 +269,32 @@ export const POST: RequestHandler = withAuth(async ({ request }, { user, group }
 
 	// Push notification is sent after download succeeds (see video/download.ts, music/download.ts)
 
+	// Auto-post message as the first comment on the clip
+	if (message) {
+		const commentId = uuid();
+		await db.insert(comments).values({
+			id: commentId,
+			clipId,
+			userId: user.id,
+			parentId: null,
+			text: message,
+			gifUrl: null,
+			createdAt: now
+		});
+
+		// Notify @mentioned users
+		const mentionedUsernames = extractMentions(message);
+		if (mentionedUsernames.length > 0) {
+			notifyMentions({
+				mentionedUsernames,
+				actorId: user.id,
+				actorUsername: user.username,
+				clipId,
+				groupId: user.groupId,
+				commentPreview: message.slice(0, 80)
+			}).catch((err) => log.error({ err, clipId }, 'mention notifications failed'));
+		}
+	}
+
 	return json({ clip: { id: clipId, status: 'downloading', contentType } }, { status: 201 });
 });
diff --git a/src/routes/api/clips/[id]/comments/+server.ts b/src/routes/api/clips/[id]/comments/+server.ts
index 111a594..e4a9792 100644
--- a/src/routes/api/clips/[id]/comments/+server.ts
+++ b/src/routes/api/clips/[id]/comments/+server.ts
@@ -11,6 +11,7 @@ import {
 	mapUsersByIds,
 	notifyClipOwner
 } from '$lib/server/api-utils';
+import { extractMentions, notifyMentions } from '$lib/server/mentions';
 
 export const GET: RequestHandler = withClipAuth(async ({ params }, { user }) => {
 	const clipId = params.id;
@@ -87,13 +88,13 @@ export const GET: RequestHandler = withClipAuth(async ({ params }, { user }) =>
 	return json({ comments: formatted });
 });
 
-/** Determine the notification recipient and dispatch. */
+/** Determine the notification recipient and dispatch. Returns recipient ID or null. */
 async function dispatchCommentNotification(
 	clipId: string,
 	parentId: string | null,
 	actor: { id: string; username: string },
 	preview: string
-) {
+): Promise<string | null> {
 	if (parentId) {
 		const parentComment = await db.query.comments.findFirst({
 			where: eq(comments.id, parentId)
@@ -111,6 +112,7 @@ async function dispatchCommentNotification(
 				pushTag: `reply-${clipId}`,
 				commentPreview: preview
 			});
+			return parentComment.userId;
 		}
 	} else {
 		const clip = await db.query.clips.findFirst({ where: eq(clips.id, clipId) });
@@ -127,8 +129,10 @@ async function dispatchCommentNotification(
 				pushTag: `comment-${clipId}`,
 				commentPreview: preview
 			});
+			return clip.addedBy;
 		}
 	}
+	return null;
 }
 
 function isValidGiphyUrl(url: string): boolean {
@@ -188,7 +192,27 @@ export const POST: RequestHandler = withClipAuth(async ({ params, request }, { u
 	});
 
 	const preview = hasText ? trimmed.slice(0, 80) : '[GIF]';
-	await dispatchCommentNotification(clipId, body.parentId || null, user, preview);
+	const commentRecipientId = await dispatchCommentNotification(
+		clipId,
+		body.parentId || null,
+		user,
+		preview
+	);
+
+	// Dispatch @mention notifications (exclude user who already got comment/reply notification)
+	const mentionedUsernames = extractMentions(trimmed);
+	if (mentionedUsernames.length > 0) {
+		const excludeUserIds = commentRecipientId ? [commentRecipientId] : [];
+		notifyMentions({
+			mentionedUsernames,
+			actorId: user.id,
+			actorUsername: user.username,
+			clipId,
+			groupId: user.groupId,
+			commentPreview: preview,
+			excludeUserIds
+		}).catch(() => {});
+	}
 
 	return json(
 		{
diff --git a/src/routes/api/notifications/preferences/+server.ts b/src/routes/api/notifications/preferences/+server.ts
index 84e8fbd..6990d26 100644
--- a/src/routes/api/notifications/preferences/+server.ts
+++ b/src/routes/api/notifications/preferences/+server.ts
@@ -11,13 +11,20 @@ export const GET: RequestHandler = withAuth(async (_event, { user }) => {
 	});
 
 	if (!prefs) {
-		return json({ newAdds: true, reactions: true, comments: true, dailyReminder: false });
+		return json({
+			newAdds: true,
+			reactions: true,
+			comments: true,
+			mentions: true,
+			dailyReminder: false
+		});
 	}
 
 	return json({
 		newAdds: prefs.newAdds,
 		reactions: prefs.reactions,
 		comments: prefs.comments,
+		mentions: prefs.mentions,
 		dailyReminder: prefs.dailyReminder
 	});
 });
@@ -26,7 +33,7 @@ export const PATCH: RequestHandler = withAuth(async ({ request }, { user }) => {
 	const body = await parseBody<Record<string, unknown>>(request);
 	if (isResponse(body)) return body;
 
-	const allowed = ['newAdds', 'reactions', 'comments', 'dailyReminder'] as const;
+	const allowed = ['newAdds', 'reactions', 'comments', 'mentions', 'dailyReminder'] as const;
 	const updates: Record<string, boolean> = {};
 
 	for (const key of allowed) {
@@ -52,6 +59,7 @@ export const PATCH: RequestHandler = withAuth(async ({ request }, { user }) => {
 		newAdds: updated!.newAdds,
 		reactions: updated!.reactions,
 		comments: updated!.comments,
+		mentions: updated!.mentions,
 		dailyReminder: updated!.dailyReminder
 	});
 });

From fcdd339d72dc132645472a2cf3868d100cca5c50 Mon Sep 17 00:00:00 2001
From: Grayson Adams <51373669+GraysonCAdams@users.noreply.github.com>
Date: Sun, 1 Mar 2026 00:43:29 -0600
Subject: [PATCH 03/10] feat: add MentionInput, MentionText components and
 members store

---
 src/lib/components/MentionInput.svelte | 253 +++++++++++++++++++++++++
 src/lib/components/MentionText.svelte  |  44 +++++
 src/lib/stores/members.ts              |  18 ++
 src/lib/types.ts                       |   6 +
 src/routes/(app)/+layout.svelte        |   2 +
 5 files changed, 323 insertions(+)
 create mode 100644 src/lib/components/MentionInput.svelte
 create mode 100644 src/lib/components/MentionText.svelte
 create mode 100644 src/lib/stores/members.ts

diff --git a/src/lib/components/MentionInput.svelte b/src/lib/components/MentionInput.svelte
new file mode 100644
index 0000000..ff439e7
--- /dev/null
+++ b/src/lib/components/MentionInput.svelte
@@ -0,0 +1,253 @@
+<script lang="ts">
+	import type { GroupMember } from '$lib/types';
+
+	const {
+		placeholder = '',
+		maxlength = 500,
+		disabled = false,
+		members = [],
+		singleLine = false,
+		onchange,
+		onsubmit
+	}: {
+		placeholder?: string;
+		maxlength?: number;
+		disabled?: boolean;
+		members?: GroupMember[];
+		singleLine?: boolean;
+		onchange?: (text: string) => void;
+		onsubmit?: () => void;
+	} = $props();
+
+	let text = $state('');
+	let inputEl = $state<HTMLInputElement | HTMLTextAreaElement | null>(null);
+	let showDropdown = $state(false);
+	let filteredMembers = $state<GroupMember[]>([]);
+	let selectedIndex = $state(0);
+	let mentionStart = $state(-1);
+
+	function handleInput() {
+		onchange?.(text);
+		checkForMention();
+	}
+
+	function checkForMention() {
+		if (!inputEl) return;
+		const pos = inputEl.selectionStart ?? 0;
+		const before = text.slice(0, pos);
+		const atMatch = before.match(/@(\w*)$/);
+
+		if (atMatch) {
+			mentionStart = pos - atMatch[0].length;
+			const partial = atMatch[1].toLowerCase();
+			filteredMembers = members
+				.filter((m) => m.username.toLowerCase().startsWith(partial))
+				.slice(0, 5);
+			showDropdown = filteredMembers.length > 0;
+			selectedIndex = 0;
+		} else {
+			showDropdown = false;
+		}
+	}
+
+	function selectMember(member: GroupMember) {
+		const pos = inputEl?.selectionStart ?? text.length;
+		const before = text.slice(0, mentionStart);
+		const after = text.slice(pos);
+		text = `${before}@${member.username} ${after}`;
+		showDropdown = false;
+		onchange?.(text);
+		requestAnimationFrame(() => {
+			const newPos = mentionStart + member.username.length + 2;
+			inputEl?.setSelectionRange(newPos, newPos);
+			inputEl?.focus();
+		});
+	}
+
+	function handleKeydown(e: KeyboardEvent) {
+		if (showDropdown) {
+			if (e.key === 'ArrowDown') {
+				e.preventDefault();
+				selectedIndex = (selectedIndex + 1) % filteredMembers.length;
+			} else if (e.key === 'ArrowUp') {
+				e.preventDefault();
+				selectedIndex = (selectedIndex - 1 + filteredMembers.length) % filteredMembers.length;
+			} else if (e.key === 'Enter' || e.key === 'Tab') {
+				e.preventDefault();
+				selectMember(filteredMembers[selectedIndex]);
+				return;
+			} else if (e.key === 'Escape') {
+				e.preventDefault();
+				showDropdown = false;
+				return;
+			}
+		}
+
+		if (singleLine && e.key === 'Enter' && !showDropdown) {
+			e.preventDefault();
+			onsubmit?.();
+		}
+	}
+
+	export function focus() {
+		inputEl?.focus();
+	}
+
+	export function clear() {
+		text = '';
+		onchange?.('');
+	}
+
+	export function getText(): string {
+		return text;
+	}
+</script>
+
+<div class="mention-input-wrap">
+	{#if showDropdown}
+		<div class="mention-dropdown">
+			{#each filteredMembers as member, i (member.id)}
+				<button
+					class="mention-option"
+					class:selected={i === selectedIndex}
+					onmousedown={(e) => {
+						e.preventDefault();
+						selectMember(member);
+					}}
+				>
+					<div class="mention-avatar">
+						{#if member.avatarPath}
+							<img src="/api/profile/avatar/{member.avatarPath}" alt="" />
+						{:else}
+							<span>{member.username.charAt(0).toUpperCase()}</span>
+						{/if}
+					</div>
+					<span class="mention-username">@{member.username}</span>
+				</button>
+			{/each}
+		</div>
+	{/if}
+
+	{#if singleLine}
+		<input
+			bind:this={inputEl}
+			bind:value={text}
+			type="text"
+			{placeholder}
+			{maxlength}
+			{disabled}
+			oninput={handleInput}
+			onkeydown={handleKeydown}
+			onclick={checkForMention}
+		/>
+	{:else}
+		<textarea
+			bind:this={inputEl}
+			bind:value={text}
+			{placeholder}
+			{maxlength}
+			{disabled}
+			rows="2"
+			oninput={handleInput}
+			onkeydown={handleKeydown}
+			onclick={checkForMention}
+		></textarea>
+	{/if}
+</div>
+
+<style>
+	.mention-input-wrap {
+		position: relative;
+		width: 100%;
+	}
+
+	input,
+	textarea {
+		width: 100%;
+		padding: var(--space-sm) var(--space-md);
+		border: 1px solid var(--border);
+		border-radius: var(--radius-sm);
+		background: var(--bg-elevated);
+		color: var(--text-primary);
+		font-size: 0.9375rem;
+		font-family: var(--font-body);
+		outline: none;
+		transition: border-color 0.2s ease;
+		box-sizing: border-box;
+	}
+
+	input::placeholder,
+	textarea::placeholder {
+		color: var(--text-muted);
+	}
+
+	input:focus,
+	textarea:focus {
+		border-color: var(--accent-primary);
+	}
+
+	textarea {
+		resize: none;
+		line-height: 1.4;
+	}
+
+	.mention-dropdown {
+		position: absolute;
+		bottom: 100%;
+		left: 0;
+		right: 0;
+		background: var(--bg-elevated);
+		border: 1px solid var(--border);
+		border-radius: var(--radius-sm);
+		margin-bottom: 4px;
+		overflow: hidden;
+		z-index: 20;
+		box-shadow: 0 -4px 16px rgba(0, 0, 0, 0.3);
+	}
+
+	.mention-option {
+		display: flex;
+		align-items: center;
+		gap: var(--space-sm);
+		width: 100%;
+		padding: var(--space-sm) var(--space-md);
+		background: none;
+		border: none;
+		color: var(--text-primary);
+		cursor: pointer;
+		text-align: left;
+		font-size: 0.875rem;
+		transition: background 0.1s ease;
+	}
+
+	.mention-option.selected,
+	.mention-option:hover {
+		background: var(--bg-surface);
+	}
+
+	.mention-avatar {
+		width: 24px;
+		height: 24px;
+		border-radius: var(--radius-full);
+		overflow: hidden;
+		background: var(--accent-magenta);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-shrink: 0;
+		font-size: 0.625rem;
+		font-weight: 700;
+		color: var(--constant-white);
+	}
+
+	.mention-avatar img {
+		width: 100%;
+		height: 100%;
+		object-fit: cover;
+	}
+
+	.mention-username {
+		font-weight: 500;
+		color: var(--text-primary);
+	}
+</style>
diff --git a/src/lib/components/MentionText.svelte b/src/lib/components/MentionText.svelte
new file mode 100644
index 0000000..45e7425
--- /dev/null
+++ b/src/lib/components/MentionText.svelte
@@ -0,0 +1,44 @@
+<script lang="ts">
+	const { text }: { text: string } = $props();
+
+	interface Segment {
+		type: 'text' | 'mention';
+		value: string;
+	}
+
+	const segments = $derived.by(() => {
+		const result: Segment[] = [];
+		const regex = /@(\w+)/g;
+		let lastIndex = 0;
+		let match;
+
+		while ((match = regex.exec(text)) !== null) {
+			if (match.index > lastIndex) {
+				result.push({ type: 'text', value: text.slice(lastIndex, match.index) });
+			}
+			result.push({ type: 'mention', value: match[0] });
+			lastIndex = regex.lastIndex;
+		}
+
+		if (lastIndex < text.length) {
+			result.push({ type: 'text', value: text.slice(lastIndex) });
+		}
+
+		return result;
+	});
+</script>
+
+{#each segments as segment, i (i)}
+	{#if segment.type === 'mention'}
+		<span class="mention">{segment.value}</span>
+	{:else}
+		{segment.value}
+	{/if}
+{/each}
+
+<style>
+	.mention {
+		color: var(--accent-blue);
+		font-weight: 600;
+	}
+</style>
diff --git a/src/lib/stores/members.ts b/src/lib/stores/members.ts
new file mode 100644
index 0000000..56429c3
--- /dev/null
+++ b/src/lib/stores/members.ts
@@ -0,0 +1,18 @@
+import { writable } from 'svelte/store';
+import type { GroupMember } from '$lib/types';
+
+export const groupMembers = writable<GroupMember[]>([]);
+
+export async function fetchGroupMembers(): Promise<void> {
+	try {
+		const res = await fetch('/api/group/members');
+		if (res.ok) {
+			const data: { id: string; username: string; avatarPath: string | null }[] = await res.json();
+			groupMembers.set(
+				data.map((m) => ({ id: m.id, username: m.username, avatarPath: m.avatarPath }))
+			);
+		}
+	} catch {
+		// silently fail — members list is optional for core functionality
+	}
+}
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 68ffcad..5460e2e 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -27,6 +27,12 @@ export interface FeedClip {
 	createdAt: string;
 }
 
+export interface GroupMember {
+	id: string;
+	username: string;
+	avatarPath: string | null;
+}
+
 export interface ClipSummary {
 	id: string;
 	title: string | null;
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index a82d1ce..89bf61a 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -9,6 +9,7 @@
 	import { globalMuted } from '$lib/stores/mute';
 	import { initAudioContext } from '$lib/audio/normalizer';
 	import { feedUiHidden } from '$lib/stores/uiHidden';
+	import { fetchGroupMembers } from '$lib/stores/members';
 	import ActivitySheet from '$lib/components/ActivitySheet.svelte';
 	import BellIcon from 'phosphor-svelte/lib/BellIcon';
 	import HouseIcon from 'phosphor-svelte/lib/HouseIcon';
@@ -26,6 +27,7 @@
 
 	onMount(() => {
 		startPolling();
+		fetchGroupMembers();
 		// Initialize mute state from user preference
 		const user = page.data?.user;
 		if (user) {

From 8345461e7405c7e9dd3c3b5857a98a3a1a36ef1d Mon Sep 17 00:00:00 2001
From: Grayson Adams <51373669+GraysonCAdams@users.noreply.github.com>
Date: Sun, 1 Mar 2026 00:45:25 -0600
Subject: [PATCH 04/10] feat: rework AddVideo with iMessage-style compose
 layout

- Two-field compose: Link (top) + Message (bottom) with @mention support
- Tab from URL field focuses message field
- Message auto-posted as first comment on clip
- Hide clipboard suggestion when URL input matches clipboard content
---
 src/lib/components/AddVideo.svelte      | 212 +++++++++++++++++-------
 src/lib/components/AddVideoModal.svelte |   8 +-
 2 files changed, 159 insertions(+), 61 deletions(-)

diff --git a/src/lib/components/AddVideo.svelte b/src/lib/components/AddVideo.svelte
index f1899e5..526a28f 100644
--- a/src/lib/components/AddVideo.svelte
+++ b/src/lib/components/AddVideo.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import InlineError from './InlineError.svelte';
+	import MentionInput from './MentionInput.svelte';
 	import {
 		isSupportedUrl,
 		platformLabel,
@@ -8,6 +9,7 @@
 	} from '$lib/url-validation';
 	import { addToast } from '$lib/stores/toasts';
 	import { page } from '$app/stores';
+	import type { GroupMember } from '$lib/types';
 	import DownloadSimpleIcon from 'phosphor-svelte/lib/DownloadSimpleIcon';
 	import ClipboardIcon from 'phosphor-svelte/lib/ClipboardIcon';
 	import XIcon from 'phosphor-svelte/lib/XIcon';
@@ -15,13 +17,15 @@
 
 	const {
 		onsubmitted,
-		initialUrl
+		initialUrl,
+		members = []
 	}: {
 		onsubmitted?: (
 			clip: { id: string; status: string; contentType: string },
 			caption: string
 		) => void;
 		initialUrl?: string;
+		members?: GroupMember[];
 	} = $props();
 
 	const hasProvider = $derived(!!$page.data.group?.downloadProvider);
@@ -32,9 +36,11 @@
 			: null
 	);
 	let url = $state('');
+	let message = $state('');
 	let error = $state('');
 	let loading = $state(false);
 	let urlInput = $state<HTMLInputElement | null>(null);
+	let messageInput = $state<ReturnType<typeof MentionInput> | null>(null);
 	let clipboardSuggestion = $state<{ url: string; label: string } | null>(null);
 
 	const detectedPlatform = $derived(url.trim() ? detectPlatform(url.trim()) : null);
@@ -44,6 +50,11 @@
 			: false
 	);
 
+	// Hide clipboard suggestion if the URL input already matches it
+	const showClipboard = $derived(
+		clipboardSuggestion !== null && url.trim() !== clipboardSuggestion.url
+	);
+
 	export function focus() {
 		urlInput?.focus();
 	}
@@ -55,7 +66,7 @@
 
 	// Attempt clipboard read on mount (requires user gesture — modal tap counts)
 	$effect(() => {
-		if (initialUrl) return; // Skip if URL was provided externally
+		if (initialUrl) return;
 		(async () => {
 			try {
 				const text = await navigator.clipboard.readText();
@@ -70,7 +81,7 @@
 					}
 				}
 			} catch {
-				// Clipboard permission denied or API unavailable — silently ignore
+				// Clipboard permission denied or API unavailable
 			}
 		})();
 	});
@@ -86,14 +97,25 @@
 		clipboardSuggestion = null;
 	}
 
+	function handleUrlKeydown(e: KeyboardEvent) {
+		if (e.key === 'Tab' && !e.shiftKey) {
+			e.preventDefault();
+			messageInput?.focus();
+		}
+	}
+
 	async function handleSubmit() {
 		error = '';
 		loading = true;
 		try {
+			const trimmedMessage = message.trim();
 			const res = await fetch('/api/clips', {
 				method: 'POST',
 				headers: { 'Content-Type': 'application/json' },
-				body: JSON.stringify({ url: url.trim() })
+				body: JSON.stringify({
+					url: url.trim(),
+					...(trimmedMessage ? { message: trimmedMessage } : {})
+				})
 			});
 			const data = await res.json();
 			if (!res.ok) {
@@ -101,9 +123,8 @@
 				return;
 			}
 			url = '';
-			// Always create a processing toast — persists in global ToastStack
-			// even if modal is dismissed/destroyed. AddVideoModal removes it
-			// when UploadStatus takes over as the feedback mechanism.
+			message = '';
+			messageInput?.clear();
 			addToast({
 				type: 'processing',
 				message: `Adding ${data.clip.contentType === 'music' ? 'song' : 'video'} to feed...`,
@@ -134,13 +155,13 @@
 			handleSubmit();
 		}}
 	>
-		{#if clipboardSuggestion}
+		{#if showClipboard}
 			<div class="clipboard-suggestion">
 				<div class="suggestion-content">
 					<ClipboardIcon size={18} class="suggestion-icon" />
 					<div class="suggestion-text">
-						<span class="suggestion-label">Paste from {clipboardSuggestion.label}?</span>
-						<span class="suggestion-url">{clipboardSuggestion.url}</span>
+						<span class="suggestion-label">Paste from {clipboardSuggestion?.label}?</span>
+						<span class="suggestion-url">{clipboardSuggestion?.url}</span>
 					</div>
 				</div>
 				<div class="suggestion-actions">
@@ -159,22 +180,49 @@
 			</div>
 		{/if}
 
-		<div class="input-wrap" class:has-error={!!error}>
-			<input
-				bind:this={urlInput}
-				type="url"
-				bind:value={url}
-				placeholder="Paste a link..."
-				disabled={loading}
-			/>
-			<button type="submit" disabled={loading || !url.trim() || platformBlocked}>
-				{#if loading}
-					<span class="spinner"></span>
-				{:else}
-					<ArrowRightIcon size={20} weight="bold" />
-				{/if}
-			</button>
+		<div class="compose-fields">
+			<div class="field-row">
+				<span class="field-label">Link</span>
+				<div class="field-input-wrap" class:has-error={!!error}>
+					<input
+						bind:this={urlInput}
+						type="url"
+						bind:value={url}
+						placeholder="Paste a link..."
+						disabled={loading}
+						onkeydown={handleUrlKeydown}
+					/>
+					<button
+						type="submit"
+						class="submit-btn"
+						disabled={loading || !url.trim() || platformBlocked}
+					>
+						{#if loading}
+							<span class="spinner"></span>
+						{:else}
+							<ArrowRightIcon size={20} weight="bold" />
+						{/if}
+					</button>
+				</div>
+			</div>
+
+			<div class="field-divider"></div>
+
+			<div class="field-row message-row">
+				<span class="field-label">Message</span>
+				<MentionInput
+					bind:this={messageInput}
+					placeholder="Add a message (optional)"
+					maxlength={500}
+					disabled={loading}
+					{members}
+					onchange={(text) => {
+						message = text;
+					}}
+				/>
+			</div>
 		</div>
+
 		{#if platformBlocked}
 			<p class="platform-blocked">{platformLabel(url.trim())} links aren't allowed in this group</p>
 		{/if}
@@ -187,11 +235,10 @@
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		gap: var(--space-sm);
+		gap: var(--space-md);
 		padding: var(--space-sm) var(--space-lg) var(--space-lg);
 	}
 
-	/* Clipboard suggestion banner */
 	.clipboard-suggestion {
 		display: flex;
 		align-items: center;
@@ -204,7 +251,6 @@
 		padding: var(--space-sm) var(--space-md);
 		animation: slide-in 0.2s ease;
 	}
-
 	.suggestion-content {
 		display: flex;
 		align-items: center;
@@ -212,26 +258,22 @@
 		min-width: 0;
 		flex: 1;
 	}
-
 	.suggestion-content :global(.suggestion-icon) {
 		width: 18px;
 		height: 18px;
 		color: var(--accent-primary);
 		flex-shrink: 0;
 	}
-
 	.suggestion-text {
 		display: flex;
 		flex-direction: column;
 		min-width: 0;
 	}
-
 	.suggestion-label {
 		font-size: 0.8125rem;
 		font-weight: 600;
 		color: var(--text-primary);
 	}
-
 	.suggestion-url {
 		font-size: 0.6875rem;
 		color: var(--text-muted);
@@ -239,14 +281,12 @@
 		overflow: hidden;
 		text-overflow: ellipsis;
 	}
-
 	.suggestion-actions {
 		display: flex;
 		align-items: center;
 		gap: var(--space-xs);
 		flex-shrink: 0;
 	}
-
 	.suggestion-confirm {
 		padding: var(--space-xs) var(--space-md);
 		background: var(--accent-primary);
@@ -260,7 +300,6 @@
 		height: auto;
 		margin: 0;
 	}
-
 	.suggestion-dismiss {
 		background: none;
 		border: none;
@@ -271,12 +310,10 @@
 		height: auto;
 		margin: 0;
 	}
-
 	.suggestion-dismiss :global(svg) {
 		width: 16px;
 		height: 16px;
 	}
-
 	@keyframes slide-in {
 		from {
 			opacity: 0;
@@ -288,49 +325,104 @@
 		}
 	}
 
-	.input-wrap {
-		display: flex;
-		align-items: center;
+	/* iMessage-style compose fields */
+	.compose-fields {
 		width: 100%;
 		background: var(--bg-elevated);
 		border: 1.5px solid var(--border);
-		border-radius: var(--radius-full);
+		border-radius: var(--radius-md);
+		overflow: hidden;
 		transition:
 			border-color 0.2s ease,
 			box-shadow 0.2s ease;
-		overflow: hidden;
 	}
 
-	.input-wrap:focus-within {
+	.compose-fields:focus-within {
 		border-color: var(--accent-primary);
 		box-shadow: 0 0 0 3px color-mix(in srgb, var(--accent-primary) 15%, transparent);
 	}
 
-	.input-wrap.has-error {
-		border-color: var(--error);
+	.field-row {
+		display: flex;
+		align-items: center;
+		gap: var(--space-sm);
+		padding: var(--space-xs) var(--space-md);
+	}
+
+	.message-row {
+		align-items: flex-start;
+		padding-top: var(--space-sm);
+		padding-bottom: var(--space-sm);
 	}
 
-	input {
+	.field-label {
+		font-size: 0.8125rem;
+		font-weight: 600;
+		color: var(--text-muted);
+		flex-shrink: 0;
+		min-width: 56px;
+	}
+
+	.message-row .field-label {
+		padding-top: var(--space-xs);
+	}
+
+	.field-divider {
+		height: 1px;
+		background: var(--border);
+		margin: 0 var(--space-md);
+	}
+
+	.field-input-wrap {
+		display: flex;
+		align-items: center;
+		flex: 1;
+		min-width: 0;
+	}
+
+	.field-input-wrap.has-error input {
+		color: var(--error);
+	}
+
+	.field-input-wrap input {
 		flex: 1;
-		padding: 14px 0 14px 20px;
+		padding: 10px 0;
 		border: none;
 		background: transparent;
 		color: var(--text-primary);
-		font-size: 1rem;
+		font-size: 0.9375rem;
 		font-family: var(--font-body);
 		outline: none;
 		min-width: 0;
 	}
 
-	input::placeholder {
+	.field-input-wrap input::placeholder {
 		color: var(--text-muted);
 	}
 
-	button {
+	.field-row :global(.mention-input-wrap) {
+		flex: 1;
+		min-width: 0;
+	}
+
+	.field-row :global(.mention-input-wrap input),
+	.field-row :global(.mention-input-wrap textarea) {
+		border: none;
+		background: transparent;
+		padding: var(--space-xs) 0;
+		font-size: 0.9375rem;
+	}
+
+	.field-row :global(.mention-input-wrap input:focus),
+	.field-row :global(.mention-input-wrap textarea:focus) {
+		border-color: transparent;
+	}
+
+	.submit-btn {
 		flex-shrink: 0;
-		width: 42px;
-		height: 42px;
-		margin: 3px;
+		width: 36px;
+		height: 36px;
+		margin: 0;
 		display: flex;
 		align-items: center;
 		justify-content: center;
@@ -344,23 +436,23 @@
 			opacity 0.15s ease;
 	}
 
-	button :global(svg) {
-		width: 20px;
-		height: 20px;
+	.submit-btn :global(svg) {
+		width: 18px;
+		height: 18px;
 	}
 
-	button:active {
+	.submit-btn:active {
 		transform: scale(0.92);
 	}
 
-	button:disabled {
+	.submit-btn:disabled {
 		opacity: 0.35;
 		cursor: not-allowed;
 	}
 
 	.spinner {
-		width: 18px;
-		height: 18px;
+		width: 16px;
+		height: 16px;
 		border: 2.5px solid rgba(0, 0, 0, 0.15);
 		border-top-color: var(--bg-primary);
 		border-radius: var(--radius-full);
diff --git a/src/lib/components/AddVideoModal.svelte b/src/lib/components/AddVideoModal.svelte
index 52043ab..f2a409c 100644
--- a/src/lib/components/AddVideoModal.svelte
+++ b/src/lib/components/AddVideoModal.svelte
@@ -7,6 +7,7 @@
 	import { addToast, toast, toasts } from '$lib/stores/toasts';
 	import { clipReadySignal, viewClipSignal } from '$lib/stores/toasts';
 	import { dismissShortcutNudge } from '$lib/stores/shortcutNudge';
+	import { groupMembers } from '$lib/stores/members';
 
 	const { ondismiss, initialUrl }: { ondismiss: () => void; initialUrl?: string } = $props();
 
@@ -166,7 +167,12 @@
 
 		{#if phase === 'form'}
 			<div class="sheet-body">
-				<AddVideo bind:this={addVideoRef} onsubmitted={handleSubmitted} {initialUrl} />
+				<AddVideo
+					bind:this={addVideoRef}
+					onsubmitted={handleSubmitted}
+					{initialUrl}
+					members={$groupMembers}
+				/>
 			</div>
 		{:else}
 			<UploadStatus

From aefe02af1431e35a49fb693fab522a8ea9b69749 Mon Sep 17 00:00:00 2001
From: Grayson Adams <51373669+GraysonCAdams@users.noreply.github.com>
Date: Sun, 1 Mar 2026 00:47:39 -0600
Subject: [PATCH 05/10] feat: integrate @mentions into CommentsSheet and
 CommentInput

- Replace plain input with MentionInput in CommentInput
- Render @mentions with MentionText highlighting in comments/replies
- Pass group members from store to CommentsSheet via ReelItem
---
 src/lib/components/CommentInput.svelte  | 37 +++++++++++++++----------
 src/lib/components/CommentsSheet.svelte |  9 ++++--
 src/lib/components/ReelItem.svelte      |  2 ++
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/lib/components/CommentInput.svelte b/src/lib/components/CommentInput.svelte
index 04223ab..f62742b 100644
--- a/src/lib/components/CommentInput.svelte
+++ b/src/lib/components/CommentInput.svelte
@@ -1,11 +1,14 @@
 <script lang="ts">
 	import GifIcon from 'phosphor-svelte/lib/GifIcon';
+	import MentionInput from './MentionInput.svelte';
+	import type { GroupMember } from '$lib/types';
 
 	const {
 		replyingTo,
 		submitting,
 		gifEnabled = false,
 		attachedGif = null,
+		members = [],
 		onsubmit,
 		oncancelreply,
 		ongiftoggle,
@@ -15,6 +18,7 @@
 		submitting: boolean;
 		gifEnabled?: boolean;
 		attachedGif: { url: string; stillUrl: string } | null;
+		members?: GroupMember[];
 		onsubmit: (text: string, gifUrl?: string) => void;
 		oncancelreply: () => void;
 		ongiftoggle: () => void;
@@ -22,16 +26,17 @@
 	} = $props();
 
 	let text = $state('');
-	let inputEl: HTMLInputElement | null = $state(null);
+	let mentionInputRef = $state<ReturnType<typeof MentionInput> | null>(null);
 
 	const canSubmit = $derived(text.trim().length > 0 || !!attachedGif);
 
 	export function focus() {
-		inputEl?.focus();
+		mentionInputRef?.focus();
 	}
 
 	export function clear() {
 		text = '';
+		mentionInputRef?.clear();
 	}
 
 	function handleSubmit(e: SubmitEvent) {
@@ -67,13 +72,19 @@
 	>
 		<GifIcon size={26} />
 	</button>
-	<input
-		type="text"
-		bind:value={text}
-		bind:this={inputEl}
+	<MentionInput
+		bind:this={mentionInputRef}
 		placeholder={replyingTo ? `Reply to ${replyingTo.username}...` : 'Add a comment...'}
 		maxlength={500}
 		disabled={submitting}
+		{members}
+		singleLine
+		onchange={(t) => {
+			text = t;
+		}}
+		onsubmit={() => {
+			if (canSubmit && !submitting) onsubmit(text.trim(), attachedGif?.url);
+		}}
 	/>
 	<button type="submit" disabled={!canSubmit || submitting}>Send</button>
 </form>
@@ -146,29 +157,27 @@
 
 	.input-bar {
 		display: flex;
+		align-items: center;
 		gap: var(--space-sm);
 		padding: var(--space-md) var(--space-lg);
 		border-top: 1px solid var(--border);
 		background: var(--bg-surface);
 		padding-bottom: max(12px, env(safe-area-inset-bottom));
 	}
-	.input-bar input {
+	.input-bar :global(.mention-input-wrap) {
 		flex: 1;
+		min-width: 0;
+	}
+	.input-bar :global(.mention-input-wrap input) {
 		padding: var(--space-sm) var(--space-md);
 		border: 1px solid var(--border);
 		border-radius: var(--radius-full);
 		background: var(--bg-elevated);
-		color: var(--text-primary);
 		font-size: 1rem;
-		outline: none;
-		transition: border-color 0.2s ease;
 	}
-	.input-bar input:focus {
+	.input-bar :global(.mention-input-wrap input:focus) {
 		border-color: var(--accent-primary);
 	}
-	.input-bar input::placeholder {
-		color: var(--text-muted);
-	}
 
 	.gif-btn {
 		display: flex;
diff --git a/src/lib/components/CommentsSheet.svelte b/src/lib/components/CommentsSheet.svelte
index ff0ad13..87059b0 100644
--- a/src/lib/components/CommentsSheet.svelte
+++ b/src/lib/components/CommentsSheet.svelte
@@ -5,7 +5,9 @@
 	import CommentInput from './CommentInput.svelte';
 	import GifPicker from './GifPicker.svelte';
 	import BaseSheet from './BaseSheet.svelte';
+	import MentionText from './MentionText.svelte';
 	import HeartIcon from 'phosphor-svelte/lib/HeartIcon';
+	import type { GroupMember } from '$lib/types';
 	import {
 		type Comment,
 		fetchComments,
@@ -20,12 +22,14 @@
 		currentUserId,
 		gifEnabled = false,
 		autoFocus = false,
+		members = [],
 		ondismiss
 	}: {
 		clipId: string;
 		currentUserId: string;
 		gifEnabled?: boolean;
 		autoFocus?: boolean;
+		members?: GroupMember[];
 		ondismiss: () => void;
 	} = $props();
 
@@ -178,7 +182,7 @@
 								{/if}
 							</div>
 							{#if comment.text}
-								<p class="comment-text">{comment.text}</p>
+								<p class="comment-text"><MentionText text={comment.text} /></p>
 							{/if}
 							{#if comment.gifUrl}
 								<img class="comment-gif" src={comment.gifUrl} alt="GIF" loading="lazy" />
@@ -217,7 +221,7 @@
 													{/if}
 												</div>
 												{#if reply.text}
-													<p class="reply-text">{reply.text}</p>
+													<p class="reply-text"><MentionText text={reply.text} /></p>
 												{/if}
 												{#if reply.gifUrl}
 													<img class="reply-gif" src={reply.gifUrl} alt="GIF" loading="lazy" />
@@ -264,6 +268,7 @@
 			{submitting}
 			{gifEnabled}
 			{attachedGif}
+			{members}
 			onsubmit={handleSubmit}
 			oncancelreply={() => {
 				replyingTo = null;
diff --git a/src/lib/components/ReelItem.svelte b/src/lib/components/ReelItem.svelte
index 9b4ddc4..2f3074f 100644
--- a/src/lib/components/ReelItem.svelte
+++ b/src/lib/components/ReelItem.svelte
@@ -13,6 +13,7 @@
 	} from '$lib/reelInteractions';
 	import { trackVideoTime, sendWatchPercent, flashIndicator } from '$lib/reelPlayback';
 	import { feedUiHidden } from '$lib/stores/uiHidden';
+	import { groupMembers } from '$lib/stores/members';
 	import ReelVideo from './ReelVideo.svelte';
 	import ReelMusic from './ReelMusic.svelte';
 	import ActionSidebar from './ActionSidebar.svelte';
@@ -415,6 +416,7 @@
 		{currentUserId}
 		{gifEnabled}
 		autoFocus={commentsAutoFocus}
+		members={$groupMembers}
 		ondismiss={() => {
 			showComments = false;
 			unreadOverride = 0;

From 8bd3e2a1b3d0d4c6fdd9aeffd5f371c4632a19da Mon Sep 17 00:00:00 2001
From: Grayson Adams <51373669+GraysonCAdams@users.noreply.github.com>
Date: Sun, 1 Mar 2026 00:48:35 -0600
Subject: [PATCH 06/10] feat: add mention notification type to activity sheet
 and settings

- Add 'mention' to Notification type union with "mentioned you" text
- Show comment preview for mention notifications in activity feed
- Add mentions toggle to notification preferences UI
- Include mentions in NotificationPrefs type and default state
---
 src/lib/components/ActivitySheet.svelte          |  7 +++++--
 .../settings/NotificationSettings.svelte         | 16 ++++++++++++++++
 src/lib/settingsApi.ts                           |  3 ++-
 src/routes/(app)/settings/+page.svelte           |  1 +
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/ActivitySheet.svelte b/src/lib/components/ActivitySheet.svelte
index 64078fa..c72a5e5 100644
--- a/src/lib/components/ActivitySheet.svelte
+++ b/src/lib/components/ActivitySheet.svelte
@@ -10,7 +10,7 @@
 
 	interface Notification {
 		id: string;
-		type: 'reaction' | 'comment';
+		type: 'reaction' | 'comment' | 'mention';
 		clipId: string;
 		emoji: string | null;
 		commentPreview: string | null;
@@ -129,6 +129,9 @@
 		if (n.type === 'reaction') {
 			return `reacted ${n.emoji} to your clip`;
 		}
+		if (n.type === 'mention') {
+			return 'mentioned you';
+		}
 		return 'commented on your clip';
 	}
 </script>
@@ -183,7 +186,7 @@
 										<span class="actor-name">{n.actorUsername}</span>
 										{description(n)}
 									</p>
-									{#if n.type === 'comment' && n.commentPreview}
+									{#if (n.type === 'comment' || n.type === 'mention') && n.commentPreview}
 										<p class="comment-preview">{n.commentPreview}</p>
 									{/if}
 									<span class="notification-time">{relativeTime(n.createdAt)}</span>
diff --git a/src/lib/components/settings/NotificationSettings.svelte b/src/lib/components/settings/NotificationSettings.svelte
index 99cb405..4be87a4 100644
--- a/src/lib/components/settings/NotificationSettings.svelte
+++ b/src/lib/components/settings/NotificationSettings.svelte
@@ -93,6 +93,22 @@
 			</button>
 		</div>
 
+		<div class="setting-row">
+			<div class="setting-label">
+				<span class="setting-name">Mentions</span>
+				<span class="setting-desc">When someone @mentions you</span>
+			</div>
+			<button
+				class="toggle"
+				class:active={prefs.mentions && pushEnabled}
+				disabled={!pushEnabled}
+				onclick={() => onUpdatePref('mentions', !prefs.mentions)}
+				aria-label="Toggle mention notifications"
+			>
+				<span class="toggle-thumb"></span>
+			</button>
+		</div>
+
 		<div class="setting-row last">
 			<div class="setting-label">
 				<span class="setting-name">Daily reminder</span>
diff --git a/src/lib/settingsApi.ts b/src/lib/settingsApi.ts
index 123a533..bfa2aef 100644
--- a/src/lib/settingsApi.ts
+++ b/src/lib/settingsApi.ts
@@ -4,6 +4,7 @@ export type NotificationPrefs = {
 	newAdds: boolean;
 	reactions: boolean;
 	comments: boolean;
+	mentions: boolean;
 	dailyReminder: boolean;
 };
 
@@ -66,7 +67,7 @@ export async function saveAccentColor(key: AccentColorKey): Promise<void> {
 export async function fetchNotificationPrefs(): Promise<NotificationPrefs> {
 	const res = await fetch('/api/notifications/preferences');
 	if (res.ok) return res.json();
-	return { newAdds: true, reactions: true, comments: true, dailyReminder: false };
+	return { newAdds: true, reactions: true, comments: true, mentions: true, dailyReminder: false };
 }
 
 export async function updateNotificationPref(key: string, value: boolean): Promise<void> {
diff --git a/src/routes/(app)/settings/+page.svelte b/src/routes/(app)/settings/+page.svelte
index 17d4fb3..c19f815 100644
--- a/src/routes/(app)/settings/+page.svelte
+++ b/src/routes/(app)/settings/+page.svelte
@@ -92,6 +92,7 @@
 		newAdds: true,
 		reactions: true,
 		comments: true,
+		mentions: true,
 		dailyReminder: false
 	});
 

From 4e93f801002ef9df56272cba67640311e941d8dc Mon Sep 17 00:00:00 2001
From: Grayson Adams <51373669+GraysonCAdams@users.noreply.github.com>
Date: Sun, 1 Mar 2026 01:07:27 -0600
Subject: [PATCH 07/10] feat: add inline mention highlighting with overlay
 input pattern

Replace plain input/textarea in MentionInput with an overlay pattern
where a highlight mirror renders colored @mentions behind a transparent
input. Syncs scroll position and tracks focus state for border styling.
Update parent component styles (AddVideo, CommentInput) to target new
class names.
---
 src/lib/components/AddVideo.svelte     |  11 +-
 src/lib/components/CommentInput.svelte |  11 +-
 src/lib/components/MentionInput.svelte | 184 ++++++++++++++++++++-----
 3 files changed, 155 insertions(+), 51 deletions(-)

diff --git a/src/lib/components/AddVideo.svelte b/src/lib/components/AddVideo.svelte
index 526a28f..8acb401 100644
--- a/src/lib/components/AddVideo.svelte
+++ b/src/lib/components/AddVideo.svelte
@@ -405,19 +405,16 @@
 		min-width: 0;
 	}
 
-	.field-row :global(.mention-input-wrap input),
-	.field-row :global(.mention-input-wrap textarea) {
+	.field-row :global(.mention-input-wrap .input-container) {
 		border: none;
 		background: transparent;
+	}
+	.field-row :global(.mention-input-wrap .overlay-input),
+	.field-row :global(.mention-input-wrap .highlight-mirror) {
 		padding: var(--space-xs) 0;
 		font-size: 0.9375rem;
 	}
 
-	.field-row :global(.mention-input-wrap input:focus),
-	.field-row :global(.mention-input-wrap textarea:focus) {
-		border-color: transparent;
-	}
-
 	.submit-btn {
 		flex-shrink: 0;
 		width: 36px;
diff --git a/src/lib/components/CommentInput.svelte b/src/lib/components/CommentInput.svelte
index f62742b..2d3c095 100644
--- a/src/lib/components/CommentInput.svelte
+++ b/src/lib/components/CommentInput.svelte
@@ -168,15 +168,12 @@
 		flex: 1;
 		min-width: 0;
 	}
-	.input-bar :global(.mention-input-wrap input) {
-		padding: var(--space-sm) var(--space-md);
-		border: 1px solid var(--border);
+	.input-bar :global(.mention-input-wrap .input-container) {
 		border-radius: var(--radius-full);
-		background: var(--bg-elevated);
-		font-size: 1rem;
 	}
-	.input-bar :global(.mention-input-wrap input:focus) {
-		border-color: var(--accent-primary);
+	.input-bar :global(.mention-input-wrap .overlay-input),
+	.input-bar :global(.mention-input-wrap .highlight-mirror) {
+		font-size: 1rem;
 	}
 
 	.gif-btn {
diff --git a/src/lib/components/MentionInput.svelte b/src/lib/components/MentionInput.svelte
index ff439e7..9f01c80 100644
--- a/src/lib/components/MentionInput.svelte
+++ b/src/lib/components/MentionInput.svelte
@@ -21,14 +21,54 @@
 
 	let text = $state('');
 	let inputEl = $state<HTMLInputElement | HTMLTextAreaElement | null>(null);
+	let mirrorEl = $state<HTMLDivElement | null>(null);
 	let showDropdown = $state(false);
 	let filteredMembers = $state<GroupMember[]>([]);
 	let selectedIndex = $state(0);
 	let mentionStart = $state(-1);
+	let isFocused = $state(false);
+
+	interface Segment {
+		type: 'text' | 'mention';
+		value: string;
+	}
+
+	const memberUsernames = $derived(new Set(members.map((m) => m.username.toLowerCase())));
+
+	const textSegments = $derived.by(() => {
+		const result: Segment[] = [];
+		const regex = /@(\w+)/g;
+		let lastIndex = 0;
+		let match;
+
+		while ((match = regex.exec(text)) !== null) {
+			const username = match[1].toLowerCase();
+			const isMember = memberUsernames.has(username);
+			if (match.index > lastIndex) {
+				result.push({ type: 'text', value: text.slice(lastIndex, match.index) });
+			}
+			result.push({ type: isMember ? 'mention' : 'text', value: match[0] });
+			lastIndex = regex.lastIndex;
+		}
+
+		if (lastIndex < text.length) {
+			result.push({ type: 'text', value: text.slice(lastIndex) });
+		}
+
+		return result;
+	});
 
 	function handleInput() {
 		onchange?.(text);
 		checkForMention();
+		syncScroll();
+	}
+
+	function syncScroll() {
+		if (mirrorEl && inputEl) {
+			mirrorEl.scrollLeft = inputEl.scrollLeft;
+			mirrorEl.scrollTop = inputEl.scrollTop;
+		}
 	}
 
 	function checkForMention() {
@@ -89,6 +129,11 @@
 		}
 	}
 
+	function handleClick() {
+		checkForMention();
+		syncScroll();
+	}
+
 	export function focus() {
 		inputEl?.focus();
 	}
@@ -128,31 +173,52 @@
 		</div>
 	{/if}
 
-	{#if singleLine}
-		<input
-			bind:this={inputEl}
-			bind:value={text}
-			type="text"
-			{placeholder}
-			{maxlength}
-			{disabled}
-			oninput={handleInput}
-			onkeydown={handleKeydown}
-			onclick={checkForMention}
-		/>
-	{:else}
-		<textarea
-			bind:this={inputEl}
-			bind:value={text}
-			{placeholder}
-			{maxlength}
-			{disabled}
-			rows="2"
-			oninput={handleInput}
-			onkeydown={handleKeydown}
-			onclick={checkForMention}
-		></textarea>
-	{/if}
+	<div class="input-container" class:focused={isFocused}>
+		<div
+			class="highlight-mirror"
+			class:single-line={singleLine}
+			bind:this={mirrorEl}
+			aria-hidden="true"
+		>
+			{#each textSegments as seg, i (i)}{#if seg.type === 'mention'}<span class="mention-hl"
+						>{seg.value}</span
+					>{:else}{seg.value}{/if}{/each}
+		</div>
+
+		{#if singleLine}
+			<input
+				bind:this={inputEl}
+				bind:value={text}
+				type="text"
+				class="overlay-input"
+				{placeholder}
+				{maxlength}
+				{disabled}
+				oninput={handleInput}
+				onkeydown={handleKeydown}
+				onclick={handleClick}
+				onfocus={() => (isFocused = true)}
+				onblur={() => (isFocused = false)}
+				onscroll={syncScroll}
+			/>
+		{:else}
+			<textarea
+				bind:this={inputEl}
+				bind:value={text}
+				class="overlay-input"
+				{placeholder}
+				{maxlength}
+				{disabled}
+				rows="2"
+				oninput={handleInput}
+				onkeydown={handleKeydown}
+				onclick={handleClick}
+				onfocus={() => (isFocused = true)}
+				onblur={() => (isFocused = false)}
+				onscroll={syncScroll}
+			></textarea>
+		{/if}
+	</div>
 </div>
 
 <style>
@@ -161,32 +227,76 @@
 		width: 100%;
 	}
 
-	input,
-	textarea {
-		width: 100%;
-		padding: var(--space-sm) var(--space-md);
+	.input-container {
+		position: relative;
+		background: var(--bg-elevated);
 		border: 1px solid var(--border);
 		border-radius: var(--radius-sm);
-		background: var(--bg-elevated);
+		overflow: hidden;
+		transition: border-color 0.2s ease;
+	}
+
+	.input-container.focused {
+		border-color: var(--accent-primary);
+	}
+
+	.highlight-mirror {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		padding: var(--space-sm) var(--space-md);
+		font-size: 0.9375rem;
+		font-family: var(--font-body);
 		color: var(--text-primary);
+		pointer-events: none;
+		overflow: hidden;
+		z-index: 1;
+	}
+
+	.highlight-mirror.single-line {
+		white-space: nowrap;
+		display: flex;
+		align-items: center;
+	}
+
+	.highlight-mirror:not(.single-line) {
+		white-space: pre-wrap;
+		word-wrap: break-word;
+		overflow-wrap: break-word;
+		line-height: 1.4;
+	}
+
+	.mention-hl {
+		color: var(--accent-blue);
+		font-weight: 700;
+	}
+
+	.overlay-input {
+		position: relative;
+		z-index: 2;
+		width: 100%;
+		padding: var(--space-sm) var(--space-md);
+		border: none;
+		background: transparent;
+		color: transparent;
+		caret-color: var(--text-primary);
 		font-size: 0.9375rem;
 		font-family: var(--font-body);
 		outline: none;
-		transition: border-color 0.2s ease;
 		box-sizing: border-box;
 	}
 
-	input::placeholder,
-	textarea::placeholder {
+	.overlay-input::placeholder {
 		color: var(--text-muted);
 	}
 
-	input:focus,
-	textarea:focus {
-		border-color: var(--accent-primary);
+	.overlay-input::selection {
+		background: rgba(74, 158, 255, 0.3);
 	}
 
-	textarea {
+	textarea.overlay-input {
 		resize: none;
 		line-height: 1.4;
 	}

From 7140c858cd42944502ac04024dda2d76928d3594 Mon Sep 17 00:00:00 2001
From: Grayson Adams <51373669+GraysonCAdams@users.noreply.github.com>
Date: Sun, 1 Mar 2026 01:07:36 -0600
Subject: [PATCH 08/10] feat: validate @mentions against group members in
 MentionText

Only highlight @mentions that match actual group member usernames.
Pass member usernames from CommentsSheet to MentionText for validation.
Bump mention font-weight from 600 to 700 for consistency with input.
---
 src/lib/components/CommentsSheet.svelte | 10 ++++++++--
 src/lib/components/MentionText.svelte   |  9 ++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/lib/components/CommentsSheet.svelte b/src/lib/components/CommentsSheet.svelte
index 87059b0..706a686 100644
--- a/src/lib/components/CommentsSheet.svelte
+++ b/src/lib/components/CommentsSheet.svelte
@@ -33,6 +33,8 @@
 		ondismiss: () => void;
 	} = $props();
 
+	const memberUsernames = $derived(members.map((m) => m.username));
+
 	let comments = $state<Comment[]>([]);
 	let loading = $state(true);
 	let submitting = $state(false);
@@ -182,7 +184,9 @@
 								{/if}
 							</div>
 							{#if comment.text}
-								<p class="comment-text"><MentionText text={comment.text} /></p>
+								<p class="comment-text">
+									<MentionText text={comment.text} usernames={memberUsernames} />
+								</p>
 							{/if}
 							{#if comment.gifUrl}
 								<img class="comment-gif" src={comment.gifUrl} alt="GIF" loading="lazy" />
@@ -221,7 +225,9 @@
 													{/if}
 												</div>
 												{#if reply.text}
-													<p class="reply-text"><MentionText text={reply.text} /></p>
+													<p class="reply-text">
+														<MentionText text={reply.text} usernames={memberUsernames} />
+													</p>
 												{/if}
 												{#if reply.gifUrl}
 													<img class="reply-gif" src={reply.gifUrl} alt="GIF" loading="lazy" />
diff --git a/src/lib/components/MentionText.svelte b/src/lib/components/MentionText.svelte
index 45e7425..4870e80 100644
--- a/src/lib/components/MentionText.svelte
+++ b/src/lib/components/MentionText.svelte
@@ -1,11 +1,13 @@
 <script lang="ts">
-	const { text }: { text: string } = $props();
+	const { text, usernames = [] }: { text: string; usernames?: string[] } = $props();
 
 	interface Segment {
 		type: 'text' | 'mention';
 		value: string;
 	}
 
+	const usernameSet = $derived(new Set(usernames.map((u) => u.toLowerCase())));
+
 	const segments = $derived.by(() => {
 		const result: Segment[] = [];
 		const regex = /@(\w+)/g;
@@ -13,10 +15,11 @@
 		let match;
 
 		while ((match = regex.exec(text)) !== null) {
+			const isMember = usernameSet.has(match[1].toLowerCase());
 			if (match.index > lastIndex) {
 				result.push({ type: 'text', value: text.slice(lastIndex, match.index) });
 			}
-			result.push({ type: 'mention', value: match[0] });
+			result.push({ type: isMember ? 'mention' : 'text', value: match[0] });
 			lastIndex = regex.lastIndex;
 		}
 
@@ -39,6 +42,6 @@
 <style>
 	.mention {
 		color: var(--accent-blue);
-		font-weight: 600;
+		font-weight: 700;
 	}
 </style>

From 5591e70bfa6097c7380981cd7a3eb369a4ec8929 Mon Sep 17 00:00:00 2001
From: Grayson Adams <51373669+GraysonCAdams@users.noreply.github.com>
Date: Sun, 1 Mar 2026 01:08:17 -0600
Subject: [PATCH 09/10] fix: recover from drizzle migration conflicts on
 regenerated files

When a migration file is regenerated after being applied (e.g. after
schema change + drizzle-kit generate), drizzle sees a new timestamp
and tries to re-run it, hitting duplicate column errors. Add recovery
logic that runs each pending statement idempotently and records the
migration in the journal.
---
 src/lib/server/db/index.ts | 76 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 2 deletions(-)

diff --git a/src/lib/server/db/index.ts b/src/lib/server/db/index.ts
index 07a8c1a..8eaf6be 100644
--- a/src/lib/server/db/index.ts
+++ b/src/lib/server/db/index.ts
@@ -3,7 +3,8 @@ import { drizzle } from 'drizzle-orm/better-sqlite3';
 import { migrate } from 'drizzle-orm/better-sqlite3/migrator';
 import * as schema from './schema';
 import { resolve } from 'path';
-import { copyFileSync, existsSync, mkdirSync } from 'fs';
+import { copyFileSync, existsSync, mkdirSync, readFileSync } from 'fs';
+import { createHash } from 'node:crypto';
 import { createLogger } from '$lib/server/logger';
 
 const dataDir = resolve(process.env.DATA_DIR || 'data');
@@ -44,8 +45,79 @@ if (existsSync(dbPath)) {
 }
 /* eslint-enable security/detect-non-literal-fs-filename */
 
+function isAlreadyAppliedError(err: unknown): boolean {
+	const msg = err instanceof Error ? err.message : '';
+	return (
+		msg.includes('duplicate column name') ||
+		msg.includes('no such column') ||
+		msg.includes('already exists')
+	);
+}
+
+function execIdempotent(sql: string) {
+	for (const stmt of sql.split('--> statement-breakpoint')) {
+		const trimmed = stmt.trim();
+		if (!trimmed) continue;
+		try {
+			sqlite.exec(trimmed);
+		} catch (err: unknown) {
+			if (isAlreadyAppliedError(err)) {
+				log.warn({ statement: trimmed.slice(0, 80) }, 'Statement already applied — skipping');
+			} else {
+				throw err;
+			}
+		}
+	}
+}
+
+/* eslint-disable security/detect-non-literal-fs-filename */
+function recoverPendingMigrations(folder: string) {
+	const journalPath = resolve(folder, 'meta/_journal.json');
+	const journal = JSON.parse(readFileSync(journalPath, 'utf-8')) as {
+		entries: { when: number; tag: string }[];
+	};
+
+	const lastRow = sqlite
+		.prepare('SELECT created_at FROM __drizzle_migrations ORDER BY created_at DESC LIMIT 1')
+		.get() as { created_at: number } | undefined;
+	const lastAppliedAt = lastRow?.created_at ?? 0;
+
+	for (const entry of journal.entries) {
+		if (entry.when <= lastAppliedAt) continue;
+
+		const sqlFile = readFileSync(resolve(folder, `${entry.tag}.sql`), 'utf-8');
+		const hash = createHash('sha256').update(sqlFile).digest('hex');
+
+		execIdempotent(sqlFile);
+
+		sqlite
+			.prepare('INSERT INTO __drizzle_migrations ("hash", "created_at") VALUES (?, ?)')
+			.run(hash, entry.when);
+		log.info({ tag: entry.tag }, 'Migration recovered');
+	}
+}
+/* eslint-enable security/detect-non-literal-fs-filename */
+
 const startMs = Date.now();
-migrate(db, { migrationsFolder });
+try {
+	migrate(db, { migrationsFolder });
+} catch (err) {
+	// If a migration file was regenerated after being applied (e.g. schema change + drizzle-kit generate),
+	// the journal timestamp changes but the DB already has the schema changes from the old version.
+	// Drizzle sees the new timestamp as unapplied and tries to re-run it, hitting "duplicate column" etc.
+	// Recovery: run each pending statement idempotently and record the migration.
+	const cause = err instanceof Error ? (err as { cause?: Error }).cause : undefined;
+	const isSchemaConflict =
+		cause instanceof Error &&
+		'code' in cause &&
+		cause.code === 'SQLITE_ERROR' &&
+		isAlreadyAppliedError(cause);
+
+	if (!isSchemaConflict) throw err;
+
+	log.warn({ error: cause?.message }, 'Migration conflict — schema already matches, recovering');
+	recoverPendingMigrations(migrationsFolder);
+}
 
 // Backfill shortcut tokens for existing groups that don't have one
 import { isNull, eq } from 'drizzle-orm';

From d5269b3fbe67d8598ef6a0c1312dd5f95ff7c9c0 Mon Sep 17 00:00:00 2001
From: Grayson Adams <51373669+GraysonCAdams@users.noreply.github.com>
Date: Sun, 1 Mar 2026 01:14:21 -0600
Subject: [PATCH 10/10] fix: update notification preferences test to include
 mentions field

---
 src/routes/api/__tests__/notifications.test.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/routes/api/__tests__/notifications.test.ts b/src/routes/api/__tests__/notifications.test.ts
index 4d63726..9fe0fce 100644
--- a/src/routes/api/__tests__/notifications.test.ts
+++ b/src/routes/api/__tests__/notifications.test.ts
@@ -130,6 +130,7 @@ describe('GET /api/notifications/preferences', () => {
 			newAdds: true,
 			reactions: true,
 			comments: true,
+			mentions: true,
 			dailyReminder: false
 		});
 	});