macltok

public

Star0

Fork 0

Watch0

97 commits 3 branches 0 tags 0 releases3.0 MiB

Commit `068bfa92dd36`

tarball

atagen <boss@atagen.co>2026-10-25 13:54 UTC

1 file changed+81-12

context: give state rows the typed content the live timeline shows

Context and inbox rows labelled every state event as a generic state change, so a join, a rename or the room's creation read as "sent a state event". Member events now go through ruma's membership_change, and the room name, topic, avatar, encryption, create and tombstone events get their own content as they do in the live timeline.

Modified file: src/normalise/observed.rs+81 additions−12 deletions@@ -2,8 +2,12 @@ use ruma::{
     OwnedEventId, UserId,
     events::{
         poll::{start::PollStartEventContent, unstable_start::UnstablePollStartEventContent},
-        room::message::{
-            MessageType, Relation, RoomMessageEventContent, RoomMessageEventContentWithoutRelation,
+        room::{
+            member::{MembershipChange as RumaMembershipChange, OriginalSyncRoomMemberEvent},
+            message::{
+                MessageType, Relation, RoomMessageEventContent,
+                RoomMessageEventContentWithoutRelation,
+            },
         },
         sticker::StickerEventContent,
     },
@@ -19,8 +23,8 @@ use super::{
     timeline::formatted_body,
 };
 use crate::{
-    Message, MessageMentions, ReplyDetails, ReplyReference, SendState, Sender, TimelineContent,
-    TimelineEvent, TimelineItem, TimelineItemId, UtdCause,
+    Change, MediaId, MembershipChange, Message, MessageMentions, ReplyDetails, ReplyReference,
+    SendState, Sender, TimelineContent, TimelineEvent, TimelineItem, TimelineItemId, UtdCause,
 };
 
 pub(crate) fn normalise_observed(
@@ -148,14 +152,11 @@ pub(crate) fn normalise_observed(
             None => (TimelineContent::Other { event_type }, None, None),
         }
     } else if let Some(state_key) = value.get("state_key").and_then(Value::as_str) {
-        (
-            TimelineContent::OtherState {
-                event_type,
-                state_key: state_key.to_owned(),
-            },
-            None,
-            None,
-        )
+        let content = state_content(value, &event_type).unwrap_or(TimelineContent::OtherState {
+            event_type,
+            state_key: state_key.to_owned(),
+        });
+        (content, None, None)
     } else {
         (TimelineContent::Other { event_type }, None, None)
     };
@@ -269,3 +270,71 @@ fn generic_text(value: &Value) -> Option<String> {
         _ => None,
     }
 }
+
+/// the typed state rows the live timeline gives these events
+fn state_content(value: &Value, event_type: &str) -> Option<TimelineContent> {
+    let content = value.get("content")?;
+    let text = |key: &str| {
+        content
+            .get(key)
+            .and_then(Value::as_str)
+            .filter(|text| !text.is_empty())
+            .map(str::to_owned)
+    };
+    Some(match event_type {
+        "m.room.member" => {
+            let event: OriginalSyncRoomMemberEvent = serde_json::from_value(value.clone()).ok()?;
+            let user_id = event.state_key.clone();
+            match event.membership_change() {
+                RumaMembershipChange::ProfileChanged {
+                    displayname_change,
+                    avatar_url_change,
+                } => TimelineContent::Profile {
+                    user_id,
+                    display_name: displayname_change.map(|change| Change {
+                        old: change.old.map(str::to_owned),
+                        new: change.new.map(str::to_owned),
+                    }),
+                    avatar: avatar_url_change.map(|change| Change {
+                        old: change.old.map(MediaId::plain),
+                        new: change.new.map(MediaId::plain),
+                    }),
+                },
+                change => TimelineContent::Membership {
+                    user_id,
+                    display_name: event.content.displayname.clone(),
+                    change: membership_change(&change),
+                },
+            }
+        }
+        "m.room.name" => TimelineContent::RoomName(text("name")),
+        "m.room.topic" => TimelineContent::RoomTopic(text("topic")),
+        "m.room.avatar" => TimelineContent::RoomAvatar(text("url").map(|url| MediaId::plain(&url))),
+        "m.room.encryption" => TimelineContent::EncryptionEnabled,
+        "m.room.create" => TimelineContent::RoomCreated,
+        "m.room.tombstone" => TimelineContent::RoomUpgraded {
+            successor: serde_json::from_value(content.get("replacement_room")?.clone()).ok()?,
+        },
+        _ => return None,
+    })
+}
+
+const fn membership_change(change: &RumaMembershipChange<'_>) -> MembershipChange {
+    match change {
+        RumaMembershipChange::Joined => MembershipChange::Joined,
+        RumaMembershipChange::Left => MembershipChange::Left,
+        RumaMembershipChange::Banned => MembershipChange::Banned,
+        RumaMembershipChange::Unbanned => MembershipChange::Unbanned,
+        RumaMembershipChange::Kicked => MembershipChange::Kicked,
+        RumaMembershipChange::KickedAndBanned => MembershipChange::KickedAndBanned,
+        RumaMembershipChange::Invited => MembershipChange::Invited,
+        RumaMembershipChange::InvitationAccepted => MembershipChange::InvitationAccepted,
+        RumaMembershipChange::InvitationRejected => MembershipChange::InvitationRejected,
+        RumaMembershipChange::InvitationRevoked => MembershipChange::InvitationRevoked,
+        RumaMembershipChange::Knocked => MembershipChange::Knocked,
+        RumaMembershipChange::KnockAccepted => MembershipChange::KnockAccepted,
+        RumaMembershipChange::KnockRetracted => MembershipChange::KnockRetracted,
+        RumaMembershipChange::KnockDenied => MembershipChange::KnockDenied,
+        _ => MembershipChange::Other,
+    }
+}

macltok

Commit 068bfa92dd36

Commit `068bfa92dd36`