feat: watch space

fix(deps): package updates
fix: logs
2026-05-07 14:43:06 +08:00 · 2026-04-08 22:41:50 +01:00 · 2026-04-07 10:24:46 +01:00 · 2026-04-07 10:10:41 +01:00 · 2026-04-05 13:45:36 +01:00 · 2026-03-31 21:14:41 +01:00
77 changed files with 2629 additions and 1240 deletions
@@ -1,7 +1,7 @@
 {
  "name": "client",
  "private": true,
-  "version": "0.70.3",
+  "version": "0.71.1",
  "scripts": {
    "dev": "vite",
    "build": "tsc && vite build",
@@ -25,7 +25,7 @@
    "@tabler/icons-react": "^3.40.0",
    "@tanstack/react-query": "5.90.17",
    "alfaaz": "^1.1.0",
-    "axios": "^1.13.6",
+    "axios": "1.13.6",
    "blueimp-load-image": "^5.16.0",
    "clsx": "^2.1.1",
    "emoji-mart": "^5.6.0",
@@ -67,7 +67,7 @@
    "@types/node": "22.19.1",
    "@types/react": "^18.3.12",
    "@types/react-dom": "^18.3.1",
-    "@vitejs/plugin-react": "^6.0.0",
+    "@vitejs/plugin-react": "^6.0.1",
    "eslint": "^9.28.0",
    "eslint-plugin-react": "^7.37.5",
    "eslint-plugin-react-hooks": "^7.0.1",
@@ -80,6 +80,6 @@
    "prettier": "^3.8.1",
    "typescript": "^5.9.3",
    "typescript-eslint": "^8.57.1",
-    "vite": "^8.0.1"
+    "vite": "8.0.5"
  }
 }
@@ -674,6 +674,24 @@
  "<bold>{{name}}</bold> mentioned you on a page": "<bold>{{name}}</bold> hat Sie auf einer Seite erwähnt",
  "<bold>{{name}}</bold> gave you edit access to a page": "<bold>{{name}}</bold> hat Ihnen Bearbeitungszugriff auf eine Seite gegeben",
  "<bold>{{name}}</bold> gave you view access to a page": "<bold>{{name}}</bold> hat Ihnen Ansichtsrechte für eine Seite gegeben",
+  "<bold>{{name}}</bold> updated a page": "<bold>{{name}}</bold> hat eine Seite aktualisiert.",
+  "Watch page": "Seite beobachten",
+  "Stop watching": "Beobachtung beenden",
+  "Email notifications": "E-Mail-Benachrichtigungen",
+  "Page updates": "Seitenaktualisierungen",
+  "Get notified when pages you watch are updated.": "Erhalten Sie eine Benachrichtigung, wenn Seiten, die Sie beobachten, aktualisiert werden.",
+  "Page mentions": "Seiten-Erwähnungen",
+  "Get notified when someone mentions you on a page.": "Erhalten Sie eine Benachrichtigung, wenn Sie jemand auf einer Seite erwähnt.",
+  "Comment mentions": "Kommentar-Erwähnungen",
+  "Get notified when someone mentions you in a comment.": "Erhalten Sie eine Benachrichtigung, wenn Sie jemand in einem Kommentar erwähnt.",
+  "New comments": "Neue Kommentare",
+  "Get notified about new comments on threads you participate in.": "Erhalten Sie eine Benachrichtigung über neue Kommentare in Threads, an denen Sie teilnehmen.",
+  "Resolved comments": "Erledigte Kommentare",
+  "Get notified when your comment is resolved.": "Erhalten Sie eine Benachrichtigung, wenn Ihr Kommentar erledigt wurde.",
+  "You are now watching this page": "Sie beobachten diese Seite jetzt",
+  "You are no longer watching this page": "Sie beobachten diese Seite nicht mehr",
+  "Direct": "Direkt",
+  "Updates": "Aktualisierungen",
  "Today": "Heute",
  "Yesterday": "Gestern",
  "This week": "Diese Woche",
