| is:unread |
diff --git a/web/tests/filter.test.js b/web/tests/filter.test.js
index ce80af6418..193f14a0e4 100644
--- a/web/tests/filter.test.js
+++ b/web/tests/filter.test.js
@@ -361,6 +361,7 @@ test("basics", () => {
// filter.supports_collapsing_recipients loop.
terms = [
{operator: "is", operand: "resolved", negated: true},
+ {operator: "is", operand: "followed", negated: true},
{operator: "is", operand: "dm", negated: true},
{operator: "channel", operand: "channel_name", negated: true},
{operator: "channels", operand: "web-public", negated: true},
@@ -490,6 +491,10 @@ function assert_not_mark_read_with_is_operands(additional_terms_to_test) {
is_operator = [{operator: "is", operand: "resolved", negated: true}];
filter = new Filter([...additional_terms_to_test, ...is_operator]);
assert.ok(!filter.can_mark_messages_read());
+
+ is_operator = [{operator: "is", operand: "followed", negated: true}];
+ filter = new Filter([...additional_terms_to_test, ...is_operator]);
+ assert.ok(!filter.can_mark_messages_read());
}
function assert_not_mark_read_when_searching(additional_terms_to_test) {
@@ -859,6 +864,14 @@ test("predicate_basics", ({override}) => {
assert.ok(!predicate({topic: resolved_topic_name}));
assert.ok(!predicate({type: stream_message, topic: "foo"}));
+ predicate = get_predicate([["is", "followed"]]);
+
+ override(user_topics, "is_topic_followed", () => false);
+ assert.ok(!predicate({type: "stream", topic: "foo", stream_id: 5}));
+
+ override(user_topics, "is_topic_followed", () => true);
+ assert.ok(predicate({type: "stream", topic: "foo", stream_id: 5}));
+
const unknown_stream_id = 999;
override(user_topics, "is_topic_muted", () => false);
override(user_topics, "is_topic_unmuted_or_followed", () => false);
@@ -1406,6 +1419,10 @@ test("describe", ({mock_template}) => {
string = "topics marked as resolved";
assert.equal(Filter.search_description_as_html(narrow), string);
+ narrow = [{operator: "is", operand: "followed"}];
+ string = "followed topics";
+ assert.equal(Filter.search_description_as_html(narrow), string);
+
narrow = [{operator: "is", operand: "something_we_do_not_support"}];
string = "invalid something_we_do_not_support operand for is operator";
assert.equal(Filter.search_description_as_html(narrow), string);
@@ -1739,6 +1756,7 @@ test("navbar_helpers", () => {
const is_dm = [{operator: "is", operand: "dm"}];
const is_mentioned = [{operator: "is", operand: "mentioned"}];
const is_resolved = [{operator: "is", operand: "resolved"}];
+ const is_followed = [{operator: "is", operand: "followed"}];
const channels_public = [{operator: "channels", operand: "public"}];
const channel_topic_terms = [
{operator: "channel", operand: "foo"},
@@ -1842,6 +1860,15 @@ test("navbar_helpers", () => {
title: "translated: Topics marked as resolved",
redirect_url_with_search: "/#narrow/topics/is/resolved",
},
+ {
+ terms: is_followed,
+ is_common_narrow: true,
+ zulip_icon: "follow",
+ title: "translated: Followed topics",
+ redirect_url_with_search: "/#narrow/topics/is/followed",
+ description: "translated: Messages in topics you follow.",
+ link: "/help/follow-a-topic",
+ },
{
terms: channel_topic_terms,
is_common_narrow: true,
diff --git a/web/tests/message_view.test.js b/web/tests/message_view.test.js
index c8760658f0..640e0e386b 100644
--- a/web/tests/message_view.test.js
+++ b/web/tests/message_view.test.js
@@ -337,6 +337,13 @@ run_test("show_empty_narrow_message", ({mock_template}) => {
empty_narrow_html("translated: No topics are marked as resolved."),
);
+ set_filter([["is", "followed"]]);
+ narrow_banner.show_empty_narrow_message();
+ assert.equal(
+ $(".empty_feed_notice_main").html(),
+ empty_narrow_html("translated: You aren't following any topics."),
+ );
+
// organization has disabled sending direct messages
realm.realm_private_message_policy =
settings_config.private_message_policy_values.disabled.code;
diff --git a/web/tests/search_suggestion.test.js b/web/tests/search_suggestion.test.js
index 0779516975..b5e6b94f50 100644
--- a/web/tests/search_suggestion.test.js
+++ b/web/tests/search_suggestion.test.js
@@ -438,6 +438,7 @@ test("empty_query_suggestions", () => {
"is:dm",
"is:starred",
"is:mentioned",
+ "is:followed",
"is:alerted",
"is:unread",
"is:resolved",
@@ -461,6 +462,7 @@ test("empty_query_suggestions", () => {
assert.equal(describe("is:alerted"), "Alerted messages");
assert.equal(describe("is:unread"), "Unread messages");
assert.equal(describe("is:resolved"), "Topics marked as resolved");
+ assert.equal(describe("is:followed"), "Followed topics");
assert.equal(describe("sender:myself@zulip.com"), "Sent by me");
assert.equal(describe("has:link"), "Messages that contain links");
assert.equal(describe("has:image"), "Messages that contain images");
@@ -543,6 +545,7 @@ test("check_is_suggestions", ({override, mock_template}) => {
"is:dm",
"is:starred",
"is:mentioned",
+ "is:followed",
"is:alerted",
"is:unread",
"is:resolved",
@@ -563,6 +566,7 @@ test("check_is_suggestions", ({override, mock_template}) => {
assert.equal(describe("is:alerted"), "Alerted messages");
assert.equal(describe("is:unread"), "Unread messages");
assert.equal(describe("is:resolved"), "Topics marked as resolved");
+ assert.equal(describe("is:followed"), "Followed topics");
query = "-i";
suggestions = get_suggestions(query);
@@ -571,6 +575,7 @@ test("check_is_suggestions", ({override, mock_template}) => {
"-is:dm",
"-is:starred",
"-is:mentioned",
+ "-is:followed",
"-is:alerted",
"-is:unread",
"-is:resolved",
@@ -583,12 +588,21 @@ test("check_is_suggestions", ({override, mock_template}) => {
assert.equal(describe("-is:alerted"), "Exclude alerted messages");
assert.equal(describe("-is:unread"), "Exclude unread messages");
assert.equal(describe("-is:resolved"), "Exclude topics marked as resolved");
+ assert.equal(describe("-is:followed"), "Exclude followed topics");
// operand suggestions follow.
query = "is:";
suggestions = get_suggestions(query);
- expected = ["is:dm", "is:starred", "is:mentioned", "is:alerted", "is:unread", "is:resolved"];
+ expected = [
+ "is:dm",
+ "is:starred",
+ "is:mentioned",
+ "is:followed",
+ "is:alerted",
+ "is:unread",
+ "is:resolved",
+ ];
assert.deepEqual(suggestions.strings, expected);
query = "is:st";
diff --git a/zerver/lib/narrow.py b/zerver/lib/narrow.py
index 1cc7b868fc..9097f5e36d 100644
--- a/zerver/lib/narrow.py
+++ b/zerver/lib/narrow.py
@@ -58,6 +58,7 @@ from zerver.lib.streams import (
get_web_public_streams_queryset,
)
from zerver.lib.topic_sqlalchemy import (
+ get_followed_topic_condition_sa,
get_resolved_topic_condition_sa,
topic_column_sa,
topic_match_sa,
@@ -405,6 +406,9 @@ class NarrowBuilder:
elif operand == "resolved":
cond = get_resolved_topic_condition_sa()
return query.where(maybe_negate(cond))
+ elif operand == "followed":
+ cond = get_followed_topic_condition_sa(self.user_profile.id)
+ return query.where(maybe_negate(cond))
raise BadNarrowOperatorError("unknown 'is' operand " + operand)
_alphanum = frozenset("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
@@ -912,7 +916,7 @@ def ok_to_include_history(
# that's a property on the UserMessage table. There cannot be
# historical messages in these cases anyway.
for term in narrow:
- if term["operator"] == "is" and term["operand"] not in {"resolved"}:
+ if term["operator"] == "is" and term["operand"] not in {"resolved", "followed"}:
include_history = False
return include_history
diff --git a/zerver/lib/narrow_predicate.py b/zerver/lib/narrow_predicate.py
index 948e793eec..cd527403d2 100644
--- a/zerver/lib/narrow_predicate.py
+++ b/zerver/lib/narrow_predicate.py
@@ -14,10 +14,15 @@ channels_operators: List[str] = ["channels", "streams"]
def check_narrow_for_events(narrow: Collection[NarrowTerm]) -> None:
supported_operators = [*channel_operators, "topic", "sender", "is"]
+ unsupported_is_operands = ["followed"]
for narrow_term in narrow:
operator = narrow_term.operator
if operator not in supported_operators:
raise JsonableError(_("Operator {operator} not supported.").format(operator=operator))
+ if operator == "is" and narrow_term.operand in unsupported_is_operands:
+ raise JsonableError(
+ _("Operand {operand} not supported.").format(operand=narrow_term.operand)
+ )
class NarrowPredicate(Protocol):
diff --git a/zerver/lib/topic_sqlalchemy.py b/zerver/lib/topic_sqlalchemy.py
index 6bbab54b89..9dfd9c7e8d 100644
--- a/zerver/lib/topic_sqlalchemy.py
+++ b/zerver/lib/topic_sqlalchemy.py
@@ -1,7 +1,8 @@
-from sqlalchemy.sql import ColumnElement, column, func, literal
+from sqlalchemy.sql import ColumnElement, and_, column, func, literal, literal_column, select, table
from sqlalchemy.types import Boolean, Text
from zerver.lib.topic import RESOLVED_TOPIC_PREFIX
+from zerver.models import UserTopic
def topic_match_sa(topic_name: str) -> ColumnElement[Boolean]:
@@ -18,3 +19,22 @@ def get_resolved_topic_condition_sa() -> ColumnElement[Boolean]:
def topic_column_sa() -> ColumnElement[Text]:
return column("subject", Text)
+
+
+def get_followed_topic_condition_sa(user_id: int) -> ColumnElement[Boolean]:
+ follow_topic_cond = (
+ select([1])
+ .select_from(table("zerver_usertopic"))
+ .where(
+ and_(
+ literal_column("zerver_usertopic.user_profile_id") == literal(user_id),
+ literal_column("zerver_usertopic.visibility_policy")
+ == literal(UserTopic.VisibilityPolicy.FOLLOWED),
+ func.upper(literal_column("zerver_usertopic.topic_name"))
+ == func.upper(literal_column("zerver_message.subject")),
+ literal_column("zerver_usertopic.recipient_id")
+ == literal_column("zerver_message.recipient_id"),
+ )
+ )
+ ).exists()
+ return follow_topic_cond
diff --git a/zerver/tests/test_message_fetch.py b/zerver/tests/test_message_fetch.py
index 28ae1c8ae0..cb6c44dc85 100644
--- a/zerver/tests/test_message_fetch.py
+++ b/zerver/tests/test_message_fetch.py
@@ -270,6 +270,20 @@ class NarrowBuilderTest(ZulipTestCase):
term = dict(operator="is", operand="resolved", negated=True)
self._do_add_term_test(term, "WHERE (subject NOT LIKE %(subject_1)s || '%%'")
+ def test_add_term_using_is_operator_for_followed_topics(self) -> None:
+ term = dict(operator="is", operand="followed", negated=False)
+ self._do_add_term_test(
+ term,
+ "EXISTS (SELECT 1 \nFROM zerver_usertopic \nWHERE zerver_usertopic.user_profile_id = %(param_1)s AND zerver_usertopic.visibility_policy = %(param_2)s AND upper(zerver_usertopic.topic_name) = upper(zerver_message.subject) AND zerver_usertopic.recipient_id = zerver_message.recipient_id)",
+ )
+
+ def test_add_term_using_is_operator_for_negated_followed_topics(self) -> None:
+ term = dict(operator="is", operand="followed", negated=True)
+ self._do_add_term_test(
+ term,
+ "NOT (EXISTS (SELECT 1 \nFROM zerver_usertopic \nWHERE zerver_usertopic.user_profile_id = %(param_1)s AND zerver_usertopic.visibility_policy = %(param_2)s AND upper(zerver_usertopic.topic_name) = upper(zerver_message.subject) AND zerver_usertopic.recipient_id = zerver_message.recipient_id))",
+ )
+
def test_add_term_using_non_supported_operator_should_raise_error(self) -> None:
term = dict(operator="is", operand="non_supported")
self.assertRaises(BadNarrowOperatorError, self._build_query, term)
@@ -951,6 +965,8 @@ class NarrowLibraryTest(ZulipTestCase):
def test_build_narrow_predicate_invalid(self) -> None:
with self.assertRaises(JsonableError):
build_narrow_predicate([NarrowTerm(operator="invalid_operator", operand="operand")])
+ with self.assertRaises(JsonableError):
+ build_narrow_predicate([NarrowTerm(operator="is", operand="followed")])
def test_is_spectator_compatible(self) -> None:
self.assertTrue(is_spectator_compatible([]))
@@ -4584,6 +4600,37 @@ class MessageHasKeywordsTest(ZulipTestCase):
self.assert_length(messages, 1)
+class MessageIsTest(ZulipTestCase):
+ def test_message_is_followed(self) -> None:
+ self.login("iago")
+ is_followed_narrow = orjson.dumps([dict(operator="is", operand="followed")]).decode()
+
+ # Sending a message in a topic that isn't followed by the user.
+ msg_id = self.send_stream_message(self.example_user("hamlet"), "Denmark", topic_name="hey")
+ result = self.client_get(
+ "/json/messages",
+ dict(narrow=is_followed_narrow, anchor=msg_id, num_before=0, num_after=0),
+ )
+ messages = self.assert_json_success(result)["messages"]
+ self.assert_length(messages, 0)
+
+ stream_id = self.get_stream_id("Denmark", self.example_user("hamlet").realm)
+
+ # Following the topic.
+ payload = {
+ "stream_id": stream_id,
+ "topic": "hey",
+ "visibility_policy": int(UserTopic.VisibilityPolicy.FOLLOWED),
+ }
+ self.client_post("/json/user_topics", payload)
+ result = self.client_get(
+ "/json/messages",
+ dict(narrow=is_followed_narrow, anchor=msg_id, num_before=0, num_after=0),
+ )
+ messages = self.assert_json_success(result)["messages"]
+ self.assert_length(messages, 1)
+
+
class MessageVisibilityTest(ZulipTestCase):
def test_update_first_visible_message_id(self) -> None:
Message.objects.all().delete()
|