MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-28 19:58:53 +02:00
Code Issues Releases Wiki Activity

modules/client/search: Allow empty search term as wildcard match for given filter keys.

Browse source
This commit is contained in:
Jason Volk 2022-10-08 11:19:29 -07:00
parent a9b22c9052
commit adc7f16831
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/client/search.cc
View file

@ -162,6 +162,7 @@ try
}); });
}}; }};
uint filter_keys {0};
m::room_event_filter room_event_filter m::room_event_filter room_event_filter
{ {
json::get<"filter"_>(room_events) json::get<"filter"_>(room_events)
@ -176,6 +177,7 @@ try
senders = json::get<"senders"_>(room_event_filter); senders = json::get<"senders"_>(room_event_filter);
senders = json::append(senders, val); senders = json::append(senders, val);
json::get<"senders"_>(room_event_filter) = senders; json::get<"senders"_>(room_event_filter) = senders;
filter_keys += 1;
}); });
json::strung not_senders; json::strung not_senders;
@ -187,17 +189,28 @@ try
not_senders = json::get<"not_senders"_>(room_event_filter); not_senders = json::get<"not_senders"_>(room_event_filter);
not_senders = json::append(not_senders, val); not_senders = json::append(not_senders, val);
json::get<"not_senders"_>(room_event_filter) = not_senders; json::get<"not_senders"_>(room_event_filter) = not_senders;
filter_keys += 1;
}); });
bool case_sensitive {false}; bool case_sensitive {false};
when({"case", "ci"}, [&](const auto &key, const auto &val) when({"case", "ci"}, [&](const auto &key, const auto &val)
{ {
case_sensitive = key == "case"; case_sensitive = key == "case";
filter_keys += 0; // doesn't count; no case-insensitive wildcard.
}); });
const string_view search_term const string_view search_term
{ {
kvs.second?: kvs.first // Any string after the separator is the search term.
kvs.second?
kvs.second:
// When only filter keys are given the search term is wildcard.
filter_keys?
string_view{}:
// No filter keys or separator; it is the search term.
kvs.first
}; };
// Override the limit to 1 to return a result and appease the user as // Override the limit to 1 to return a result and appease the user as
@ -419,7 +432,7 @@ try
const bool match const bool match
{ {
true true
&& match_term && (!query.search_term || match_term)
&& m::match(query.filter, result.event_idx) && m::match(query.filter, result.event_idx)
}; };