@@ -1,7 +1,7 @@
 {
-  "Account": "Account ",
+  "Account": "Account",
  "Active": "Active",
-  "Add": "Add.",
+  "Add": "Add",
  "Add group members": "Add group members",
  "Add groups": "Add groups",
  "Add members": "Add members",
@@ -44,24 +44,24 @@
  "Are you sure you want to delete this page? This will delete its children and page history. This action is irreversible.": "Are you sure you want to delete this page? This will delete its children and page history. This action is irreversible.",
  "Description": "Description",
  "Details": "Details",
-  "e.g ACME": "e.g. ACME",
-  "e.g ACME Inc": "e.g. ACME Inc",
-  "e.g Developers": "e.g. Developers",
-  "e.g Group for developers": "e.g. Group for developers",
-  "e.g product": "e.g. product",
-  "e.g Product Team": "e.g. Product Team",
-  "e.g Sales": "e.g. Sales",
-  "e.g Space for product team": "e.g. Space for product team",
-  "e.g Space for sales team to collaborate": "e.g. Space for sales team to collaborate",
+  "e.g ACME": "e.g ACME",
+  "e.g ACME Inc": "e.g ACME Inc",
+  "e.g Developers": "e.g Developers",
+  "e.g Group for developers": "e.g Group for developers",
+  "e.g product": "e.g product",
+  "e.g Product Team": "e.g Product Team",
+  "e.g Sales": "e.g Sales",
+  "e.g Space for product team": "e.g Space for product team",
+  "e.g Space for sales team to collaborate": "e.g Space for sales team to collaborate",
  "Edit": "Edit",
-  "Read": "Read.",
+  "Read": "Read",
  "Edit group": "Edit group",
  "Email": "Email",
  "Enter a strong password": "Enter a strong password",
  "Enter valid email addresses separated by comma or space max_50": "Enter valid email addresses separated by comma or space [max: 50]",
-  "enter valid emails addresses": "Enter valid email addresses",
+  "enter valid emails addresses": "enter valid emails addresses",
  "Enter your current password": "Enter your current password",
-  "enter your full name": "Enter your full name",
+  "enter your full name": "enter your full name",
  "Enter your new password": "Enter your new password",
  "Enter your new preferred email": "Enter your new preferred email",
  "Enter your password": "Enter your password",
@@ -87,7 +87,7 @@
  "Import pages": "Import pages",
  "Import pages & space settings": "Import pages & space settings",
  "Importing pages": "Importing pages",
-  "invalid invitation link": "Invalid invitation link",
+  "invalid invitation link": "invalid invitation link",
  "Invitation signup": "Invitation signup",
  "Invite by email": "Invite by email",
  "Invite members": "Invite members",
@@ -113,7 +113,7 @@
  "New email": "New email",
  "New page": "New page",
  "New password": "New password",
-  "No group found": "No group found.",
+  "No group found": "No group found",
  "No page history saved yet.": "No page history saved yet.",
  "No pages yet": "No pages yet",
  "No shared pages": "No shared pages",
@@ -149,56 +149,56 @@
  "Search for users": "Search for users",
  "Search for users and groups": "Search for users and groups",
  "Search...": "Search...",
-  "Select language": "Select language.",
-  "Select role": "Select role.",
-  "Select role to assign to all invited members": "Select role to assign to all invited members.",
-  "Select theme": "Select theme.",
-  "Send invitation": "Send invitation.",
-  "Invitation sent": "Invitation sent.",
-  "Settings": "Settings.",
-  "Setup workspace": "Setup workspace.",
-  "Sign In": "Sign In.",
-  "Sign Up": "Sign Up.",
-  "Slug": "Slug.",
-  "Space": "Space.",
-  "Space description": "Space description.",
-  "Space menu": "Space menu.",
-  "Space name": "Space name.",
-  "Space settings": "Space settings.",
-  "Space slug": "Space slug.",
-  "Spaces": "Spaces.",
-  "Spaces you belong to": "Spaces you belong to.",
-  "No space found": "No space found.",
-  "Search for spaces": "Search for spaces.",
+  "Select language": "Select language",
+  "Select role": "Select role",
+  "Select role to assign to all invited members": "Select role to assign to all invited members",
+  "Select theme": "Select theme",
+  "Send invitation": "Send invitation",
+  "Invitation sent": "Invitation sent",
+  "Settings": "Settings",
+  "Setup workspace": "Setup workspace",
+  "Sign In": "Sign In",
+  "Sign Up": "Sign Up",
+  "Slug": "Slug",
+  "Space": "Space",
+  "Space description": "Space description",
+  "Space menu": "Space menu",
+  "Space name": "Space name",
+  "Space settings": "Space settings",
+  "Space slug": "Space slug",
+  "Spaces": "Spaces",
+  "Spaces you belong to": "Spaces you belong to",
+  "No space found": "No space found",
+  "Search for spaces": "Search for spaces",
  "Start typing to search...": "Start typing to search...",
-  "Status": "Status.",
-  "Successfully imported": "Successfully imported.",
-  "Successfully restored": "Successfully restored.",
-  "System settings": "System settings.",
-  "Theme": "Theme.",
+  "Status": "Status",
+  "Successfully imported": "Successfully imported",
+  "Successfully restored": "Successfully restored",
+  "System settings": "System settings",
+  "Theme": "Theme",
  "To change your email, you have to enter your password and new email.": "To change your email, you have to enter your password and new email.",
-  "Toggle full page width": "Toggle full page width.",
+  "Toggle full page width": "Toggle full page width",
  "Unable to import pages. Please try again.": "Unable to import pages. Please try again.",
-  "untitled": "untitled.",
-  "Untitled": "Untitled.",
-  "Updated successfully": "Updated successfully.",
-  "User": "User.",
-  "Workspace": "Workspace.",
-  "Workspace Name": "Workspace name.",
-  "Workspace settings": "Workspace settings.",
+  "untitled": "untitled",
+  "Untitled": "Untitled",
+  "Updated successfully": "Updated successfully",
+  "User": "User",
+  "Workspace": "Workspace",
+  "Workspace Name": "Workspace Name",
+  "Workspace settings": "Workspace settings",
  "You can change your password here.": "You can change your password here.",
-  "Your Email": "Your email.",
+  "Your Email": "Your Email",
  "Your import is complete.": "Your import is complete.",
-  "Your name": "Your name.",
-  "Your Name": "Your name.",
-  "Your password": "Your password.",
+  "Your name": "Your name",
+  "Your Name": "Your Name",
+  "Your password": "Your password",
  "Your password must be a minimum of 8 characters.": "Your password must be a minimum of 8 characters.",
-  "Sidebar toggle": "Sidebar toggle.",
-  "Comments": "Comments.",
-  "404 page not found": "404 page not found.",
+  "Sidebar toggle": "Sidebar toggle",
+  "Comments": "Comments",
+  "404 page not found": "404 page not found",
  "Sorry, we can't find the page you are looking for.": "Sorry, we can't find the page you are looking for.",
-  "Take me back to homepage": "Take me back to the homepage.",
-  "Forgot password": "Forgot password.",
+  "Take me back to homepage": "Take me back to homepage",
+  "Forgot password": "Forgot password",
  "Forgot your password?": "Forgot your password?",
  "A password reset link has been sent to your email. Please check your inbox.": "A password reset link has been sent to your email. Please check your inbox.",
  "Send reset link": "Send reset link",
@@ -222,16 +222,16 @@
  "Comment deleted successfully": "Comment deleted successfully",
  "Failed to delete comment": "Failed to delete comment",
  "Comment resolved successfully": "Comment resolved successfully",
-  "Comment re-opened successfully": "Comment re-opened successfully.",
-  "Comment unresolved successfully": "Comment marked as unresolved successfully.",
+  "Comment re-opened successfully": "Comment re-opened successfully",
+  "Comment unresolved successfully": "Comment unresolved successfully",
  "Failed to resolve comment": "Failed to resolve comment",
-  "Resolve comment": "Resolve comment.",
-  "Unresolve comment": "Mark comment as unresolved.",
-  "Resolve Comment Thread": "Resolve comment thread.",
-  "Unresolve Comment Thread": "Mark comment thread as unresolved.",
+  "Resolve comment": "Resolve comment",
+  "Unresolve comment": "Unresolve comment",
+  "Resolve Comment Thread": "Resolve Comment Thread",
+  "Unresolve Comment Thread": "Unresolve Comment Thread",
  "Are you sure you want to resolve this comment thread? This will mark it as completed.": "Are you sure you want to resolve this comment thread? This will mark it as completed.",
  "Are you sure you want to unresolve this comment thread?": "Are you sure you want to unresolve this comment thread?",
-  "Resolved": "Resolved.",
+  "Resolved": "Resolved",
  "No active comments.": "No active comments.",
  "Revoke invitation": "Revoke invitation",
  "Revoke": "Revoke",
@@ -241,9 +241,9 @@
  "Anyone with this link can join this workspace.": "Anyone with this link can join this workspace.",
  "Invite link": "Invite link",
  "Copy": "Copy",
-  "Copy to space": "Copy to space.",
+  "Copy to space": "Copy to space",
  "Copied": "Copied",
-  "Duplicate": "Duplicate.",
+  "Duplicate": "Duplicate",
  "Select a user": "Select a user",
  "Select a group": "Select a group",
  "Export all pages and attachments in this space.": "Export all pages and attachments in this space.",
@@ -251,7 +251,7 @@
  "Are you sure you want to delete this space?": "Are you sure you want to delete this space?",
  "Delete this space with all its pages and data.": "Delete this space with all its pages and data.",
  "All pages, comments, attachments and permissions in this space will be deleted irreversibly.": "All pages, comments, attachments and permissions in this space will be deleted irreversibly.",
-  "Confirm space name": "Confirm space name.",
+  "Confirm space name": "Confirm space name",
  "Type the space name <b>{{spaceName}}</b> to confirm your action.": "Type the space name <b>{{spaceName}}</b> to confirm your action.",
  "Format": "Format",
  "Include subpages": "Include subpages",
@@ -267,7 +267,7 @@
  "Align left": "Align left",
  "Align right": "Align right",
  "Align center": "Align center",
-  "Justify": "Justify.",
+  "Justify": "Justify",
  "Merge cells": "Merge cells",
  "Split cell": "Split cell",
  "Delete column": "Delete column",
@@ -312,7 +312,7 @@
  "Pink": "Pink",
  "Gray": "Gray",
  "Embed link": "Embed link",
-  "Invalid {{provider}} embed link": "Invalid {{provider}} embed link.",
+  "Invalid {{provider}} embed link": "Invalid {{provider}} embed link",
  "Embed {{provider}}": "Embed {{provider}}",
  "Enter {{provider}} link to embed": "Enter {{provider}} link to embed",
  "Bold": "Bold",
@@ -345,41 +345,41 @@
  "Upload any file from your device.": "Upload any file from your device.",
  "Uploading {{name}}": "Uploading {{name}}",
  "Uploading file": "Uploading file",
-  "Table": "Table.",
+  "Table": "Table",
  "Insert a table.": "Insert a table.",
  "Insert collapsible block.": "Insert collapsible block.",
-  "Video": "Video.",
-  "Divider": "Divider.",
-  "Quote": "Quote.",
-  "Image": "Image.",
-  "Audio": "Audio.",
+  "Video": "Video",
+  "Divider": "Divider",
+  "Quote": "Quote",
+  "Image": "Image",
+  "Audio": "Audio",
  "Embed PDF": "Embed PDF",
  "Upload and embed a PDF file.": "Upload and embed a PDF file.",
  "Embed as PDF": "Embed as PDF",
  "Failed to load PDF": "Failed to load PDF",
  "Convert to attachment": "Convert to attachment",
-  "File attachment": "File attachment.",
-  "Toggle block": "Toggle block.",
-  "Callout": "Callout.",
+  "File attachment": "File attachment",
+  "Toggle block": "Toggle block",
+  "Callout": "Callout",
  "Insert callout notice.": "Insert callout notice.",
-  "Math inline": "Math inline.",
+  "Math inline": "Math inline",
  "Insert inline math equation.": "Insert inline math equation.",
-  "Math block": "Math block.",
-  "Insert math equation": "Insert math equation.",
-  "Mermaid diagram": "Mermaid diagram.",
-  "Insert mermaid diagram": "Insert mermaid diagram.",
-  "Insert and design Drawio diagrams": "Insert and design Drawio diagrams.",
-  "Insert current date": "Insert current date.",
-  "Draw and sketch excalidraw diagrams": "Draw and sketch Excalidraw diagrams.",
-  "Multiple": "Multiple.",
+  "Math block": "Math block",
+  "Insert math equation": "Insert math equation",
+  "Mermaid diagram": "Mermaid diagram",
+  "Insert mermaid diagram": "Insert mermaid diagram",
+  "Insert and design Drawio diagrams": "Insert and design Drawio diagrams",
+  "Insert current date": "Insert current date",
+  "Draw and sketch excalidraw diagrams": "Draw and sketch excalidraw diagrams",
+  "Multiple": "Multiple",
  "Turn into": "Turn into",
  "Text align": "Text align",
  "This page may have been deleted, moved, or you may not have access.": "This page may have been deleted, moved, or you may not have access.",
  "Go to homepage": "Go to homepage",
  "Pages you create will show up here.": "Pages you create will show up here.",
-  "Heading {{level}}": "Heading {{level}}.",
-  "Toggle title": "Toggle title.",
-  "Write anything. Enter \"/\" for commands": "Write anything. Enter \"/\" for commands.",
+  "Heading {{level}}": "Heading {{level}}",
+  "Toggle title": "Toggle title",
+  "Write anything. Enter \"/\" for commands": "Write anything. Enter \"/\" for commands",
  "Write...": "Write...",
  "Column count": "Column count",
  "{{count}} Columns": "{{count}} Columns",
@@ -389,27 +389,27 @@
  "Wide center": "Wide center",
  "Left wide": "Left wide",
  "Right wide": "Right wide",
-  "Names do not match": "Names do not match.",
-  "Today, {{time}}": "Today, {{time}}.",
-  "Yesterday, {{time}}": "Yesterday, {{time}}.",
-  "Space created successfully": "Space created successfully.",
-  "Space updated successfully": "Space updated successfully.",
-  "Space deleted successfully": "Space deleted successfully.",
-  "Members added successfully": "Members added successfully.",
-  "Member removed successfully": "Member removed successfully.",
-  "Member role updated successfully": "Member role updated successfully.",
-  "Created by: <b>{{creatorName}}</b>": "Created by: <b>{{creatorName}}</b>.",
-  "Created at: {{time}}": "Created at: {{time}}.",
-  "Edited by {{name}} {{time}}": "Edited by {{name}} {{time}}.",
-  "Word count: {{wordCount}}": "Word count: {{wordCount}}.",
-  "Character count: {{characterCount}}": "Character count: {{characterCount}}.",
-  "New update": "New update.",
-  "{{latestVersion}} is available": "{{latestVersion}} is available.",
-  "Default page edit mode": "Default page edit mode.",
+  "Names do not match": "Names do not match",
+  "Today, {{time}}": "Today, {{time}}",
+  "Yesterday, {{time}}": "Yesterday, {{time}}",
+  "Space created successfully": "Space created successfully",
+  "Space updated successfully": "Space updated successfully",
+  "Space deleted successfully": "Space deleted successfully",
+  "Members added successfully": "Members added successfully",
+  "Member removed successfully": "Member removed successfully",
+  "Member role updated successfully": "Member role updated successfully",
+  "Created by: <b>{{creatorName}}</b>": "Created by: <b>{{creatorName}}</b>",
+  "Created at: {{time}}": "Created at: {{time}}",
+  "Edited by {{name}} {{time}}": "Edited by {{name}} {{time}}",
+  "Word count: {{wordCount}}": "Word count: {{wordCount}}",
+  "Character count: {{characterCount}}": "Character count: {{characterCount}}",
+  "New update": "New update",
+  "{{latestVersion}} is available": "{{latestVersion}} is available",
+  "Default page edit mode": "Default page edit mode",
  "Choose your preferred page edit mode. Avoid accidental edits.": "Choose your preferred page edit mode. Avoid accidental edits.",
-  "Reading": "Reading.",
-  "Delete member": "Delete member.",
-  "Member deleted successfully": "Member deleted successfully.",
+  "Reading": "Reading",
+  "Delete member": "Delete member",
+  "Member deleted successfully": "Member deleted successfully",
  "Are you sure you want to delete this workspace member? This action is irreversible.": "Are you sure you want to delete this workspace member? This action is irreversible.",
  "Deactivate member": "Deactivate member",
  "Activate member": "Activate member",
@@ -418,33 +418,33 @@
  "Deactivate": "Deactivate",
  "Activate": "Activate",
  "Deactivated": "Deactivated",
-  "Move": "Move.",
-  "Move page": "Move page.",
+  "Move": "Move",
+  "Move page": "Move page",
  "Move page to a different space.": "Move page to a different space.",
  "Real-time editor connection lost. Retrying...": "Real-time editor connection lost. Retrying...",
-  "Table of contents": "Table of contents.",
+  "Table of contents": "Table of contents",
  "Add headings (H1, H2, H3) to generate a table of contents.": "Add headings (H1, H2, H3) to generate a table of contents.",
-  "Share": "Share.",
-  "Public sharing": "Public sharing.",
-  "Shared by": "Shared by.",
-  "Shared at": "Shared at.",
-  "Inherits public sharing from": "Inherits public sharing from.",
-  "Share to web": "Share to web.",
-  "Shared to web": "Shared to web.",
-  "Anyone with the link can view this page": "Anyone with the link can view this page.",
-  "Make this page publicly accessible": "Make this page publicly accessible.",
-  "Include sub-pages": "Include sub-pages.",
-  "Make sub-pages public too": "Make sub-pages public too.",
-  "Allow search engines to index page": "Allow search engines to index page.",
-  "Open page": "Open page.",
-  "Page": "Page.",
-  "Delete public share link": "Delete public share link.",
-  "Delete share": "Delete share.",
+  "Share": "Share",
+  "Public sharing": "Public sharing",
+  "Shared by": "Shared by",
+  "Shared at": "Shared at",
+  "Inherits public sharing from": "Inherits public sharing from",
+  "Share to web": "Share to web",
+  "Shared to web": "Shared to web",
+  "Anyone with the link can view this page": "Anyone with the link can view this page",
+  "Make this page publicly accessible": "Make this page publicly accessible",
+  "Include sub-pages": "Include sub-pages",
+  "Make sub-pages public too": "Make sub-pages public too",
+  "Allow search engines to index page": "Allow search engines to index page",
+  "Open page": "Open page",
+  "Page": "Page",
+  "Delete public share link": "Delete public share link",
+  "Delete share": "Delete share",
  "Are you sure you want to delete this shared link?": "Are you sure you want to delete this shared link?",
-  "Publicly shared pages from spaces you are a member of will appear here": "Publicly shared pages from spaces you are a member of will appear here.",
-  "Share deleted successfully": "Share deleted successfully.",
-  "Share not found": "Share not found.",
-  "Failed to share page": "Failed to share page.",
+  "Publicly shared pages from spaces you are a member of will appear here": "Publicly shared pages from spaces you are a member of will appear here",
+  "Share deleted successfully": "Share deleted successfully",
+  "Share not found": "Share not found",
+  "Failed to share page": "Failed to share page",
  "Disable public sharing": "Disable public sharing",
  "Prevent members from sharing pages publicly.": "Prevent members from sharing pages publicly.",
  "Toggle public sharing": "Toggle public sharing",
@@ -464,135 +464,135 @@
  "Public sharing is disabled": "Public sharing is disabled",
  "Public sharing has been disabled at the workspace level.": "Public sharing has been disabled at the workspace level.",
  "Public sharing has been disabled for this space.": "Public sharing has been disabled for this space.",
-  "Copy page": "Copy page.",
+  "Copy page": "Copy page",
  "Copy page to a different space.": "Copy page to a different space.",
-  "Page copied successfully": "Page copied successfully.",
-  "Page duplicated successfully": "Page duplicated successfully.",
-  "Find": "Find.",
-  "Not found": "Not found.",
-  "Previous Match (Shift+Enter)": "Previous Match (Shift+Enter).",
-  "Next match (Enter)": "Next match (Enter).",
-  "Match case (Alt+C)": "Match case (Alt+C).",
-  "Replace": "Replace.",
-  "Close (Escape)": "Close (Escape).",
-  "Replace (Enter)": "Replace (Enter).",
-  "Replace all (Ctrl+Alt+Enter)": "Replace all (Ctrl+Alt+Enter).",
-  "Replace all": "Replace all.",
-  "View all spaces": "View all spaces.",
-  "Error": "Error.",
-  "Failed to disable MFA": "Failed to disable MFA.",
-  "Disable two-factor authentication": "Disable two-factor authentication.",
+  "Page copied successfully": "Page copied successfully",
+  "Page duplicated successfully": "Page duplicated successfully",
+  "Find": "Find",
+  "Not found": "Not found",
+  "Previous Match (Shift+Enter)": "Previous Match (Shift+Enter)",
+  "Next match (Enter)": "Next match (Enter)",
+  "Match case (Alt+C)": "Match case (Alt+C)",
+  "Replace": "Replace",
+  "Close (Escape)": "Close (Escape)",
+  "Replace (Enter)": "Replace (Enter)",
+  "Replace all (Ctrl+Alt+Enter)": "Replace all (Ctrl+Alt+Enter)",
+  "Replace all": "Replace all",
+  "View all spaces": "View all spaces",
+  "Error": "Error",
+  "Failed to disable MFA": "Failed to disable MFA",
+  "Disable two-factor authentication": "Disable two-factor authentication",
  "Disabling two-factor authentication will make your account less secure. You'll only need your password to sign in.": "Disabling two-factor authentication will make your account less secure. You'll only need your password to sign in.",
  "Please enter your password to disable two-factor authentication:": "Please enter your password to disable two-factor authentication:",
-  "Two-factor authentication has been enabled": "Two-factor authentication has been enabled.",
-  "Two-factor authentication has been disabled": "Two-factor authentication has been disabled.",
-  "2-step verification": "2-step verification.",
+  "Two-factor authentication has been enabled": "Two-factor authentication has been enabled",
+  "Two-factor authentication has been disabled": "Two-factor authentication has been disabled",
+  "2-step verification": "2-step verification",
  "Protect your account with an additional verification layer when signing in.": "Protect your account with an additional verification layer when signing in.",
  "Two-factor authentication is active on your account.": "Two-factor authentication is active on your account.",
-  "Add 2FA method": "Add 2FA method.",
-  "Backup codes": "Backup codes.",
-  "Disable": "Disable.",
-  "Invalid verification code": "Invalid verification code.",
-  "New backup codes have been generated": "New backup codes have been generated.",
-  "Failed to regenerate backup codes": "Failed to regenerate backup codes.",
-  "About backup codes": "About backup codes.",
+  "Add 2FA method": "Add 2FA method",
+  "Backup codes": "Backup codes",
+  "Disable": "Disable",
+  "Invalid verification code": "Invalid verification code",
+  "New backup codes have been generated": "New backup codes have been generated",
+  "Failed to regenerate backup codes": "Failed to regenerate backup codes",
+  "About backup codes": "About backup codes",
  "Backup codes can be used to access your account if you lose access to your authenticator app. Each code can only be used once.": "Backup codes can be used to access your account if you lose access to your authenticator app. Each code can only be used once.",
  "You can regenerate new backup codes at any time. This will invalidate all existing codes.": "You can regenerate new backup codes at any time. This will invalidate all existing codes.",
-  "Confirm password": "Confirm password.",
-  "Generate new backup codes": "Generate new backup codes.",
-  "Save your new backup codes": "Save your new backup codes.",
+  "Confirm password": "Confirm password",
+  "Generate new backup codes": "Generate new backup codes",
+  "Save your new backup codes": "Save your new backup codes",
  "Make sure to save these codes in a secure place. Your old backup codes are no longer valid.": "Make sure to save these codes in a secure place. Your old backup codes are no longer valid.",
-  "Your new backup codes": "Your new backup codes.",
-  "I've saved my backup codes": "I've saved my backup codes.",
-  "Failed to setup MFA": "Failed to setup MFA.",
-  "Setup & Verify": "Setup & Verify.",
-  "Add to authenticator": "Add to authenticator.",
-  "1. Scan this QR code with your authenticator app": "1. Scan this QR code with your authenticator app.",
+  "Your new backup codes": "Your new backup codes",
+  "I've saved my backup codes": "I've saved my backup codes",
+  "Failed to setup MFA": "Failed to setup MFA",
+  "Setup & Verify": "Setup & Verify",
+  "Add to authenticator": "Add to authenticator",
+  "1. Scan this QR code with your authenticator app": "1. Scan this QR code with your authenticator app",
  "Can't scan the code?": "Can't scan the code?",
  "Enter this code manually in your authenticator app:": "Enter this code manually in your authenticator app:",
-  "2. Enter the 6-digit code from your authenticator": "2. Enter the 6-digit code from your authenticator.",
-  "Verify and enable": "Verify and enable.",
+  "2. Enter the 6-digit code from your authenticator": "2. Enter the 6-digit code from your authenticator",
+  "Verify and enable": "Verify and enable",
  "Failed to generate QR code. Please try again.": "Failed to generate QR code. Please try again.",
-  "Backup": "Backup.",
-  "Save codes": "Save codes.",
-  "Save your backup codes": "Save your backup codes.",
+  "Backup": "Backup",
+  "Save codes": "Save codes",
+  "Save your backup codes": "Save your backup codes",
  "These codes can be used to access your account if you lose access to your authenticator app. Each code can only be used once.": "These codes can be used to access your account if you lose access to your authenticator app. Each code can only be used once.",
-  "Print": "Print.",
+  "Print": "Print",
  "Two-factor authentication has been set up. Please log in again.": "Two-factor authentication has been set up. Please log in again.",
-  "Two-Factor authentication required": "Two-factor authentication required.",
-  "Your workspace requires two-factor authentication for all users": "Your workspace requires two-factor authentication for all users.",
+  "Two-Factor authentication required": "Two-factor authentication required",
+  "Your workspace requires two-factor authentication for all users": "Your workspace requires two-factor authentication for all users",
  "To continue accessing your workspace, you must set up two-factor authentication. This adds an extra layer of security to your account.": "To continue accessing your workspace, you must set up two-factor authentication. This adds an extra layer of security to your account.",
-  "Set up two-factor authentication": "Set up two-factor authentication.",
-  "Cancel and logout": "Cancel and logout.",
+  "Set up two-factor authentication": "Set up two-factor authentication",
+  "Cancel and logout": "Cancel and logout",
  "Your workspace requires two-factor authentication. Please set it up to continue.": "Your workspace requires two-factor authentication. Please set it up to continue.",
  "This adds an extra layer of security to your account by requiring a verification code from your authenticator app.": "This adds an extra layer of security to your account by requiring a verification code from your authenticator app.",
-  "Password is required": "Password is required.",
-  "Password must be at least 8 characters": "Password must be at least 8 characters.",
-  "Please enter a 6-digit code": "Please enter a 6-digit code.",
-  "Code must be exactly 6 digits": "Code must be exactly 6 digits.",
-  "Enter the 6-digit code found in your authenticator app": "Enter the 6-digit code found in your authenticator app.",
+  "Password is required": "Password is required",
+  "Password must be at least 8 characters": "Password must be at least 8 characters",
+  "Please enter a 6-digit code": "Please enter a 6-digit code",
+  "Code must be exactly 6 digits": "Code must be exactly 6 digits",
+  "Enter the 6-digit code found in your authenticator app": "Enter the 6-digit code found in your authenticator app",
  "Need help authenticating?": "Need help authenticating?",
-  "MFA QR Code": "MFA QR Code.",
+  "MFA QR Code": "MFA QR Code",
  "Account created successfully. Please log in to set up two-factor authentication.": "Account created successfully. Please log in to set up two-factor authentication.",
  "Password reset successful. Please log in with your new password and complete two-factor authentication.": "Password reset successful. Please log in with your new password and complete two-factor authentication.",
  "Password reset successful. Please log in with your new password to set up two-factor authentication.": "Password reset successful. Please log in with your new password to set up two-factor authentication.",
  "Password reset was successful. Please log in with your new password.": "Password reset was successful. Please log in with your new password.",
-  "Two-factor authentication": "Two-factor authentication.",
-  "Use authenticator app instead": "Use authenticator app instead.",
-  "Verify backup code": "Verify backup code.",
-  "Use backup code": "Use backup code.",
-  "Enter one of your backup codes": "Enter one of your backup codes.",
-  "Backup code": "Backup code.",
+  "Two-factor authentication": "Two-factor authentication",
+  "Use authenticator app instead": "Use authenticator app instead",
+  "Verify backup code": "Verify backup code",
+  "Use backup code": "Use backup code",
+  "Enter one of your backup codes": "Enter one of your backup codes",
+  "Backup code": "Backup code",
  "Enter one of your backup codes. Each backup code can only be used once.": "Enter one of your backup codes. Each backup code can only be used once.",
-  "Verify": "Verify.",
-  "Trash": "Trash.",
+  "Verify": "Verify",
+  "Trash": "Trash",
  "Pages in trash will be permanently deleted after {{count}} days.": "Pages in trash will be permanently deleted after {{count}} days.",
-  "Deleted": "Deleted.",
-  "No pages in trash": "No pages in trash.",
+  "Deleted": "Deleted",
+  "No pages in trash": "No pages in trash",
  "Permanently delete page?": "Permanently delete page?",
  "Are you sure you want to permanently delete '{{title}}'? This action cannot be undone.": "Are you sure you want to permanently delete '{{title}}'? This action cannot be undone.",
  "Restore '{{title}}' and its sub-pages?": "Restore '{{title}}' and its sub-pages?",
-  "Move to trash": "Move to trash.",
+  "Move to trash": "Move to trash",
  "Move this page to trash?": "Move this page to trash?",
-  "Restore page": "Restore page.",
-  "Page moved to trash": "Page moved to trash.",
-  "Page restored successfully": "Page restored successfully.",
-  "Deleted by": "Deleted by.",
-  "Deleted at": "Deleted at.",
-  "Preview": "Preview.",
-  "Subpages": "Subpages.",
-  "Failed to load subpages": "Failed to load subpages.",
-  "No subpages": "No subpages.",
-  "Subpages (Child pages)": "Subpages (Child pages).",
-  "List all subpages of the current page": "List all subpages of the current page.",
-  "Attachments": "Attachments.",
-  "All spaces": "All spaces.",
-  "Unknown": "Unknown.",
-  "Find a space": "Find a space.",
-  "Search in all your spaces": "Search in all your spaces.",
-  "Type": "Type.",
-  "Enterprise": "Enterprise.",
-  "Download attachment": "Download attachment.",
-  "Allowed email domains": "Allowed email domains.",
-  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can sign up via SSO.",
-  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space.",
-  "Enforce two-factor authentication": "Enforce two-factor authentication.",
+  "Restore page": "Restore page",
+  "Page moved to trash": "Page moved to trash",
+  "Page restored successfully": "Page restored successfully",
+  "Deleted by": "Deleted by",
+  "Deleted at": "Deleted at",
+  "Preview": "Preview",
+  "Subpages": "Subpages",
+  "Failed to load subpages": "Failed to load subpages",
+  "No subpages": "No subpages",
+  "Subpages (Child pages)": "Subpages (Child pages)",
+  "List all subpages of the current page": "List all subpages of the current page",
+  "Attachments": "Attachments",
+  "All spaces": "All spaces",
+  "Unknown": "Unknown",
+  "Find a space": "Find a space",
+  "Search in all your spaces": "Search in all your spaces",
+  "Type": "Type",
+  "Enterprise": "Enterprise",
+  "Download attachment": "Download attachment",
+  "Allowed email domains": "Allowed email domains",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
+  "Enforce two-factor authentication": "Enforce two-factor authentication",
  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
-  "Toggle MFA enforcement": "Toggle MFA enforcement.",
-  "Display name": "Display name.",
-  "Allow signup": "Allow signup.",
-  "Enabled": "Enabled.",
-  "Advanced Settings": "Advanced Settings.",
-  "Enable TLS/SSL": "Enable TLS/SSL.",
-  "Use secure connection to LDAP server": "Use secure connection to LDAP server.",
-  "Group sync": "Group sync.",
+  "Toggle MFA enforcement": "Toggle MFA enforcement",
+  "Display name": "Display name",
+  "Allow signup": "Allow signup",
+  "Enabled": "Enabled",
+  "Advanced Settings": "Advanced Settings",
+  "Enable TLS/SSL": "Enable TLS/SSL",
+  "Use secure connection to LDAP server": "Use secure connection to LDAP server",
+  "Group sync": "Group sync",
  "No SSO providers found.": "No SSO providers found.",
-  "Delete SSO provider": "Delete SSO provider.",
+  "Delete SSO provider": "Delete SSO provider",
  "Are you sure you want to delete this SSO provider?": "Are you sure you want to delete this SSO provider?",
-  "Action": "Action.",
-  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration.",
-  "Icon": "Icon.",
-  "Upload image": "Upload image.",
+  "Action": "Action",
+  "{{ssoProviderType}} configuration": "{{ssoProviderType}} configuration",
+  "Icon": "Icon",
+  "Upload image": "Upload image",
  "Remove image": "Remove image",
  "Failed to remove image": "Failed to remove image",
  "Image exceeds 10MB limit.": "Image exceeds 10MB limit.",
@@ -670,10 +670,32 @@
  "More options": "More options",
  "<bold>{{name}}</bold> mentioned you in a comment": "<bold>{{name}}</bold> mentioned you in a comment",
  "<bold>{{name}}</bold> commented on a page": "<bold>{{name}}</bold> commented on a page",
-  "<bold>{{name}}</bold> resolved a comment": "<bold>{{name}}</bold> resolved a comment.",
-  "<bold>{{name}}</bold> mentioned you on a page": "<bold>{{name}}</bold> mentioned you on a page.",
-  "<bold>{{name}}</bold> gave you edit access to a page": "<bold>{{name}}</bold> gave you edit access to a page.",
-  "<bold>{{name}}</bold> gave you view access to a page": "<bold>{{name}}</bold> gave you view access to a page.",
+  "<bold>{{name}}</bold> resolved a comment": "<bold>{{name}}</bold> resolved a comment",
+  "<bold>{{name}}</bold> mentioned you on a page": "<bold>{{name}}</bold> mentioned you on a page",
+  "<bold>{{name}}</bold> gave you edit access to a page": "<bold>{{name}}</bold> gave you edit access to a page",
+  "<bold>{{name}}</bold> gave you view access to a page": "<bold>{{name}}</bold> gave you view access to a page",
+  "<bold>{{name}}</bold> updated a page": "<bold>{{name}}</bold> updated a page",
+  "Watch page": "Watch page",
+  "Stop watching": "Stop watching",
+  "Watch space": "Watch space",
+  "Stop watching space": "Stop watching space",
+  "Email notifications": "Email notifications",
+  "Page updates": "Page updates",
+  "Get notified when pages you watch are updated.": "Receive notifications when the pages you watch are updated.",
+  "Page mentions": "Page mentions",
+  "Get notified when someone mentions you on a page.": "Receive notifications when someone mentions you on a page.",
+  "Comment mentions": "Comment mentions",
+  "Get notified when someone mentions you in a comment.": "Receive notifications when someone mentions you in a comment.",
+  "New comments": "New comments",
+  "Get notified about new comments on threads you participate in.": "Receive notifications about new comments in threads you are participating in.",
+  "Resolved comments": "Resolved comments",
+  "Get notified when your comment is resolved.": "Receive a notification when your comment is resolved.",
+  "You are now watching this page": "You’re now watching this page",
+  "You are no longer watching this page": "You’re no longer watching this page",
+  "You are now watching this space": "You’re now watching this space",
+  "You are no longer watching this space": "You’re no longer watching this space",
+  "Direct": "Direct",
+  "Updates": "Updates",
  "Today": "Today",
  "Yesterday": "Yesterday",
  "This week": "This week",
@@ -708,30 +730,30 @@
  "Removed page restriction": "Removed page restriction",
  "Added page permission": "Added page permission",
  "Removed page permission": "Removed page permission",
-  "Verifying your email": "Verifying your email.",
+  "Verifying your email": "Verifying your email",
  "Please wait...": "Please wait...",
  "Verification failed. The link may have expired.": "Verification failed. The link may have expired.",
-  "Check your email": "Check your email.",
+  "Check your email": "Check your email",
  "We sent a verification link to {{email}}.": "We sent a verification link to {{email}}.",
  "We sent a verification link to your email.": "We sent a verification link to your email.",
  "Click the link to verify your email and access your workspace.": "Click the link to verify your email and access your workspace.",
-  "Resend verification email": "Resend verification email.",
+  "Resend verification email": "Resend verification email",
  "Verification email sent. Please check your inbox.": "Verification email sent. Please check your inbox.",
  "Failed to resend verification email. Please try again.": "Failed to resend verification email. Please try again.",
  "We've sent you an email with your associated workspaces.": "We've sent you an email with your associated workspaces.",
-  "Load more": "Load more.",
-  "Log out of all devices": "Log out of all devices.",
-  "Log out of all sessions except this device": "Log out of all sessions except this device.",
-  "This Device": "This Device.",
-  "Unknown device": "Unknown device.",
-  "No active sessions": "No active sessions.",
-  "Session revoked": "Session revoked.",
-  "All other sessions revoked": "All other sessions revoked.",
-  "Last used": "Last used.",
-  "Created": "Created.",
-  "Rename": "Rename.",
-  "Publish": "Publish.",
-  "Security": "Security.",
-  "Enforce SSO": "Enforce SSO.",
-  "Once enforced, members will not be able to login with email and password.": "Once enforced, members will not be able to log in with email and password."
+  "Load more": "Load more",
+  "Log out of all devices": "Log out of all devices",
+  "Log out of all sessions except this device": "Log out of all sessions except this device",
+  "This Device": "This Device",
+  "Unknown device": "Unknown device",
+  "No active sessions": "No active sessions",
+  "Session revoked": "Session revoked",
+  "All other sessions revoked": "All other sessions revoked",
+  "Last used": "Last used",
+  "Created": "Created",
+  "Rename": "Rename",
+  "Publish": "Publish",
+  "Security": "Security",
+  "Enforce SSO": "Enforce SSO",
+  "Once enforced, members will not be able to login with email and password.": "Once enforced, members will not be able to login with email and password."
 }
