Restore filtering out of RPL_TOPIC and RPL_TOPICWHOTIME messages …

…when finding oldest/latest message in channel.
squidowl · May 9, 2024 · d16c548 · d16c548
1 parent 2d6f78c
commit d16c548
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/data/src/history.rs b/data/src/history.rs
@@ -413,7 +413,7 @@ impl History {
                                 .num_seconds()
                                 < 0
                                 && message.id.is_some()
-                                && !matches!(message.target.source(), message::Source::Internal(_))
+                                && is_reference_message(message)
                         })
                     }
                     isupport::MessageReferenceType::Timestamp => {
@@ -423,7 +423,7 @@ impl History {
                                 .signed_duration_since(join_server_time)
                                 .num_seconds()
                                 < 0
-                                && !matches!(message.target.source(), message::Source::Internal(_))
+                                && is_reference_message(message)
                         })
                     }
                 }
@@ -438,19 +438,26 @@ impl History {
         match self {
             History::Partial { messages, .. } | History::Full { messages, .. } => {
                 match message_reference_type {
-                    isupport::MessageReferenceType::MessageId => messages.iter().find(|message| {
-                        message.id.is_some()
-                            && !matches!(message.target.source(), message::Source::Internal(_))
-                    }),
-                    isupport::MessageReferenceType::Timestamp => messages.iter().find(|message| {
-                        !matches!(message.target.source(), message::Source::Internal(_))
-                    }),
+                    isupport::MessageReferenceType::MessageId => messages
+                        .iter()
+                        .find(|message| message.id.is_some() && is_reference_message(message)),
+                    isupport::MessageReferenceType::Timestamp => messages
+                        .iter()
+                        .find(|message| is_reference_message(message)),
                 }
             }
         }
     }
 }
 
+fn is_reference_message(message: &Message) -> bool {
+    if let message::Source::Server(Some(source)) = message.target.source() {
+        !matches!(source.kind(), message::source::server::Kind::ReplyTopic)
+    } else {
+        !matches!(message.target.source(), message::Source::Internal(_))
+    }
+}
+
 #[derive(Debug)]
 pub struct View<'a> {
     pub total: usize,