mirror of
https://github.com/matrix-construct/construct
synced 2025-01-13 16:33:53 +01:00
modules/client/search: Add cmd for limit override to workaround pagination bug in Riot.
This commit is contained in:
parent
5294e607bd
commit
df522ef8e9
1 changed files with 29 additions and 9 deletions
|
@ -199,6 +199,35 @@ try
|
||||||
filter_keys += 0; // doesn't count; no case-insensitive wildcard.
|
filter_keys += 0; // doesn't count; no case-insensitive wildcard.
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Override the limit to 1 to return a result and appease the user as
|
||||||
|
// quickly as possible. The client can call us again for more results.
|
||||||
|
size_t limit
|
||||||
|
{
|
||||||
|
limit_override?
|
||||||
|
size_t(limit_override):
|
||||||
|
size_t(json::get<"limit"_>(room_event_filter))
|
||||||
|
};
|
||||||
|
|
||||||
|
// Key command for the user to override the limit to workaround pagination
|
||||||
|
// bugs in riot which don't properly request next batch to fill viewport.
|
||||||
|
when({"limit"}, [&](const auto &key, const auto &val)
|
||||||
|
{
|
||||||
|
// limit=-1 is unlimited
|
||||||
|
// limit=0 is unchanged
|
||||||
|
// limit=n is overriding
|
||||||
|
limit = lex_cast<ssize_t>(val)?: limit;
|
||||||
|
filter_keys += 0; // doesn't count for wildcard.
|
||||||
|
});
|
||||||
|
|
||||||
|
// The limit value is limited to the viewport size so we can force
|
||||||
|
// pagination rather than search the whole room with one giant result.
|
||||||
|
limit = std::clamp
|
||||||
|
(
|
||||||
|
limit,
|
||||||
|
1UL,
|
||||||
|
size_t(m::room::events::viewport_size)
|
||||||
|
);
|
||||||
|
|
||||||
const string_view search_term
|
const string_view search_term
|
||||||
{
|
{
|
||||||
// Any string after the separator is the search term.
|
// Any string after the separator is the search term.
|
||||||
|
@ -213,15 +242,6 @@ try
|
||||||
kvs.first
|
kvs.first
|
||||||
};
|
};
|
||||||
|
|
||||||
// Override the limit to 1 to return a result and appease the user as
|
|
||||||
// quickly as possible. The client can call us again for more results.
|
|
||||||
const size_t limit
|
|
||||||
{
|
|
||||||
limit_override?
|
|
||||||
size_t(limit_override):
|
|
||||||
size_t(json::get<"limit"_>(room_event_filter))
|
|
||||||
};
|
|
||||||
|
|
||||||
const json::object &event_context
|
const json::object &event_context
|
||||||
{
|
{
|
||||||
json::get<"event_context"_>(room_events)
|
json::get<"event_context"_>(room_events)
|
||||||
|
|
Loading…
Reference in a new issue