@@ -674,6 +674,24 @@
  "<bold>{{name}}</bold> mentioned you on a page": "<bold>{{name}}</bold> te mencionó en una página",
  "<bold>{{name}}</bold> gave you edit access to a page": "<bold>{{name}}</bold> te dio acceso de edición a una página",
  "<bold>{{name}}</bold> gave you view access to a page": "<bold>{{name}}</bold> te dio acceso de visualización a una página",
+  "<bold>{{name}}</bold> updated a page": "<bold>{{name}}</bold> actualizó una página.",
+  "Watch page": "Seguir página",
+  "Stop watching": "Dejar de seguir",
+  "Email notifications": "Notificaciones por correo electrónico",
+  "Page updates": "Actualizaciones de página",
+  "Get notified when pages you watch are updated.": "Recibe una notificación cuando se actualicen las páginas que sigues.",
+  "Page mentions": "Menciones en la página",
+  "Get notified when someone mentions you on a page.": "Recibe una notificación cuando alguien te mencione en una página.",
+  "Comment mentions": "Menciones en comentarios",
+  "Get notified when someone mentions you in a comment.": "Recibe una notificación cuando alguien te mencione en un comentario.",
+  "New comments": "Nuevos comentarios",
+  "Get notified about new comments on threads you participate in.": "Recibe una notificación sobre nuevos comentarios en los hilos donde participas.",
+  "Resolved comments": "Comentarios resueltos",
+  "Get notified when your comment is resolved.": "Recibe una notificación cuando tu comentario sea resuelto.",
+  "You are now watching this page": "Ahora sigues esta página",
+  "You are no longer watching this page": "Ya no sigues esta página",
+  "Direct": "Directo",
+  "Updates": "Actualizaciones",
  "Today": "Hoy",
  "Yesterday": "Ayer",
  "This week": "Esta semana",
@@ -674,6 +674,24 @@
  "<bold>{{name}}</bold> mentioned you on a page": "<bold>{{name}}</bold> vous a mentionné sur une page",
  "<bold>{{name}}</bold> gave you edit access to a page": "<bold>{{name}}</bold> vous a donné l'accès en modification à une page",
  "<bold>{{name}}</bold> gave you view access to a page": "<bold>{{name}}</bold> vous a donné l'accès en lecture à une page",
+  "<bold>{{name}}</bold> updated a page": "<bold>{{name}}</bold> a mis à jour une page.",
+  "Watch page": "Surveiller la page",
+  "Stop watching": "Ne plus surveiller",
+  "Email notifications": "Notifications par e-mail",
+  "Page updates": "Mises à jour de la page",
+  "Get notified when pages you watch are updated.": "Recevez une notification lorsque les pages que vous surveillez sont mises à jour.",
+  "Page mentions": "Mentions sur la page",
+  "Get notified when someone mentions you on a page.": "Recevez une notification lorsqu'une personne vous mentionne sur une page.",
+  "Comment mentions": "Mentions dans les commentaires",
+  "Get notified when someone mentions you in a comment.": "Recevez une notification lorsqu'une personne vous mentionne dans un commentaire.",
+  "New comments": "Nouveaux commentaires",
+  "Get notified about new comments on threads you participate in.": "Recevez une notification concernant les nouveaux commentaires dans les fils auxquels vous participez.",
+  "Resolved comments": "Commentaires résolus",
+  "Get notified when your comment is resolved.": "Recevez une notification lorsque votre commentaire est résolu.",
+  "You are now watching this page": "Vous surveillez désormais cette page",
+  "You are no longer watching this page": "Vous ne surveillez plus cette page",
+  "Direct": "Direct",
+  "Updates": "Mises à jour",
  "Today": "Aujourd'hui",
  "Yesterday": "Hier",
  "This week": "Cette semaine",
@@ -674,6 +674,24 @@
  "<bold>{{name}}</bold> mentioned you on a page": "<bold>{{name}}</bold> ti ha menzionato su una pagina",
  "<bold>{{name}}</bold> gave you edit access to a page": "<bold>{{name}}</bold> ti ha dato l'accesso di modifica a una pagina",
  "<bold>{{name}}</bold> gave you view access to a page": "<bold>{{name}}</bold> ti ha dato l'accesso di visualizzazione a una pagina",
+  "<bold>{{name}}</bold> updated a page": "<bold>{{name}}</bold> ha aggiornato una pagina.",
+  "Watch page": "Segui pagina",
+  "Stop watching": "Smetti di seguire",
+  "Email notifications": "Notifiche email",
+  "Page updates": "Aggiornamenti pagina",
+  "Get notified when pages you watch are updated.": "Ricevi una notifica quando le pagine che segui vengono aggiornate.",
+  "Page mentions": "Menzioni nella pagina",
+  "Get notified when someone mentions you on a page.": "Ricevi una notifica quando qualcuno ti menziona su una pagina.",
+  "Comment mentions": "Menzioni nei commenti",
+  "Get notified when someone mentions you in a comment.": "Ricevi una notifica quando qualcuno ti menziona in un commento.",
+  "New comments": "Nuovi commenti",
+  "Get notified about new comments on threads you participate in.": "Ricevi una notifica sui nuovi commenti nelle discussioni a cui partecipi.",
+  "Resolved comments": "Commenti risolti",
+  "Get notified when your comment is resolved.": "Ricevi una notifica quando il tuo commento viene risolto.",
+  "You are now watching this page": "Ora stai seguendo questa pagina",
+  "You are no longer watching this page": "Non stai più seguendo questa pagina",
+  "Direct": "Diretto",
+  "Updates": "Aggiornamenti",
  "Today": "Oggi",
  "Yesterday": "Ieri",
  "This week": "Questa settimana",
@@ -674,6 +674,24 @@
  "<bold>{{name}}</bold> mentioned you on a page": "<bold>{{name}}</bold>さんがページであなたに言及しました",
  "<bold>{{name}}</bold> gave you edit access to a page": "<bold>{{name}}</bold>さんがページの編集権限をあなたに付与しました",
  "<bold>{{name}}</bold> gave you view access to a page": "<bold>{{name}}</bold>さんがページの閲覧権限をあなたに付与しました",
+  "<bold>{{name}}</bold> updated a page": "<bold>{{name}}</bold>さんがページを更新しました。",
+  "Watch page": "ページをウォッチ",
+  "Stop watching": "ウォッチを解除",
+  "Email notifications": "メール通知",
+  "Page updates": "ページの更新",
+  "Get notified when pages you watch are updated.": "ウォッチしているページが更新されたときに通知を受け取ります。",
+  "Page mentions": "ページでの言及",
+  "Get notified when someone mentions you on a page.": "誰かがページであなたに言及したとき通知を受け取ります。",
+  "Comment mentions": "コメントでの言及",
+  "Get notified when someone mentions you in a comment.": "誰かがコメントであなたに言及したとき通知を受け取ります。",
+  "New comments": "新しいコメント",
+  "Get notified about new comments on threads you participate in.": "参加しているスレッドに新しいコメントがあると通知されます。",
+  "Resolved comments": "解決済みコメント",
+  "Get notified when your comment is resolved.": "あなたのコメントが解決されたとき通知を受け取ります。",
+  "You are now watching this page": "このページをウォッチしています",
+  "You are no longer watching this page": "このページのウォッチを解除しました",
+  "Direct": "直接",
+  "Updates": "アップデート",
  "Today": "今日",
  "Yesterday": "昨日",
  "This week": "今週",
@@ -674,6 +674,24 @@
  "<bold>{{name}}</bold> mentioned you on a page": "<bold>{{name}}</bold>님이 페이지에서 당신을 언급했습니다",
  "<bold>{{name}}</bold> gave you edit access to a page": "<bold>{{name}}</bold>님이 페이지 편집 권한을 부여했습니다",
  "<bold>{{name}}</bold> gave you view access to a page": "<bold>{{name}}</bold>님이 페이지 조회 권한을 부여했습니다",
+  "<bold>{{name}}</bold> updated a page": "<bold>{{name}}</bold>님이 페이지를 업데이트했습니다.",
+  "Watch page": "페이지 구독",
+  "Stop watching": "구독 취소",
+  "Email notifications": "이메일 알림",
+  "Page updates": "페이지 업데이트",
+  "Get notified when pages you watch are updated.": "구독한 페이지가 업데이트될 때 알림을 받으세요.",
+  "Page mentions": "페이지 언급",
+  "Get notified when someone mentions you on a page.": "누군가가 페이지에서 당신을 언급하면 알림을 받으세요.",
+  "Comment mentions": "댓글 언급",
+  "Get notified when someone mentions you in a comment.": "누군가가 댓글에서 당신을 언급하면 알림을 받으세요.",
+  "New comments": "새 댓글",
+  "Get notified about new comments on threads you participate in.": "참여 중인 스레드에 새 댓글이 달리면 알림을 받으세요.",
+  "Resolved comments": "해결된 댓글",
+  "Get notified when your comment is resolved.": "내 댓글이 해결되었을 때 알림을 받으세요.",
+  "You are now watching this page": "이제 이 페이지를 주시합니다.",
+  "You are no longer watching this page": "더 이상 이 페이지를 주시하지 않습니다.",
+  "Direct": "직접",
+  "Updates": "업데이트",
  "Today": "오늘",
  "Yesterday": "어제",
  "This week": "이번 주",
@@ -674,6 +674,24 @@
  "<bold>{{name}}</bold> mentioned you on a page": "<bold>{{name}}</bold> noemde je op een pagina",
  "<bold>{{name}}</bold> gave you edit access to a page": "<bold>{{name}}</bold> heeft je toegang gegeven om een pagina te bewerken",
  "<bold>{{name}}</bold> gave you view access to a page": "<bold>{{name}}</bold> heeft je toegang gegeven om een pagina te bekijken",
+  "<bold>{{name}}</bold> updated a page": "<bold>{{name}}</bold> heeft een pagina bijgewerkt.",
+  "Watch page": "Pagina volgen",
+  "Stop watching": "Volgen stoppen",
+  "Email notifications": "E-mailmeldingen",
+  "Page updates": "Pagina-updates",
+  "Get notified when pages you watch are updated.": "Ontvang een melding wanneer pagina's die je volgt worden bijgewerkt.",
+  "Page mentions": "Pagina-vermeldingen",
+  "Get notified when someone mentions you on a page.": "Ontvang een melding wanneer iemand je noemt op een pagina.",
+  "Comment mentions": "Vermeldingen in opmerkingen",
+  "Get notified when someone mentions you in a comment.": "Ontvang een melding wanneer iemand je noemt in een opmerking.",
+  "New comments": "Nieuwe opmerkingen",
+  "Get notified about new comments on threads you participate in.": "Ontvang meldingen over nieuwe reacties in threads waaraan je deelneemt.",
+  "Resolved comments": "Opgeloste opmerkingen",
+  "Get notified when your comment is resolved.": "Ontvang een melding wanneer je reactie is opgelost.",
+  "You are now watching this page": "Je volgt nu deze pagina",
+  "You are no longer watching this page": "Je volgt deze pagina niet meer",
+  "Direct": "Direct",
+  "Updates": "Updates",
  "Today": "Vandaag",
  "Yesterday": "Gisteren",
  "This week": "Deze week",
@@ -674,6 +674,24 @@
  "<bold>{{name}}</bold> mentioned you on a page": "<bold>{{name}}</bold> mencionou você em uma página",
  "<bold>{{name}}</bold> gave you edit access to a page": "<bold>{{name}}</bold> concedeu acesso de edição a uma página",
  "<bold>{{name}}</bold> gave you view access to a page": "<bold>{{name}}</bold> concedeu acesso de visualização a uma página",
+  "<bold>{{name}}</bold> updated a page": "<bold>{{name}}</bold> atualizou uma página.",
+  "Watch page": "Observar página",
+  "Stop watching": "Parar de observar",
+  "Email notifications": "Notificações por e-mail",
+  "Page updates": "Atualizações da página",
+  "Get notified when pages you watch are updated.": "Receba notificações quando as páginas que você observa forem atualizadas.",
+  "Page mentions": "Menções na página",
+  "Get notified when someone mentions you on a page.": "Receba notificações quando alguém mencionar você em uma página.",
+  "Comment mentions": "Menções em comentários",
+  "Get notified when someone mentions you in a comment.": "Receba notificações quando alguém mencionar você em um comentário.",
+  "New comments": "Novos comentários",
+  "Get notified about new comments on threads you participate in.": "Receba notificações sobre novos comentários nas discussões em que você participa.",
+  "Resolved comments": "Comentários resolvidos",
+  "Get notified when your comment is resolved.": "Receba notificações quando seu comentário for resolvido.",
+  "You are now watching this page": "Agora você está observando esta página",
+  "You are no longer watching this page": "Você não está mais observando esta página",
+  "Direct": "Direto",
+  "Updates": "Atualizações",
  "Today": "Hoje",
  "Yesterday": "Ontem",
  "This week": "Esta semana",
@@ -674,6 +674,24 @@
  "<bold>{{name}}</bold> mentioned you on a page": "<bold>{{name}}</bold> упомянул вас на странице",
  "<bold>{{name}}</bold> gave you edit access to a page": "<bold>{{name}}</bold> предоставил вам доступ для редактирования страницы",
  "<bold>{{name}}</bold> gave you view access to a page": "<bold>{{name}}</bold> предоставил вам доступ к просмотру страницы",
+  "<bold>{{name}}</bold> updated a page": "<bold>{{name}}</bold> обновил страницу.",
+  "Watch page": "Следить за страницей",
+  "Stop watching": "Прекратить отслеживание",
+  "Email notifications": "Уведомления на email",
+  "Page updates": "Обновления страницы",
+  "Get notified when pages you watch are updated.": "Получайте уведомления, когда отслеживаемые вами страницы обновляются.",
+  "Page mentions": "Упоминания на странице",
+  "Get notified when someone mentions you on a page.": "Получайте уведомления, когда кто-то упоминает вас на странице.",
+  "Comment mentions": "Упоминания в комментариях",
+  "Get notified when someone mentions you in a comment.": "Получайте уведомления, когда кто-то упоминает вас в комментарии.",
+  "New comments": "Новые комментарии",
+  "Get notified about new comments on threads you participate in.": "Получайте уведомления о новых комментариях в цепочках, в которых вы участвуете.",
+  "Resolved comments": "Разрешённые комментарии",
+  "Get notified when your comment is resolved.": "Получайте уведомление, когда ваш комментарий разрешён.",
+  "You are now watching this page": "Вы теперь следите за этой страницей",
+  "You are no longer watching this page": "Вы больше не следите за этой страницей",
+  "Direct": "Прямые",
+  "Updates": "Обновления",
  "Today": "Сегодня",
  "Yesterday": "Вчера",
  "This week": "На этой неделе",
@@ -674,6 +674,24 @@
  "<bold>{{name}}</bold> mentioned you on a page": "<bold>{{name}}</bold> згадав вас на сторінці",
  "<bold>{{name}}</bold> gave you edit access to a page": "<bold>{{name}}</bold> надав вам доступ до редагування сторінки",
  "<bold>{{name}}</bold> gave you view access to a page": "<bold>{{name}}</bold> надав вам доступ до перегляду сторінки",
+  "<bold>{{name}}</bold> updated a page": "<bold>{{name}}</bold> оновив сторінку.",
+  "Watch page": "Стежити за сторінкою",
+  "Stop watching": "Припинити стежити",
+  "Email notifications": "Сповіщення електронною поштою",
+  "Page updates": "Оновлення сторінки",
+  "Get notified when pages you watch are updated.": "Отримуйте сповіщення, коли сторінки, за якими ви стежите, оновлюються.",
+  "Page mentions": "Згадки на сторінці",
+  "Get notified when someone mentions you on a page.": "Отримуйте сповіщення, коли хтось згадує вас на сторінці.",
+  "Comment mentions": "Згадки у коментарях",
+  "Get notified when someone mentions you in a comment.": "Отримуйте сповіщення, коли хтось згадує вас у коментарі.",
+  "New comments": "Нові коментарі",
+  "Get notified about new comments on threads you participate in.": "Отримуйте сповіщення про нові коментарі у темах, у яких ви берете участь.",
+  "Resolved comments": "Вирішені коментарі",
+  "Get notified when your comment is resolved.": "Отримайте сповіщення, коли ваш коментар вирішено.",
+  "You are now watching this page": "Ви зараз стежите за цією сторінкою",
+  "You are no longer watching this page": "Ви більше не стежите за цією сторінкою",
+  "Direct": "Прямі",
+  "Updates": "Оновлення",
  "Today": "Сьогодні",
  "Yesterday": "Вчора",
  "This week": "Цього тижня",
