Private
Public Access
Add #roomname references in chat messages (#47)
Mirrors the existing @-mention system's shape: a regex finds #roomname tokens, extract_referenced_room_ids validates them against rooms the *sender* actually belongs to (mirrors mentions' "must be a real member" rule -- referencing a private room the sender isn't in would otherwise leak its existence), and a MessageRoomReference join row is stored per match in create_message. No notification/unread layer, unlike mentions -- referencing a room has no "you were referenced" semantics. Rendering is the same markdown-link rewrite trick MessageContent.tsx already uses for mentions (#username -> [#username](mention:username)), but resolved against the *viewer's* own room list (threaded down from ChatShellPage's room state through ChatPane/MessageList) rather than the stored server-side reference -- a reference to a room the current viewer isn't in quietly renders as plain text instead of a link, same as an @mention of someone outside the room does. The href scheme renders a real react-router Link instead of mentions' inert span, since a room reference is meant to be navigable. mention_service.strip_code_spans (was _strip_code_spans) is now shared between both extraction paths rather than private to one module. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -9,12 +9,14 @@ from app.models import RoomMembership, User
|
||||
MENTION_PATTERN = re.compile(r"@([a-zA-Z0-9_.-]+)")
|
||||
|
||||
|
||||
def _strip_code_spans(content: str) -> str:
|
||||
def strip_code_spans(content: str) -> str:
|
||||
"""Blanks out fenced code blocks and inline code spans (replacing with
|
||||
equal-length whitespace, so a bare '@' in pasted code -- a decorator, an
|
||||
email fragment -- doesn't page someone. Mirrors the same skip logic
|
||||
equal-length whitespace, so a bare '@'/'#' in pasted code -- a
|
||||
decorator, an email fragment, a shell comment -- doesn't trigger a
|
||||
mention or room reference. Mirrors the same skip logic
|
||||
frontend/src/components/MessageContent.tsx already uses for emoji
|
||||
shortcode conversion."""
|
||||
shortcode conversion. Shared with room_reference_service, not private
|
||||
to this module anymore."""
|
||||
lines = content.split("\n")
|
||||
in_fence = False
|
||||
out = []
|
||||
@@ -37,7 +39,7 @@ async def extract_mentioned_user_ids(
|
||||
"""Resolves `@username` tokens in `content` against this room's actual
|
||||
members -- a bare '@' followed by prose that happens to not match
|
||||
anyone's username is just text, not a mention."""
|
||||
usernames = set(MENTION_PATTERN.findall(_strip_code_spans(content)))
|
||||
usernames = set(MENTION_PATTERN.findall(strip_code_spans(content)))
|
||||
if not usernames:
|
||||
return set()
|
||||
|
||||
|
||||
@@ -6,10 +6,11 @@ from sqlalchemy import or_, select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy.orm import selectinload
|
||||
|
||||
from app.models import Message, MessageMention, MessageReaction
|
||||
from app.models import Message, MessageMention, MessageReaction, MessageRoomReference
|
||||
from app.schemas.message import ReactionSummary
|
||||
from app.services.link_preview_service import extract_first_url
|
||||
from app.services.mention_service import extract_mentioned_user_ids
|
||||
from app.services.room_reference_service import extract_referenced_room_ids
|
||||
|
||||
|
||||
class MessageNotFoundError(Exception):
|
||||
@@ -43,6 +44,9 @@ async def create_message(
|
||||
mentioned_ids = await extract_mentioned_user_ids(db, room_id, content)
|
||||
for mentioned_id in mentioned_ids:
|
||||
db.add(MessageMention(message_id=message.id, user_id=mentioned_id))
|
||||
referenced_room_ids = await extract_referenced_room_ids(db, user_id, content)
|
||||
for referenced_room_id in referenced_room_ids:
|
||||
db.add(MessageRoomReference(message_id=message.id, room_id=referenced_room_id))
|
||||
await db.commit()
|
||||
await db.refresh(message)
|
||||
return message
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
import re
|
||||
import uuid
|
||||
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.models import Room, RoomMembership
|
||||
from app.services.mention_service import strip_code_spans
|
||||
|
||||
ROOM_REFERENCE_PATTERN = re.compile(r"#([a-zA-Z0-9_.-]+)")
|
||||
|
||||
|
||||
async def extract_referenced_room_ids(
|
||||
db: AsyncSession, sender_id: uuid.UUID, content: str
|
||||
) -> set[uuid.UUID]:
|
||||
"""Resolves `#roomname` tokens in `content` against rooms the *sender*
|
||||
is a member of -- deliberately not the room the message is being sent
|
||||
in (the whole point is referencing a *different* room), and not open to
|
||||
arbitrary site rooms either (#47: referencing a private room the sender
|
||||
isn't in would leak its existence to anyone reading the message, even
|
||||
though they aren't in it either)."""
|
||||
room_names = set(ROOM_REFERENCE_PATTERN.findall(strip_code_spans(content)))
|
||||
if not room_names:
|
||||
return set()
|
||||
|
||||
result = await db.execute(
|
||||
select(Room.id)
|
||||
.join(RoomMembership, RoomMembership.room_id == Room.id)
|
||||
.where(RoomMembership.user_id == sender_id, Room.name.in_(room_names))
|
||||
)
|
||||
return {row[0] for row in result.all()}
|
||||
Reference in New Issue
Block a user