increase iframe default dimension

apps/client/package.json

@@ -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",

apps/client/public/locales/de-DE/translation.json

@@ -341,7 +341,6 @@
   "Insert horizontal rule divider": "Horizontale Trennlinie einfügen",
   "Upload any image from your device.": "Laden Sie ein beliebiges Bild von Ihrem Gerät hoch.",
   "Upload any video from your device.": "Laden Sie ein beliebiges Video von Ihrem Gerät hoch.",
-  "Upload any audio from your device.": "Laden Sie beliebige Audiodateien von Ihrem Gerät hoch.",
   "Upload any file from your device.": "Laden Sie eine beliebige Datei von Ihrem Gerät hoch.",
   "Uploading {{name}}": "Lade {{name}} hoch",
   "Uploading file": "Datei wird hochgeladen",
@@ -352,12 +351,6 @@
   "Divider": "Trennlinie",
   "Quote": "Zitat",
   "Image": "Bild",
-  "Audio": "Audio.",
-  "Embed PDF": "PDF einbetten",
-  "Upload and embed a PDF file.": "Laden Sie eine PDF-Datei hoch und betten Sie sie ein.",
-  "Embed as PDF": "Als PDF einbetten",
-  "Failed to load PDF": "Fehler beim Laden der PDF",
-  "Convert to attachment": "In Anhang umwandeln",
   "File attachment": "Dateianhang",
   "Toggle block": "Block umschalten",
   "Callout": "Hinweisbox",
@@ -449,9 +442,6 @@
   "Prevent members from sharing pages publicly.": "Verhindern Sie, dass Mitglieder Seiten öffentlich teilen.",
   "Toggle public sharing": "Öffentliches Teilen umschalten",
   "Toggle space public sharing": "Öffentliches Teilen im Bereich umschalten",
-  "Allow viewers to comment": "Zuschauern erlauben, Kommentare zu hinterlassen",
-  "Allow viewers to add comments on pages in this space.": "Erlauben Sie Zuschauern, Kommentare auf Seiten in diesem Bereich hinzuzufügen.",
-  "Toggle viewer comments": "Zuschauerkommentare umschalten",
   "Public sharing is disabled at the workspace level": "Öffentliches Teilen ist auf der Arbeitsbereichsebene deaktiviert",
   "Prevent pages in this space from being shared publicly.": "Verhindern Sie, dass Seiten in diesem Bereich öffentlich geteilt werden.",
   "Page permissions": "Seitenberechtigungen",

apps/client/public/locales/en-US/translation.json

@@ -184,20 +184,20 @@
   "Updated successfully": "Updated successfully.",
   "User": "User.",
   "Workspace": "Workspace.",
-  "Workspace Name": "Workspace name.",
+  "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 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.",
   "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.",
+  "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.",
@@ -223,12 +223,12 @@
   "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 unresolved successfully": "Comment unresolved successfully.",
   "Failed to resolve comment": "Failed to resolve comment",
   "Resolve comment": "Resolve comment.",
-  "Unresolve comment": "Mark comment as unresolved.",
+  "Unresolve comment": "Unresolve comment.",
-  "Resolve Comment Thread": "Resolve comment thread.",
+  "Resolve Comment Thread": "Resolve Comment Thread.",
-  "Unresolve Comment Thread": "Mark comment thread as unresolved.",
+  "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.",
@@ -370,7 +370,7 @@
   "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.",
+  "Draw and sketch excalidraw diagrams": "Draw and sketch excalidraw diagrams.",
   "Multiple": "Multiple.",
   "Turn into": "Turn into",
   "Text align": "Text align",
@@ -449,9 +449,6 @@
   "Prevent members from sharing pages publicly.": "Prevent members from sharing pages publicly.",
   "Toggle public sharing": "Toggle public sharing",
   "Toggle space public sharing": "Toggle space public sharing",
-  "Allow viewers to comment": "Allow viewers to comment",
-  "Allow viewers to add comments on pages in this space.": "Allow viewers to add comments on pages in this space.",
-  "Toggle viewer comments": "Toggle viewer comments",
   "Public sharing is disabled at the workspace level": "Public sharing is disabled at the workspace level",
   "Prevent pages in this space from being shared publicly.": "Prevent pages in this space from being shared publicly.",
   "Page permissions": "Page permissions",
@@ -674,24 +671,6 @@
   "<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",
-  "Email notifications": "Email notifications",
-  "Page updates": "Page updates",
-  "Get notified when pages you watch are updated.": "Get notified when pages you watch are updated.",
-  "Page mentions": "Page mentions",
-  "Get notified when someone mentions you on a page.": "Get notified when someone mentions you on a page.",
-  "Comment mentions": "Comment mentions",
-  "Get notified when someone mentions you in a comment.": "Get notified when someone mentions you in a comment.",
-  "New comments": "New comments",
-  "Get notified about new comments on threads you participate in.": "Get notified about new comments on threads you participate in.",
-  "Resolved comments": "Resolved comments",
-  "Get notified when your comment is resolved.": "Get notified when your comment is resolved.",
-  "You are now watching this page": "You are now watching this page",
-  "You are no longer watching this page": "You are no longer watching this page",
-  "Direct": "Direct",
-  "Updates": "Updates",
   "Today": "Today",
   "Yesterday": "Yesterday",
   "This week": "This week",
@@ -751,5 +730,7 @@
   "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."
+  "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.",
+  "Uploading {{name}}": "Uploading {{name}}",
+  "Uploading file": "Uploading file"
 }

apps/client/public/locales/es-ES/translation.json

@@ -341,7 +341,6 @@
   "Insert horizontal rule divider": "Insertar regla horizontal",
   "Upload any image from your device.": "Sube cualquier imagen desde tu dispositivo.",
   "Upload any video from your device.": "Sube cualquier video desde tu dispositivo.",
-  "Upload any audio from your device.": "Sube cualquier audio desde tu dispositivo.",
   "Upload any file from your device.": "Sube cualquier archivo desde tu dispositivo.",
   "Uploading {{name}}": "Subiendo {{name}}",
   "Uploading file": "Subiendo archivo",
@@ -352,12 +351,6 @@
   "Divider": "Divisor",
   "Quote": "Cita",
   "Image": "Imagen",
-  "Audio": "Audio.",
-  "Embed PDF": "Adjuntar PDF",
-  "Upload and embed a PDF file.": "Sube y adjunta un archivo PDF.",
-  "Embed as PDF": "Adjuntar como PDF",
-  "Failed to load PDF": "Error al cargar el PDF",
-  "Convert to attachment": "Convertir en adjunto",
   "File attachment": "Adjunto de archivo",
   "Toggle block": "Alternar bloque",
   "Callout": "Aviso",
@@ -449,9 +442,6 @@
   "Prevent members from sharing pages publicly.": "Evitar que los miembros compartan páginas públicamente.",
   "Toggle public sharing": "Alternar el uso compartido público",
   "Toggle space public sharing": "Alternar el uso compartido público del espacio",
-  "Allow viewers to comment": "Permitir que los espectadores comenten",
-  "Allow viewers to add comments on pages in this space.": "Permitir que los espectadores agreguen comentarios en las páginas de este espacio.",
-  "Toggle viewer comments": "Activar/desactivar comentarios de los espectadores",
   "Public sharing is disabled at the workspace level": "El uso compartido público está desactivado a nivel de espacio de trabajo",
   "Prevent pages in this space from being shared publicly.": "Evitar que las páginas en este espacio se compartan públicamente.",
   "Page permissions": "Permisos de la página},{",

apps/client/public/locales/fr-FR/translation.json

@@ -341,7 +341,6 @@
   "Insert horizontal rule divider": "Insérer un séparateur de règle horizontale",
   "Upload any image from your device.": "Téléchargez n'importe quelle image depuis votre appareil.",
   "Upload any video from your device.": "Téléchargez n'importe quelle vidéo depuis votre appareil.",
-  "Upload any audio from your device.": "Téléchargez n'importe quel fichier audio depuis votre appareil.",
   "Upload any file from your device.": "Téléchargez n'importe quel fichier depuis votre appareil.",
   "Uploading {{name}}": "Téléchargement de {{name}}",
   "Uploading file": "Téléchargement du fichier",
@@ -352,12 +351,6 @@
   "Divider": "Diviseur",
   "Quote": "Citation",
   "Image": "Image",
-  "Audio": "Audio.",
-  "Embed PDF": "Intégrer un PDF",
-  "Upload and embed a PDF file.": "Téléchargez et intégrez un fichier PDF.",
-  "Embed as PDF": "Intégrer comme PDF",
-  "Failed to load PDF": "Échec du chargement du PDF",
-  "Convert to attachment": "Convertir en pièce jointe",
   "File attachment": "Pièce jointe",
   "Toggle block": "Basculer le bloc",
   "Callout": "Appel",
@@ -422,7 +415,7 @@
   "Move page": "Déplacer la page",
   "Move page to a different space.": "Déplacer la page vers un autre espace.",
   "Real-time editor connection lost. Retrying...": "Connexion avec l'éditeur en temps réel perdue. Nouvelle tentative...",
-  "Table of contents": "Table des matières.",
+  "Table of contents": "",
   "Add headings (H1, H2, H3) to generate a table of contents.": "Ajoutez des titres (H1, H2, H3) pour générer une table des matières.",
   "Share": "Partager",
   "Public sharing": "Partage public",
@@ -449,9 +442,6 @@
   "Prevent members from sharing pages publicly.": "Empêcher les membres de partager des pages publiquement.",
   "Toggle public sharing": "Basculer le partage public",
   "Toggle space public sharing": "Basculer le partage public de l'espace",
-  "Allow viewers to comment": "Autoriser les spectateurs à commenter",
-  "Allow viewers to add comments on pages in this space.": "Autoriser les spectateurs à ajouter des commentaires sur les pages de cet espace.",
-  "Toggle viewer comments": "Basculer les commentaires des spectateurs",
   "Public sharing is disabled at the workspace level": "Le partage public est désactivé au niveau de l'espace de travail",
   "Prevent pages in this space from being shared publicly.": "Empêcher les pages de cet espace d'être partagées publiquement.",
   "Page permissions": "Autorisations de la page",

apps/client/public/locales/it-IT/translation.json

@@ -341,7 +341,6 @@
   "Insert horizontal rule divider": "Inserisci divisore di regola orizzontale",
   "Upload any image from your device.": "Carica un'immagine dal tuo dispositivo.",
   "Upload any video from your device.": "Carica qualsiasi video dal tuo dispositivo.",
-  "Upload any audio from your device.": "Carica qualsiasi audio dal tuo dispositivo.",
   "Upload any file from your device.": "Carica qualsiasi file dal tuo dispositivo.",
   "Uploading {{name}}": "Caricamento di {{name}}",
   "Uploading file": "Caricamento file",
@@ -352,12 +351,6 @@
   "Divider": "Divisore",
   "Quote": "Preventivo",
   "Image": "Immagine",
-  "Audio": "Audio.",
-  "Embed PDF": "Incorpora PDF",
-  "Upload and embed a PDF file.": "Carica e incorpora un file PDF.",
-  "Embed as PDF": "Incorpora come PDF",
-  "Failed to load PDF": "Caricamento del PDF non riuscito",
-  "Convert to attachment": "Converti in allegato",
   "File attachment": "Allegato file",
   "Toggle block": "Attiva blocco",
   "Callout": "Avviso",
@@ -449,9 +442,6 @@
   "Prevent members from sharing pages publicly.": "Impedisci ai membri di condividere pubblicamente le pagine.",
   "Toggle public sharing": "Attiva/disattiva la condivisione pubblica",
   "Toggle space public sharing": "Attiva/disattiva la condivisione pubblica nello spazio",
-  "Allow viewers to comment": "Consenti agli utenti di commentare",
-  "Allow viewers to add comments on pages in this space.": "Consenti agli utenti di aggiungere commenti alle pagine in questo spazio.",
-  "Toggle viewer comments": "Attiva/disattiva i commenti degli utenti",
   "Public sharing is disabled at the workspace level": "La condivisione pubblica è disabilitata a livello di area di lavoro",
   "Prevent pages in this space from being shared publicly.": "Impedisci che le pagine in questo spazio vengano condivise pubblicamente.",
   "Page permissions": "Autorizzazioni della pagina.",

apps/client/public/locales/ja-JP/translation.json

@@ -341,7 +341,6 @@
   "Insert horizontal rule divider": "区切り線を挿入します",
   "Upload any image from your device.": "デバイスから画像をアップロードします",
   "Upload any video from your device.": "デバイスから動画をアップロードします",
-  "Upload any audio from your device.": "デバイスから音声ファイルをアップロードします。",
   "Upload any file from your device.": "デバイスからファイルをアップロードします",
   "Uploading {{name}}": "{{name}} をアップロード中",
   "Uploading file": "ファイルをアップロード中",
@@ -352,12 +351,6 @@
   "Divider": "区切り線",
   "Quote": "引用",
   "Image": "画像",
-  "Audio": "音声。",
-  "Embed PDF": "PDFを埋め込む",
-  "Upload and embed a PDF file.": "PDFファイルをアップロードして埋め込みます。",
-  "Embed as PDF": "PDFとして埋め込む",
-  "Failed to load PDF": "PDFの読み込みに失敗しました",
-  "Convert to attachment": "添付ファイルに変換",
   "File attachment": "ファイル添付",
   "Toggle block": "ブロックを切り替える",
   "Callout": "コールアウト",
@@ -449,9 +442,6 @@
   "Prevent members from sharing pages publicly.": "メンバーがページを公開で共有するのを防ぐ。",
   "Toggle public sharing": "公開共有を切り替える",
   "Toggle space public sharing": "スペースの公開共有を切り替える",
-  "Allow viewers to comment": "閲覧者によるコメントを許可",
-  "Allow viewers to add comments on pages in this space.": "このスペース内のページに閲覧者がコメントを追加できるようにします。",
-  "Toggle viewer comments": "閲覧者コメントの切り替え",
   "Public sharing is disabled at the workspace level": "ワークスペースレベルで公開共有が無効になっています",
   "Prevent pages in this space from being shared publicly.": "このスペース内のページが公開で共有されるのを防ぐ。",
   "Page permissions": "ページのアクセス権",

apps/client/public/locales/ko-KR/translation.json

@@ -341,7 +341,6 @@
   "Insert horizontal rule divider": "가로 구분선 삽입",
   "Upload any image from your device.": "기기에서 이미지를 업로드하세요.",
   "Upload any video from your device.": "기기에서 비디오를 업로드하세요.",
-  "Upload any audio from your device.": "기기에서 오디오를 업로드하세요.",
   "Upload any file from your device.": "기기에서 파일을 업로드하세요.",
   "Uploading {{name}}": "{{name}} 업로드 중",
   "Uploading file": "파일 업로드 중",
@@ -352,12 +351,6 @@
   "Divider": "구분선",
   "Quote": "인용",
   "Image": "이미지",
-  "Audio": "오디오.",
-  "Embed PDF": "PDF 임베드",
-  "Upload and embed a PDF file.": "PDF 파일을 업로드하고 임베드하세요.",
-  "Embed as PDF": "PDF로 임베드",
-  "Failed to load PDF": "PDF 로드 실패",
-  "Convert to attachment": "첨부 파일로 변환",
   "File attachment": "파일 첨부",
   "Toggle block": "블록 토글",
   "Callout": "경고 상자",
@@ -449,9 +442,6 @@
   "Prevent members from sharing pages publicly.": "멤버들이 페이지를 공개적으로 공유하지 못하도록 방지하십시오.",
   "Toggle public sharing": "공유 전환",
   "Toggle space public sharing": "공간 공유 전환",
