Merge branch 'mam_default_limit' into 'master'

Limit of 100 MAM messages, if no other limit has been set by the client

Closes #3256

See merge request !9
This commit is contained in:
louiz
2017-04-19 23:15:49 +02:00
4 changed files with 62 additions and 0 deletions
+6
View File
@@ -627,6 +627,12 @@ bool BiboumiComponent::handle_mam_request(const Stanza& stanza)
if (max)
limit = std::atoi(max->get_inner().data());
}
// If the archive is really big, and the client didn’t specify any
// limit, we avoid flooding it: we set an arbitrary max limit.
if (limit == -1 && start.empty() && end.empty())
{
limit = 100;
}
const auto lines = Database::get_muc_logs(from.bare(), iid.get_local(), iid.get_server(), limit, start, end);
for (const db::MucLogLine& line: lines)
{