@@ -674,6 +674,24 @@
  "<bold>{{name}}</bold> mentioned you on a page": "<bold>{{name}}</bold>在页面上提到你",
  "<bold>{{name}}</bold> gave you edit access to a page": "<bold>{{name}}</bold>授予你页面编辑权限",
  "<bold>{{name}}</bold> gave you view access to a page": "<bold>{{name}}</bold>授予你页面查看权限",
+  "<bold>{{name}}</bold> updated a page": "<bold>{{name}}</bold>更新了一个页面。",
+  "Watch page": "关注页面",
+  "Stop watching": "取消关注",
+  "Email notifications": "邮件通知",
+  "Page updates": "页面更新",
+  "Get notified when pages you watch are updated.": "当你关注的页面有更新时收到通知。",
+  "Page mentions": "页面提及",
+  "Get notified when someone mentions you on a page.": "当有人在页面上提到你时收到通知。",
+  "Comment mentions": "评论提及",
+  "Get notified when someone mentions you in a comment.": "当有人在评论中提到你时收到通知。",
+  "New comments": "新评论",
+  "Get notified about new comments on threads you participate in.": "当你参与的讨论有新评论时收到通知。",
+  "Resolved comments": "已解决的评论",
+  "Get notified when your comment is resolved.": "当你的评论被解决时收到通知。",
+  "You are now watching this page": "你现在正在关注此页面",
+  "You are no longer watching this page": "你已取消关注此页面",
+  "Direct": "直接",
+  "Updates": "更新",
  "Today": "今天",
  "Yesterday": "昨天",
  "This week": "本周",