-  "Allow viewers to comment": "뷰어가 댓글을 달 수 있도록 허용",
-  "Allow viewers to add comments on pages in this space.": "이 공간 내 페이지에 뷰어가 댓글을 추가할 수 있도록 허용합니다.",
-  "Toggle viewer comments": "뷰어 댓글 전환",
   "Public sharing is disabled at the workspace level": "워크스페이스 수준에서 공유가 비활성화되었습니다.",
   "Prevent pages in this space from being shared publicly.": "이 공간의 페이지가 공개적으로 공유되지 않도록 방지하십시오.",
   "Page permissions": "페이지 권한},{",

apps/client/public/locales/nl-NL/translation.json

@@ -341,7 +341,6 @@
   "Insert horizontal rule divider": "Horizontale lijn invoegen",
   "Upload any image from your device.": "Upload een afbeelding vanaf uw apparaat.",
   "Upload any video from your device.": "Upload een video vanaf uw apparaat.",
-  "Upload any audio from your device.": "Upload een audio vanaf uw apparaat.",
   "Upload any file from your device.": "Upload een bestand vanaf uw apparaat.",
   "Uploading {{name}}": "Uploaden {{name}}",
   "Uploading file": "Bestand uploaden",
@@ -352,12 +351,6 @@
   "Divider": "Scheidingslijn",
   "Quote": "Quote",
   "Image": "Afbeelding",
-  "Audio": "Audio.",
-  "Embed PDF": "PDF insluiten",
-  "Upload and embed a PDF file.": "Upload en sluit een PDF-bestand in.",
-  "Embed as PDF": "Insluiten als PDF",
-  "Failed to load PDF": "Laden van PDF mislukt",
-  "Convert to attachment": "Converteren naar bijlage",
   "File attachment": "Bestand bijlage",
   "Toggle block": "Schakel blok in/uit",
   "Callout": "Opmerking",
@@ -449,9 +442,6 @@
   "Prevent members from sharing pages publicly.": "Voorkom dat leden pagina's openbaar delen.",
   "Toggle public sharing": "Wissel openbaar delen",
   "Toggle space public sharing": "Wissel openbaar delen van ruimte",
-  "Allow viewers to comment": "Toestaan dat kijkers reageren",
-  "Allow viewers to add comments on pages in this space.": "Sta kijkers toe om reacties toe te voegen op pagina\u0019s in deze ruimte.",
-  "Toggle viewer comments": "Reacties van kijkers in- of uitschakelen",
   "Public sharing is disabled at the workspace level": "Openbaar delen is uitgeschakeld op werkruimteniveau",
   "Prevent pages in this space from being shared publicly.": "Voorkom dat pagina's in deze ruimte openbaar worden gedeeld.",
   "Page permissions": "Pagina rechten",

apps/client/public/locales/pt-BR/translation.json

@@ -341,7 +341,6 @@
   "Insert horizontal rule divider": "Insira um divisor horizontal",
   "Upload any image from your device.": "Envie qualquer imagem do seu dispositivo.",
   "Upload any video from your device.": "Envie qualquer vídeo do seu dispositivo.",
-  "Upload any audio from your device.": "Envie qualquer áudio do seu dispositivo.",
   "Upload any file from your device.": "Envie qualquer arquivo do seu dispositivo.",
   "Uploading {{name}}": "Enviando {{name}}",
   "Uploading file": "Enviando arquivo",
@@ -352,12 +351,6 @@
   "Divider": "Divisor",
   "Quote": "Citação",
   "Image": "Imagem",
-  "Audio": "Áudio.",
-  "Embed PDF": "Incorporar PDF",
-  "Upload and embed a PDF file.": "Envie e incorpore um arquivo PDF.",
-  "Embed as PDF": "Incorporar como PDF",
-  "Failed to load PDF": "Falha ao carregar PDF",
-  "Convert to attachment": "Converter em anexo",
   "File attachment": "Anexo de arquivo",
   "Toggle block": "Bloco colapsável",
   "Callout": "Aviso",
@@ -449,9 +442,6 @@
   "Prevent members from sharing pages publicly.": "Impedir que os membros compartilhem páginas publicamente.",
   "Toggle public sharing": "Alternar compartilhamento público",
   "Toggle space public sharing": "Alternar compartilhamento público do espaço",
-  "Allow viewers to comment": "Permitir que os visualizadores comentem",
-  "Allow viewers to add comments on pages in this space.": "Permitir que os visualizadores adicionem comentários em páginas deste espaço.",
-  "Toggle viewer comments": "Ativar/desativar comentários de visualizadores",
   "Public sharing is disabled at the workspace level": "O compartilhamento público está desativado no nível do espaço de trabalho",
   "Prevent pages in this space from being shared publicly.": "Impedir que as páginas neste espaço sejam compartilhadas publicamente.",
   "Page permissions": "Permissões da página},{",

apps/client/public/locales/ru-RU/translation.json

@@ -341,7 +341,6 @@
   "Insert horizontal rule divider": "Вставить горизонтальный разделитель",
   "Upload any image from your device.": "Загрузить любое изображение с вашего устройства.",
   "Upload any video from your device.": "Загрузить любое видео с вашего устройства.",
-  "Upload any audio from your device.": "Загрузите любой аудиофайл с вашего устройства.",
   "Upload any file from your device.": "Загрузить любой файл с вашего устройства.",
   "Uploading {{name}}": "Загрузка {{name}}",
   "Uploading file": "Загрузка файла",
@@ -352,12 +351,6 @@
   "Divider": "Разделитель",
   "Quote": "Цитата",
   "Image": "Изображение",
-  "Audio": "Аудио.",
-  "Embed PDF": "Встроить PDF",
-  "Upload and embed a PDF file.": "Загрузите и встроите PDF-файл.",
-  "Embed as PDF": "Встроить как PDF",
-  "Failed to load PDF": "Не удалось загрузить PDF",
-  "Convert to attachment": "Преобразовать в вложение",
   "File attachment": "Прикрепленный файл",
   "Toggle block": "Сворачиваемый блок",
   "Callout": "Выноска",
@@ -449,9 +442,6 @@
   "Prevent members from sharing pages publicly.": "Запретить участникам делиться страницами публично.",
   "Toggle public sharing": "Переключить общий доступ",
   "Toggle space public sharing": "Переключить общий доступ для пространства",
-  "Allow viewers to comment": "Разрешить зрителям комментировать",
-  "Allow viewers to add comments on pages in this space.": "Разрешить зрителям добавлять комментарии на страницах в этом пространстве.",
-  "Toggle viewer comments": "Переключить комментарии зрителей",
   "Public sharing is disabled at the workspace level": "Общий доступ отключен на уровне рабочего пространства",
   "Prevent pages in this space from being shared publicly.": "Запретить делиться страницами в этом пространстве публично.",
   "Page permissions": "Права доступа к странице},{",

apps/client/public/locales/uk-UA/translation.json

@@ -341,7 +341,6 @@
   "Insert horizontal rule divider": "Вставити горизонтальний роздільник",
   "Upload any image from your device.": "Завантажити будь-яке зображення з вашого пристрою.",
   "Upload any video from your device.": "Завантажити будь-яке відео з вашого пристрою.",
-  "Upload any audio from your device.": "Завантажте будь-який аудіофайл зі свого пристрою.",
   "Upload any file from your device.": "Завантажити будь-який файл з вашого пристрою.",
   "Uploading {{name}}": "Завантаження {{name}}",
   "Uploading file": "Завантаження файлу",
@@ -352,12 +351,6 @@
   "Divider": "Роздільник",
   "Quote": "Цитата",
   "Image": "Зображення",
-  "Audio": "Аудіо.",
-  "Embed PDF": "Вбудувати PDF",
-  "Upload and embed a PDF file.": "Завантажте та вбудуйте файл PDF.",
-  "Embed as PDF": "Вбудувати як PDF",
-  "Failed to load PDF": "Не вдалося завантажити PDF",
-  "Convert to attachment": "Перетворити на вкладення",
   "File attachment": "Прикріплений файл",
   "Toggle block": "Блок, що згортається",
   "Callout": "Виноска",
@@ -449,9 +442,6 @@
   "Prevent members from sharing pages publicly.": "Перешкодити учасникам публічно ділитися сторінками.",
   "Toggle public sharing": "Перемикання публічного доступу",
   "Toggle space public sharing": "Перемикання публічного доступу до просторів",
-  "Allow viewers to comment": "Дозволити глядачам коментувати",
-  "Allow viewers to add comments on pages in this space.": "Дозволити глядачам додавати коментарі на сторінках у цьому просторі.",
-  "Toggle viewer comments": "Увімкнути або вимкнути коментарі глядачів",
   "Public sharing is disabled at the workspace level": "Публічний доступ вимкнуто на рівні робочого простору",
   "Prevent pages in this space from being shared publicly.": "Перешкодити публічному поширенню сторінок у цьому просторі.",
   "Page permissions": "Права доступу до сторінки.",

apps/client/public/locales/zh-CN/translation.json

@@ -341,7 +341,6 @@
   "Insert horizontal rule divider": "插入水平分割线",
   "Upload any image from your device.": "从设备上传任何图像",
   "Upload any video from your device.": "从设备上传任何视频",
-  "Upload any audio from your device.": "从您的设备上传任意音频文件。",
   "Upload any file from your device.": "从设备上传任何文件",
   "Uploading {{name}}": "正在上传{{name}}",
   "Uploading file": "正在上传文件",
@@ -352,12 +351,6 @@
   "Divider": "分割线",
   "Quote": "引用",
   "Image": "图像",
-  "Audio": "音频。",
-  "Embed PDF": "嵌入 PDF",
-  "Upload and embed a PDF file.": "上传并嵌入 PDF 文件。",
-  "Embed as PDF": "作为 PDF 嵌入",
-  "Failed to load PDF": "加载 PDF 失败",
-  "Convert to attachment": "转换为附件",
   "File attachment": "文件附件",
   "Toggle block": "切换块",
   "Callout": "标注块",
@@ -449,9 +442,6 @@
   "Prevent members from sharing pages publicly.": "阻止成员公开分享页面。",
   "Toggle public sharing": "切换公开分享",
   "Toggle space public sharing": "切换空间公开分享",
-  "Allow viewers to comment": "允许观众评论",
-  "Allow viewers to add comments on pages in this space.": "允许观众在此空间的页面上添加评论。",
-  "Toggle viewer comments": "切换观众评论",
   "Public sharing is disabled at the workspace level": "公开分享在工作区级别被禁用",
   "Prevent pages in this space from being shared publicly.": "阻止此空间中的页面被公开分享。",
   "Page permissions": "页面权限},{",

apps/client/src/ee/features.ts

@@ -16,5 +16,4 @@ export const Feature = {
   AUDIT_LOGS: 'audit:logs',
   RETENTION: 'retention',
   SHARING_CONTROLS: 'sharing:controls',
-  VIEWER_COMMENTS: 'comment:viewer',
 } as const;

apps/client/src/ee/security/components/space-viewer-comments-toggle.tsx

@@ -1,61 +0,0 @@
-import { Group, Text, Switch, Tooltip } from "@mantine/core";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { ISpace } from "@/features/space/types/space.types.ts";
-import { useUpdateSpaceMutation } from "@/features/space/queries/space-query.ts";
-import { useHasFeature } from "@/ee/hooks/use-feature.ts";
-import { Feature } from "@/ee/features.ts";
-import { useUpgradeLabel } from "@/ee/hooks/use-upgrade-label.ts";
-
-type SpaceViewerCommentsToggleProps = {
-  space: ISpace;
-};
-
-export default function SpaceViewerCommentsToggle({
-  space,
-}: SpaceViewerCommentsToggleProps) {
-  const { t } = useTranslation();
-  const hasViewerComments = useHasFeature(Feature.VIEWER_COMMENTS);
-  const upgradeLabel = useUpgradeLabel();
-  const isDisabled = !hasViewerComments;
-  const [checked, setChecked] = useState(
-    space.settings?.comments?.allowViewerComments === true,
-  );
-  const updateSpaceMutation = useUpdateSpaceMutation();
-
-  const handleChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
-    const value = event.currentTarget.checked;
-    try {
-      await updateSpaceMutation.mutateAsync({
-        spaceId: space.id,
-        allowViewerComments: value,
-      });
-      setChecked(value);
-    } catch {
-      // error handled by mutation
-    }
-  };
-
-  return (
-    <Group justify="space-between" wrap="nowrap" gap="xl">
-      <div>
-        <Text size="md">{t("Allow viewers to comment")}</Text>
-        <Text size="sm" c="dimmed">
-          {t("Allow viewers to add comments on pages in this space.")}
-        </Text>
-      </div>
-      <Tooltip
-        label={upgradeLabel}
-        disabled={!isDisabled}
-        refProp="rootRef"
-      >
-        <Switch
-          checked={checked}
-          onChange={handleChange}
-          disabled={isDisabled}
-          aria-label={t("Toggle viewer comments")}
-        />
-      </Tooltip>
-    </Group>
-  );
-}

apps/client/src/features/comment/atoms/comment-atom.ts

@@ -3,15 +3,3 @@ import { atom } from 'jotai';
 export const showCommentPopupAtom = atom<boolean>(false);
 export const activeCommentIdAtom = atom<string>('');
 export const draftCommentIdAtom = atom<string>('');
-
-// Read-only comment state
-export const showReadOnlyCommentPopupAtom = atom<boolean>(false);
-export type YjsSelection = {
-  anchor: any;
-  head: any;
-};
-export type ReadOnlyCommentData = {
-  yjsSelection: YjsSelection;
-  selectedText: string;
-};
-export const readOnlyCommentDataAtom = atom<ReadOnlyCommentData | null>(null);

apps/client/src/features/comment/components/comment-dialog.tsx

@@ -6,8 +6,6 @@ import {
   activeCommentIdAtom,
   draftCommentIdAtom,
   showCommentPopupAtom,
-  showReadOnlyCommentPopupAtom,
-  readOnlyCommentDataAtom,
 } from "@/features/comment/atoms/comment-atom";
 import CommentEditor from "@/features/comment/components/comment-editor";
 import CommentActions from "@/features/comment/components/comment-actions";
@@ -21,15 +19,12 @@ import { useTranslation } from "react-i18next";
 interface CommentDialogProps {
   editor: ReturnType<typeof useEditor>;
   pageId: string;
-  readOnly?: boolean;
 }
 
