paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 01:16:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

topic: Enforce is_channel_message=True on topic queries.

Browse Source
This commit is contained in:
Alex Vandiver
2025-03-17 18:16:38 +00:00
committed by Tim Abbott
parent 33e1d583bf
commit d978363a75
10 changed files with 68 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zerver/lib/topic_sqlalchemy.py
View File

@@ -8,12 +8,18 @@ from zerver.models import UserTopic
def topic_match_sa(topic_name: str) -> ColumnElement[Boolean]:
# _sa is short for SQLAlchemy, which we use mostly for
# queries that search messages
topic_cond = func.upper(column("subject", Text)) == func.upper(literal(topic_name))
topic_cond = and_(
func.upper(column("subject", Text)) == func.upper(literal(topic_name)),
column("is_channel_message", Boolean),
)
return topic_cond
def get_resolved_topic_condition_sa() -> ColumnElement[Boolean]:
resolved_topic_cond = column("subject", Text).startswith(RESOLVED_TOPIC_PREFIX)
resolved_topic_cond = and_(
column("subject", Text).startswith(RESOLVED_TOPIC_PREFIX),
column("is_channel_message", Boolean),
)
return resolved_topic_cond
@@ -32,6 +38,7 @@ def get_followed_topic_condition_sa(user_id: int) -> ColumnElement[Boolean]:
== literal(UserTopic.VisibilityPolicy.FOLLOWED),
func.upper(literal_column("zerver_usertopic.topic_name"))
== func.upper(literal_column("zerver_message.subject")),
literal_column("zerver_message.is_channel_message", Boolean),
literal_column("zerver_usertopic.recipient_id")
== literal_column("zerver_message.recipient_id"),
)