Skip to content

Commit

Permalink
Make CHATHISTORY AROUND return a single batch
Browse files Browse the repository at this point in the history
  • Loading branch information
@progval @spb
progval authored and spb committed Apr 25, 2024
1 parent 9087997 commit 63a3ff9
Showing 1 changed file with 71 additions and 75 deletions.
146 changes: 71 additions & 75 deletions sable_ircd/src/command/handlers/chathistory.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,16 @@ fn handle_chathistory(
return Ok(());
}

send_history_for_target_reverse(
server, &response, source, subcommand, &target, from_ts, None, limit,
send_history_for_target(
server,
&response,
source,
subcommand,
&target,
from_ts,
None,
limit,
Some(0), // forward limit
)?;
}
"BEFORE" => {
Expand All @@ -110,7 +118,7 @@ fn handle_chathistory(
return Ok(());
}

send_history_for_target_reverse(
send_history_for_target(
server,
&response,
source,
Expand All @@ -119,6 +127,7 @@ fn handle_chathistory(
None,
Some(end_ts),
limit,
Some(0), // forward limit
)?;
}
"AFTER" => {
Expand All @@ -136,14 +145,15 @@ fn handle_chathistory(
return Ok(());
}

send_history_for_target_forward(
send_history_for_target(
server,
&response,
source,
subcommand,
&target,
Some(start_ts),
None,
Some(0), // backward limit
limit,
)?;
}
Expand All @@ -164,25 +174,16 @@ fn handle_chathistory(
}
};

send_history_for_target_reverse(
server,
&response,
source,
subcommand,
&target,
Some(around_ts),
None,
Some(limit / 2),
)?;
send_history_for_target_forward(
send_history_for_target(
server,
&response,
source,
subcommand,
&target,
Some(around_ts),
None,
Some(limit / 2),
Some(limit / 2), // backward limit
Some(limit / 2), // forward limit
)?;
}
"BETWEEN" => {
Expand All @@ -201,14 +202,15 @@ fn handle_chathistory(
return Ok(());
}

send_history_for_target_forward(
send_history_for_target(
server,
&response,
source,
subcommand,
&target,
Some(start_ts),
Some(end_ts),
Some(0), // backward limit
limit,
)?;
}
Expand Down Expand Up @@ -290,91 +292,78 @@ fn list_targets(
}
}

fn send_history_for_target_forward(
fn send_history_for_target(
server: &ClientServer,
into: impl MessageSink,
source: &wrapper::User,
subcommand: &str,
target: &str,
from_ts: Option<i64>,
to_ts: Option<i64>,
limit: Option<usize>,
backward_limit: Option<usize>,
forward_limit: Option<usize>,
) -> CommandResult {
let log = server.node().history();
let mut entries = Vec::new();

for entry in log.entries_for_user(source.id()) {
if matches!(from_ts, Some(ts) if entry.timestamp <= ts) {
// Skip over until we hit the timestamp window we're interested in
continue;
}
if matches!(to_ts, Some(ts) if entry.timestamp >= ts) {
// If we hit this then we've passed the requested window and should stop
break;
}
let mut backward_entries = Vec::new();
let mut forward_entries = Vec::new();

if backward_limit != Some(0) {
for entry in log.entries_for_user_reverse(source.id()) {
if matches!(from_ts, Some(ts) if entry.timestamp <= ts) {
// Skip over until we hit the timestamp window we're interested in
continue;
}
if matches!(to_ts, Some(ts) if entry.timestamp >= ts) {
// If we hit this then we've passed the requested window and should stop
break;
}

if let Some(event_target) = target_name_for_entry(source.id(), entry) {
if event_target == target {
entries.push(entry);
if let Some(event_target) = target_name_for_entry(source.id(), entry) {
if event_target == target {
backward_entries.push(entry);
}
}
}

if matches!(limit, Some(limit) if limit <= entries.len()) {
break;
if matches!(backward_limit, Some(limit) if limit <= backward_entries.len()) {
break;
}
}
}

send_history_entries(into, subcommand, target, entries.into_iter())
}

// As above, but work backwards
fn send_history_for_target_reverse(
server: &ClientServer,
into: impl MessageSink,
source: &wrapper::User,
subcommand: &str,
target: &str,
from_ts: Option<i64>,
to_ts: Option<i64>,
limit: Option<usize>,
) -> CommandResult {
let log = server.node().history();
let mut entries = Vec::new();

for entry in log.entries_for_user_reverse(source.id()) {
if matches!(from_ts, Some(ts) if entry.timestamp <= ts) {
// Skip over until we hit the timestamp window we're interested in
continue;
}
if matches!(to_ts, Some(ts) if entry.timestamp >= ts) {
// If we hit this then we've passed the requested window and should stop
break;
}
if forward_limit != Some(0) {
for entry in log.entries_for_user(source.id()) {
if matches!(from_ts, Some(ts) if entry.timestamp <= ts) {
// Skip over until we hit the timestamp window we're interested in
continue;
}
if matches!(to_ts, Some(ts) if entry.timestamp >= ts) {
// If we hit this then we've passed the requested window and should stop
break;
}

if let Some(event_target) = target_name_for_entry(source.id(), entry) {
if event_target == target {
entries.push(entry);
if let Some(event_target) = target_name_for_entry(source.id(), entry) {
if event_target == target {
forward_entries.push(entry);
}
}
}

if matches!(limit, Some(limit) if limit <= entries.len()) {
break;
if matches!(forward_limit, Some(limit) if limit <= forward_entries.len()) {
break;
}
}
}

// "The order of returned messages within the batch is implementation-defined, but SHOULD be
// ascending time order or some approximation thereof, regardless of the subcommand used."
// -- https://ircv3.net/specs/extensions/chathistory#returned-message-notes
send_history_entries(into, subcommand, target, entries.into_iter().rev())
send_history_entries(into, subcommand, target, backward_entries, forward_entries)
}

fn send_history_entries<'a>(
into: impl MessageSink,
subcommand: &str,
target: &str,
entries: impl ExactSizeIterator<Item = &'a HistoryLogEntry>,
backward_entries: Vec<&'a HistoryLogEntry>,
forward_entries: Vec<&'a HistoryLogEntry>,
) -> CommandResult {
if entries.len() == 0 {
if backward_entries.len() == 0 && forward_entries.len() == 0 {
into.send(message::Fail::new(
"CHATHISTORY",
"INVALID_TARGET",
Expand All @@ -387,7 +376,14 @@ fn send_history_entries<'a>(
.with_arguments(&[target])
.start();

for entry in entries {
// "The order of returned messages within the batch is implementation-defined, but SHOULD be
// ascending time order or some approximation thereof, regardless of the subcommand used."
// -- https://ircv3.net/specs/extensions/chathistory#returned-message-notes
for entry in backward_entries
.into_iter()
.rev()
.chain(forward_entries.into_iter())
{
entry.send_to(&batch, entry)?;
}
}
Expand Down

0 comments on commit 63a3ff9

Please sign in to comment.