-function CommentDialog({ editor, pageId, readOnly }: CommentDialogProps) {
+function CommentDialog({ editor, pageId }: CommentDialogProps) {
   const { t } = useTranslation();
   const [comment, setComment] = useState("");
   const [, setShowCommentPopup] = useAtom(showCommentPopupAtom);
-  const [, setShowReadOnlyCommentPopup] = useAtom(showReadOnlyCommentPopupAtom);
-  const [readOnlyCommentData, setReadOnlyCommentData] = useAtom(readOnlyCommentDataAtom);
   const [, setActiveCommentId] = useAtom(activeCommentIdAtom);
   const [draftCommentId, setDraftCommentId] = useAtom(draftCommentIdAtom);
   const [currentUser] = useAtom(currentUserAtom);
@@ -39,17 +34,11 @@ function CommentDialog({ editor, pageId, readOnly }: CommentDialogProps) {
     handleDialogClose();
   });
   const createCommentMutation = useCreateCommentMutation();
-  const isPending = createCommentMutation.isPending;
+  const { isPending } = createCommentMutation;
 
   const handleDialogClose = () => {
-    if (readOnly) {
+    setShowCommentPopup(false);
-      setShowReadOnlyCommentPopup(false);
+    editor.chain().focus().unsetCommentDecoration().run();
-      // @ts-ignore
-      setReadOnlyCommentData(null);
-    } else {
-      setShowCommentPopup(false);
-      editor.chain().focus().unsetCommentDecoration().run();
-    }
   };
 
   const getSelectedText = () => {
@@ -58,11 +47,6 @@ function CommentDialog({ editor, pageId, readOnly }: CommentDialogProps) {
   };
 
   const handleAddComment = async () => {
-    if (readOnly) {
-      await handleAddReadOnlyComment();
-      return;
-    }
-
     try {
       const selectedText = getSelectedText();
       const commentData = {
@@ -81,6 +65,7 @@ function CommentDialog({ editor, pageId, readOnly }: CommentDialogProps) {
         .run();
       setActiveCommentId(createdComment.id);
 
+      //unselect text to close bubble menu
       editor.commands.setTextSelection({ from: editor.view.state.selection.from, to: editor.view.state.selection.from });
 
       setAsideState({ tab: "comments", isAsideOpen: true });
@@ -100,33 +85,6 @@ function CommentDialog({ editor, pageId, readOnly }: CommentDialogProps) {
     }
   };
 
-  const handleAddReadOnlyComment = async () => {
-    if (!readOnlyCommentData) return;
-
-    try {
-      const createdComment = await createCommentMutation.mutateAsync({
-        pageId,
-        content: JSON.stringify(comment),
-        selection: readOnlyCommentData.selectedText,
-        type: "inline",
-        yjsSelection: readOnlyCommentData.yjsSelection,
-      });
-
-      setActiveCommentId(createdComment.id);
-      setAsideState({ tab: "comments", isAsideOpen: true });
-
-      setTimeout(() => {
-        const selector = `div[data-comment-id="${createdComment.id}"]`;
-        const commentElement = document.querySelector(selector);
-        commentElement?.scrollIntoView({ behavior: "smooth", block: "center" });
-      }, 400);
-    } finally {
-      setShowReadOnlyCommentPopup(false);
-      // @ts-ignore
-      setReadOnlyCommentData(null);
-    }
-  };
-
   const handleCommentEditorChange = (newContent: any) => {
     setComment(newContent);
   };

apps/client/src/features/comment/components/comment-list-with-tabs.tsx

@@ -44,9 +44,7 @@ function CommentListWithTabs() {
   const [isLoading, setIsLoading] = useState(false);
   const { data: space } = useGetSpaceBySlugQuery(page?.space?.slug);
 
-  const canComment =
+  const canComment = page?.permissions?.canEdit ?? false;
-    (page?.permissions?.canEdit ?? false) ||
-    (space?.settings?.comments?.allowViewerComments === true);
 
   // Separate active and resolved comments
   const { activeComments, resolvedComments } = useMemo(() => {
@@ -155,7 +153,7 @@ function CommentListWithTabs() {
         )}
       </Paper>
     ),
-    [comments, handleAddReply, isLoading, space?.membership?.role, canComment],
+    [comments, handleAddReply, isLoading, space?.membership?.role],
   );
 
   if (isCommentsLoading) {

apps/client/src/features/comment/components/comment-menu.tsx

@@ -75,7 +75,7 @@ function CommentMenu({
               {isResolved ? t("Re-open comment") : t("Resolve comment")}
             </Menu.Item>
           ) : (
-            <Tooltip label={upgradeLabel} position="left" withinPortal={false}>
+            <Tooltip label={upgradeLabel} position="left">
               <Menu.Item disabled leftSection={<IconCircleCheck size={14} />}>
                 {t("Resolve comment")}
               </Menu.Item>

apps/client/src/features/comment/types/comment.types.ts

@@ -17,10 +17,6 @@ export interface IComment {
   deletedAt?: Date;
   creator: IUser;
   resolvedBy?: IUser;
-  yjsSelection?: {
-    anchor: any;
-    head: any;
-  };
 }
 
 export interface ICommentData {

apps/client/src/features/editor/components/attachment/attachment-view.tsx

@@ -10,7 +10,7 @@ import { useCallback } from "react";
 export default function AttachmentView(props: NodeViewProps) {
   const { t } = useTranslation();
   const { editor, node, getPos, selected } = props;
-  const { url, name, size, mime, attachmentId, placeholder } = node.attrs;
+  const { url, name, size, mime, attachmentId } = node.attrs;
   const { hovered, ref } = useHover();
 
   const isPdf = mime === "application/pdf" || name?.toLowerCase().endsWith(".pdf");
@@ -49,14 +49,14 @@ export default function AttachmentView(props: NodeViewProps) {
           h={25}
         >
           <Group wrap="nowrap" gap="sm" style={{ minWidth: 0, flex: 1 }}>
-            {!url && placeholder ? (
+            {url ? (
-              <Loader size={20} style={{ flexShrink: 0 }} />
-            ) : (
               <IconPaperclip size={20} style={{ flexShrink: 0 }} />
+            ) : (
+              <Loader size={20} style={{ flexShrink: 0 }} />
             )}
 
             <Text component="span" size="md" truncate="end" style={{ minWidth: 0 }}>
-              {!url && placeholder ? t("Uploading {{name}}", { name }) : name}
+              {url ? name : t("Uploading {{name}}", { name })}
             </Text>
 
             <Text component="span" size="sm" c="dimmed" style={{ flexShrink: 0 }}>

apps/client/src/features/editor/components/audio/audio-view.tsx

@@ -29,7 +29,7 @@ export default function AudioView(props: NodeViewProps) {
 
   return (
     <NodeViewWrapper data-drag-handle>
-      <div className={`${classes.audioWrapper} ${!safeSrc && placeholder ? classes.skeleton : ''}`}>
+      <div className={`${classes.audioWrapper} ${!safeSrc ? classes.skeleton : ''}`}>
         {safeSrc && (
           <audio
             className={classes.audio}
@@ -49,7 +49,7 @@ export default function AudioView(props: NodeViewProps) {
             <Loader size={20} pos="absolute" top={6} right={6} />
           </Group>
         )}
-        {!safeSrc && !previewSrc && placeholder && (
+        {!safeSrc && !previewSrc && (
           <Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md" h={54}>
             <Loader size={20} style={{ flexShrink: 0 }} />
             <Text component="span" size="sm" truncate="end">
@@ -59,9 +59,6 @@ export default function AudioView(props: NodeViewProps) {
             </Text>
           </Group>
         )}
-        {!safeSrc && !previewSrc && !placeholder && (
-          <audio className={classes.audio} controls />
-        )}
       </div>
     </NodeViewWrapper>
   );

apps/client/src/features/editor/components/bubble-menu/readonly-bubble-menu.tsx

@@ -1,159 +0,0 @@
-import type { Editor } from "@tiptap/react";
-import { TextSelection } from "@tiptap/pm/state";
-import { FC, useCallback, useEffect, useRef, useState } from "react";
-import { IconMessage } from "@tabler/icons-react";
-import classes from "./bubble-menu.module.css";
-import { ActionIcon, Tooltip } from "@mantine/core";
-import { useAtom } from "jotai";
-import {
-  showReadOnlyCommentPopupAtom,
-  readOnlyCommentDataAtom,
-} from "@/features/comment/atoms/comment-atom";
-import { useTranslation } from "react-i18next";
-import { getRelativeSelection, ySyncPluginKey } from "@tiptap/y-tiptap";
-
-type ReadonlyBubbleMenuProps = {
-  editor: Editor;
-};
-
-export const ReadonlyBubbleMenu: FC<ReadonlyBubbleMenuProps> = ({ editor }) => {
-  const { t } = useTranslation();
-  const [showReadOnlyCommentPopup, setShowReadOnlyCommentPopup] = useAtom(
-    showReadOnlyCommentPopupAtom,
-  );
-  const [, setReadOnlyCommentData] = useAtom(readOnlyCommentDataAtom);
-  const menuRef = useRef<HTMLDivElement>(null);
-  const [visible, setVisible] = useState(false);
-  const [position, setPosition] = useState({ top: 0, left: 0 });
-  const isInteractingRef = useRef(false);
-
-  const updateMenuPosition = useCallback(() => {
-    if (isInteractingRef.current) return;
-
-    const pmSelection = editor.state.selection;
-    if (!(pmSelection instanceof TextSelection) || pmSelection.empty) {
-      setVisible(false);
-      return;
-    }
-
-    const selection = window.getSelection();
-    if (
-      !selection ||
-      selection.isCollapsed ||
-      selection.rangeCount === 0 ||
-      showReadOnlyCommentPopup
-    ) {
-      setVisible(false);
-      return;
-    }
-
-    const editorDom = editor.view.dom;
-    if (
-      !editorDom.contains(selection.anchorNode) ||
-      !editorDom.contains(selection.focusNode)
-    ) {
-      setVisible(false);
-      return;
-    }
-
-    const range = selection.getRangeAt(0);
-    const rect = range.getBoundingClientRect();
-
-    if (rect.width === 0) {
-      setVisible(false);
-      return;
-    }
-
-    const editorRect = editorDom
-      .closest(".editor-container")
-      ?.getBoundingClientRect();
-    if (!editorRect) {
-      setVisible(false);
-      return;
-    }
-
-    setPosition({
-      top: rect.top - editorRect.top - 44,
-      left: rect.left - editorRect.left + rect.width / 2,
-    });
-    setVisible(true);
-  }, [editor, showReadOnlyCommentPopup]);
-
-  useEffect(() => {
-    const handleSelectionChange = () => {
-      updateMenuPosition();
-    };
-
-    document.addEventListener("selectionchange", handleSelectionChange);
-    return () => {
-      document.removeEventListener("selectionchange", handleSelectionChange);
-    };
-  }, [updateMenuPosition]);
-
-  useEffect(() => {
-    if (showReadOnlyCommentPopup) {
-      setVisible(false);
-    }
-  }, [showReadOnlyCommentPopup]);
-
-  const handleCommentClick = () => {
-    if (!editor) return;
-
-    const view = editor.view;
-    const ystate = ySyncPluginKey.getState(view.state);
-
-    if (ystate?.binding) {
-      const selection = getRelativeSelection(ystate.binding, view.state);
-      const { from, to } = editor.state.selection;
-      const selectedText = editor.state.doc.textBetween(from, to);
-
-      // @ts-ignore
-      setReadOnlyCommentData({
-        yjsSelection: {
-          anchor: selection.anchor,
-          head: selection.head,
-        },
-        selectedText,
-      });
-
-      setShowReadOnlyCommentPopup(true);
-      setVisible(false);
-    }
-  };
-
-  if (!visible) return null;
-
-  return (
-    <div
-      ref={menuRef}
-      style={{
-        position: "absolute",
-        top: position.top,
-        left: position.left,
-        transform: "translateX(-50%)",
-        zIndex: 199,
-      }}
-    >
-      <div className={classes.bubbleMenu}>
-        <Tooltip label={t("Comment")} withArrow withinPortal={false}>
-          <ActionIcon
-            variant="default"
-            size="lg"
-            radius="6px"
-            aria-label={t("Comment")}
-            style={{ border: "none" }}
-            onMouseDown={(e) => {
-              e.preventDefault();
-              e.stopPropagation();
-              isInteractingRef.current = true;
-              handleCommentClick();
-              isInteractingRef.current = false;
-            }}
-          >
-            <IconMessage size={16} stroke={2} />
-          </ActionIcon>
-        </Tooltip>
-      </div>
-    </div>
-  );
-};

apps/client/src/features/editor/components/image/image-view.tsx

@@ -33,7 +33,7 @@ export default function ImageView(props: NodeViewProps) {
         className={clsx(
           selected && "ProseMirror-selectednode",
           classes.imageWrapper,
-          !src && placeholder && classes.skeleton,
+          !src && classes.skeleton,
           alignClass,
         )}
         style={{
@@ -55,7 +55,7 @@ export default function ImageView(props: NodeViewProps) {
             <Loader size={20} pos="absolute" bottom={6} right={6} />
           </Group>
         )}
-        {!src && !previewSrc && placeholder && (
+        {!src && !previewSrc && (
           <Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md">
             <Loader size={20} style={{ flexShrink: 0 }} />
             <Text component="span" size="sm" truncate="end">

apps/client/src/features/editor/components/mention/mention-list.tsx

@@ -294,7 +294,6 @@ const MentionList = forwardRef<any, MentionListProps>((props, ref) => {
         w={popupWidth}
         scrollbars={"y"}
         scrollbarSize={6}
-        overscrollBehavior={"contain"}
         styles={{ content: { minWidth: 0 } }}
       >
         {renderItems?.map((item, index) => {

apps/client/src/features/editor/components/pdf/pdf-view.tsx

@@ -73,17 +73,15 @@ export default function PdfView(props: NodeViewProps) {
   if (!src || !safeSrc) {
     return (
       <NodeViewWrapper data-drag-handle>
-        <div className={`${classes.pdfWrapper} ${placeholder ? classes.skeleton : ''}`} style={{ height: placeholder ? 600 : undefined }}>
+        <div className={`${classes.pdfWrapper} ${classes.skeleton}`} style={{ height: 600 }}>
-          {placeholder && (
+          <Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md">
-            <Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md">
+            <Loader size={20} style={{ flexShrink: 0 }} />
-              <Loader size={20} style={{ flexShrink: 0 }} />
+            <Text component="span" size="sm" truncate="end">
-              <Text component="span" size="sm" truncate="end">
+              {placeholder?.name
-                {placeholder?.name
+                ? t("Uploading {{name}}", { name: placeholder.name })
-                  ? t("Uploading {{name}}", { name: placeholder.name })
+                : t("Uploading file")}
-                  : t("Uploading file")}
+            </Text>
-              </Text>
+          </Group>
-            </Group>
-          )}
         </div>
       </NodeViewWrapper>
     );

apps/client/src/features/editor/components/slash-menu/command-list.tsx

@@ -87,13 +87,7 @@ const CommandList = ({
 
   return flatItems.length > 0 ? (
     <Paper id="slash-command" shadow="md" p="xs" withBorder>
-      <ScrollArea
+      <ScrollArea viewportRef={viewportRef} h={350} w={270} scrollbarSize={8}>
-        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">
@@ -109,7 +103,10 @@ const CommandList = ({
                 })}
               >
                 <Group>
-                  <ActionIcon variant="default" component="div">
+                  <ActionIcon
+                    variant="default"
+                    component="div"
+                  >
                     <item.icon size={18} />
                   </ActionIcon>
 

apps/client/src/features/editor/components/slash-menu/render-items.ts

@@ -49,7 +49,7 @@ const renderItems = () => {
       getReferenceClientRect = props.clientRect;
 
       popup = document.createElement("div");
-      popup.style.zIndex = "199";
+      popup.style.zIndex = "9999";
       popup.style.position = "absolute";
       popup.style.top = "0";
       popup.style.left = "0";

apps/client/src/features/editor/components/table/table-menu.tsx

@@ -34,7 +34,7 @@ export const TableMenu = React.memo(
         if (isTextSelected(editor)) return false;
         return editor.isActive("table") && !isCellSelection(state.selection);
       },
-      [editor],
+      [editor]
     );
 
     const getReferencedVirtualElement = useCallback(() => {
@@ -121,11 +121,7 @@ export const TableMenu = React.memo(
         shouldShow={shouldShow}
       >
         <div className={classes.toolbar}>
-          <Tooltip
+          <Tooltip position="top" label={t("Add left column")}>
-            position="top"
-            label={t("Add left column")}
-            withinPortal={false}
-          >
             <ActionIcon
               onClick={addColumnLeft}
               variant="subtle"
@@ -136,11 +132,7 @@ export const TableMenu = React.memo(
             </ActionIcon>
           </Tooltip>
 
-          <Tooltip
+          <Tooltip position="top" label={t("Add right column")}>
-            position="top"
-            label={t("Add right column")}
-            withinPortal={false}
-          >
             <ActionIcon
               onClick={addColumnRight}
               variant="subtle"
@@ -151,11 +143,7 @@ export const TableMenu = React.memo(
             </ActionIcon>
           </Tooltip>
 
-          <Tooltip
+          <Tooltip position="top" label={t("Delete column")}>
-            position="top"
-            label={t("Delete column")}
-            withinPortal={false}
-          >
             <ActionIcon
               onClick={deleteColumn}
               variant="subtle"
@@ -168,11 +156,7 @@ export const TableMenu = React.memo(
 
           <div className={classes.divider} />
 
-          <Tooltip
+          <Tooltip position="top" label={t("Add row above")}>
-            position="top"
-            label={t("Add row above")}
-            withinPortal={false}
-          >
             <ActionIcon
               onClick={addRowAbove}
               variant="subtle"
@@ -183,11 +167,7 @@ export const TableMenu = React.memo(
             </ActionIcon>
           </Tooltip>
 
-          <Tooltip
+          <Tooltip position="top" label={t("Add row below")}>
-            position="top"
-            label={t("Add row below")}
-            withinPortal={false}
-          >
             <ActionIcon
               onClick={addRowBelow}
               variant="subtle"
@@ -198,7 +178,7 @@ export const TableMenu = React.memo(
             </ActionIcon>
           </Tooltip>
 
-          <Tooltip position="top" label={t("Delete row")} withinPortal={false}>
+          <Tooltip position="top" label={t("Delete row")}>
             <ActionIcon
               onClick={deleteRow}
               variant="subtle"
@@ -211,11 +191,7 @@ export const TableMenu = React.memo(
 
           <div className={classes.divider} />
 
-          <Tooltip
+          <Tooltip position="top" label={t("Toggle header row")}>
-            position="top"
-            label={t("Toggle header row")}
-            withinPortal={false}
-          >
             <ActionIcon
               onClick={toggleHeaderRow}
               variant="subtle"
@@ -226,11 +202,7 @@ export const TableMenu = React.memo(
             </ActionIcon>
           </Tooltip>
 
-          <Tooltip
+          <Tooltip position="top" label={t("Toggle header column")}>
-            position="top"
-            label={t("Toggle header column")}
-            withinPortal={false}
-          >
             <ActionIcon
               onClick={toggleHeaderColumn}
               variant="subtle"
@@ -243,11 +215,7 @@ export const TableMenu = React.memo(
 
           <div className={classes.divider} />
 
-          <Tooltip
+          <Tooltip position="top" label={t("Delete table")}>
-            position="top"
-            label={t("Delete table")}
-            withinPortal={false}
-          >
             <ActionIcon
               onClick={deleteTable}
               variant="subtle"
@@ -260,7 +228,7 @@ export const TableMenu = React.memo(
         </div>
       </BubbleMenu>
     );
-  },
+  }
 );
 
 export default TableMenu;

apps/client/src/features/editor/components/video/video-view.tsx

@@ -33,7 +33,7 @@ export default function VideoView(props: NodeViewProps) {
         className={clsx(
           selected && "ProseMirror-selectednode",
           classes.videoWrapper,
-          !src && placeholder && classes.skeleton,
+          !src && classes.skeleton,
           alignClass,
         )}
         style={{
@@ -60,7 +60,7 @@ export default function VideoView(props: NodeViewProps) {
             <Loader size={20} pos="absolute" top={6} right={6} />
           </Group>
         )}
-        {!src && !previewSrc && placeholder && (
+        {!src && !previewSrc && (
           <Group justify="center" wrap="nowrap" gap="xs" maw="100%" px="md">
             <Loader size={20} style={{ flexShrink: 0 }} />
             <Text component="span" size="sm" truncate="end">
@@ -70,9 +70,6 @@ export default function VideoView(props: NodeViewProps) {
             </Text>
           </Group>
         )}
-        {!src && !previewSrc && !placeholder && (
-          <video className={classes.video} controls />
-        )}
       </div>
     </NodeViewWrapper>
   );

apps/client/src/features/editor/extensions/autojoiner.ts

@@ -1,105 +0,0 @@
-// https://github.com/NiclasDev63/tiptap-extension-auto-joiner - MIT
-import { Extension } from "@tiptap/core";
-import { Plugin, PluginKey } from "@tiptap/pm/state";
-import { canJoin } from "@tiptap/pm/transform";
-import { getNodeType } from "@tiptap/react";
-import { NodeType } from "@tiptap/pm/model";
-import { Transaction } from "@tiptap/pm/state";
-
-// https://discuss.prosemirror.net/t/how-to-autojoin-all-the-time/2957/4
-// Adapted from prosemirror-commands wrapDispatchForJoin
-function autoJoin(
-  transactions: readonly Transaction[],
-  newTr: Transaction,
-  nodeTypes: NodeType[]
-) {
-  // Collect changed ranges across all transactions, mapping earlier ranges
-  // forward through later mappings so every position lands in newTr.doc space.
-  let ranges: number[] = [];
-  for (const tr of transactions) {
-    for (let i = 0; i < tr.mapping.maps.length; i++) {
-      let map = tr.mapping.maps[i];
-      if (!map) continue;
-      for (let j = 0; j < ranges.length; j++) ranges[j] = map.map(ranges[j]!);
-      map.forEach((_s, _e, from, to) => ranges.push(from, to));
-    }
-  }
-
-  // Figure out which joinable points exist inside those ranges,
-  // by checking all node boundaries in their parent nodes.
-  // Resolve against newTr.doc — the same document we will join on.
-  let joinable: number[] = [];
-  for (let i = 0; i < ranges.length; i += 2) {
-    let from = ranges[i]!,
-      to = ranges[i + 1]!;
-    let $from = newTr.doc.resolve(from),
-      depth = $from.sharedDepth(to),
-      parent = $from.node(depth);
-    for (
-      let index = $from.indexAfter(depth), pos = $from.after(depth + 1);
-      pos <= to;
-      ++index
-    ) {
-      let after = parent.maybeChild(index);
-      if (!after) break;
-      if (index && joinable.indexOf(pos) == -1) {
-        let before = parent.child(index - 1);
-        if (before.type == after.type && nodeTypes.includes(before.type))
-          joinable.push(pos);
-      }
-      pos += after.nodeSize;
-    }
-  }
-
-  // Join the joinable points (reverse order to preserve earlier positions)
-  let joined = false;
-  joinable.sort((a, b) => a - b);
-  for (let i = joinable.length - 1; i >= 0; i--) {
-    if (canJoin(newTr.doc, joinable[i]!)) {
-      newTr.join(joinable[i]!);
-      joined = true;
-    }
-  }
-
-  return joined;
-}
-
-export interface AutoJoinerOptions {
-  elementsToJoin: string[];
-}
-
-const AutoJoiner = Extension.create<AutoJoinerOptions>({
-  name: "autoJoiner",
-
-  addOptions() {
-    return {
-      elementsToJoin: [],
-    };
-  },
-
-  addProseMirrorPlugins() {
-    const plugin = new PluginKey(this.name);
-    const joinableNodes = [
-      this.editor.schema.nodes.bulletList,
-      this.editor.schema.nodes.orderedList,
-    ];
-    this.options.elementsToJoin.forEach((element) => {
-      const nodeTyp = getNodeType(element, this.editor.schema);
-      joinableNodes.push(nodeTyp);
-    });
-
-    return [
-      new Plugin({
-        key: plugin,
-        appendTransaction(transactions, _, newState) {
-          let newTr = newState.tr;
-          if (autoJoin(transactions, newTr, joinableNodes as NodeType[])) {
-            return newTr;
-          }
-        },
-      }),
-    ];
-  },
-});
-
-export default AutoJoiner;

apps/client/src/features/editor/extensions/extensions.ts

@@ -49,7 +49,7 @@ import {
   SharedStorage,
   Columns,
   Column,
-  Status,
+  Status
 } from "@docmost/editor-ext";
 import {
   randomElement,
@@ -97,7 +97,6 @@ import i18n from "@/i18n.ts";
 import { MarkdownClipboard } from "@/features/editor/extensions/markdown-clipboard.ts";
 import EmojiCommand from "./emoji-command";
 import { countWords } from "alfaaz";
-import AutoJoiner from "@/features/editor/extensions/autojoiner.ts";
 
 const lowlight = createLowlight(common);
 lowlight.register("mermaid", plaintext);
@@ -253,8 +252,8 @@ export const mainExtensions = [
     resize: {
       enabled: true,
       directions: ["left", "right"],
-      minWidth: 24,
+      minWidth: 80,
-      minHeight: 16,
+      minHeight: 40,
       alwaysPreserveAspectRatio: true,
       //@ts-ignore
       createCustomHandle: createImageHandle,
@@ -266,8 +265,8 @@ export const mainExtensions = [
     resize: {
       enabled: true,
       directions: ["left", "right"],
-      minWidth: 24,
+      minWidth: 80,
-      minHeight: 16,
+      minHeight: 40,
       alwaysPreserveAspectRatio: true,
       //@ts-ignore
       createCustomHandle: createResizeHandle,
@@ -297,8 +296,8 @@ export const mainExtensions = [
     resize: {
       enabled: true,
       directions: ["left", "right"],
-      minWidth: 24,
+      minWidth: 80,
-      minHeight: 16,
+      minHeight: 40,
       alwaysPreserveAspectRatio: true,
       //@ts-ignore
       createCustomHandle: createResizeHandle,
@@ -310,8 +309,8 @@ export const mainExtensions = [
     resize: {
       enabled: true,
       directions: ["left", "right"],
-      minWidth: 24,
+      minWidth: 80,
-      minHeight: 16,
+      minHeight: 40,
       alwaysPreserveAspectRatio: true,
       //@ts-ignore
       createCustomHandle: createResizeHandle,
@@ -354,9 +353,6 @@ export const mainExtensions = [
   }).configure(),
   Columns,
   Column,
-  AutoJoiner.configure({
-    elementsToJoin: [],
-  }),
 ] as any;
 
 type CollabExtensions = (provider: HocuspocusProvider, user: IUser) => any[];

apps/client/src/features/editor/extensions/markdown-clipboard.ts

@@ -1,9 +1,9 @@
 // adapted from: https://github.com/aguingand/tiptap-markdown/blob/main/src/extensions/tiptap/clipboard.js - MIT
 import { Extension } from "@tiptap/core";
-import { Plugin, PluginKey, TextSelection } from "@tiptap/pm/state";
+import { Plugin, PluginKey } from "@tiptap/pm/state";
-import { DOMParser, DOMSerializer, Fragment, Slice } from "@tiptap/pm/model";
+import { DOMParser } from "@tiptap/pm/model";
 import { find } from "linkifyjs";
-import { markdownToHtml, htmlToMarkdown } from "@docmost/editor-ext";
+import { markdownToHtml } from "@docmost/editor-ext";
 
 export const MarkdownClipboard = Extension.create({
   name: "markdownClipboard",
@@ -19,27 +19,6 @@ export const MarkdownClipboard = Extension.create({
       new Plugin({
         key: new PluginKey("markdownClipboard"),
         props: {
-          clipboardTextSerializer: (slice) => {
-            const listTypes = ["bulletList", "orderedList", "taskList"];
-            let topLevelCount = 0;
-            let hasList = false;
-            slice.content.forEach((node) => {
-              if (listTypes.includes(node.type.name)) {
-                hasList = true;
-                topLevelCount += node.childCount;
-              } else {
-                topLevelCount++;
-              }
-            });
-
-            if (!hasList || topLevelCount < 2) return null;
-
-            const div = document.createElement("div");
-            const serializer = DOMSerializer.fromSchema(this.editor.schema);
-            const fragment = serializer.serializeFragment(slice.content);
-            div.appendChild(fragment);
-            return htmlToMarkdown(div.innerHTML);
-          },
           handlePaste: (view, event, slice) => {
             if (!event.clipboardData) {
               return false;
@@ -50,80 +29,49 @@ export const MarkdownClipboard = Extension.create({
             }
 
             const text = event.clipboardData.getData("text/plain");
-            const html = event.clipboardData.getData("text/html");
             const vscode = event.clipboardData.getData("vscode-editor-data");
             const vscodeData = vscode ? JSON.parse(vscode) : undefined;
             const language = vscodeData?.mode;
 
-            const isVscodeMarkdown = language === "markdown";
+            if (language !== "markdown") {
-            const isPlainTextOnly = !html && !vscode && !!text;
-
-            if (!isVscodeMarkdown && !isPlainTextOnly) {
               return false;
             }
 
-            if (isPlainTextOnly) {
-              if ((view as any).input?.shiftKey || !this.options.transformPastedText) {
-                return false;
-              }
-
-              const link = find(text, {
-                defaultProtocol: "http",
-              }).find((item) => item.isLink && item.value === text);
-
-              if (link) {
-                return false;
-              }
-            }
-
             const { tr } = view.state;
             const { from, to } = view.state.selection;
 
-            const parsed = markdownToHtml(text.replace(/\n+$/, ""));
+            const html = markdownToHtml(text);
 
             const contentNodes = DOMParser.fromSchema(
               this.editor.schema,
-            ).parseSlice(elementFromString(parsed), {
+            ).parseSlice(elementFromString(html), {
               preserveWhitespace: true,
             });
 
             tr.replaceRange(from, to, contentNodes);
-            const insertEnd = tr.mapping.map(from, 1);
-            tr.setSelection(TextSelection.near(tr.doc.resolve(Math.max(from, insertEnd - 2)), -1));
             tr.setMeta('paste', true)
             view.dispatch(tr);
             return true;
           },
-          // Strip trailing whitespace-only paragraphs from pasted content.
+          clipboardTextParser: (text, context, plainText) => {
-          // Terminals (GNOME Terminal, etc.) often include trailing
+            const link = find(text, {
-          // whitespace in their HTML clipboard data, which ProseMirror
+              defaultProtocol: "http",
-          // parses as an extra paragraph. Inside a list item this creates
+            }).find((item) => item.isLink && item.value === text);
-          // an orphan empty line that breaks the list structure.
-          transformPasted: (slice) => {
-            let { content, openStart, openEnd } = slice;
 
-            // Remove trailing paragraphs that contain only whitespace
+            if (plainText || !this.options.transformPastedText || link) {
-            while (content.childCount > 1) {
+              // don't parse plaintext link to allow link paste handler to work
-              const lastChild = content.lastChild;
+              // pasting with shift key prevents formatting
-              if (
+              return null;
-                lastChild?.type.name === "paragraph" &&
-                lastChild.textContent.trim() === ""
-              ) {
-                const children = [];
-                for (let i = 0; i < content.childCount - 1; i++) {
-                  children.push(content.child(i));
-                }
-                content = Fragment.from(children);
-              } else {
-                break;
-              }
             }
 
-            if (content !== slice.content) {
+            const parsed = markdownToHtml(text);
-              return new Slice(content, openStart, Math.max(openEnd, 1));
+            return DOMParser.fromSchema(this.editor.schema).parseSlice(
-            }
+              elementFromString(parsed),
-
+              {
-            return slice;
+                preserveWhitespace: true,
+                context,
+              },
+            );
           },
         },
       }),

apps/client/src/features/editor/full-editor.tsx

@@ -16,7 +16,6 @@ export interface FullEditorProps {
   content: string;
   spaceSlug: string;
   editable: boolean;
-  canComment?: boolean;
 }
 
 export function FullEditor({
@@ -26,7 +25,6 @@ export function FullEditor({
   content,
   spaceSlug,
   editable,
-  canComment,
 }: FullEditorProps) {
   const [user] = useAtom(userAtom);
   const fullPageWidth = user.settings?.preferences?.fullPageWidth;
@@ -48,7 +46,6 @@ export function FullEditor({
         pageId={pageId}
         editable={editable}
         content={content}
-        canComment={canComment}
       />
     </Container>
   );

apps/client/src/features/editor/page-editor.tsx

@@ -37,11 +37,9 @@ import { asideStateAtom } from "@/components/layouts/global/hooks/atoms/sidebar-
 import {
   activeCommentIdAtom,
   showCommentPopupAtom,
-  showReadOnlyCommentPopupAtom,
 } from "@/features/comment/atoms/comment-atom";
 import CommentDialog from "@/features/comment/components/comment-dialog";
 import { EditorBubbleMenu } from "@/features/editor/components/bubble-menu/bubble-menu";
-import { ReadonlyBubbleMenu } from "@/features/editor/components/bubble-menu/readonly-bubble-menu";
 import TableCellMenu from "@/features/editor/components/table/table-cell-menu.tsx";
 import TableMenu from "@/features/editor/components/table/table-menu.tsx";
 import ImageMenu from "@/features/editor/components/image/image-menu.tsx";
@@ -76,14 +74,12 @@ interface PageEditorProps {
   pageId: string;
   editable: boolean;
   content: any;
-  canComment?: boolean;
 }
 
 export default function PageEditor({
   pageId,
   editable,
   content,
-  canComment,
 }: PageEditorProps) {
   const collaborationURL = useCollaborationUrl();
   const isComponentMounted = useRef(false);
@@ -98,7 +94,6 @@ export default function PageEditor({
   const [, setAsideState] = useAtom(asideStateAtom);
   const [, setActiveCommentId] = useAtom(activeCommentIdAtom);
   const [showCommentPopup, setShowCommentPopup] = useAtom(showCommentPopupAtom);
-  const [showReadOnlyCommentPopup] = useAtom(showReadOnlyCommentPopupAtom);
   const [isLocalSynced, setIsLocalSynced] = useState(false);
   const [isRemoteSynced, setIsRemoteSynced] = useState(false);
   const [yjsConnectionStatus, setYjsConnectionStatus] = useAtom(
@@ -428,13 +423,7 @@ export default function PageEditor({
             <ColumnsMenu editor={editor} />
           </div>
         )}
-        {editor && !editorIsEditable && (editable || canComment) && providersRef.current && (
-          <ReadonlyBubbleMenu editor={editor} />
-        )}
         {showCommentPopup && <CommentDialog editor={editor} pageId={pageId} />}
-        {showReadOnlyCommentPopup && (
-          <CommentDialog editor={editor} pageId={pageId} readOnly />
-        )}
       </div>
       <div
         onClick={() => editor.commands.focus("end")}

apps/client/src/features/notification/components/notification-item.tsx

@@ -13,7 +13,7 @@ import {
 import { CustomAvatar } from "@/components/ui/custom-avatar";
 import { INotification } from "../types/notification.types";
 import { Trans, useTranslation } from "react-i18next";
-import { Link } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { useState } from "react";
 import { useMarkReadMutation } from "../queries/notification-query";
 import { buildPageUrl } from "@/features/page/page.utils";
@@ -30,6 +30,7 @@ export function NotificationItem({
   onNavigate,
 }: NotificationItemProps) {
   const { t } = useTranslation();
+  const navigate = useNavigate();
   const markRead = useMarkReadMutation();
   const [hovered, setHovered] = useState(false);
 
@@ -49,47 +50,37 @@ 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 "";
     }
   };
 
-  const pageUrl =
+  const handleClick = () => {
-    notification.page && notification.space
+    if (notification.page && notification.space) {
-      ? buildPageUrl(
+      if (isUnread) {
+        markRead.mutate([notification.id]);
+      }
+      navigate(
+        buildPageUrl(
           notification.space.slug,
           notification.page.slugId,
           notification.page.title,
-        )
+        ),
-      : undefined;
+      );
+      onNavigate();
+    }
+  };
 
-  const markReadIfNeeded = () => {
+  const handleMarkRead = (e: React.MouseEvent) => {
+    e.stopPropagation();
     if (isUnread) {
       markRead.mutate([notification.id]);
     }
   };
 
-  const handleClick = () => {
-    markReadIfNeeded();
-    onNavigate();
-  };
-
-  const handleMarkRead = (e: React.MouseEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-    markReadIfNeeded();
-  };
-
   return (
     <UnstyledButton
-      component={Link}
-      to={pageUrl ?? ""}
       onClick={handleClick}
-      // auxclick fires for all non-primary buttons; guard to middle-click only (button 1)
-      // so that right-click (button 2, context menu) does not mark as read
-      onAuxClick={(e: React.MouseEvent) => e.button === 1 && markReadIfNeeded()}
       onMouseEnter={() => setHovered(true)}
       onMouseLeave={() => setHovered(false)}
       w="100%"

apps/client/src/features/notification/components/notification-list.tsx

@@ -3,23 +3,17 @@ import { IconBellOff } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { useEffect, useRef } from "react";
 import { NotificationItem } from "./notification-item";
-import {
+import { INotification, NotificationFilter } from "../types/notification.types";
-  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) {
@@ -30,7 +24,7 @@ export function NotificationList({
     hasNextPage,
     fetchNextPage,
     isFetchingNextPage,
-  } = useNotificationsQuery(tab as string);
+  } = useNotificationsQuery();
 
   const sentinelRef = useRef<HTMLDivElement>(null);
 

apps/client/src/features/notification/components/notification-popover.tsx

@@ -6,7 +6,6 @@ import {
   Menu,
   Popover,
   ScrollArea,
-  Tabs,
   Text,
   Tooltip,
 } from "@mantine/core";
@@ -19,20 +18,15 @@ import {
 } from "@tabler/icons-react";
 import { useTranslation } from "react-i18next";
 import { NotificationList } from "./notification-list";
-import {
+import { NotificationFilter } from "../types/notification.types";
-  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();
@@ -131,27 +125,13 @@ 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)}
           />

apps/client/src/features/notification/notification.module.css

@@ -1,9 +1,7 @@
 .notificationItem {
-  display: block;
   padding: 8px 12px;
   border-radius: 4px;
   cursor: pointer;
-  user-select: none;
 }
 
 .notificationItem:hover {
@@ -13,4 +11,3 @@
 .divider {
   border-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5));
 }
-

apps/client/src/features/notification/queries/notification-query.ts

@@ -15,10 +15,10 @@ import {
 export const NOTIFICATION_KEY = ["notifications"];
 export const UNREAD_COUNT_KEY = ["notifications", "unread-count"];
 
-export function useNotificationsQuery(type?: string) {
+export function useNotificationsQuery() {
   return useInfiniteQuery({
-    queryKey: [...NOTIFICATION_KEY, type],
+    queryKey: NOTIFICATION_KEY,
-    queryFn: ({ pageParam }) => getNotifications({ cursor: pageParam, type }),
+    queryFn: ({ pageParam }) => getNotifications({ cursor: pageParam }),
     initialPageParam: undefined as string | undefined,
     getNextPageParam: (lastPage) =>
       lastPage.meta.hasNextPage ? lastPage.meta.nextCursor : undefined,

apps/client/src/features/notification/services/notification-service.ts

@@ -5,7 +5,6 @@ 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",

apps/client/src/features/notification/types/notification.types.ts

@@ -3,8 +3,7 @@ export type NotificationType =
   | "comment.created"
   | "comment.resolved"
   | "page.user_mention"
-  | "page.permission_granted"
+  | "page.permission_granted";
-  | "page.updated";
 
 export type INotification = {
   id: string;
@@ -39,5 +38,3 @@ export type INotification = {
 };
 
 export type NotificationFilter = "all" | "unread";
-
-export type NotificationTab = "direct" | "updates" | "all";

apps/client/src/features/page/components/header/page-header-menu.tsx

@@ -3,8 +3,6 @@ import {
   IconArrowRight,
   IconArrowsHorizontal,
   IconDots,
-  IconEye,
-  IconEyeOff,
   IconFileExport,
   IconHistory,
   IconLink,
@@ -42,11 +40,6 @@ 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;
@@ -130,9 +123,6 @@ 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 =
@@ -195,23 +185,6 @@ 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} />}>

apps/client/src/features/page/queries/watcher-query.ts

@@ -1,43 +0,0 @@
-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") });
-    },
-  });
-}

apps/client/src/features/page/services/watcher-service.ts

@@ -1,16 +0,0 @@
-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;
-}

apps/client/src/features/space/components/settings-modal.tsx

@@ -3,7 +3,6 @@ import SpaceMembersList from "@/features/space/components/space-members.tsx";
 import AddSpaceMembersModal from "@/features/space/components/add-space-members-modal.tsx";
 import React from "react";
 import SpaceDetails from "@/features/space/components/space-details.tsx";
-import SpaceSecuritySettings from "@/features/space/components/space-security-settings.tsx";
 import { useSpaceQuery } from "@/features/space/queries/space-query.ts";
 import { useSpaceAbility } from "@/features/space/permissions/use-space-ability.ts";
 import {
@@ -60,14 +59,6 @@ export default function SpaceSettingsModal({
                   <Tabs.Tab fw={500} value="members">
                     {t("Members")}
                   </Tabs.Tab>
-                  {spaceAbility.can(
-                    SpaceCaslAction.Manage,
-                    SpaceCaslSubject.Settings,
-                  ) && (
-                    <Tabs.Tab fw={500} value="security">
-                      {t("Security")}
-                    </Tabs.Tab>
-                  )}
                 </Tabs.List>
 
                 <Tabs.Panel value="general">
@@ -100,20 +91,6 @@ export default function SpaceSettingsModal({
                     )}
                   />
                 </Tabs.Panel>
-
-                <Tabs.Panel value="security">
-                  <ScrollArea h={580} scrollbarSize={5} pr={8}>
-                    <div style={{ paddingBottom: "100px" }}>
-                      <SpaceSecuritySettings
-                        space={space}
-                        readOnly={spaceAbility.cannot(
-                          SpaceCaslAction.Manage,
-                          SpaceCaslSubject.Settings,
-                        )}
-                      />
-                    </div>
-                  </ScrollArea>
-                </Tabs.Panel>
               </Tabs>
             </div>
           </Modal.Body>

apps/client/src/features/space/components/space-details.tsx

@@ -18,7 +18,7 @@ import {
   ResponsiveSettingsControl,
   ResponsiveSettingsRow,
 } from "@/components/ui/responsive-settings-row.tsx";
-
+import SpacePublicSharingToggle from "@/ee/security/components/space-public-sharing-toggle.tsx";
 
 interface SpaceDetailsProps {
   spaceId: string;
@@ -27,6 +27,7 @@ interface SpaceDetailsProps {
 export default function SpaceDetails({ spaceId, readOnly }: SpaceDetailsProps) {
   const { t } = useTranslation();
   const { data: space, isLoading, refetch } = useSpaceQuery(spaceId);
+  const showSharingToggle = !readOnly;
   const [exportOpened, { open: openExportModal, close: closeExportModal }] =
     useDisclosure(false);
   const [isIconUploading, setIsIconUploading] = useState(false);
@@ -88,6 +89,13 @@ export default function SpaceDetails({ spaceId, readOnly }: SpaceDetailsProps) {
 
           <EditSpaceForm space={space} readOnly={readOnly} />
 
+          {showSharingToggle && (
+            <>
+              <Divider my="lg" />
+              <SpacePublicSharingToggle space={space} />
+            </>
+          )}
+
           {!readOnly && (
             <>
               <Divider my="lg" />

apps/client/src/features/space/components/space-security-settings.tsx

@@ -1,34 +0,0 @@
-import { Text, Divider } from "@mantine/core";
-import React from "react";
-import { useTranslation } from "react-i18next";
-import { ISpace } from "@/features/space/types/space.types.ts";
-import SpacePublicSharingToggle from "@/ee/security/components/space-public-sharing-toggle.tsx";
-import SpaceViewerCommentsToggle from "@/ee/security/components/space-viewer-comments-toggle.tsx";
-
-type SpaceSecuritySettingsProps = {
-  space: ISpace;
-  readOnly?: boolean;
-};
-
-export default function SpaceSecuritySettings({
-  space,
-  readOnly,
-}: SpaceSecuritySettingsProps) {
-  const { t } = useTranslation();
-
-  if (readOnly) return null;
-
-  return (
-    <div>
-      <Text my="md" fw={600}>
-        {t("Security")}
-      </Text>
-
-      <SpacePublicSharingToggle space={space} />
-
-      <Divider my="lg" />
-
-      <SpaceViewerCommentsToggle space={space} />
-    </div>
-  );
-}

apps/client/src/features/space/types/space.types.ts

@@ -9,13 +9,8 @@ export interface ISpaceSharingSettings {
   disabled?: boolean;
 }
 
-export interface ISpaceCommentsSettings {
-  allowViewerComments?: boolean;
-}
-
 export interface ISpaceSettings {
   sharing?: ISpaceSharingSettings;
-  comments?: ISpaceCommentsSettings;
 }
 
 export interface ISpace {
@@ -34,7 +29,6 @@ export interface ISpace {
   settings?: ISpaceSettings;
   // for updates
   disablePublicSharing?: boolean;
-  allowViewerComments?: boolean;
 }
 
 interface IMembership {

apps/client/src/features/user/components/notification-pref.tsx

@@ -1,117 +0,0 @@
-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>
-  );
-}

apps/client/src/features/user/types/user.types.ts

@@ -20,11 +20,6 @@ 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;
 }
 
@@ -38,13 +33,6 @@ 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 {

apps/client/src/pages/page/page.tsx

@@ -53,9 +53,6 @@ function PageContent({ pageSlug }: { pageSlug: string | undefined }) {
   const { data: space } = useGetSpaceBySlugQuery(page?.space?.slug);
 
   const canEdit = page?.permissions?.canEdit ?? false;
-  const canComment =
-    canEdit ||
-    (space?.settings?.comments?.allowViewerComments === true);
 
   if (isLoading) {
     return <></>;
@@ -107,7 +104,6 @@ function PageContent({ pageSlug }: { pageSlug: string | undefined }) {
           slugId={page.slugId}
           spaceSlug={page?.space?.slug}
           editable={canEdit}
-          canComment={canComment}
         />
         <MemoizedHistoryModal pageId={page.id} />
       </div>

apps/client/src/pages/settings/account/account-preferences.tsx

@@ -3,7 +3,6 @@ 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";
@@ -34,10 +33,6 @@ export default function AccountPreferences() {
       <Divider my={"md"} />
 
       <PageEditPref />
-
-      <Divider my={"md"} />
-
-      <NotificationPref />
     </>
   );
 }

apps/server/package.json

@@ -44,7 +44,6 @@
     "@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",
@@ -59,7 +58,6 @@
     "@nestjs/platform-socket.io": "^11.1.17",
     "@nestjs/schedule": "^6.1.1",
     "@nestjs/terminus": "^11.1.1",
-    "@nestjs/throttler": "^6.5.0",
     "@nestjs/websockets": "^11.1.17",
     "@node-saml/passport-saml": "^5.1.0",
     "@react-email/components": "1.0.10",
@@ -75,9 +73,8 @@
     "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",
+    "happy-dom": "20.8.4",
     "ioredis": "^5.10.1",
     "jsonwebtoken": "^9.0.3",
     "kysely": "^0.28.14",
@@ -92,7 +89,7 @@
     "nestjs-cls": "^6.2.0",
     "nestjs-kysely": "^3.1.2",
     "nestjs-pino": "^4.6.1",
-    "nodemailer": "^8.0.4",
+    "nodemailer": "^8.0.3",
     "openid-client": "^6.8.2",
     "otpauth": "^9.5.0",
     "p-limit": "^7.3.0",

apps/server/src/app.module.ts

@@ -26,7 +26,6 @@ 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 {
@@ -84,7 +83,6 @@ try {
     EventEmitterModule.forRoot(),
     SecurityModule,
     TelemetryModule,
-    ThrottleModule,
     ...enterpriseModules,
   ],
   controllers: [AppController],

apps/server/src/collaboration/collaboration.handler.ts

@@ -5,7 +5,6 @@ import {
   prosemirrorNodeToYElement,
   tiptapExtensions,
 } from './collaboration.util';
-import { setYjsMark, updateYjsMarkAttribute, YjsSelection } from './yjs.util';
 import * as Y from 'yjs';
 import { User } from '@docmost/db/types/entity.types';
 
@@ -28,53 +27,6 @@ export class CollaborationHandler {
         //   const fragment = doc.getXmlFragment('default');
         //});
       },
-      setCommentMark: async (
-        documentName: string,
-        payload: {
-          yjsSelection: YjsSelection;
-          commentId: string;
-          resolved: boolean;
-          user: User;
-        },
-      ) => {
-        const { yjsSelection, commentId, resolved, user } = payload;
-        await this.withYdocConnection(
-          hocuspocus,
-          documentName,
-          { user },
-          (doc) => {
-            const fragment = doc.getXmlFragment('default');
-            setYjsMark(doc, fragment, yjsSelection, 'comment', {
-              commentId,
-              resolved,
-            });
-          },
-        );
-      },
-      resolveCommentMark: async (
-        documentName: string,
-        payload: {
-          commentId: string;
-          resolved: boolean;
-          user: User;
-        },
-      ) => {
-        const { commentId, resolved, user } = payload;
-        await this.withYdocConnection(
-          hocuspocus,
-          documentName,
-          { user },
-          (doc) => {
-            const fragment = doc.getXmlFragment('default');
-            updateYjsMarkAttribute(
-              fragment,
-              'comment',
-              { name: 'commentId', value: commentId },
-              { resolved },
-            );
-          },
-        );
-      },
       updatePageContent: async (
         documentName: string,
         payload: {
@@ -106,7 +58,8 @@ export class CollaborationHandler {
             } else {
               const newContent = prosemirrorJson.content || [];
               const yElements = newContent.map(prosemirrorNodeToYElement);
-              const position = operation === 'prepend' ? 0 : fragment.length;
+              const position =
+                operation === 'prepend' ? 0 : fragment.length;
               fragment.insert(position, yElements);
             }
           },

apps/server/src/collaboration/extensions/persistence.extension.ts

@@ -18,10 +18,12 @@ 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';
@@ -41,6 +43,7 @@ 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,
@@ -162,6 +165,13 @@ 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) : [];

apps/server/src/collaboration/processors/history.processor.ts

@@ -1,17 +1,8 @@
 import { Logger, OnModuleDestroy } from '@nestjs/common';
 import { OnWorkerEvent, Processor, WorkerHost } from '@nestjs/bullmq';
-import { InjectQueue } from '@nestjs/bullmq';
+import { Job } from 'bullmq';
-import { Job, Queue } from 'bullmq';
 import { QueueJob, QueueName } from '../../integrations/queue/constants';
-import {
+import { IPageHistoryJob } from '../../integrations/queue/constants/queue.interface';
-  IPageBacklinkJob,
-  IPageHistoryJob,
-  IPageUpdateNotificationJob,
-} from '../../integrations/queue/constants/queue.interface';
-import {
-  extractMentions,
-  extractPageMentions,
-} 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';
@@ -27,8 +18,6 @@ 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();
   }
@@ -58,7 +47,8 @@ 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(
@@ -71,38 +61,11 @@ 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(
-          throw err;
-        }
-
-        const mentions = extractMentions(page.content);
-        const pageMentions = extractPageMentions(mentions);
-
-        await this.generalQueue
-          .add(QueueJob.PAGE_BACKLINKS, {
             pageId,
-            workspaceId: page.workspaceId,
+            contributorIds,
-            mentions: pageMentions,
+          );
-          } as IPageBacklinkJob)
+          throw err;
-          .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) {

apps/server/src/collaboration/yjs.util.ts

@@ -1,7 +1,7 @@
 import {
   initProseMirrorDoc,
   relativePositionToAbsolutePosition,
-} from '@tiptap/y-tiptap';
+} from 'y-prosemirror';
 import * as Y from 'yjs';
 import { Document } from '@hocuspocus/server';
 import { getSchema } from '@tiptap/core';

apps/server/src/common/features.ts

@@ -1,22 +0,0 @@
-export const Feature = {
-  SSO_CUSTOM: 'sso:custom',
-  SSO_GOOGLE: 'sso:google',
-  MFA: 'mfa',
-  API_KEYS: 'api:keys',
-  COMMENT_RESOLUTION: 'comment:resolution',
-  PAGE_PERMISSIONS: 'page:permissions',
-  AI: 'ai',
-  CONFLUENCE_IMPORT: 'import:confluence',
-  DOCX_IMPORT: 'import:docx',
-  ATTACHMENT_INDEXING: 'attachment:indexing',
-  SECURITY_SETTINGS: 'security:settings',
-  MCP: 'mcp',
-  SCIM: 'scim',
-  PAGE_VERIFICATION: 'page:verification',
-  AUDIT_LOGS: 'audit:logs',
-  RETENTION: 'retention',
-  SHARING_CONTROLS: 'sharing:controls',
-  VIEWER_COMMENTS: 'comment:viewer',
-} as const;
-
-export type FeatureKey = (typeof Feature)[keyof typeof Feature];

apps/server/src/common/logger/pino.config.ts

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

apps/server/src/common/middlewares/audit-context.middleware.ts

@@ -18,8 +18,7 @@ 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;
@@ -36,4 +35,21 @@ 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;
+  }
 }

apps/server/src/core/auth/auth.controller.ts

@@ -10,7 +10,6 @@ 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';
@@ -34,7 +33,6 @@ import {
   IAuditService,
 } from '../../integrations/audit/audit.service';
 
-@UseGuards(ThrottlerGuard)
 @Controller('auth')
 export class AuthController {
   private readonly logger = new Logger(AuthController.name);
@@ -113,7 +111,6 @@ export class AuthController {
     return workspace;
   }
 
-  @SkipThrottle()
   @UseGuards(JwtAuthGuard)
   @HttpCode(HttpStatus.OK)
   @Post('change-password')
@@ -176,7 +173,6 @@ export class AuthController {
     return this.authService.verifyUserToken(verifyUserTokenDto, workspace.id);
   }
 
-  @SkipThrottle()
   @UseGuards(JwtAuthGuard)
   @HttpCode(HttpStatus.OK)
   @Post('collab-token')
@@ -187,7 +183,6 @@ export class AuthController {
     return this.authService.getCollabToken(user, workspace.id);
   }
 
-  @SkipThrottle()
   @UseGuards(JwtAuthGuard)
   @HttpCode(HttpStatus.OK)
   @Post('logout')

apps/server/src/core/comment/comment.controller.ts

@@ -58,13 +58,13 @@ export class CommentController {
       throw new NotFoundException('Page not found');
     }
 
-    await this.pageAccessService.validateCanComment(page, user, workspace.id);
+    await this.pageAccessService.validateCanEdit(page, user);
 
     const comment = await this.commentService.create(
       {
+        userId: user.id,
         page,
         workspaceId: workspace.id,
-        user,
       },
       createCommentDto,
     );
@@ -120,7 +120,7 @@ export class CommentController {
 
   @HttpCode(HttpStatus.OK)
   @Post('update')
-  async update(@Body() dto: UpdateCommentDto, @AuthUser() user: User, @AuthWorkspace() workspace: Workspace) {
+  async update(@Body() dto: UpdateCommentDto, @AuthUser() user: User) {
     const comment = await this.commentRepo.findById(dto.commentId, {
       includeCreator: true,
       includeResolvedBy: true,
@@ -134,14 +134,14 @@ export class CommentController {
       throw new NotFoundException('Page not found');
     }
 
-    await this.pageAccessService.validateCanComment(page, user, workspace.id);
+    await this.pageAccessService.validateCanEdit(page, user);
 
     return this.commentService.update(comment, dto, user);
   }
 
   @HttpCode(HttpStatus.OK)
   @Post('delete')
-  async delete(@Body() input: CommentIdDto, @AuthUser() user: User, @AuthWorkspace() workspace: Workspace) {
+  async delete(@Body() input: CommentIdDto, @AuthUser() user: User) {
     const comment = await this.commentRepo.findById(input.commentId);
     if (!comment) {
       throw new NotFoundException('Comment not found');
@@ -152,7 +152,8 @@ export class CommentController {
       throw new NotFoundException('Page not found');
     }
 
-    await this.pageAccessService.validateCanComment(page, user, workspace.id);
+    // Check page-level edit permission first
+    await this.pageAccessService.validateCanEdit(page, user);
 
     // Check if user is the comment owner
     const isOwner = comment.creatorId === user.id;
@@ -168,7 +169,7 @@ export class CommentController {
       // Space admin can delete any comment
       if (ability.cannot(SpaceCaslAction.Manage, SpaceCaslSubject.Settings)) {
         throw new ForbiddenException(
-          'You can only delete your own comments',
+          'You can only delete your own comments or must be a space admin',
         );
       }
       await this.commentRepo.deleteComment(comment.id);

apps/server/src/core/comment/comment.module.ts

@@ -1,10 +1,8 @@
 import { Module } from '@nestjs/common';
 import { CommentService } from './comment.service';
 import { CommentController } from './comment.controller';
-import { CollaborationModule } from '../../collaboration/collaboration.module';
 
 @Module({
-  imports: [CollaborationModule],
   controllers: [CommentController],
   providers: [CommentService],
   exports: [CommentService],

apps/server/src/core/comment/comment.service.ts

@@ -7,8 +7,7 @@ import {
 } from '@nestjs/common';
 import { InjectQueue } from '@nestjs/bullmq';
 import { Queue } from 'bullmq';
-import { CreateCommentDto, yjsSelectionSchema } from './dto/create-comment.dto';
+import { CreateCommentDto } from './dto/create-comment.dto';
-import { CollaborationGateway } from '../../collaboration/collaboration.gateway';
 import { UpdateCommentDto } from './dto/update-comment.dto';
 import { CommentRepo } from '@docmost/db/repos/comment/comment.repo';
 import { Comment, Page, User } from '@docmost/db/types/entity.types';
@@ -28,7 +27,6 @@ export class CommentService {
     private commentRepo: CommentRepo,
     private pageRepo: PageRepo,
     private wsService: WsService,
-    private collaborationGateway: CollaborationGateway,
     @InjectQueue(QueueName.GENERAL_QUEUE)
     private generalQueue: Queue,
     @InjectQueue(QueueName.NOTIFICATION_QUEUE)
@@ -47,10 +45,10 @@ export class CommentService {
   }
 
   async create(
-    opts: { page: Page; workspaceId: string; user: User },
+    opts: { userId: string; page: Page; workspaceId: string },
     createCommentDto: CreateCommentDto,
   ) {
-    const { page, workspaceId, user } = opts;
+    const { userId, page, workspaceId } = opts;
     const commentContent = JSON.parse(createCommentDto.content);
 
     if (createCommentDto.parentCommentId) {
@@ -73,39 +71,11 @@ export class CommentService {
       selection: createCommentDto?.selection?.substring(0, 250) ?? null,
       type: createCommentDto.type ?? 'page',
       parentCommentId: createCommentDto?.parentCommentId,
-      creatorId: user.id,
+      creatorId: userId,
       workspaceId: workspaceId,
       spaceId: page.spaceId,
     });
 
-    if (createCommentDto.yjsSelection) {
-      const parsed = yjsSelectionSchema.safeParse(createCommentDto.yjsSelection);
-      if (!parsed.success) {
-        this.logger.warn(
-          `Invalid yjsSelection for comment ${inserted.id}: ${parsed.error.message}`,
-        );
-      } else {
-        const documentName = `page.${page.id}`;
-        try {
-          await this.collaborationGateway.handleYjsEvent(
-            'setCommentMark',
-            documentName,
-            {
-              yjsSelection: parsed.data,
-              commentId: inserted.id,
-              resolved: false,
-              user,
-            },
-          );
-        } catch (error) {
-          this.logger.warn(
-            `Failed to apply comment mark for comment ${inserted.id}, comment saved without inline highlight`,
-            error,
-          );
-        }
-      }
-    }
-
     const comment = await this.commentRepo.findById(inserted.id, {
       includeCreator: true,
       includeResolvedBy: true,
@@ -113,7 +83,7 @@ export class CommentService {
 
     this.generalQueue
       .add(QueueJob.ADD_PAGE_WATCHERS, {
-        userIds: [user.id],
+        userIds: [userId],
         pageId: page.id,
         spaceId: page.spaceId,
         workspaceId,
@@ -131,7 +101,7 @@ export class CommentService {
       page.id,
       page.spaceId,
       workspaceId,
-      user.id,
+      userId,
       !isReply,
       createCommentDto.parentCommentId,
     );

apps/server/src/core/comment/dto/create-comment.dto.ts

@@ -1,22 +1,4 @@
-import { IsIn, IsJSON, IsObject, IsOptional, IsString, IsUUID } from 'class-validator';
+import { IsIn, IsJSON, IsOptional, IsString, IsUUID } from 'class-validator';
-import { z } from 'zod';
-
-const yjsIdSchema = z.object({
-  client: z.number().int().nonnegative(),
-  clock: z.number().int().nonnegative(),
-});
-
-const yjsRelativePositionSchema = z.object({
-  type: yjsIdSchema,
-  tname: z.string().nullable(),
-  item: yjsIdSchema.nullable(),
-  assoc: z.number().int(),
-});
-
-export const yjsSelectionSchema = z.object({
-  anchor: yjsRelativePositionSchema,
-  head: yjsRelativePositionSchema,
-});
 
 export class CreateCommentDto {
   @IsString()
@@ -36,11 +18,4 @@ export class CreateCommentDto {
   @IsOptional()
   @IsUUID()
   parentCommentId: string;
-
-  @IsOptional()
-  @IsObject()
-  yjsSelection?: {
-    anchor: any;
-    head: any;
-  };
 }

apps/server/src/core/notification/dto/notification.dto.ts

@@ -1,5 +1,4 @@
-import { IsArray, IsIn, IsOptional, IsString, IsUUID } from 'class-validator';
+import { IsArray, IsOptional, IsUUID } from 'class-validator';
-import { PaginationOptions } from '@docmost/db/pagination/pagination-options';
 
 export class NotificationIdDto {
   @IsUUID()
@@ -12,10 +11,3 @@ export class MarkNotificationsReadDto {
   @IsOptional()
   notificationIds?: string[];
 }
-
-export class ListNotificationsDto extends PaginationOptions {
-  @IsOptional()
-  @IsString()
-  @IsIn(['direct', 'updates', 'all'])
-  type?: 'direct' | 'updates' | 'all' = 'all';
-}

apps/server/src/core/notification/notification.constants.ts

@@ -4,45 +4,7 @@ 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;
-}

apps/server/src/core/notification/notification.controller.ts

@@ -9,8 +9,9 @@ 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 { ListNotificationsDto, MarkNotificationsReadDto } from './dto/notification.dto';
+import { MarkNotificationsReadDto } from './dto/notification.dto';
 
 @UseGuards(JwtAuthGuard)
 @Controller('notifications')
@@ -20,10 +21,10 @@ export class NotificationController {
   @HttpCode(HttpStatus.OK)
   @Post('/')
   async getNotifications(
-    @Body() dto: ListNotificationsDto,
+    @Body() pagination: PaginationOptions,
     @AuthUser() user: User,
   ) {
-    return this.notificationService.findByUserId(user.id, dto, dto.type);
+    return this.notificationService.findByUserId(user.id, pagination);
   }
 
   @HttpCode(HttpStatus.OK)

apps/server/src/core/notification/notification.module.ts

@@ -4,7 +4,6 @@ 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: [],
@@ -14,7 +13,6 @@ import { PageUpdateEmailRateLimiter } from './services/page-update-email-rate-li
     NotificationProcessor,
     CommentNotificationService,
     PageNotificationService,
-    PageUpdateEmailRateLimiter,
   ],
   exports: [NotificationService],
 })

apps/server/src/core/notification/notification.processor.ts

@@ -8,7 +8,6 @@ import {
   ICommentNotificationJob,
   ICommentResolvedNotificationJob,
   IPageMentionNotificationJob,
-  IPageUpdateNotificationJob,
   IPermissionGrantedNotificationJob,
 } from '../../integrations/queue/constants/queue.interface';
 import { CommentNotificationService } from './services/comment.notification';
@@ -36,7 +35,6 @@ export class NotificationProcessor
       | ICommentNotificationJob
       | ICommentResolvedNotificationJob
       | IPageMentionNotificationJob
-      | IPageUpdateNotificationJob
       | IPermissionGrantedNotificationJob,
       void
     >,
@@ -78,20 +76,6 @@ 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}`);
       }

apps/server/src/core/notification/notification.service.ts

@@ -6,8 +6,6 @@ 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 {
@@ -15,23 +13,12 @@ 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
@@ -41,35 +28,8 @@ export class NotificationService {
     return notification;
   }
 
-  async findByUserId(
+  async findByUserId(userId: string, pagination: PaginationOptions) {
-    userId: string,
+    return this.notificationRepo.findByUserId(userId, pagination);
-    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) {
@@ -93,27 +53,17 @@ export class NotificationService {
     notificationId: string,
     subject: string,
     template: any,
-    type?: NotificationType,
   ) {
     try {
       const user = await this.db
         .selectFrom('users')
-        .select(['email', 'settings'])
+        .select(['email'])
         .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,

apps/server/src/core/notification/services/comment.notification.ts

@@ -86,14 +86,12 @@ 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);
@@ -112,14 +110,12 @@ 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,
       );
     }
   }
@@ -175,7 +171,6 @@ export class CommentNotificationService {
       spaceId,
       commentId,
     });
-    if (!notification) return;
 
     const subject = `${actor.name} resolved a comment on ${pageTitle}`;
 
@@ -184,7 +179,6 @@ export class CommentNotificationService {
       notification.id,
       subject,
       CommentResolvedEmail({ actorName: actor.name, pageTitle, pageUrl }),
-      NotificationType.COMMENT_RESOLVED,
     );
   }
 

apps/server/src/core/notification/services/page-update-email-rate-limiter.ts

@@ -1,43 +0,0 @@
-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[]) ?? [];
-  }
-
-}

apps/server/src/core/notification/services/page.notification.ts

@@ -1,43 +1,25 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } 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) {
@@ -59,9 +41,10 @@ export class PageNotificationService {
       );
 
     const usersWithPageAccess =
-      await this.pagePermissionRepo.getUserIdsWithPageAccess(pageId, [
+      await this.pagePermissionRepo.getUserIdsWithPageAccess(
-        ...usersWithSpaceAccess,
+        pageId,
-      ]);
+        [...usersWithSpaceAccess],
+      );
     const usersWithAccess = new Set(usersWithPageAccess);
 
     const accessibleMentions = newMentions.filter((m) =>
@@ -114,7 +97,6 @@ export class PageNotificationService {
         spaceId,
         data: { mentionId },
       });
-      if (!notification) continue;
 
       const pageUrl = `${basePageUrl}`;
       const subject = `${actor.name} mentioned you in ${pageTitle}`;
@@ -124,7 +106,6 @@ export class PageNotificationService {
         notification.id,
         subject,
         PageMentionEmail({ actorName: actor.name, pageTitle, pageUrl }),
-        NotificationType.PAGE_USER_MENTION,
       );
     }
   }
@@ -158,7 +139,6 @@ export class PageNotificationService {
         spaceId,
         data: { role },
       });
-      if (!notification) continue;
 
       const subject = `${actor.name} gave you ${accessLabel} access to ${pageTitle}`;
 
@@ -176,232 +156,6 @@ export class PageNotificationService {
     }
   }
 
-  async processPageUpdate(data: IPageUpdateNotificationJob, appUrl: string) {
-    const { pageId, spaceId, workspaceId, actorIds } = data;
-
-    const watcherIds = await this.watcherRepo.getPageWatcherIds(pageId);
-    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 } = 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,
-          }),
-          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,

apps/server/src/core/page/page-access/page-access.service.ts

@@ -6,14 +6,12 @@ import {
   SpaceCaslAction,
   SpaceCaslSubject,
 } from '../../casl/interfaces/space-ability.type';
-import { SpaceRepo } from '@docmost/db/repos/space/space.repo';
 
 @Injectable()
 export class PageAccessService {
   constructor(
     private readonly pagePermissionRepo: PagePermissionRepo,
     private readonly spaceAbility: SpaceAbilityFactory,
-    private readonly spaceRepo: SpaceRepo,
   ) {}
 
   /**
@@ -101,25 +99,4 @@ export class PageAccessService {
 
     return { hasRestriction: hasAnyRestriction };
   }
-
-  async validateCanComment(
-    page: Page,
-    user: User,
-    workspaceId: string,
-  ): Promise<void> {
-    try {
-      await this.validateCanEdit(page, user);
-      return;
-    } catch {
-      // User cannot edit — check if reader commenting is enabled
-    }
-
-    await this.validateCanView(page, user);
-
-    const space = await this.spaceRepo.findById(page.spaceId, workspaceId);
-    const settings = space?.settings as Record<string, any> | null;
-    if (!settings?.comments?.allowViewerComments) {
-      throw new ForbiddenException();
-    }
-  }
 }

apps/server/src/core/space/dto/update-space.dto.ts

@@ -11,8 +11,4 @@ export class UpdateSpaceDto extends PartialType(CreateSpaceDto) {
   @IsOptional()
   @IsBoolean()
   disablePublicSharing: boolean;
-
-  @IsOptional()
-  @IsBoolean()
-  allowViewerComments: boolean;
 }

apps/server/src/core/space/services/space.service.ts

@@ -13,7 +13,6 @@ import { Space, User } from '@docmost/db/types/entity.types';
 import { UpdateSpaceDto } from '../dto/update-space.dto';
 import { executeTx } from '@docmost/db/utils';
 import { InjectKysely } from 'nestjs-kysely';
-import { Feature } from '../../../common/features';
 import { SpaceMemberService } from './space-member.service';
 import { SpaceRole } from '../../../common/helpers/types/permission';
 import { QueueJob, QueueName } from 'src/integrations/queue/constants';
@@ -134,34 +133,17 @@ export class SpaceService {
       }
     }
 
-    if (
+    if (typeof updateSpaceDto.disablePublicSharing !== 'undefined') {
-      typeof updateSpaceDto.disablePublicSharing !== 'undefined' ||
-      typeof updateSpaceDto.allowViewerComments !== 'undefined'
-    ) {
       const workspace = await this.workspaceRepo.findById(workspaceId, {
         withLicenseKey: true,
       });
 
       if (
-        typeof updateSpaceDto.disablePublicSharing !== 'undefined' &&
+        !this.licenseCheckService.hasFeature(workspace.licenseKey, 'security:settings', workspace.plan)
-        !this.licenseCheckService.hasFeature(
-          workspace.licenseKey,
-          Feature.SECURITY_SETTINGS,
-          workspace.plan,
-        )
       ) {
-        throw new ForbiddenException('This feature requires a valid license');
+        throw new ForbiddenException(
-      }
+          'This feature requires a valid license',
-
+        );
-      if (
-        typeof updateSpaceDto.allowViewerComments !== 'undefined' &&
-        !this.licenseCheckService.hasFeature(
-          workspace.licenseKey,
-          Feature.VIEWER_COMMENTS,
-          workspace.plan,
-        )
-      ) {
-        throw new ForbiddenException('This feature requires a valid license');
       }
     }
 
@@ -197,22 +179,6 @@ export class SpaceService {
         }
       }
 
-      if (typeof updateSpaceDto.allowViewerComments !== 'undefined') {
-        const prev = settingsBefore?.comments?.allowViewerComments ?? false;
-        if (prev !== updateSpaceDto.allowViewerComments) {
-          before.allowViewerComments = prev;
-          after.allowViewerComments = updateSpaceDto.allowViewerComments;
-        }
-
-        await this.spaceRepo.updateCommentSettings(
-          updateSpaceDto.spaceId,
-          workspaceId,
-          'allowViewerComments',
-          updateSpaceDto.allowViewerComments,
-          trx,
-        );
-      }
-
       updatedSpace = await this.spaceRepo.updateSpace(
         {
           name: updateSpaceDto.name,

apps/server/src/core/user/dto/update-user.dto.ts

@@ -35,24 +35,4 @@ 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;
 }

apps/server/src/core/user/user.service.ts

@@ -7,7 +7,6 @@ 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';
@@ -61,24 +60,6 @@ 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) {

apps/server/src/core/watcher/watcher.controller.ts

@@ -1,6 +1,8 @@
-import {
+/***
+ import {
   Body,
   Controller,
+  ForbiddenException,
   HttpCode,
   HttpStatus,
   NotFoundException,
@@ -14,7 +16,12 @@ 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 { PageAccessService } from '../page/page-access/page-access.service';
+import SpaceAbilityFactory from '../casl/abilities/space-ability.factory';
+import {
+  SpaceCaslAction,
+  SpaceCaslSubject,
+} from '../casl/interfaces/space-ability.type';
+
 
 @UseGuards(JwtAuthGuard)
 @Controller('pages')
@@ -22,7 +29,7 @@ export class WatcherController {
   constructor(
     private readonly watcherService: WatcherService,
     private readonly pageRepo: PageRepo,
-    private readonly pageAccessService: PageAccessService,
+    private readonly spaceAbility: SpaceAbilityFactory,
   ) {}
 
   @HttpCode(HttpStatus.OK)
@@ -37,7 +44,10 @@ export class WatcherController {
       throw new NotFoundException('Page not found');
     }
 
-    await this.pageAccessService.validateCanView(page, user);
+    const ability = await this.spaceAbility.createForUser(user, page.spaceId);
+    if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
+      throw new ForbiddenException();
+    }
 
     await this.watcherService.watchPage(
       user.id,
@@ -57,7 +67,10 @@ export class WatcherController {
       throw new NotFoundException('Page not found');
     }
 
-    await this.pageAccessService.validateCanView(page, user);
+    const ability = await this.spaceAbility.createForUser(user, page.spaceId);
+    if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
+      throw new ForbiddenException();
+    }
 
     await this.watcherService.unwatchPage(user.id, page.id);
 
@@ -72,10 +85,15 @@ export class WatcherController {
       throw new NotFoundException('Page not found');
     }
 
-    await this.pageAccessService.validateCanView(page, user);
+    const ability = await this.spaceAbility.createForUser(user, page.spaceId);
+    if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
+      throw new ForbiddenException();
+    }
 
     const watching = await this.watcherService.isWatchingPage(user.id, page.id);
 
     return { watching };
   }
+
 }
+***/

apps/server/src/core/watcher/watcher.module.ts

@@ -1,11 +1,10 @@
 import { Module } from '@nestjs/common';
 import { WatcherService } from './watcher.service';
-import { WatcherController } from './watcher.controller';
+import { CaslModule } from '../casl/casl.module';
-import { PageAccessModule } from '../page/page-access/page-access.module';
 
 @Module({
-  imports: [PageAccessModule],
+  imports: [CaslModule],
-  controllers: [WatcherController],
+  controllers: [],
   providers: [WatcherService],
   exports: [WatcherService],
 })

apps/server/src/core/workspace/services/workspace.service.ts

@@ -18,7 +18,6 @@ import { WorkspaceRepo } from '@docmost/db/repos/workspace/workspace.repo';
 import { KyselyDB, KyselyTransaction } from '@docmost/db/types/kysely.types';
 import { executeTx } from '@docmost/db/utils';
 import { InjectKysely } from 'nestjs-kysely';
-import { Feature } from '../../../common/features';
 import { User } from '@docmost/db/types/entity.types';
 import { GroupUserRepo } from '@docmost/db/repos/group/group-user.repo';
 import { GroupRepo } from '@docmost/db/repos/group/group.repo';
@@ -353,7 +352,7 @@ export class WorkspaceService {
         typeof updateWorkspaceDto.trashRetentionDays !== 'undefined' ||
         typeof updateWorkspaceDto.restrictApiToAdmins !== 'undefined'
       ) {
-        if (!this.licenseCheckService.hasFeature(ws.licenseKey, Feature.SECURITY_SETTINGS, ws.plan)) {
+        if (!this.licenseCheckService.hasFeature(ws.licenseKey, 'security:settings', ws.plan)) {
           throw new ForbiddenException(
             'This feature requires a valid license',
           );

apps/server/src/database/migrations/20260329T163516-add-new-indexes.ts

@@ -1,333 +0,0 @@
-import { type Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await db.schema
-    .createIndex('idx_group_users_user_id')
-    .ifNotExists()
-    .on('group_users')
-    .column('user_id')
-    .execute();
-
-  await db.schema
-    .createIndex('idx_space_members_user_id')
-    .ifNotExists()
-    .on('space_members')
-    .column('user_id')
-    .execute();
-
-  await db.schema
-    .createIndex('idx_space_members_group_id')
-    .ifNotExists()
-    .on('space_members')
-    .column('group_id')
-    .execute();
-
-  // Page tree
-  await sql`
-    CREATE INDEX IF NOT EXISTS idx_pages_space_parent_position
-    ON pages (space_id, parent_page_id, position COLLATE "C")
-    WHERE deleted_at IS NULL
-  `.execute(db);
-
-  await sql`
-    CREATE INDEX IF NOT EXISTS idx_pages_parent_page_id
-    ON pages (parent_page_id)
-    WHERE deleted_at IS NULL
-  `.execute(db);
-
-  // Recent pages query
-  await sql`
-    CREATE INDEX IF NOT EXISTS idx_pages_space_updated
-    ON pages (space_id, updated_at DESC)
-    WHERE deleted_at IS NULL
-  `.execute(db);
-
-  // Trash view
-  await sql`
-    CREATE INDEX IF NOT EXISTS idx_pages_space_deleted
-    ON pages (space_id, deleted_at DESC)
-    WHERE deleted_at IS NOT NULL
-  `.execute(db);
-
-  await sql`
-    CREATE UNIQUE INDEX IF NOT EXISTS idx_workspaces_hostname_lower
-    ON workspaces (LOWER(hostname))
-  `.execute(db);
-
-  await db.schema
-    .createIndex('idx_workspaces_created_at')
-    .ifNotExists()
-    .on('workspaces')
-    .column('created_at')
-    .execute();
-
-  await db.schema
-    .createIndex('idx_users_workspace_deleted')
-    .ifNotExists()
-    .on('users')
-    .columns(['workspace_id', 'deleted_at'])
-    .execute();
-
-  await sql`
-    CREATE UNIQUE INDEX IF NOT EXISTS idx_spaces_slug_lower_workspace
-    ON spaces (LOWER(slug), workspace_id)
-  `.execute(db);
-
-  await db.schema
-    .createIndex('idx_spaces_workspace_id')
-    .ifNotExists()
-    .on('spaces')
-    .column('workspace_id')
-    .execute();
-
-  await sql`
-    CREATE UNIQUE INDEX IF NOT EXISTS idx_groups_name_lower_workspace
-    ON groups (LOWER(name), workspace_id)
-  `.execute(db);
-
-  await db.schema
-    .createIndex('idx_groups_workspace_id')
-    .ifNotExists()
-    .on('groups')
-    .column('workspace_id')
-    .execute();
-
-  await db.schema
-    .createIndex('idx_shares_page_id')
-    .ifNotExists()
-    .on('shares')
-    .column('page_id')
-    .execute();
-
-  await db.schema
-    .createIndex('idx_attachments_page_id')
-    .ifNotExists()
-    .on('attachments')
-    .column('page_id')
-    .execute();
-
-  await db.schema
-    .createIndex('idx_attachments_space_id')
-    .ifNotExists()
-    .on('attachments')
-    .column('space_id')
-    .execute();
-
-  await db.schema
-    .createIndex('idx_comments_page_id')
-    .ifNotExists()
-    .on('comments')
-    .column('page_id')
-    .execute();
-
-  await db.schema
-    .createIndex('idx_comments_parent_comment_id')
-    .ifNotExists()
-    .on('comments')
-    .column('parent_comment_id')
-    .execute();
-
-  await sql`
-    CREATE INDEX IF NOT EXISTS idx_page_history_page_created
-    ON page_history (page_id, created_at DESC)
-  `.execute(db);
-
-  await db.schema
-    .createIndex('idx_attachments_workspace_id')
-    .ifNotExists()
-    .on('attachments')
-    .column('workspace_id')
-    .execute();
-
-  await db.schema
-    .createIndex('idx_backlinks_target_page_id')
-    .ifNotExists()
-    .on('backlinks')
-    .column('target_page_id')
-    .execute();
-
-  await db.schema
-    .createIndex('idx_pages_workspace_id')
-    .ifNotExists()
-    .on('pages')
-    .column('workspace_id')
-    .execute();
-
-  await db.schema
-    .createIndex('idx_pages_creator_id')
-    .ifNotExists()
-    .on('pages')
-    .column('creator_id')
-    .execute();
-
-  // Notifications: FK cascade from pages, spaces, comments
-  await db.schema
-    .createIndex('idx_notifications_page_id')
-    .ifNotExists()
-    .on('notifications')
-    .column('page_id')
-    .execute();
-
-  await db.schema
-    .createIndex('idx_notifications_space_id')
-    .ifNotExists()
-    .on('notifications')
-    .column('space_id')
-    .execute();
-
-  await db.schema
-    .createIndex('idx_notifications_comment_id')
-    .ifNotExists()
-    .on('notifications')
-    .column('comment_id')
-    .execute();
-
-  // Watchers: cleanup queries and FK cascade
-  await db.schema
-    .createIndex('idx_watchers_user_workspace')
-    .ifNotExists()
-    .on('watchers')
-    .columns(['user_id', 'workspace_id'])
-    .execute();
-
-  await db.schema
-    .createIndex('idx_watchers_space_id')
-    .ifNotExists()
-    .on('watchers')
-    .column('space_id')
-    .execute();
-
-  // Auth providers: all queries filter by workspaceId
-  await db.schema
-    .createIndex('idx_auth_providers_workspace_id')
-    .ifNotExists()
-    .on('auth_providers')
-    .column('workspace_id')
-    .execute();
-
-  // Auth accounts: SSO login lookup by provider user
-  await db.schema
-    .createIndex('idx_auth_accounts_provider_user_id')
-    .ifNotExists()
-    .on('auth_accounts')
-    .columns(['provider_user_id', 'auth_provider_id'])
-    .execute();
-
-  // Workspace invitations: listing and SSO lookup
-  await db.schema
-    .createIndex('idx_workspace_invitations_workspace_id')
-    .ifNotExists()
-    .on('workspace_invitations')
-    .column('workspace_id')
-    .execute();
-
-  // API keys: query and FK cascade
-  await db.schema
-    .createIndex('idx_api_keys_workspace_id')
-    .ifNotExists()
-    .on('api_keys')
-    .column('workspace_id')
-    .execute();
-
-  // User sessions: delete queries and FK cascade on all session states
-  await db.schema
-    .createIndex('idx_user_sessions_user_workspace')
-    .ifNotExists()
-    .on('user_sessions')
-    .columns(['user_id', 'workspace_id'])
-    .execute();
-}
-
-export async function down(db: Kysely<any>): Promise<void> {
-  await db.schema.dropIndex('idx_group_users_user_id').ifExists().execute();
-  await db.schema.dropIndex('idx_space_members_user_id').ifExists().execute();
-  await db.schema.dropIndex('idx_space_members_group_id').ifExists().execute();
-  await db.schema
-    .dropIndex('idx_pages_space_parent_position')
-    .ifExists()
-    .execute();
-  await db.schema.dropIndex('idx_pages_parent_page_id').ifExists().execute();
-  await db.schema.dropIndex('idx_pages_space_updated').ifExists().execute();
-  await db.schema.dropIndex('idx_pages_space_deleted').ifExists().execute();
-  await db.schema
-    .dropIndex('idx_workspaces_hostname_lower')
-    .ifExists()
-    .execute();
-  await db.schema.dropIndex('idx_workspaces_created_at').ifExists().execute();
-  await db.schema
-    .dropIndex('idx_users_workspace_deleted')
-    .ifExists()
-    .execute();
-  await db.schema
-    .dropIndex('idx_spaces_slug_lower_workspace')
-    .ifExists()
-    .execute();
-  await db.schema
-    .dropIndex('idx_spaces_workspace_id')
-    .ifExists()
-    .execute();
-  await db.schema
-    .dropIndex('idx_groups_name_lower_workspace')
-    .ifExists()
-    .execute();
-  await db.schema.dropIndex('idx_groups_workspace_id').ifExists().execute();
-  await db.schema.dropIndex('idx_shares_page_id').ifExists().execute();
-  await db.schema.dropIndex('idx_attachments_page_id').ifExists().execute();
-  await db.schema.dropIndex('idx_attachments_space_id').ifExists().execute();
-  await db.schema.dropIndex('idx_comments_page_id').ifExists().execute();
-  await db.schema
-    .dropIndex('idx_comments_parent_comment_id')
-    .ifExists()
-    .execute();
-  await db.schema
-    .dropIndex('idx_page_history_page_created')
-    .ifExists()
-    .execute();
-  await db.schema
-    .dropIndex('idx_attachments_workspace_id')
-    .ifExists()
-    .execute();
-  await db.schema
-    .dropIndex('idx_backlinks_target_page_id')
-    .ifExists()
-    .execute();
-  await db.schema.dropIndex('idx_pages_workspace_id').ifExists().execute();
-  await db.schema.dropIndex('idx_pages_creator_id').ifExists().execute();
-  await db.schema
-    .dropIndex('idx_notifications_page_id')
-    .ifExists()
-    .execute();
-  await db.schema
-    .dropIndex('idx_notifications_space_id')
-    .ifExists()
-    .execute();
-  await db.schema
-    .dropIndex('idx_notifications_comment_id')
-    .ifExists()
-    .execute();
-  await db.schema
-    .dropIndex('idx_watchers_user_workspace')
-    .ifExists()
-    .execute();
-  await db.schema.dropIndex('idx_watchers_space_id').ifExists().execute();
-  await db.schema
-    .dropIndex('idx_auth_providers_workspace_id')
-    .ifExists()
-    .execute();
-  await db.schema
-    .dropIndex('idx_auth_accounts_provider_user_id')
-    .ifExists()
-    .execute();
-  await db.schema
-    .dropIndex('idx_workspace_invitations_workspace_id')
-    .ifExists()
-    .execute();
-  await db.schema
-    .dropIndex('idx_api_keys_workspace_id')
-    .ifExists()
-    .execute();
-  await db.schema
-    .dropIndex('idx_user_sessions_user_workspace')
-    .ifExists()
-    .execute();
-}

apps/server/src/database/repos/notification/notification.repo.ts

@@ -11,7 +11,6 @@ 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 {
@@ -28,12 +27,8 @@ export class NotificationRepo {
       .executeTakeFirst();
   }
 
-  async findByUserId(
+  async findByUserId(userId: string, pagination: PaginationOptions) {
-    userId: string,
+    const query = this.db
-    pagination: PaginationOptions,
-    type: NotificationTab = 'all',
-  ) {
-    let query = this.db
       .selectFrom('notifications')
       .selectAll('notifications')
       .select((eb) => this.withActor(eb))
@@ -47,12 +42,6 @@ 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,
@@ -149,29 +138,6 @@ 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

apps/server/src/database/repos/space/space.repo.ts

@@ -111,28 +111,6 @@ export class SpaceRepo {
       .executeTakeFirst();
   }
 
-  async updateCommentSettings(
-    spaceId: string,
-    workspaceId: string,
-    prefKey: string,
-    prefValue: string | boolean,
-    trx?: KyselyTransaction,
-  ) {
-    const db = dbOrTx(this.db, trx);
-    return db
-      .updateTable('spaces')
-      .set({
-        settings: sql`COALESCE(settings, '{}'::jsonb)
-          || jsonb_build_object('comments', COALESCE(settings->'comments', '{}'::jsonb)
-          || jsonb_build_object('${sql.raw(prefKey)}', ${sql.lit(prefValue)}))`,
-        updatedAt: new Date(),
-      })
-      .where('id', '=', spaceId)
-      .where('workspaceId', '=', workspaceId)
-      .returningAll()
-      .executeTakeFirst();
-  }
-
   async insertSpace(
     insertableSpace: InsertableSpace,
     trx?: KyselyTransaction,

apps/server/src/database/repos/user/user.repo.ts

@@ -13,7 +13,6 @@ 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 {
@@ -192,24 +191,6 @@ 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

apps/server/src/integrations/environment/environment.service.ts

@@ -259,12 +259,6 @@ 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');
   }

apps/server/src/integrations/environment/environment.validation.ts

@@ -117,12 +117,6 @@ 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()

apps/server/src/integrations/export/export.controller.ts

@@ -61,7 +61,7 @@ export class ExportController {
 
     await this.pageAccessService.validateCanView(page, user);
 
-    const result = await this.exportService.exportPages(
+    const zipFileStream = await this.exportService.exportPages(
       dto.pageId,
       dto.format,
       dto.includeAttachments,
@@ -83,29 +83,15 @@ export class ExportController {
       },
     });
 
-    if (result.type === 'file') {
+    const fileName = sanitize(page.title || 'untitled') + '.zip';
-      const ext = getExportExtension(dto.format);
-      const fileName = sanitize(page.title || 'untitled') + ext;
-      const contentType = getMimeType(path.extname(fileName));
 
-      res.headers({
+    res.headers({
-        'Content-Type': contentType,
+      'Content-Type': 'application/zip',
-        'Content-Disposition':
+      'Content-Disposition':
-          'attachment; filename="' + encodeURIComponent(fileName) + '"',
+        'attachment; filename="' + encodeURIComponent(fileName) + '"',
-      });
+    });
 
-      res.send(result.content);
+    res.send(zipFileStream);
-    } else {
-      const fileName = sanitize(page.title || 'untitled') + '.zip';
-
-      res.headers({
-        'Content-Type': 'application/zip',
-        'Content-Disposition':
-          'attachment; filename="' + encodeURIComponent(fileName) + '"',
-      });
-
-      res.send(result.stream);
-    }
   }
 
   @UseGuards(JwtAuthGuard)

apps/server/src/integrations/export/export.service.ts

@@ -150,13 +150,6 @@ export class ExportService {
     // set to null to make export of pages with parentId work
     pages[parentPageIndex].parentPageId = null;
 
-    const isSinglePage = pages.length === 1 && !includeAttachments;
-
-    if (isSinglePage) {
-      const pageContent = await this.exportPage(format, pages[0], true);
-      return { type: 'file' as const, content: pageContent, page: pages[0] };
-    }
-
     const tree = buildTree(pages as Page[]);
 
     const baseUrl = await this.getWorkspaceBaseUrl(pages[0].workspaceId);
@@ -177,7 +170,7 @@ export class ExportService {
       compression: 'DEFLATE',
     });
 
-    return { type: 'zip' as const, stream: zipFile, page: pages[0] };
+    return zipFile;
   }
 
   async exportSpace(

apps/server/src/integrations/import/services/import-attachment.service.ts

@@ -193,8 +193,6 @@ export class ImportAttachmentService {
     // Build a map from resolved archive path → real filename from Confluence
     // metadata. Confluence Server archives often store files under numeric IDs
     // (e.g. "attachments/65601/65602") instead of the original filename.
-    // Also register aliases so HTML references using the original filename
-    // (e.g. "attachments/pageId/original.mp3") resolve to the numeric path.
     const pageDir = path.dirname(pageRelativePath);
     const attachmentNameByRelPath = new Map<string, string>();
     for (const attachment of pageAttachments) {
@@ -205,13 +203,6 @@ export class ImportAttachmentService {
       );
       if (relPath && attachment.fileName) {
         attachmentNameByRelPath.set(relPath, attachment.fileName);
-
-        const dir = path.posix.dirname(relPath);
-        const aliasKey = `${dir}/${attachment.fileName}`;
-        if (!attachmentCandidates.has(aliasKey)) {
-          attachmentCandidates.set(aliasKey, attachmentCandidates.get(relPath)!);
-          attachmentNameByRelPath.set(aliasKey, attachment.fileName);
-        }
       }
     }
 
@@ -571,31 +562,18 @@ export class ImportAttachmentService {
         continue;
       }
 
-      // Resolve the metadata href to the actual archive path
+      // Check if already processed (was referenced in HTML)
-      const resolvedHref = resolveRelativeAttachmentPath(
+      if (processed.has(href)) {
-        href,
+        continue;
-        pageDir,
+      }
-        attachmentCandidates,
-      );
-      if (!resolvedHref) continue;
 
-      // Check if already processed (was referenced in HTML).
+      // Skip if the file doesn't exist
-      // Inline elements may have been processed under an alias key (original
+      if (!attachmentCandidates.has(href)) {
-      // filename) rather than the numeric archive path, so also check whether
-      // the underlying absolute file path has already been uploaded.
-      const absPath = attachmentCandidates.get(resolvedHref);
-      const alreadyProcessed =
-        processed.has(resolvedHref) ||
-        (absPath &&
-          Array.from(processed.values()).some(
-            (entry) => entry.abs === absPath,
-          ));
-      if (alreadyProcessed) {
         continue;
       }
 
       // This attachment was in the list but not referenced in HTML - add it
-      const { attachmentId, apiFilePath, abs } = processFile(resolvedHref);
+      const { attachmentId, apiFilePath, abs } = processFile(href);
       const mime = mimeType || getMimeType(abs);
 
       // Add as attachment node at the end

apps/server/src/integrations/queue/constants/queue.constants.ts

@@ -69,7 +69,6 @@ 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',

apps/server/src/integrations/queue/constants/queue.interface.ts

@@ -60,13 +60,6 @@ export interface IPageMentionNotificationJob {
   workspaceId: string;
 }
 
-export interface IPageUpdateNotificationJob {
-  pageId: string;
-  spaceId: string;
-  workspaceId: string;
-  actorIds: string[];
-}
-
 export interface IPermissionGrantedNotificationJob {
   userIds: string[];
   pageId: string;

apps/server/src/integrations/throttle/throttle.module.ts

@@ -1,35 +0,0 @@
-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 {}

apps/server/src/integrations/transactional/emails/page-update-digest-email.tsx

@@ -1,76 +0,0 @@
-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;

apps/server/src/integrations/transactional/emails/page-update-email.tsx

@@ -1,36 +0,0 @@
-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;
-}
-
-export const PageUpdateEmail = ({
-  userName,
-  actorName,
-  pageTitle,
-  pageUrl,
-}: 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>
-          .
-        </Text>
-      </Section>
-      <EmailButton href={pageUrl}>View page</EmailButton>
-    </MailBody>
-  );
-};
-
-export default PageUpdateEmail;

apps/server/src/integrations/transactional/partials/partials.tsx

@@ -87,7 +87,3 @@ export function MailFooter() {
     </Section>
   );
 }
-
-export function getGreetingName(name?: string): string {
-  return name?.split(' ')[0] || 'there';
-}