@@ -65,6 +65,11 @@ export function useCreateCommentMutation() {
      ) as InfiniteData<IPagination<IComment>> | undefined;

      if (cache && cache.pages.length > 0) {
+        const alreadyExists = cache.pages.some((page) =>
+          page.items.some((c) => c.id === newComment.id),
+        );
+        if (alreadyExists) return;
+
        const lastIdx = cache.pages.length - 1;
        queryClient.setQueryData(RQ_KEY(newComment.pageId), {
          ...cache,
@@ -294,6 +294,7 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
        w={popupWidth}
        scrollbars={"y"}
        scrollbarSize={6}
+        overscrollBehavior={"contain"}
        styles={{ content: { minWidth: 0 } }}
      >
        {renderItems?.map((item, index) => {
@@ -87,7 +87,13 @@ const CommandList = ({

  return flatItems.length > 0 ? (
    <Paper id="slash-command" shadow="md" p="xs" withBorder>
-      <ScrollArea viewportRef={viewportRef} h={350} w={270} scrollbarSize={8}>
+      <ScrollArea
+        viewportRef={viewportRef}
+        h={350}
+        w={270}
+        scrollbarSize={8}
+        overscrollBehavior="contain"
+      >
        {Object.entries(items).map(([category, categoryItems]) => (
          <div key={category}>
            <Text c="dimmed" mb={4} fw={500} tt="capitalize">
@@ -103,10 +109,7 @@ const CommandList = ({
                })}
              >
                <Group>
-                  <ActionIcon
-                    variant="default"
-                    component="div"
-                  >
+                  <ActionIcon variant="default" component="div">
                    <item.icon size={18} />
                  </ActionIcon>

@@ -49,7 +49,7 @@ const renderItems = () => {
      getReferenceClientRect = props.clientRect;

      popup = document.createElement("div");
-      popup.style.zIndex = "9999";
+      popup.style.zIndex = "199";
      popup.style.position = "absolute";
      popup.style.top = "0";
      popup.style.left = "0";
@@ -142,6 +142,25 @@ export const mainExtensions = [
        }),
      ];
    },
+    addKeyboardShortcuts() {
+      return {
+        Enter: ({ editor }) => {
+          const { from, to } = editor.state.selection;
+          if (from !== to) return false;
+          if (!editor.isActive("code")) return false;
+
+          const $from = editor.state.doc.resolve(from);
+          const codeType = editor.state.schema.marks.code;
+          const nodeAfter = $from.nodeAfter;
+
+          if (nodeAfter && codeType.isInSet(nodeAfter.marks)) {
+            return false;
+          }
+
+          return editor.chain().unsetCode().splitBlock().run();
+        },
+      };
+    },
  }),
  SharedStorage,
  Heading,
@@ -49,6 +49,8 @@ export function NotificationItem({
        return notification.data?.role === "writer"
          ? "<bold>{{name}}</bold> gave you edit access to a page"
          : "<bold>{{name}}</bold> gave you view access to a page";
+      case "page.updated":
+        return "<bold>{{name}}</bold> updated a page";
      default:
        return "";
    }
@@ -75,6 +77,7 @@ export function NotificationItem({
  };

  const handleMarkRead = (e: React.MouseEvent) => {
+    e.preventDefault();
    e.stopPropagation();
    markReadIfNeeded();
  };
@@ -3,17 +3,23 @@ import { IconBellOff } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { useEffect, useRef } from "react";
 import { NotificationItem } from "./notification-item";
-import { INotification, NotificationFilter } from "../types/notification.types";
+import {
+  INotification,
+  NotificationFilter,
+  NotificationTab,
+} from "../types/notification.types";
 import { groupNotificationsByTime } from "../notification.utils";
 import { useNotificationsQuery } from "../queries/notification-query";
 import classes from "../notification.module.css";

 type NotificationListProps = {
+  tab: NotificationTab;
  filter: NotificationFilter;
  onNavigate: () => void;
 };

 export function NotificationList({
+  tab,
  filter,
  onNavigate,
 }: NotificationListProps) {
@@ -24,7 +30,7 @@ export function NotificationList({
    hasNextPage,
    fetchNextPage,
    isFetchingNextPage,
-  } = useNotificationsQuery();
+  } = useNotificationsQuery(tab as string);

  const sentinelRef = useRef<HTMLDivElement>(null);

@@ -6,6 +6,7 @@ import {
  Menu,
  Popover,
  ScrollArea,
+  Tabs,
  Text,
  Tooltip,
 } from "@mantine/core";
@@ -18,15 +19,20 @@ import {
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { NotificationList } from "./notification-list";
-import { NotificationFilter } from "../types/notification.types";
+import {
+  NotificationFilter,
+  NotificationTab,
+} from "../types/notification.types";
 import {
  useMarkAllReadMutation,
  useUnreadCountQuery,
 } from "../queries/notification-query";
+import classes from "../notification.module.css";

 export function NotificationPopover() {
  const { t } = useTranslation();
  const [opened, setOpened] = useState(false);
+  const [tab, setTab] = useState<NotificationTab>("direct");
  const [filter, setFilter] = useState<NotificationFilter>("all");

  const { data: unreadData } = useUnreadCountQuery();
@@ -125,13 +131,27 @@ export function NotificationPopover() {
          </Group>
        </Group>

+        <Tabs
+          value={tab}
+          onChange={(value) => setTab(value as NotificationTab)}
+          variant="default"
+          color="dark"
+        >
+          <Tabs.List px="md">
+            <Tabs.Tab value="direct">{t("Direct")}</Tabs.Tab>
+            <Tabs.Tab value="updates">{t("Updates")}</Tabs.Tab>
+          </Tabs.List>
+        </Tabs>
+
        <ScrollArea.Autosize
          mah={500}
          type="auto"
          offsetScrollbars
          scrollbarSize={6}
+          style={{ overscrollBehavior: "contain" }}
        >
          <NotificationList
+            tab={tab}
            filter={filter}
            onNavigate={() => setOpened(false)}
          />
@@ -13,3 +13,4 @@
 .divider {
  border-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5));
 }
+
@@ -15,10 +15,10 @@ import {
 export const NOTIFICATION_KEY = ["notifications"];
 export const UNREAD_COUNT_KEY = ["notifications", "unread-count"];

-export function useNotificationsQuery() {
+export function useNotificationsQuery(type?: string) {
  return useInfiniteQuery({
-    queryKey: NOTIFICATION_KEY,
-    queryFn: ({ pageParam }) => getNotifications({ cursor: pageParam }),
+    queryKey: [...NOTIFICATION_KEY, type],
+    queryFn: ({ pageParam }) => getNotifications({ cursor: pageParam, type }),
    initialPageParam: undefined as string | undefined,
    getNextPageParam: (lastPage) =>
      lastPage.meta.hasNextPage ? lastPage.meta.nextCursor : undefined,
@@ -5,6 +5,7 @@ import { IPagination } from "@/lib/types";
 export async function getNotifications(params: {
  limit?: number;
  cursor?: string;
+  type?: string;
 }): Promise<IPagination<INotification>> {
  const req = await api.post<IPagination<INotification>>(
    "/notifications",
@@ -3,7 +3,8 @@ export type NotificationType =
  | "comment.created"
  | "comment.resolved"
  | "page.user_mention"
-  | "page.permission_granted";
+  | "page.permission_granted"
+  | "page.updated";

 export type INotification = {
  id: string;
@@ -38,3 +39,5 @@ export type INotification = {
 };

 export type NotificationFilter = "all" | "unread";
+
+export type NotificationTab = "direct" | "updates" | "all";
@@ -3,6 +3,8 @@ import {
  IconArrowRight,
  IconArrowsHorizontal,
  IconDots,
+  IconEye,
+  IconEyeOff,
  IconFileExport,
  IconHistory,
  IconLink,
@@ -40,6 +42,11 @@ import { PageStateSegmentedControl } from "@/features/user/components/page-state
 import MovePageModal from "@/features/page/components/move-page-modal.tsx";
 import { useTimeAgo } from "@/hooks/use-time-ago.tsx";
 import { PageShareModal } from "@/ee/page-permission";
+import {
+  useWatchStatusQuery,
+  useWatchPageMutation,
+  useUnwatchPageMutation,
+} from "@/features/page/queries/watcher-query";

 interface PageHeaderMenuProps {
  readOnly?: boolean;
@@ -123,6 +130,9 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
  ] = useDisclosure(false);
  const [pageEditor] = useAtom(pageEditorAtom);
  const pageUpdatedAt = useTimeAgo(page?.updatedAt);
+  const { data: watchStatus } = useWatchStatusQuery(page?.id);
+  const watchPage = useWatchPageMutation();
+  const unwatchPage = useUnwatchPageMutation();

  const handleCopyLink = () => {
    const pageUrl =
@@ -185,6 +195,23 @@ function PageActionMenu({ readOnly }: PageActionMenuProps) {
          >
            {t("Copy as Markdown")}
          </Menu.Item>
+
+          {watchStatus?.watching ? (
+            <Menu.Item
+              leftSection={<IconEyeOff size={16} />}
+              onClick={() => unwatchPage.mutate(page.id)}
+            >
+              {t("Stop watching")}
+            </Menu.Item>
+          ) : (
+            <Menu.Item
+              leftSection={<IconEye size={16} />}
+              onClick={() => watchPage.mutate(page.id)}
+            >
+              {t("Watch page")}
+            </Menu.Item>
+          )}
+
          <Menu.Divider />

          <Menu.Item leftSection={<IconArrowsHorizontal size={16} />}>
@@ -0,0 +1,43 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import {
+  watchPage,
+  unwatchPage,
+  getWatchStatus,
+} from "@/features/page/services/watcher-service";
+import { notifications } from "@mantine/notifications";
+import { useTranslation } from "react-i18next";
+
+const WATCHER_KEY = "watcher";
+
+export function useWatchStatusQuery(pageId: string) {
+  return useQuery({
+    queryKey: [WATCHER_KEY, pageId],
+    queryFn: () => getWatchStatus(pageId),
+    enabled: !!pageId,
+    staleTime: 60_000,
+  });
+}
+
+export function useWatchPageMutation() {
+  const queryClient = useQueryClient();
+  const { t } = useTranslation();
+  return useMutation({
+    mutationFn: (pageId: string) => watchPage(pageId),
+    onSuccess: (_data, pageId) => {
+      queryClient.setQueryData([WATCHER_KEY, pageId], { watching: true });
+      notifications.show({ message: t("You are now watching this page") });
+    },
+  });
+}
+
+export function useUnwatchPageMutation() {
+  const queryClient = useQueryClient();
+  const { t } = useTranslation();
+  return useMutation({
+    mutationFn: (pageId: string) => unwatchPage(pageId),
+    onSuccess: (_data, pageId) => {
+      queryClient.setQueryData([WATCHER_KEY, pageId], { watching: false });
+      notifications.show({ message: t("You are no longer watching this page") });
+    },
+  });
+}
@@ -0,0 +1,16 @@
+import api from "@/lib/api-client";
+
+export async function watchPage(pageId: string): Promise<{ watching: boolean }> {
+  const req = await api.post<{ watching: boolean }>("/pages/watch", { pageId });
+  return req.data;
+}
+
+export async function unwatchPage(pageId: string): Promise<{ watching: boolean }> {
+  const req = await api.post<{ watching: boolean }>("/pages/unwatch", { pageId });
+  return req.data;
+}
+
+export async function getWatchStatus(pageId: string): Promise<{ watching: boolean }> {
+  const req = await api.post<{ watching: boolean }>("/pages/watch-status", { pageId });
+  return req.data;
+}
@@ -9,6 +9,8 @@ import {
 import {
  IconArrowDown,
  IconDots,
+  IconEye,
+  IconEyeOff,
  IconFileExport,
  IconHome,
  IconPlus,
@@ -16,6 +18,11 @@ import {
  IconSettings,
  IconTrash,
 } from "@tabler/icons-react";
+import {
+  useSpaceWatchStatusQuery,
+  useWatchSpaceMutation,
+  useUnwatchSpaceMutation,
+} from "@/features/space/queries/space-watcher-query.ts";
 import classes from "./space-sidebar.module.css";
 import React from "react";
 import { useAtom } from "jotai";
@@ -160,13 +167,20 @@ export function SpaceSidebar() {
              {t("Pages")}
            </Text>

-            {spaceAbility.can(
-              SpaceCaslAction.Manage,
-              SpaceCaslSubject.Page,
-            ) && (
-              <Group gap="xs">
-                <SpaceMenu spaceId={space.id} onSpaceSettings={openSettings} />
+            <Group gap="xs">
+              <SpaceMenu
+                spaceId={space.id}
+                canManagePages={spaceAbility.can(
+                  SpaceCaslAction.Manage,
+                  SpaceCaslSubject.Page,
+                )}
+                onSpaceSettings={openSettings}
+              />

+              {spaceAbility.can(
+                SpaceCaslAction.Manage,
+                SpaceCaslSubject.Page,
+              ) && (
                <Tooltip label={t("Create page")} withArrow position="right">
                  <ActionIcon
                    variant="default"
@@ -177,8 +191,8 @@ export function SpaceSidebar() {
                    <IconPlus />
                  </ActionIcon>
                </Tooltip>
-              </Group>
-            )}
+              )}
+            </Group>
          </Group>

          <div className={classes.pages}>
@@ -204,9 +218,14 @@ export function SpaceSidebar() {

 interface SpaceMenuProps {
  spaceId: string;
+  canManagePages: boolean;
  onSpaceSettings: () => void;
 }
-function SpaceMenu({ spaceId, onSpaceSettings }: SpaceMenuProps) {
+function SpaceMenu({
+  spaceId,
+  canManagePages,
+  onSpaceSettings,
+}: SpaceMenuProps) {
  const { t } = useTranslation();
  const { spaceSlug } = useParams();
  const [importOpened, { open: openImportModal, close: closeImportModal }] =
@@ -214,15 +233,24 @@ function SpaceMenu({ spaceId, onSpaceSettings }: SpaceMenuProps) {
  const [exportOpened, { open: openExportModal, close: closeExportModal }] =
    useDisclosure(false);

+  const { data: watchStatus } = useSpaceWatchStatusQuery(spaceId);
+  const watchMutation = useWatchSpaceMutation();
+  const unwatchMutation = useUnwatchSpaceMutation();
+  const isWatching = watchStatus?.watching ?? false;
+
+  const handleToggleWatch = () => {
+    if (isWatching) {
+      unwatchMutation.mutate(spaceId);
+    } else {
+      watchMutation.mutate(spaceId);
+    }
+  };
+
  return (
    <>
      <Menu width={200} shadow="md" withArrow>
        <Menu.Target>
-          <Tooltip
-            label={t("Import pages & space settings")}
-            withArrow
-            position="top"
-          >
+          <Tooltip label={t("Space menu")} withArrow position="top">
            <ActionIcon
              variant="default"
              size={18}
@@ -235,50 +263,69 @@ function SpaceMenu({ spaceId, onSpaceSettings }: SpaceMenuProps) {

        <Menu.Dropdown>
          <Menu.Item
-            onClick={openImportModal}
-            leftSection={<IconArrowDown size={16} />}
+            onClick={handleToggleWatch}
+            leftSection={
+              isWatching ? <IconEyeOff size={16} /> : <IconEye size={16} />
+            }
          >
-            {t("Import pages")}
+            {isWatching ? t("Stop watching space") : t("Watch space")}
          </Menu.Item>

-          <Menu.Item
-            onClick={openExportModal}
-            leftSection={<IconFileExport size={16} />}
-          >
-            {t("Export space")}
-          </Menu.Item>
+          {canManagePages && (
+            <>
+              <Menu.Divider />

-          <Menu.Divider />
+              <Menu.Item
+                onClick={openImportModal}
+                leftSection={<IconArrowDown size={16} />}
+              >
+                {t("Import pages")}
+              </Menu.Item>

-          <Menu.Item
-            onClick={onSpaceSettings}
-            leftSection={<IconSettings size={16} />}
-          >
-            {t("Space settings")}
-          </Menu.Item>
+              <Menu.Item
+                onClick={openExportModal}
+                leftSection={<IconFileExport size={16} />}
+              >
+                {t("Export space")}
+              </Menu.Item>

-          <Menu.Item
-            component={Link}
-            to={`/s/${spaceSlug}/trash`}
-            leftSection={<IconTrash size={16} />}
-          >
-            {t("Trash")}
-          </Menu.Item>
+              <Menu.Divider />
+
+              <Menu.Item
+                onClick={onSpaceSettings}
+                leftSection={<IconSettings size={16} />}
+              >
+                {t("Space settings")}
+              </Menu.Item>
+
+              <Menu.Item
+                component={Link}
+                to={`/s/${spaceSlug}/trash`}
+                leftSection={<IconTrash size={16} />}
+              >
+                {t("Trash")}
+              </Menu.Item>
+            </>
+          )}
        </Menu.Dropdown>
      </Menu>

-      <PageImportModal
-        spaceId={spaceId}
-        open={importOpened}
-        onClose={closeImportModal}
-      />
+      {canManagePages && (
+        <>
+          <PageImportModal
+            spaceId={spaceId}
+            open={importOpened}
+            onClose={closeImportModal}
+          />

-      <ExportModal
-        type="space"
-        id={spaceId}
-        open={exportOpened}
-        onClose={closeExportModal}
-      />
+          <ExportModal
+            type="space"
+            id={spaceId}
+            open={exportOpened}
+            onClose={closeExportModal}
+          />
+        </>
+      )}
    </>
  );
 }
@@ -0,0 +1,49 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import {
+  watchSpace,
+  unwatchSpace,
+  getSpaceWatchStatus,
+} from "@/features/space/services/space-watcher-service";
+import { notifications } from "@mantine/notifications";
+import { useTranslation } from "react-i18next";
+
+const SPACE_WATCHER_KEY = "space-watcher";
+
+export function useSpaceWatchStatusQuery(spaceId: string) {
+  return useQuery({
+    queryKey: [SPACE_WATCHER_KEY, spaceId],
+    queryFn: () => getSpaceWatchStatus(spaceId),
+    enabled: !!spaceId,
+    staleTime: 60_000,
+  });
+}
+
+export function useWatchSpaceMutation() {
+  const queryClient = useQueryClient();
+  const { t } = useTranslation();
+  return useMutation({
+    mutationFn: (spaceId: string) => watchSpace(spaceId),
+    onSuccess: (_data, spaceId) => {
+      queryClient.setQueryData([SPACE_WATCHER_KEY, spaceId], {
+        watching: true,
+      });
+      notifications.show({ message: t("You are now watching this space") });
+    },
+  });
+}
+
+export function useUnwatchSpaceMutation() {
+  const queryClient = useQueryClient();
+  const { t } = useTranslation();
+  return useMutation({
+    mutationFn: (spaceId: string) => unwatchSpace(spaceId),
+    onSuccess: (_data, spaceId) => {
+      queryClient.setQueryData([SPACE_WATCHER_KEY, spaceId], {
+        watching: false,
+      });
+      notifications.show({
+        message: t("You are no longer watching this space"),
+      });
+    },
+  });
+}
@@ -0,0 +1,28 @@
+import api from "@/lib/api-client";
+
+export async function watchSpace(
+  spaceId: string,
+): Promise<{ watching: boolean }> {
+  const req = await api.post<{ watching: boolean }>("/spaces/watch", {
+    spaceId,
+  });
+  return req.data;
+}
+
+export async function unwatchSpace(
+  spaceId: string,
+): Promise<{ watching: boolean }> {
+  const req = await api.post<{ watching: boolean }>("/spaces/unwatch", {
+    spaceId,
+  });
+  return req.data;
+}
+
+export async function getSpaceWatchStatus(
+  spaceId: string,
+): Promise<{ watching: boolean }> {
+  const req = await api.post<{ watching: boolean }>("/spaces/watch-status", {
+    spaceId,
+  });
+  return req.data;
+}
@@ -0,0 +1,117 @@
+import { userAtom } from "@/features/user/atoms/current-user-atom.ts";
+import { updateUser } from "@/features/user/services/user-service.ts";
+import { IUser, IUserSettings } from "@/features/user/types/user.types.ts";
+import { Switch, Text, Title, Stack } from "@mantine/core";
+import { useAtom } from "jotai";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import {
+  ResponsiveSettingsRow,
+  ResponsiveSettingsContent,
+  ResponsiveSettingsControl,
+} from "@/components/ui/responsive-settings-row";
+
+type NotificationKey = keyof NonNullable<IUserSettings["notifications"]>;
+
+const notificationItems: {
+  key: NotificationKey;
+  dtoField: keyof IUser;
+  label: string;
+  description: string;
+}[] = [
+  {
+    key: "page.updated",
+    dtoField: "notificationPageUpdates",
+    label: "Page updates",
+    description: "Get notified when pages you watch are updated.",
+  },
+  {
+    key: "page.userMention",
+    dtoField: "notificationPageUserMention",
+    label: "Page mentions",
+    description: "Get notified when someone mentions you on a page.",
+  },
+  {
+    key: "comment.userMention",
+    dtoField: "notificationCommentUserMention",
+    label: "Comment mentions",
+    description: "Get notified when someone mentions you in a comment.",
+  },
+  {
+    key: "comment.created",
+    dtoField: "notificationCommentCreated",
+    label: "New comments",
+    description:
+      "Get notified about new comments on threads you participate in.",
+  },
+  {
+    key: "comment.resolved",
+    dtoField: "notificationCommentResolved",
+    label: "Resolved comments",
+    description: "Get notified when your comment is resolved.",
+  },
+];
+
+function NotificationToggle({
+  settingKey,
+  dtoField,
+  label,
+  description,
+}: {
+  settingKey: NotificationKey;
+  dtoField: keyof IUser;
+  label: string;
+  description: string;
+}) {
+  const { t } = useTranslation();
+  const [user, setUser] = useAtom(userAtom);
+  const [checked, setChecked] = useState(
+    user.settings?.notifications?.[settingKey] !== false,
+  );
+
+  const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const value = event.currentTarget.checked;
+    setChecked(value);
+    try {
+      const updatedUser = await updateUser({ [dtoField]: value } as any);
+      setUser(updatedUser);
+    } catch {
+      setChecked(!value);
+    }
+  };
+
+  return (
+    <ResponsiveSettingsRow>
+      <ResponsiveSettingsContent>
+        <Text size="md">{t(label)}</Text>
+        <Text size="sm" c="dimmed">
+          {t(description)}
+        </Text>
+      </ResponsiveSettingsContent>
+
+      <ResponsiveSettingsControl>
+        <Switch checked={checked} onChange={handleChange} />
+      </ResponsiveSettingsControl>
+    </ResponsiveSettingsRow>
+  );
+}
+
+export default function NotificationPref() {
+  const { t } = useTranslation();
+
+  return (
+    <Stack gap="xs">
+      <Title order={5}>{t("Email notifications")}</Title>
+
+      {notificationItems.map((item) => (
+        <NotificationToggle
+          key={item.key}
+          settingKey={item.key}
+          dtoField={item.dtoField}
+          label={item.label}
+          description={item.description}
+        />
+      ))}
+    </Stack>
+  );
+}
@@ -20,6 +20,11 @@ export interface IUser {
  deletedAt: Date;
  fullPageWidth: boolean; // used for update
  pageEditMode: string; // used for update
+  notificationPageUpdates: boolean; // used for update
+  notificationPageUserMention: boolean; // used for update
+  notificationCommentUserMention: boolean; // used for update
+  notificationCommentCreated: boolean; // used for update
+  notificationCommentResolved: boolean; // used for update
  hasGeneratedPassword?: boolean;
 }

@@ -33,6 +38,13 @@ export interface IUserSettings {
    fullPageWidth: boolean;
    pageEditMode: string;
  };
+  notifications?: {
+    "page.updated"?: boolean;
+    "page.userMention"?: boolean;
+    "comment.userMention"?: boolean;
+    "comment.created"?: boolean;
+    "comment.resolved"?: boolean;
+  };
 }

 export enum PageEditMode {
@@ -3,6 +3,7 @@ import AccountLanguage from "@/features/user/components/account-language.tsx";
 import AccountTheme from "@/features/user/components/account-theme.tsx";
 import PageWidthPref from "@/features/user/components/page-width-pref.tsx";
 import PageEditPref from "@/features/user/components/page-state-pref";
+import NotificationPref from "@/features/user/components/notification-pref";
 import { getAppName } from "@/lib/config.ts";
 import { Divider } from "@mantine/core";
 import { Helmet } from "react-helmet-async";
@@ -33,6 +34,10 @@ export default function AccountPreferences() {
      <Divider my={"md"} />

      <PageEditPref />
+
+      <Divider my={"md"} />
+
+      <NotificationPref />
    </>
  );
 }
@@ -1,6 +1,6 @@
 {
  "name": "server",
-  "version": "0.70.3",
+  "version": "0.71.1",
  "description": "",
  "author": "",
  "private": true,
@@ -44,21 +44,23 @@
    "@langchain/core": "1.1.34",
    "@langchain/textsplitters": "1.0.1",
    "@modelcontextprotocol/sdk": "^1.27.1",
+    "@nest-lab/throttler-storage-redis": "^1.2.0",
    "@nestjs-labs/nestjs-ioredis": "^11.0.4",
    "@nestjs/bullmq": "^11.0.4",
    "@nestjs/cache-manager": "^3.1.0",
-    "@nestjs/common": "^11.1.17",
+    "@nestjs/common": "^11.1.18",
    "@nestjs/config": "^4.0.3",
-    "@nestjs/core": "^11.1.17",
+    "@nestjs/core": "^11.1.18",
    "@nestjs/event-emitter": "^3.0.1",
    "@nestjs/jwt": "11.0.2",
-    "@nestjs/mapped-types": "^2.1.0",
+    "@nestjs/mapped-types": "^2.1.1",
    "@nestjs/passport": "^11.0.5",
-    "@nestjs/platform-fastify": "^11.1.17",
-    "@nestjs/platform-socket.io": "^11.1.17",
+    "@nestjs/platform-fastify": "^11.1.18",
+    "@nestjs/platform-socket.io": "^11.1.18",
    "@nestjs/schedule": "^6.1.1",
    "@nestjs/terminus": "^11.1.1",
-    "@nestjs/websockets": "^11.1.17",
+    "@nestjs/throttler": "^6.5.0",
+    "@nestjs/websockets": "^11.1.18",
    "@node-saml/passport-saml": "^5.1.0",
    "@react-email/components": "1.0.10",
    "@react-email/render": "2.0.4",
@@ -73,6 +75,7 @@
    "class-transformer": "^0.5.1",
    "class-validator": "^0.15.1",
    "cookie": "^1.1.1",
+    "fastify-ip": "^2.0.0",
    "fs-extra": "^11.3.4",
    "happy-dom": "20.8.9",
    "ioredis": "^5.10.1",
@@ -118,9 +121,9 @@
  },
  "devDependencies": {
    "@eslint/js": "^9.28.0",
-    "@nestjs/cli": "^11.0.16",
-    "@nestjs/schematics": "^11.0.9",
-    "@nestjs/testing": "^11.1.17",
+    "@nestjs/cli": "^11.0.18",
+    "@nestjs/schematics": "^11.0.10",
+    "@nestjs/testing": "^11.1.18",
    "@types/bcrypt": "^6.0.0",
    "@types/debounce": "^1.2.4",
    "@types/fs-extra": "^11.0.4",
@@ -143,7 +146,7 @@
    "source-map-support": "^0.5.21",
    "supertest": "^7.2.2",
    "ts-jest": "^29.4.6",
-    "ts-loader": "^9.5.4",
+    "ts-loader": "^9.5.7",
    "ts-node": "^10.9.2",
    "tsconfig-paths": "^4.2.0",
    "typescript": "^5.9.3",
@@ -26,6 +26,7 @@ import KeyvRedis from '@keyv/redis';
 import { LoggerModule } from './common/logger/logger.module';
 import { ClsModule } from 'nestjs-cls';
 import { NoopAuditModule } from './integrations/audit/audit.module';
+import { ThrottleModule } from './integrations/throttle/throttle.module';

 const enterpriseModules = [];
 try {
@@ -83,6 +84,7 @@ try {
    EventEmitterModule.forRoot(),
    SecurityModule,
    TelemetryModule,
+    ThrottleModule,
    ...enterpriseModules,
  ],
  controllers: [AppController],
@@ -18,12 +18,10 @@ import { QueueJob, QueueName } from '../../integrations/queue/constants';
 import { Queue } from 'bullmq';
 import {
  extractMentions,
-  extractPageMentions,
  extractUserMentions,
 } from '../../common/helpers/prosemirror/utils';
 import { isDeepStrictEqual } from 'node:util';
 import {
-  IPageBacklinkJob,
  IPageHistoryJob,
  IPageMentionNotificationJob,
 } from '../../integrations/queue/constants/queue.interface';
@@ -43,7 +41,6 @@ export class PersistenceExtension implements Extension {
  constructor(
    private readonly pageRepo: PageRepo,
    @InjectKysely() private readonly db: KyselyDB,
-    @InjectQueue(QueueName.GENERAL_QUEUE) private generalQueue: Queue,
    @InjectQueue(QueueName.AI_QUEUE) private aiQueue: Queue,
    @InjectQueue(QueueName.HISTORY_QUEUE) private historyQueue: Queue,
    @InjectQueue(QueueName.NOTIFICATION_QUEUE) private notificationQueue: Queue,
@@ -165,13 +162,6 @@ export class PersistenceExtension implements Extension {
      await this.collabHistory.addContributors(pageId, editingUserIds);

      const mentions = extractMentions(tiptapJson);
-      const pageMentions = extractPageMentions(mentions);
-
-      await this.generalQueue.add(QueueJob.PAGE_BACKLINKS, {
-        pageId: pageId,
-        workspaceId: page.workspaceId,
-        mentions: pageMentions,
-      } as IPageBacklinkJob);

      const userMentions = extractUserMentions(mentions);
      const oldMentions = page.content ? extractMentions(page.content) : [];
@@ -1,8 +1,18 @@
 import { Logger, OnModuleDestroy } from '@nestjs/common';
 import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq';
-import { Job } from 'bullmq';
+import { InjectQueue } from '@nestjs/bullmq';
+import { Job, Queue } from 'bullmq';
 import { QueueJob, QueueName } from '../../integrations/queue/constants';
-import { IPageHistoryJob } from '../../integrations/queue/constants/queue.interface';
+import {
+  IPageBacklinkJob,
+  IPageHistoryJob,
+  IPageUpdateNotificationJob,
+} from '../../integrations/queue/constants/queue.interface';
+import {
+  extractMentions,
+  extractPageMentions,
+  extractInternalLinkSlugIds,
+} from '../../common/helpers/prosemirror/utils';
 import { PageHistoryRepo } from '@docmost/db/repos/page/page-history.repo';
 import { PageRepo } from '@docmost/db/repos/page/page.repo';
 import { isDeepStrictEqual } from 'node:util';
@@ -18,6 +28,8 @@ export class HistoryProcessor extends WorkerHost implements OnModuleDestroy {
    private readonly pageRepo: PageRepo,
    private readonly collabHistory: CollabHistoryService,
    private readonly watcherService: WatcherService,
+    @InjectQueue(QueueName.NOTIFICATION_QUEUE) private notificationQueue: Queue,
+    @InjectQueue(QueueName.GENERAL_QUEUE) private generalQueue: Queue,
  ) {
    super();
  }
@@ -47,8 +59,7 @@ export class HistoryProcessor extends WorkerHost implements OnModuleDestroy {
        !lastHistory ||
        !isDeepStrictEqual(lastHistory.content, page.content)
      ) {
-        const contributorIds =
-          await this.collabHistory.popContributors(pageId);
+        const contributorIds = await this.collabHistory.popContributors(pageId);

        try {
          await this.watcherService.addPageWatchers(
@@ -61,12 +72,41 @@ export class HistoryProcessor extends WorkerHost implements OnModuleDestroy {
          await this.pageHistoryRepo.saveHistory(page, { contributorIds });
          this.logger.debug(`History created for page: ${pageId}`);
        } catch (err) {
-          await this.collabHistory.addContributors(
-            pageId,
-            contributorIds,
-          );
+          await this.collabHistory.addContributors(pageId, contributorIds);
          throw err;
        }
+
+        const mentions = extractMentions(page.content);
+        const pageMentions = extractPageMentions(mentions);
+        const internalLinkSlugIds = extractInternalLinkSlugIds(page.content);
+
+        await this.generalQueue
+          .add(QueueJob.PAGE_BACKLINKS, {
+            pageId,
+            workspaceId: page.workspaceId,
+            mentions: pageMentions,
+            internalLinkSlugIds,
+          } as IPageBacklinkJob)
+          .catch((err) => {
+            this.logger.error(
+              `Failed to queue backlinks for ${pageId}: ${err.message}`,
+            );
+          });
+
+        if (contributorIds.length > 0 && lastHistory?.content) {
+          await this.notificationQueue
+            .add(QueueJob.PAGE_UPDATED, {
+              pageId,
+              spaceId: page.spaceId,
+              workspaceId: page.workspaceId,
+              actorIds: contributorIds,
+            } as IPageUpdateNotificationJob)
+            .catch((err) => {
+              this.logger.error(
+                `Failed to queue page update notification for ${pageId}: ${err.message}`,
+              );
+            });
+        }
      }
    } catch (err) {
      throw err;
@@ -11,12 +11,14 @@ import { CollaborationController } from './collaboration.controller';
 import { LoggerModule } from '../../common/logger/logger.module';
 import { RedisModule } from '@nestjs-labs/nestjs-ioredis';
 import { RedisConfigService } from '../../integrations/redis/redis-config.service';
+import { CaslModule } from '../../core/casl/casl.module';

@Module({
  imports: [
    LoggerModule,
    DatabaseModule,
    EnvironmentModule,
+    CaslModule,
    CollaborationModule,
    QueueModule,
    HealthModule,
@@ -7,6 +7,10 @@ import { validate as isValidUUID } from 'uuid';
 import { Transform } from '@tiptap/pm/transform';
 import { TiptapTransformer } from '@hocuspocus/transformer';
 import * as Y from 'yjs';
+import {
+  INTERNAL_LINK_REGEX,
+  extractPageSlugId,
+} from '../../../integrations/export/utils';

 export interface MentionNode {
  id: string;
@@ -64,6 +68,27 @@ export function extractPageMentions(mentionList: MentionNode[]): MentionNode[] {
  return pageMentionList as MentionNode[];
 }

+export function extractInternalLinkSlugIds(prosemirrorJson: any): string[] {
+  const slugIds: string[] = [];
+  const doc = jsonToNode(prosemirrorJson);
+
+  doc.descendants((node: Node) => {
+    for (const mark of node.marks) {
+      if (mark.type.name === 'link' && mark.attrs.internal && mark.attrs.href) {
+        const match = mark.attrs.href.match(INTERNAL_LINK_REGEX);
+        if (match) {
+          const slugId = extractPageSlugId(match[5]);
+          if (slugId && !slugIds.includes(slugId)) {
+            slugIds.push(slugId);
+          }
+        }
+      }
+    }
+  });
+
+  return slugIds;
+}
+
 export function extractUserMentionIdsFromJson(json: any): string[] {
  const userIds: string[] = [];

@@ -142,6 +142,18 @@ export function isUserDisabled(user: {
  return !!(user.deactivatedAt || user.deletedAt);
 }

+const SENSITIVE_URL_PREFIXES = ['/api/sso/'];
+
+export function redactSensitiveUrl(url: string): string {
+  if (url && SENSITIVE_URL_PREFIXES.some((prefix) => url.includes(prefix))) {
+    const qsIndex = url.indexOf('?');
+    if (qsIndex !== -1) {
+      return url.substring(0, qsIndex);
+    }
+  }
+  return url;
+}
+
 export function createByteCountingStream(source: Readable) {
  let bytesRead = 0;
  const stream = new Transform({
@@ -1,5 +1,6 @@
 import { Params } from 'nestjs-pino';
 import { stdTimeFunctions } from 'pino';
+import { redactSensitiveUrl } from '../helpers/utils';

 const CONTEXTS_TO_IGNORE = [
  'InstanceLoader',
@@ -50,20 +51,12 @@ export function createPinoConfig(): Params {
        },
      },
      serializers: {
-        req: (req) => {
-          const forwardedFor = req.headers?.['x-forwarded-for'];
-          const ip =
-            req.headers?.['cf-connecting-ip'] ||
-            (typeof forwardedFor === 'string' ? forwardedFor.split(',')[0]?.trim() : undefined) ||
-            req.remoteAddress;
-
-          return {
-            method: req.method,
-            url: req.url,
-            ip,
-            userAgent: req.headers?.['user-agent'],
-          };
-        },
+        req: (req) => ({
+          method: req.method,
+          url: redactSensitiveUrl(req.url),
+          ip: req.ip || req.remoteAddress,
+          userAgent: req.headers?.['user-agent'],
+        }),
        res: (res) => ({
          statusCode: res.statusCode,
        }),
@@ -18,7 +18,8 @@ export class AuditContextMiddleware implements NestMiddleware {

  use(req: FastifyRequest['raw'], res: FastifyReply['raw'], next: () => void) {
    const workspaceId = (req as any).workspaceId ?? null;
-    const ipAddress = this.extractIpAddress(req);
+
+    const ipAddress = (req as any).ip ?? (req as any).socket?.remoteAddress ?? null;

    const userAgent =
      (req.headers['user-agent'] as string) ?? null;
@@ -35,21 +36,4 @@ export class AuditContextMiddleware implements NestMiddleware {

    next();
  }
-
-  private extractIpAddress(req: FastifyRequest['raw']): string | null {
-    const xForwardedFor = req.headers['x-forwarded-for'];
-    if (xForwardedFor) {
-      const ips = Array.isArray(xForwardedFor)
-        ? xForwardedFor[0]
-        : xForwardedFor.split(',')[0];
-      return ips?.trim() ?? null;
-    }
-
-    const xRealIp = req.headers['x-real-ip'];
-    if (xRealIp) {
-      return Array.isArray(xRealIp) ? xRealIp[0] : xRealIp;
-    }
-
-    return (req as any).socket?.remoteAddress ?? null;
-  }
 }
@@ -10,6 +10,7 @@ import {
  UseGuards,
  Logger,
 } from '@nestjs/common';
+import { SkipThrottle, ThrottlerGuard } from '@nestjs/throttler';
 import { LoginDto } from './dto/login.dto';
 import { AuthService } from './services/auth.service';
 import { SessionService } from '../session/session.service';
@@ -33,6 +34,7 @@ import {
  IAuditService,
 } from '../../integrations/audit/audit.service';

+@UseGuards(ThrottlerGuard)
@Controller('auth')
 export class AuthController {
  private readonly logger = new Logger(AuthController.name);
@@ -111,6 +113,7 @@ export class AuthController {
    return workspace;
  }

+  @SkipThrottle()
  @UseGuards(JwtAuthGuard)
  @HttpCode(HttpStatus.OK)
  @Post('change-password')
@@ -173,6 +176,7 @@ export class AuthController {
    return this.authService.verifyUserToken(verifyUserTokenDto, workspace.id);
  }

+  @SkipThrottle()
  @UseGuards(JwtAuthGuard)
  @HttpCode(HttpStatus.OK)
  @Post('collab-token')
@@ -183,6 +187,7 @@ export class AuthController {
    return this.authService.getCollabToken(user, workspace.id);
  }

+  @SkipThrottle()
  @UseGuards(JwtAuthGuard)
  @HttpCode(HttpStatus.OK)
  @Post('logout')
@@ -1,4 +1,5 @@
-import { IsArray, IsOptional, IsUUID } from 'class-validator';
+import { IsArray, IsIn, IsOptional, IsString, IsUUID } from 'class-validator';
+import { PaginationOptions } from '@docmost/db/pagination/pagination-options';

 export class NotificationIdDto {
  @IsUUID()
@@ -11,3 +12,10 @@ export class MarkNotificationsReadDto {
  @IsOptional()
  notificationIds?: string[];
 }
+
+export class ListNotificationsDto extends PaginationOptions {
+  @IsOptional()
+  @IsString()
+  @IsIn(['direct', 'updates', 'all'])
+  type?: 'direct' | 'updates' | 'all' = 'all';
+}
@@ -4,7 +4,45 @@ export const NotificationType = {
  COMMENT_RESOLVED: 'comment.resolved',
  PAGE_USER_MENTION: 'page.user_mention',
  PAGE_PERMISSION_GRANTED: 'page.permission_granted',
+  PAGE_UPDATED: 'page.updated',
 } as const;

 export type NotificationType =
  (typeof NotificationType)[keyof typeof NotificationType];
+
+export type NotificationSettingKey =
+  | 'page.updated'
+  | 'page.userMention'
+  | 'comment.userMention'
+  | 'comment.created'
+  | 'comment.resolved';
+
+export const NotificationTypeToSettingKey: Partial<
+  Record<NotificationType, NotificationSettingKey>
+> = {
+  [NotificationType.PAGE_UPDATED]: 'page.updated',
+  [NotificationType.PAGE_USER_MENTION]: 'page.userMention',
+  [NotificationType.COMMENT_USER_MENTION]: 'comment.userMention',
+  [NotificationType.COMMENT_CREATED]: 'comment.created',
+  [NotificationType.COMMENT_RESOLVED]: 'comment.resolved',
+};
+
+export type NotificationTab = 'direct' | 'updates' | 'all';
+
+export const DIRECT_NOTIFICATION_TYPES: NotificationType[] = [
+  NotificationType.COMMENT_USER_MENTION,
+  NotificationType.COMMENT_CREATED,
+  NotificationType.COMMENT_RESOLVED,
+  NotificationType.PAGE_USER_MENTION,
+  NotificationType.PAGE_PERMISSION_GRANTED,
+];
+
+export const UPDATES_NOTIFICATION_TYPES: NotificationType[] = [
+  NotificationType.PAGE_UPDATED,
+];
+
+export function getTypesForTab(tab: NotificationTab): NotificationType[] | undefined {
+  if (tab === 'direct') return DIRECT_NOTIFICATION_TYPES;
+  if (tab === 'updates') return UPDATES_NOTIFICATION_TYPES;
+  return undefined;
+}
@@ -9,9 +9,8 @@ import {
 import { NotificationService } from './notification.service';
 import { AuthUser } from '../../common/decorators/auth-user.decorator';
 import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
-import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { User } from '@docmost/db/types/entity.types';
-import { MarkNotificationsReadDto } from './dto/notification.dto';
+import { ListNotificationsDto, MarkNotificationsReadDto } from './dto/notification.dto';

@UseGuards(JwtAuthGuard)
@Controller('notifications')
@@ -21,10 +20,10 @@ export class NotificationController {
  @HttpCode(HttpStatus.OK)
  @Post('/')
  async getNotifications(
-    @Body() pagination: PaginationOptions,
+    @Body() dto: ListNotificationsDto,
    @AuthUser() user: User,
  ) {
-    return this.notificationService.findByUserId(user.id, pagination);
+    return this.notificationService.findByUserId(user.id, dto, dto.type);
  }

  @HttpCode(HttpStatus.OK)
@@ -4,6 +4,7 @@ import { NotificationController } from './notification.controller';
 import { NotificationProcessor } from './notification.processor';
 import { CommentNotificationService } from './services/comment.notification';
 import { PageNotificationService } from './services/page.notification';
+import { PageUpdateEmailRateLimiter } from './services/page-update-email-rate-limiter';

@Module({
  imports: [],
@@ -13,6 +14,7 @@ import { PageNotificationService } from './services/page.notification';
    NotificationProcessor,
    CommentNotificationService,
    PageNotificationService,
+    PageUpdateEmailRateLimiter,
  ],
  exports: [NotificationService],
 })
@@ -8,6 +8,7 @@ import {
  ICommentNotificationJob,
  ICommentResolvedNotificationJob,
  IPageMentionNotificationJob,
+  IPageUpdateNotificationJob,
  IPermissionGrantedNotificationJob,
 } from '../../integrations/queue/constants/queue.interface';
 import { CommentNotificationService } from './services/comment.notification';
@@ -35,6 +36,7 @@ export class NotificationProcessor
      | ICommentNotificationJob
      | ICommentResolvedNotificationJob
      | IPageMentionNotificationJob
+      | IPageUpdateNotificationJob
      | IPermissionGrantedNotificationJob,
      void
    >,
@@ -76,6 +78,20 @@ export class NotificationProcessor
          break;
        }

+        case QueueJob.PAGE_UPDATED: {
+          await this.pageNotificationService.processPageUpdate(
+            job.data as IPageUpdateNotificationJob,
+            appUrl,
+          );
+          break;
+        }
+
+        case QueueJob.PAGE_UPDATE_DIGEST: {
+          const { userId } = job.data as unknown as { userId: string };
+          await this.pageNotificationService.processDigest(userId, appUrl);
+          break;
+        }
+
        default:
          this.logger.warn(`Unknown notification job: ${job.name}`);
      }
@@ -6,6 +6,8 @@ import { InsertableNotification } from '@docmost/db/types/entity.types';
 import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 import { WsGateway } from '../../ws/ws.gateway';
 import { MailService } from '../../integrations/mail/mail.service';
+import { NotificationTab, NotificationType, NotificationTypeToSettingKey } from './notification.constants';
+import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo';

@Injectable()
 export class NotificationService {
@@ -13,12 +15,23 @@ export class NotificationService {

  constructor(
    private readonly notificationRepo: NotificationRepo,
+    private readonly pagePermissionRepo: PagePermissionRepo,
    private readonly wsGateway: WsGateway,
    private readonly mailService: MailService,
    @InjectKysely() private readonly db: KyselyDB,
  ) {}

  async create(data: InsertableNotification) {
+    const user = await this.db
+      .selectFrom('users')
+      .select(['id'])
+      .where('id', '=', data.userId)
+      .where('deletedAt', 'is', null)
+      .where('deactivatedAt', 'is', null)
+      .executeTakeFirst();
+
+    if (!user) return null;
+
    const notification = await this.notificationRepo.insert(data);

    this.wsGateway.server
@@ -28,8 +41,35 @@ export class NotificationService {
    return notification;
  }

-  async findByUserId(userId: string, pagination: PaginationOptions) {
-    return this.notificationRepo.findByUserId(userId, pagination);
+  async findByUserId(
+    userId: string,
+    pagination: PaginationOptions,
+    type: NotificationTab = 'all',
+  ) {
+    const result = await this.notificationRepo.findByUserId(
+      userId,
+      pagination,
+      type,
+    );
+
+    const pageIds = result.items
+      .map((n: any) => n.pageId)
+      .filter(Boolean);
+
+    if (pageIds.length > 0) {
+      const accessiblePageIds =
+        await this.pagePermissionRepo.filterAccessiblePageIds({
+          pageIds,
+          userId,
+        });
+      const accessibleSet = new Set(accessiblePageIds);
+
+      result.items = result.items.filter(
+        (n: any) => !n.pageId || accessibleSet.has(n.pageId),
+      );
+    }
+
+    return result;
  }

  async getUnreadCount(userId: string) {
@@ -53,17 +93,27 @@ export class NotificationService {
    notificationId: string,
    subject: string,
    template: any,
+    type?: NotificationType,
  ) {
    try {
      const user = await this.db
        .selectFrom('users')
-        .select(['email'])
+        .select(['email', 'settings'])
        .where('id', '=', userId)
        .where('deletedAt', 'is', null)
+        .where('deactivatedAt', 'is', null)
        .executeTakeFirst();

      if (!user?.email) return;

+      if (type) {
+        const settingKey = NotificationTypeToSettingKey[type];
+        if (settingKey) {
+          const settings = user.settings as any;
+          if (settings?.notifications?.[settingKey] === false) return;
+        }
+      }
+
      await this.mailService.sendToQueue({
        to: user.email,
        subject,
@@ -86,12 +86,14 @@ export class CommentNotificationService {
        spaceId,
        commentId,
      });
+      if (!notification) continue;

      await this.notificationService.queueEmail(
        userId,
        notification.id,
        `${actor.name} mentioned you in a comment`,
        CommentMentionEmail({ actorName: actor.name, pageTitle, pageUrl }),
+        NotificationType.COMMENT_USER_MENTION,
      );

      notifiedUserIds.add(userId);
@@ -110,12 +112,14 @@ export class CommentNotificationService {
        spaceId,
        commentId,
      });
+      if (!notification) continue;

      await this.notificationService.queueEmail(
        recipientId,
        notification.id,
        `${actor.name} commented on ${pageTitle}`,
        CommentCreateEmail({ actorName: actor.name, pageTitle, pageUrl }),
+        NotificationType.COMMENT_CREATED,
      );
    }
  }
@@ -171,6 +175,7 @@ export class CommentNotificationService {
      spaceId,
      commentId,
    });
+    if (!notification) return;

    const subject = `${actor.name} resolved a comment on ${pageTitle}`;

@@ -179,6 +184,7 @@ export class CommentNotificationService {
      notification.id,
      subject,
      CommentResolvedEmail({ actorName: actor.name, pageTitle, pageUrl }),
+      NotificationType.COMMENT_RESOLVED,
    );
  }

@@ -0,0 +1,43 @@
+import { Injectable } from '@nestjs/common';
+import { RedisService } from '@nestjs-labs/nestjs-ioredis';
+import type { Redis } from 'ioredis';
+
+const KEY_PREFIX = 'page-update:emails:';
+const DIGEST_PREFIX = 'page-update:digest:';
+const TTL_SECONDS = 86400; // 24 hours
+const MAX_IMMEDIATE_EMAILS = 4;
+
+@Injectable()
+export class PageUpdateEmailRateLimiter {
+  private readonly redis: Redis;
+
+  constructor(private readonly redisService: RedisService) {
+    this.redis = this.redisService.getOrThrow();
+  }
+
+  async canSendEmail(userId: string): Promise<boolean> {
+    const key = KEY_PREFIX + userId;
+    const count = await this.redis.incr(key);
+    await this.redis.expire(key, TTL_SECONDS, 'NX');
+    return count <= MAX_IMMEDIATE_EMAILS;
+  }
+
+  async addToDigest(userId: string, notificationId: string): Promise<boolean> {
+    const key = DIGEST_PREFIX + userId;
+    const len = await this.redis.rpush(key, notificationId);
+    await this.redis.expire(key, TTL_SECONDS);
+    return len === 1;
+  }
+
+  async popDigest(userId: string): Promise<string[]> {
+    const key = DIGEST_PREFIX + userId;
+    const [ids] = await this.redis
+      .multi()
+      .lrange(key, 0, -1)
+      .del(key)
+      .exec();
+
+    return (ids?.[1] as string[]) ?? [];
+  }
+
+}
@@ -1,25 +1,43 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { InjectKysely } from 'nestjs-kysely';
+import { InjectQueue } from '@nestjs/bullmq';
+import { Queue } from 'bullmq';
 import { KyselyDB } from '@docmost/db/types/kysely.types';
 import {
  IPageMentionNotificationJob,
+  IPageUpdateNotificationJob,
  IPermissionGrantedNotificationJob,
 } from '../../../integrations/queue/constants/queue.interface';
 import { NotificationService } from '../notification.service';
 import { NotificationType } from '../notification.constants';
+import { NotificationRepo } from '@docmost/db/repos/notification/notification.repo';
 import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
 import { PagePermissionRepo } from '@docmost/db/repos/page/page-permission.repo';
+import { WatcherRepo } from '@docmost/db/repos/watcher/watcher.repo';
+import { PageUpdateEmailRateLimiter } from './page-update-email-rate-limiter';
 import { PageMentionEmail } from '@docmost/transactional/emails/page-mention-email';
+import { PageUpdateEmail } from '@docmost/transactional/emails/page-update-email';
+import { PageUpdateDigestEmail } from '@docmost/transactional/emails/page-update-digest-email';
 import { PermissionGrantedEmail } from '@docmost/transactional/emails/permission-granted-email';
 import { getPageTitle } from '../../../common/helpers';
+import { QueueJob, QueueName } from '../../../integrations/queue/constants';
+
+const PAGE_UPDATE_COOLDOWN_HOURS = 7;
+const DIGEST_DELAY_MS = 12 * 60 * 60 * 1000; // 12 hours

@Injectable()
 export class PageNotificationService {
+  private readonly logger = new Logger(PageNotificationService.name);
+
  constructor(
    @InjectKysely() private readonly db: KyselyDB,
    private readonly notificationService: NotificationService,
+    private readonly notificationRepo: NotificationRepo,
    private readonly spaceMemberRepo: SpaceMemberRepo,
    private readonly pagePermissionRepo: PagePermissionRepo,
+    private readonly watcherRepo: WatcherRepo,
+    private readonly rateLimiter: PageUpdateEmailRateLimiter,
+    @InjectQueue(QueueName.NOTIFICATION_QUEUE) private notificationQueue: Queue,
  ) {}

  async processPageMention(data: IPageMentionNotificationJob, appUrl: string) {
@@ -41,10 +59,9 @@ export class PageNotificationService {
      );

    const usersWithPageAccess =
-      await this.pagePermissionRepo.getUserIdsWithPageAccess(
-        pageId,
-        [...usersWithSpaceAccess],
-      );
+      await this.pagePermissionRepo.getUserIdsWithPageAccess(pageId, [
+        ...usersWithSpaceAccess,
+      ]);
    const usersWithAccess = new Set(usersWithPageAccess);

    const accessibleMentions = newMentions.filter((m) =>
@@ -97,6 +114,7 @@ export class PageNotificationService {
        spaceId,
        data: { mentionId },
      });
+      if (!notification) continue;

      const pageUrl = `${basePageUrl}`;
      const subject = `${actor.name} mentioned you in ${pageTitle}`;
@@ -106,6 +124,7 @@ export class PageNotificationService {
        notification.id,
        subject,
        PageMentionEmail({ actorName: actor.name, pageTitle, pageUrl }),
+        NotificationType.PAGE_USER_MENTION,
      );
    }
  }
@@ -139,6 +158,7 @@ export class PageNotificationService {
        spaceId,
        data: { role },
      });
+      if (!notification) continue;

      const subject = `${actor.name} gave you ${accessLabel} access to ${pageTitle}`;

@@ -156,6 +176,237 @@ export class PageNotificationService {
    }
  }

+  async processPageUpdate(data: IPageUpdateNotificationJob, appUrl: string) {
+    const { pageId, spaceId, workspaceId, actorIds } = data;
+
+    const watcherIds = await this.watcherRepo.getPageUpdateRecipientIds(
+      pageId,
+      spaceId,
+    );
+
+    if (watcherIds.length === 0) return;
+
+    const actorSet = new Set(actorIds);
+    const candidateIds = watcherIds.filter((id) => !actorSet.has(id));
+    if (candidateIds.length === 0) return;
+
+    const eligibleUsers = await this.getEligiblePageUpdateUsers(candidateIds);
+    if (eligibleUsers.size === 0) return;
+
+    const afterPrefs = [...eligibleUsers.keys()];
+
+    const recentlyNotified =
+      await this.notificationRepo.getRecentlyNotifiedUserIds(
+        afterPrefs,
+        pageId,
+        NotificationType.PAGE_UPDATED,
+        PAGE_UPDATE_COOLDOWN_HOURS,
+      );
+    const afterCooldown = afterPrefs.filter((id) => !recentlyNotified.has(id));
+    if (afterCooldown.length === 0) return;
+
+    const usersWithSpaceAccess =
+      await this.spaceMemberRepo.getUserIdsWithSpaceAccess(
+        afterCooldown,
+        spaceId,
+      );
+
+    const usersWithPageAccess =
+      await this.pagePermissionRepo.getUserIdsWithPageAccess(pageId, [
+        ...usersWithSpaceAccess,
+      ]);
+    if (usersWithPageAccess.length === 0) return;
+
+    const recipientIds = new Set(usersWithPageAccess);
+    const actorId = actorIds[0];
+
+    const context = await this.getPageContext(actorId, pageId, spaceId, appUrl);
+    if (!context) return;
+
+    const { actor, pageTitle, basePageUrl, spaceName } = context;
+
+    for (const userId of recipientIds) {
+      const notification = await this.notificationService.create({
+        userId,
+        workspaceId,
+        type: NotificationType.PAGE_UPDATED,
+        actorId,
+        pageId,
+        spaceId,
+      });
+      if (!notification) continue;
+
+      const canSend = await this.rateLimiter.canSendEmail(userId);
+      if (canSend) {
+        await this.notificationService.queueEmail(
+          userId,
+          notification.id,
+          `${actor.name} updated ${pageTitle}`,
+          PageUpdateEmail({
+            userName: eligibleUsers.get(userId) ?? '',
+            actorName: actor.name,
+            pageTitle,
+            pageUrl: basePageUrl,
+            spaceName,
+          }),
+          NotificationType.PAGE_UPDATED,
+        );
+      } else {
+        const isFirst = await this.rateLimiter.addToDigest(
+          userId,
+          notification.id,
+        );
+        if (isFirst) {
+          await this.scheduleDigest(userId, workspaceId);
+        }
+      }
+    }
+  }
+
+  private async getEligiblePageUpdateUsers(
+    userIds: string[],
+  ): Promise<Map<string, string>> {
+    if (userIds.length === 0) return new Map();
+
+    const users = await this.db
+      .selectFrom('users')
+      .select(['id', 'name', 'settings'])
+      .where('id', 'in', userIds)
+      .where('deletedAt', 'is', null)
+      .where('deactivatedAt', 'is', null)
+      .execute();
+
+    const eligible = new Map<string, string>();
+    for (const u of users) {
+      const settings = u.settings as any;
+      if (settings?.notifications?.['page.updated'] !== false) {
+        eligible.set(u.id, u.name);
+      }
+    }
+    return eligible;
+  }
+
+  private async scheduleDigest(
+    userId: string,
+    workspaceId: string,
+  ): Promise<void> {
+    await this.notificationQueue
+      .add(
+        QueueJob.PAGE_UPDATE_DIGEST,
+        { userId, workspaceId },
+        { delay: DIGEST_DELAY_MS, removeOnComplete: true },
+      )
+      .catch((err) => {
+        this.logger.error(
+          `Failed to schedule digest for ${userId}: ${err.message}`,
+        );
+      });
+  }
+
+  async processDigest(userId: string, appUrl: string): Promise<void> {
+    const notificationIds = await this.rateLimiter.popDigest(userId);
+    if (notificationIds.length === 0) return;
+
+    const [user, notifications] = await Promise.all([
+      this.db
+        .selectFrom('users')
+        .select(['id', 'name'])
+        .where('id', '=', userId)
+        .executeTakeFirst(),
+      this.db
+        .selectFrom('notifications')
+        .select(['id', 'pageId', 'actorId'])
+        .where('id', 'in', notificationIds)
+        .execute(),
+    ]);
+
+    if (!user || notifications.length === 0) return;
+
+    const pageIds = [
+      ...new Set(notifications.map((n) => n.pageId).filter(Boolean)),
+    ];
+    const actorIds = [
+      ...new Set(notifications.map((n) => n.actorId).filter(Boolean)),
+    ];
+
+    const allPages = await this.db
+      .selectFrom('pages')
+      .innerJoin('spaces', 'spaces.id', 'pages.spaceId')
+      .select([
+        'pages.id',
+        'pages.title',
+        'pages.slugId',
+        'pages.spaceId',
+        'spaces.slug as spaceSlug',
+      ])
+      .where('pages.id', 'in', pageIds)
+      .execute();
+
+    if (allPages.length === 0) return;
+
+    const spaceIds = [...new Set(allPages.map((p) => p.spaceId))];
+
+    const accessibleSpaceIds = new Set<string>();
+    for (const spaceId of spaceIds) {
+      const usersWithAccess =
+        await this.spaceMemberRepo.getUserIdsWithSpaceAccess([userId], spaceId);
+      if (usersWithAccess.has(userId)) accessibleSpaceIds.add(spaceId);
+    }
+
+    const spaceFilteredPages = allPages.filter((p) =>
+      accessibleSpaceIds.has(p.spaceId),
+    );
+    if (spaceFilteredPages.length === 0) return;
+
+    const accessiblePageIds = new Set<string>();
+    for (const p of spaceFilteredPages) {
+      const hasAccess = await this.pagePermissionRepo.getUserIdsWithPageAccess(
+        p.id,
+        [userId],
+      );
+      if (hasAccess.includes(userId)) accessiblePageIds.add(p.id);
+    }
+
+    const pages = spaceFilteredPages.filter((p) => accessiblePageIds.has(p.id));
+    if (pages.length === 0) return;
+
+    const actors = actorIds.length > 0
+      ? await this.db
+          .selectFrom('users')
+          .select(['id', 'name'])
+          .where('id', 'in', actorIds)
+          .execute()
+      : [];
+
+    const actorMap = new Map(actors.map((a) => [a.id, a.name]));
+    const pageActors = new Map<string, Set<string>>();
+    for (const n of notifications) {
+      if (!n.pageId || !n.actorId) continue;
+      const names = pageActors.get(n.pageId) ?? new Set();
+      const name = actorMap.get(n.actorId);
+      if (name) names.add(name);
+      pageActors.set(n.pageId, names);
+    }
+
+    const pageUpdates = pages.map((p) => ({
+      title: getPageTitle(p.title),
+      url: `${appUrl}/s/${p.spaceSlug}/p/${p.slugId}`,
+      updatedBy: [...(pageActors.get(p.id) ?? [])],
+    }));
+
+    await this.notificationService.queueEmail(
+      userId,
+      notificationIds[0],
+      `Your digest: ${pageUpdates.length} page ${pageUpdates.length === 1 ? 'update' : 'updates'}`,
+      PageUpdateDigestEmail({
+        userName: user.name,
+        pageUpdates,
+        totalUpdates: pageUpdates.length,
+      }),
+      NotificationType.PAGE_UPDATED,
+    );
+  }
+
  private async getPageContext(
    actorId: string,
    pageId: string,
@@ -175,7 +426,7 @@ export class PageNotificationService {
        .executeTakeFirst(),
      this.db
        .selectFrom('spaces')
-        .select(['id', 'slug'])
+        .select(['id', 'slug', 'name'])
        .where('id', '=', spaceId)
        .executeTakeFirst(),
    ]);
@@ -186,6 +437,11 @@ export class PageNotificationService {

    const basePageUrl = `${appUrl}/s/${space.slug}/p/${page.slugId}`;

-    return { actor, pageTitle: getPageTitle(page.title), basePageUrl };
+    return {
+      actor,
+      pageTitle: getPageTitle(page.title),
+      basePageUrl,
+      spaceName: space.name,
+    };
  }
 }
@@ -47,6 +47,10 @@ import { QueueJob, QueueName } from '../../../integrations/queue/constants';
 import { EventName } from '../../../common/events/event.contants';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { CollaborationGateway } from '../../../collaboration/collaboration.gateway';
+import {
+  INTERNAL_LINK_REGEX,
+  extractPageSlugId,
+} from '../../../integrations/export/utils';
 import { markdownToHtml } from '@docmost/editor-ext';
 import { WatcherService } from '../../watcher/watcher.service';
 import { sql } from 'kysely';
@@ -510,6 +514,11 @@ export class PageService {
      });
    });

+    const slugIdMap = new Map<string, CopyPageMapEntry>();
+    for (const [, entry] of pageMap) {
+      slugIdMap.set(entry.oldSlugId, entry);
+    }
+
    const attachmentMap = new Map<string, ICopyPageAttachment>();

    const insertablePages: InsertablePage[] = await Promise.all(
@@ -576,6 +585,28 @@ export class PageService {
              node.attrs.slugId = mappedPage.newSlugId;
            }
          }
+
+          // Update internal page links in link marks
+          for (const mark of node.marks) {
+            if (
+              mark.type.name === 'link' &&
+              mark.attrs.internal &&
+              mark.attrs.href
+            ) {
+              const match = mark.attrs.href.match(INTERNAL_LINK_REGEX);
+              if (match) {
+                const slugId = extractPageSlugId(match[5]);
+                if (slugId && slugIdMap.has(slugId)) {
+                  const mappedPage = slugIdMap.get(slugId);
+                  //@ts-ignore
+                  mark.attrs.href = mark.attrs.href.replace(
+                    slugId,
+                    mappedPage.newSlugId,
+                  );
+                }
+              }
+            }
+          }
        });

        const prosemirrorJson = prosemirrorDoc.toJSON();
@@ -35,4 +35,24 @@ export class UpdateUserDto extends PartialType(
  @MaxLength(70)
  @IsString()
  confirmPassword: string;
+
+  @IsOptional()
+  @IsBoolean()
+  notificationPageUpdates: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  notificationPageUserMention: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  notificationCommentUserMention: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  notificationCommentCreated: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  notificationCommentResolved: boolean;
 }
@@ -7,6 +7,7 @@ import {
  UnauthorizedException,
 } from '@nestjs/common';
 import { UpdateUserDto } from './dto/update-user.dto';
+import { NotificationSettingKey } from '../notification/notification.constants';
 import { comparePasswordHash, diffAuditTrackedFields } from 'src/common/helpers/utils';
 import { Workspace } from '@docmost/db/types/entity.types';
 import { validateSsoEnforcement } from '../auth/auth.util';
@@ -60,6 +61,24 @@ export class UserService {
      );
    }

+    const notificationSettings: Record<string, NotificationSettingKey> = {
+      notificationPageUpdates: 'page.updated',
+      notificationPageUserMention: 'page.userMention',
+      notificationCommentUserMention: 'comment.userMention',
+      notificationCommentCreated: 'comment.created',
+      notificationCommentResolved: 'comment.resolved',
+    };
+
+    for (const [dtoField, settingKey] of Object.entries(notificationSettings)) {
+      if (typeof updateUserDto[dtoField] !== 'undefined') {
+        return this.userRepo.updateNotificationSetting(
+          userId,
+          settingKey,
+          updateUserDto[dtoField],
+        );
+      }
+    }
+
    const userBefore = { name: user.name, email: user.email, locale: user.locale };

    if (updateUserDto.name) {
@@ -0,0 +1,7 @@
+import { IsString, IsNotEmpty } from 'class-validator';
+
+export class SpaceWatcherDto {
+  @IsString()
+  @IsNotEmpty()
+  spaceId: string;
+}
@@ -0,0 +1,95 @@
+import {
+  Body,
+  Controller,
+  ForbiddenException,
+  HttpCode,
+  HttpStatus,
+  NotFoundException,
+  Post,
+  UseGuards,
+} from '@nestjs/common';
+import { WatcherService } from './watcher.service';
+import { AuthUser } from '../../common/decorators/auth-user.decorator';
+import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
+import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
+import { User, Workspace } from '@docmost/db/types/entity.types';
+import { SpaceWatcherDto } from './dto/space-watcher.dto';
+import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
+import SpaceAbilityFactory from '../casl/abilities/space-ability.factory';
+import {
+  SpaceCaslAction,
+  SpaceCaslSubject,
+} from '../casl/interfaces/space-ability.type';
+
+@UseGuards(JwtAuthGuard)
+@Controller('spaces')
+export class SpaceWatcherController {
+  constructor(
+    private readonly watcherService: WatcherService,
+    private readonly spaceRepo: SpaceRepo,
+    private readonly spaceAbility: SpaceAbilityFactory,
+  ) {}
+
+  private async loadSpaceAndAuthorize(
+    spaceId: string,
+    user: User,
+    workspace: Workspace,
+  ) {
+    const space = await this.spaceRepo.findById(spaceId, workspace.id);
+    if (!space) {
+      throw new NotFoundException('Space not found');
+    }
+
+    const ability = await this.spaceAbility.createForUser(user, space.id);
+    if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Settings)) {
+      throw new ForbiddenException();
+    }
+
+    return space;
+  }
+
+  @HttpCode(HttpStatus.OK)
+  @Post('watch')
+  async watchSpace(
+    @Body() dto: SpaceWatcherDto,
+    @AuthUser() user: User,
+    @AuthWorkspace() workspace: Workspace,
+  ) {
+    const space = await this.loadSpaceAndAuthorize(dto.spaceId, user, workspace);
+
+    await this.watcherService.watchSpace(user.id, space.id, workspace.id);
+
+    return { watching: true };
+  }
+
+  @HttpCode(HttpStatus.OK)
+  @Post('unwatch')
+  async unwatchSpace(
+    @Body() dto: SpaceWatcherDto,
+    @AuthUser() user: User,
+    @AuthWorkspace() workspace: Workspace,
+  ) {
+    const space = await this.loadSpaceAndAuthorize(dto.spaceId, user, workspace);
+
+    await this.watcherService.unwatchSpace(user.id, space.id);
+
+    return { watching: false };
+  }
+
+  @HttpCode(HttpStatus.OK)
+  @Post('watch-status')
+  async getWatchStatus(
+    @Body() dto: SpaceWatcherDto,
+    @AuthUser() user: User,
+    @AuthWorkspace() workspace: Workspace,
+  ) {
+    const space = await this.loadSpaceAndAuthorize(dto.spaceId, user, workspace);
+
+    const watching = await this.watcherService.isWatchingSpace(
+      user.id,
+      space.id,
+    );
+
+    return { watching };
+  }
+}
@@ -1,8 +1,6 @@
-/***
- import {
+import {
  Body,
  Controller,
-  ForbiddenException,
  HttpCode,
  HttpStatus,
  NotFoundException,
@@ -16,12 +14,7 @@ import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { User, Workspace } from '@docmost/db/types/entity.types';
 import { WatcherPageDto } from './dto/watcher.dto';
 import { PageRepo } from '@docmost/db/repos/page/page.repo';
-import SpaceAbilityFactory from '../casl/abilities/space-ability.factory';
-import {
-  SpaceCaslAction,
-  SpaceCaslSubject,
-} from '../casl/interfaces/space-ability.type';
-
+import { PageAccessService } from '../page/page-access/page-access.service';

@UseGuards(JwtAuthGuard)
@Controller('pages')
@@ -29,7 +22,7 @@ export class WatcherController {
  constructor(
    private readonly watcherService: WatcherService,
    private readonly pageRepo: PageRepo,
-    private readonly spaceAbility: SpaceAbilityFactory,
+    private readonly pageAccessService: PageAccessService,
  ) {}

  @HttpCode(HttpStatus.OK)
@@ -44,10 +37,7 @@ export class WatcherController {
      throw new NotFoundException('Page not found');
    }

-    const ability = await this.spaceAbility.createForUser(user, page.spaceId);
-    if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
-      throw new ForbiddenException();
-    }
+    await this.pageAccessService.validateCanView(page, user);

    await this.watcherService.watchPage(
      user.id,
@@ -67,12 +57,14 @@ export class WatcherController {
      throw new NotFoundException('Page not found');
    }

-    const ability = await this.spaceAbility.createForUser(user, page.spaceId);
-    if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
-      throw new ForbiddenException();
-    }
+    await this.pageAccessService.validateCanView(page, user);

-    await this.watcherService.unwatchPage(user.id, page.id);
+    await this.watcherService.unwatchPage(
+      user.id,
+      page.id,
+      page.spaceId,
+      page.workspaceId,
+    );

    return { watching: false };
  }
@@ -85,15 +77,10 @@ export class WatcherController {
      throw new NotFoundException('Page not found');
    }

-    const ability = await this.spaceAbility.createForUser(user, page.spaceId);
-    if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
-      throw new ForbiddenException();
-    }
+    await this.pageAccessService.validateCanView(page, user);

    const watching = await this.watcherService.isWatchingPage(user.id, page.id);

    return { watching };
  }
-
 }
-***/
@@ -1,10 +1,12 @@
 import { Module } from '@nestjs/common';
 import { WatcherService } from './watcher.service';
-import { CaslModule } from '../casl/casl.module';
+import { WatcherController } from './watcher.controller';
+import { SpaceWatcherController } from './space-watcher.controller';
+import { PageAccessModule } from '../page/page-access/page-access.module';

@Module({
-  imports: [CaslModule],
-  controllers: [],
+  imports: [PageAccessModule],
+  controllers: [WatcherController, SpaceWatcherController],
  providers: [WatcherService],
  exports: [WatcherService],
 })
@@ -50,14 +50,44 @@ export class WatcherService {
    return this.watcherRepo.insertMany(watchers, trx);
  }

-  async unwatchPage(userId: string, pageId: string) {
-    return this.watcherRepo.mute(userId, pageId);
+  async unwatchPage(
+    userId: string,
+    pageId: string,
+    spaceId: string,
+    workspaceId: string,
+  ) {
+    return this.watcherRepo.mute(userId, pageId, spaceId, workspaceId);
  }

  async isWatchingPage(userId: string, pageId: string): Promise<boolean> {
    return this.watcherRepo.isWatching(userId, pageId);
  }

+  async watchSpace(
+    userId: string,
+    spaceId: string,
+    workspaceId: string,
+    trx?: KyselyTransaction,
+  ) {
+    const watcher: InsertableWatcher = {
+      userId,
+      pageId: null,
+      spaceId,
+      workspaceId,
+      type: WatcherType.SPACE,
+      addedById: userId,
+    };
+    return this.watcherRepo.upsertSpace(watcher, trx);
+  }
+
+  async unwatchSpace(userId: string, spaceId: string) {
+    return this.watcherRepo.deleteSpaceWatch(userId, spaceId);
+  }
+
+  async isWatchingSpace(userId: string, spaceId: string): Promise<boolean> {
+    return this.watcherRepo.isWatchingSpace(userId, spaceId);
+  }
+
  async getPageWatchers(pageId: string, pagination: PaginationOptions) {
    return this.watcherRepo.findPageWatchers(pageId, pagination);
  }
@@ -11,6 +11,7 @@ import { ExpressionBuilder } from 'kysely';
 import { DB } from '@docmost/db/types/db';
 import { jsonObjectFrom } from 'kysely/helpers/postgres';
 import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
+import { NotificationTab, NotificationType } from '../../../core/notification/notification.constants';

@Injectable()
 export class NotificationRepo {
@@ -27,8 +28,12 @@ export class NotificationRepo {
      .executeTakeFirst();
  }

-  async findByUserId(userId: string, pagination: PaginationOptions) {
-    const query = this.db
+  async findByUserId(
+    userId: string,
+    pagination: PaginationOptions,
+    type: NotificationTab = 'all',
+  ) {
+    let query = this.db
      .selectFrom('notifications')
      .selectAll('notifications')
      .select((eb) => this.withActor(eb))
@@ -42,6 +47,12 @@ export class NotificationRepo {
        ]),
      );

+    if (type === 'direct') {
+      query = query.where('type', '!=', NotificationType.PAGE_UPDATED);
+    } else if (type === 'updates') {
+      query = query.where('type', '=', NotificationType.PAGE_UPDATED);
+    }
+
    return executeWithCursorPagination(query, {
      perPage: pagination.limit,
      cursor: pagination.cursor,
@@ -138,6 +149,29 @@ export class NotificationRepo {
      .execute();
  }

+  async getRecentlyNotifiedUserIds(
+    userIds: string[],
+    pageId: string,
+    type: string,
+    withinHours: number,
+  ): Promise<Set<string>> {
+    if (userIds.length === 0) return new Set();
+
+    const cutoff = new Date(Date.now() - withinHours * 60 * 60 * 1000);
+
+    const rows = await this.db
+      .selectFrom('notifications')
+      .select('userId')
+      .where('userId', 'in', userIds)
+      .where('pageId', '=', pageId)
+      .where('type', '=', type)
+      .where('createdAt', '>', cutoff)
+      .groupBy('userId')
+      .execute();
+
+    return new Set(rows.map((r) => r.userId));
+  }
+
  withActor(eb: ExpressionBuilder<DB, 'notifications'>) {
    return jsonObjectFrom(
      eb
@@ -13,6 +13,7 @@ import { PaginationOptions } from '../../pagination/pagination-options';
 import { executeWithCursorPagination } from '@docmost/db/pagination/cursor-pagination';
 import { ExpressionBuilder, sql } from 'kysely';
 import { jsonObjectFrom } from 'kysely/helpers/postgres';
+import { NotificationSettingKey } from '../../../core/notification/notification.constants';

@Injectable()
 export class UserRepo {
@@ -191,6 +192,24 @@ export class UserRepo {
      .executeTakeFirst();
  }

+  async updateNotificationSetting(
+    userId: string,
+    settingKey: NotificationSettingKey,
+    settingValue: boolean,
+  ) {
+    return await this.db
+      .updateTable('users')
+      .set({
+        settings: sql`COALESCE(settings, '{}'::jsonb)
+                || jsonb_build_object('notifications', COALESCE(settings->'notifications', '{}'::jsonb)
+                || jsonb_build_object(${sql.lit(settingKey)}, ${sql.lit(settingValue)}))`,
+        updatedAt: new Date(),
+      })
+      .where('id', '=', userId)
+      .returning(this.baseFields)
+      .executeTakeFirst();
+  }
+
  withUserMfa(eb: ExpressionBuilder<DB, 'users'>) {
    return jsonObjectFrom(
      eb
@@ -20,18 +20,6 @@ export type WatcherType = (typeof WatcherType)[keyof typeof WatcherType];
 export class WatcherRepo {
  constructor(@InjectKysely() private readonly db: KyselyDB) {}

-  async findByUserAndPage(
-    userId: string,
-    pageId: string,
-  ): Promise<Watcher | undefined> {
-    return this.db
-      .selectFrom('watchers')
-      .selectAll()
-      .where('userId', '=', userId)
-      .where('pageId', '=', pageId)
-      .executeTakeFirst();
-  }
-
  async findPageWatchers(pageId: string, pagination: PaginationOptions) {
    const query = this.db
      .selectFrom('watchers')
@@ -66,6 +54,53 @@ export class WatcherRepo {
    return watchers.map((w) => w.userId);
  }

+  /**
+   * Recipients for a `page.updated` notification, combining:
+   *   - Active page watchers on this page, AND
+   *   - Active space watchers on this space, EXCLUDING any user who has a
+   *     muted page watcher row for this page (per-page mute always wins).
+   *
+   * Deduplicated at the SQL level — a user watching both the page and the
+   * containing space appears once.
+   */
+  async getPageUpdateRecipientIds(
+    pageId: string,
+    spaceId: string,
+    trx?: KyselyTransaction,
+  ): Promise<string[]> {
+    const db = dbOrTx(this.db, trx);
+
+    const pageWatchers = db
+      .selectFrom('watchers')
+      .select('userId')
+      .where('pageId', '=', pageId)
+      .where('type', '=', WatcherType.PAGE)
+      .where('mutedAt', 'is', null);
+
+    const spaceWatchers = db
+      .selectFrom('watchers as sw')
+      .select('sw.userId')
+      .where('sw.spaceId', '=', spaceId)
+      .where('sw.pageId', 'is', null)
+      .where('sw.type', '=', WatcherType.SPACE)
+      .where((eb) =>
+        eb.not(
+          eb.exists(
+            eb
+              .selectFrom('watchers as pw')
+              .select('pw.id')
+              .whereRef('pw.userId', '=', 'sw.userId')
+              .where('pw.pageId', '=', pageId)
+              .where('pw.type', '=', WatcherType.PAGE)
+              .where('pw.mutedAt', 'is not', null),
+          ),
+        ),
+      );
+
+    const rows = await pageWatchers.union(spaceWatchers).execute();
+    return [...new Set(rows.map((r) => r.userId))];
+  }
+
  async insert(
    watcher: InsertableWatcher,
    trx?: KyselyTransaction,
@@ -110,20 +145,81 @@ export class WatcherRepo {
      .executeTakeFirst();
  }

+  async upsertSpace(
+    watcher: InsertableWatcher,
+    trx?: KyselyTransaction,
+  ): Promise<Watcher | undefined> {
+    const db = dbOrTx(this.db, trx);
+    return db
+      .insertInto('watchers')
+      .values(watcher)
+      .onConflict((oc) =>
+        oc
+          .columns(['userId', 'spaceId'])
+          .where('pageId', 'is', null)
+          .doNothing(),
+      )
+      .returningAll()
+      .executeTakeFirst();
+  }
+
  async mute(
    userId: string,
    pageId: string,
+    spaceId: string,
+    workspaceId: string,
+    trx?: KyselyTransaction,
+  ): Promise<void> {
+    const db = dbOrTx(this.db, trx);
+    const mutedAt = new Date();
+    await db
+      .insertInto('watchers')
+      .values({
+        userId,
+        pageId,
+        spaceId,
+        workspaceId,
+        type: WatcherType.PAGE,
+        addedById: userId,
+        mutedAt,
+      })
+      .onConflict((oc) =>
+        oc
+          .columns(['userId', 'pageId'])
+          .where('pageId', 'is not', null)
+          .doUpdateSet({ mutedAt }),
+      )
+      .execute();
+  }
+
+  async deleteSpaceWatch(
+    userId: string,
+    spaceId: string,
    trx?: KyselyTransaction,
  ): Promise<void> {
    const db = dbOrTx(this.db, trx);
    await db
-      .updateTable('watchers')
-      .set({ mutedAt: new Date() })
+      .deleteFrom('watchers')
      .where('userId', '=', userId)
-      .where('pageId', '=', pageId)
+      .where('spaceId', '=', spaceId)
+      .where('pageId', 'is', null)
+      .where('type', '=', WatcherType.SPACE)
      .execute();
  }

+  async isWatchingSpace(userId: string, spaceId: string): Promise<boolean> {
+    const watcher = await this.db
+      .selectFrom('watchers')
+      .select('id')
+      .where('userId', '=', userId)
+      .where('spaceId', '=', spaceId)
+      .where('pageId', 'is', null)
+      .where('type', '=', WatcherType.SPACE)
+      .executeTakeFirst();
+
+    return !!watcher;
+  }
+
  async isWatching(userId: string, pageId: string): Promise<boolean> {
    const watcher = await this.db
      .selectFrom('watchers')
@@ -164,14 +260,14 @@ export class WatcherRepo {
      .where('spaceId', '=', spaceId)
      .where('userId', 'is not', null)
      .union(
-        this.db
+        db
          .selectFrom('spaceMembers')
          .innerJoin('groupUsers', 'groupUsers.groupId', 'spaceMembers.groupId')
          .select('groupUsers.userId')
          .where('spaceMembers.spaceId', '=', spaceId),
      );

-    await this.db
+    await db
      .deleteFrom('watchers')
      .where('userId', 'in', userIds)
      .where('spaceId', '=', spaceId)
@@ -259,6 +259,12 @@ export class EnvironmentService {
    );
  }

+  getAiEmbeddingSupportsMrl(): boolean | undefined {
+    const val = this.configService.get<string>('AI_EMBEDDING_SUPPORTS_MRL');
+    if (val === undefined || val === null || val === '') return undefined;
+    return val === 'true';
+  }
+
  getOpenAiApiKey(): string {
    return this.configService.get<string>('OPENAI_API_KEY');
  }
@@ -117,6 +117,12 @@ export class EnvironmentVariables {
  @IsString()
  AI_EMBEDDING_DIMENSION: string;

+  @IsOptional()
+  @ValidateIf((obj) => obj.AI_EMBEDDING_SUPPORTS_MRL)
+  @IsIn(['true', 'false'])
+  @IsString()
+  AI_EMBEDDING_SUPPORTS_MRL: string;
+
  @ValidateIf((obj) => obj.AI_DRIVER)
  @IsString()
  @IsNotEmpty()
@@ -69,6 +69,7 @@ export enum QueueJob {
  COMMENT_RESOLVED_NOTIFICATION = 'comment-resolved-notification',
  PAGE_MENTION_NOTIFICATION = 'page-mention-notification',
  PAGE_PERMISSION_GRANTED = 'page-permission-granted',
+  PAGE_UPDATE_DIGEST = 'page-update-digest',

  AUDIT_LOG = 'audit-log',
  AUDIT_CLEANUP = 'audit-cleanup',
@@ -4,6 +4,7 @@ export interface IPageBacklinkJob {
  pageId: string;
  workspaceId: string;
  mentions: MentionNode[];
+  internalLinkSlugIds?: string[];
 }

 export interface IAddPageWatchersJob {
@@ -60,6 +61,13 @@ export interface IPageMentionNotificationJob {
  workspaceId: string;
 }

+export interface IPageUpdateNotificationJob {
+  pageId: string;
+  spaceId: string;
+  workspaceId: string;
+  actorIds: string[];
+}
+
 export interface IPermissionGrantedNotificationJob {
  userIds: string[];
  pageId: string;
@@ -11,7 +11,7 @@ export async function processBacklinks(
  backlinkRepo: BacklinkRepo,
  data: IPageBacklinkJob,
 ): Promise<void> {
-  const { pageId, mentions, workspaceId } = data;
+  const { pageId, mentions, workspaceId, internalLinkSlugIds = [] } = data;

  await executeTx(db, async (trx) => {
    const existingBacklinks = await trx
@@ -20,7 +20,28 @@ export async function processBacklinks(
      .where('sourcePageId', '=', pageId)
      .execute();

-    if (existingBacklinks.length === 0 && mentions.length === 0) {
+    const mentionTargetPageIds = mentions
+      .filter((mention) => mention.entityId !== pageId)
+      .map((mention) => mention.entityId);
+
+    let resolvedLinkPageIds: string[] = [];
+    if (internalLinkSlugIds.length > 0) {
+      const resolvedPages = await trx
+        .selectFrom('pages')
+        .select('id')
+        .where('slugId', 'in', internalLinkSlugIds)
+        .where('workspaceId', '=', workspaceId)
+        .execute();
+      resolvedLinkPageIds = resolvedPages
+        .map((p) => p.id)
+        .filter((id) => id !== pageId);
+    }
+
+    const allTargetPageIds = [
+      ...new Set([...mentionTargetPageIds, ...resolvedLinkPageIds]),
+    ];
+
+    if (existingBacklinks.length === 0 && allTargetPageIds.length === 0) {
      return;
    }

@@ -28,16 +49,12 @@ export async function processBacklinks(
      (backlink) => backlink.targetPageId,
    );

-    const targetPageIds = mentions
-      .filter((mention) => mention.entityId !== pageId)
-      .map((mention) => mention.entityId);
-
    let validTargetPages = [];
-    if (targetPageIds.length > 0) {
+    if (allTargetPageIds.length > 0) {
      validTargetPages = await trx
        .selectFrom('pages')
        .select('id')
-        .where('id', 'in', targetPageIds)
+        .where('id', 'in', allTargetPageIds)
        .where('workspaceId', '=', workspaceId)
        .execute();
    }
@@ -0,0 +1,35 @@
+import { Module } from '@nestjs/common';
+import { ThrottlerModule } from '@nestjs/throttler';
+import { ThrottlerStorageRedisService } from '@nest-lab/throttler-storage-redis';
+import { EnvironmentService } from '../environment/environment.service';
+import { EnvironmentModule } from '../environment/environment.module';
+import { parseRedisUrl } from '../../common/helpers';
+import Redis from 'ioredis';
+
+@Module({
+  imports: [
+    ThrottlerModule.forRootAsync({
+      imports: [EnvironmentModule],
+      useFactory: (environmentService: EnvironmentService) => {
+        const redisConfig = parseRedisUrl(environmentService.getRedisUrl());
+
+        return {
+          throttlers: [{ name: 'auth', ttl: 60_000, limit: 10 }],
+          errorMessage: 'Too many requests',
+          storage: new ThrottlerStorageRedisService(
+            new Redis({
+              host: redisConfig.host,
+              port: redisConfig.port,
+              password: redisConfig.password,
+              db: redisConfig.db,
+              family: redisConfig.family,
+              keyPrefix: 'throttle:',
+            }),
+          ),
+        };
+      },
+      inject: [EnvironmentService],
+    }),
+  ],
+})
+export class ThrottleModule {}
@@ -0,0 +1,76 @@
+import { Link, Section, Text } from '@react-email/components';
+import * as React from 'react';
+import { content, link, paragraph } from '../css/styles';
+import { getGreetingName, MailBody } from '../partials/partials';
+
+interface PageUpdate {
+  title: string;
+  url: string;
+  updatedBy: string[];
+}
+
+interface Props {
+  userName: string;
+  pageUpdates: PageUpdate[];
+  totalUpdates: number;
+}
+
+export const PageUpdateDigestEmail = ({
+  userName,
+  pageUpdates,
+  totalUpdates,
+}: Props) => {
+  return (
+    <MailBody>
+      <Section style={content}>
+        <Text style={paragraph}>
+          Hi {getGreetingName(userName)},
+        </Text>
+        <Text style={paragraph}>
+          There {totalUpdates === 1 ? 'has' : 'have'} been{' '}
+          <strong>
+            {totalUpdates} update{totalUpdates === 1 ? '' : 's'}
+          </strong>{' '}
+          since your last update.
+        </Text>
+
+        {pageUpdates.map((page, i) => (
+          <Section key={i} style={pageCard}>
+            <Text style={pageTitle}>
+              <Link href={page.url} style={link}>
+                {page.title}
+              </Link>
+            </Text>
+            {page.updatedBy.length > 0 && (
+              <Text style={updatedByText}>
+                Edited by {page.updatedBy.join(', ')}
+              </Text>
+            )}
+          </Section>
+        ))}
+      </Section>
+    </MailBody>
+  );
+};
+
+const pageCard = {
+  borderLeft: '3px solid #e8e5ef',
+  paddingLeft: '12px',
+  marginBottom: '12px',
+};
+
+const pageTitle = {
+  ...paragraph,
+  margin: '0 0 2px 0',
+  fontSize: 14,
+  fontWeight: 'bold' as const,
+};
+
+const updatedByText = {
+  ...paragraph,
+  margin: '0',
+  fontSize: 13,
+  color: '#666',
+};
+
+export default PageUpdateDigestEmail;
@@ -0,0 +1,38 @@
+import { Link, Section, Text } from '@react-email/components';
+import * as React from 'react';
+import { content, link, paragraph } from '../css/styles';
+import { EmailButton, getGreetingName, MailBody } from '../partials/partials';
+
+interface Props {
+  userName: string;
+  actorName: string;
+  pageTitle: string;
+  pageUrl: string;
+  spaceName: string;
+}
+
+export const PageUpdateEmail = ({
+  userName,
+  actorName,
+  pageTitle,
+  pageUrl,
+  spaceName,
+}: Props) => {
+  return (
+    <MailBody>
+      <Section style={content}>
+        <Text style={paragraph}>Hi {getGreetingName(userName)},</Text>
+        <Text style={paragraph}>
+          <strong>{actorName}</strong> updated{' '}
+          <Link href={pageUrl} style={link}>
+            <strong>{pageTitle}</strong>
+          </Link>{' '}
+          in <strong>{spaceName}</strong>.
+        </Text>
+      </Section>
+      <EmailButton href={pageUrl}>View page</EmailButton>
+    </MailBody>
+  );
+};
+
+export default PageUpdateEmail;
@@ -87,3 +87,7 @@ export function MailFooter() {
    </Section>
  );
 }
+
+export function getGreetingName(name?: string): string {
+  return name?.split(' ')[0] || 'there';
+}
@@ -10,6 +10,7 @@ import { TransformHttpResponseInterceptor } from './common/interceptors/http-res
 import { WsRedisIoAdapter } from './ws/adapter/ws-redis.adapter';
 import fastifyMultipart from '@fastify/multipart';
 import fastifyCookie from '@fastify/cookie';
+import fastifyIp from 'fastify-ip';
 import { InternalLogFilter } from './common/logger/internal-log-filter';

 async function bootstrap() {
@@ -45,6 +46,7 @@ async function bootstrap() {

  app.useWebSocketAdapter(redisIoAdapter);

+  await app.register(fastifyIp);
  await app.register(fastifyMultipart);
  await app.register(fastifyCookie);

@@ -1,7 +1,7 @@
 {
  "name": "docmost",
  "homepage": "https://docmost.com",
-  "version": "0.70.3",
+  "version": "0.71.1",
  "private": true,
  "scripts": {
    "build": "nx run-many -t build",
@@ -109,7 +109,8 @@
      "nanoid@^3": "3.3.8",
      "socket.io-parser": "4.2.6",
      "serialize-javascript": "7.0.3",
-      "lodash-es": "4.17.23",
+      "lodash-es": "4.18.1",
+      "lodash": "4.18.1",
      "@hono/node-server": "1.19.10",
      "undici": "7.24.0",
      "ajv@^6": "6.14.0",
@@ -126,7 +127,9 @@
      "yaml@>=1.0.0 <1.10.3": "1.10.3",
      "yaml@>=2.0.0 <2.8.3": "2.8.3",
      "path-to-regexp@^8": "8.4.0",
-      "brace-expansion@^5": "5.0.5"
+      "brace-expansion@^5": "5.0.5",
+      "@xmldom/xmldom": "0.8.12",
+      "handlebars": "4.7.9"
    },
    "neverBuiltDependencies": []
  }
Author	SHA1	Message	Date
Philipinho	eb8a834d2f	feat: watch space	2026-04-08 22:41:50 +01:00
Philipinho	4966f9b152	fix(deps): package updates	2026-04-07 10:24:46 +01:00
Philipinho	e1bbceb9a6	fix: logs	2026-04-07 10:10:41 +01:00
Philip Okugbe	895c1817ae	feat: bug fixes (#2084 ) * handle enter in inline code * fix: duplicate comment cache * track link nodes (backlinks) * fix en-US translation * fix internal a-links * overrides * 0.71.1	2026-04-05 13:45:36 +01:00
Philip Okugbe	642024ba9d	New Crowdin updates (#2078 )	2026-03-31 21:14:41 +01:00
Philipinho	147d028036	v0.71.0	2026-03-31 20:42:37 +01:00
Philipinho	992691e6e0	fix module import	2026-03-31 20:41:09 +01:00
Philip Okugbe	9aaa6c731c	feat: add AI_EMBEDDING_SUPPORTS_MRL env var to decouple pgvector dimensions from model API (#2079 ) Some embedding models don't accept a `dimensions` parameter. This adds an optional env var that controls whether the dimension is sent to the model API, while always using it for pgvector indexing. Preset models have this handled automatically; the env var allows explicit override for custom models.	2026-03-31 19:39:49 +01:00
Philipinho	fd91b11c6c	pin version	2026-03-31 16:06:44 +01:00
Philipinho	af8b0ddf3a	sync	2026-03-31 16:05:09 +01:00
Philip Okugbe	879aa2c3d8	feat: page update notifications (#2074 ) * feat: watchers notification and email preferences * fix: email copy * digests * clean up * fix * clean up * move backlinks queue-up to history processor * fix * fix keys * feat: group notifications * filter * adjust email digest window	2026-03-31 16:03:59 +01:00
Philip Okugbe	c180d0e487	feat: ratelimits (#2073 ) * feat: rate limits * ip	2026-03-30 15:38:44 +01:00
Philip Okugbe	a062f7a165	fix: enhance confluence importer (#2072 ) * fix placeholder * min resize dimensions * fix media links * fix	2026-03-30 13:16:40 +01:00