macltok

public

Star0

Fork 0

Watch0

77 commits 3 branches 0 tags 0 releases3.0 MiB

Commit `924b7c011591`

tarball

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

4 files changed+29-11

packs: send stickers to a timeline, threads included

A sticker sent from a thread view landed in the main timeline, because SendSticker only knew the room. It now takes a TimelineId like AttachmentUpload, so a thread target gets the thread relation and the pinned timeline refuses it.

Modified file: src/engine/packs.rs+23 additions−5 deletions@@ -18,6 +18,7 @@ use super::{
 };
 use crate::{
     CommandOutput, Error, ErrorKind, ImagePackSource, PackCommand, PackImageInfo, PackUsage, Patch,
+    TimelineId,
     normalise::{
         ENABLED_ROOMS, ROOM_PACKS, USER_PACK, effective_usage, resolve_pack_id, stored_pack,
     },
@@ -223,10 +224,10 @@ pub(super) async fn run_detached(
     }
     match command {
         PackCommand::SendSticker {
-            room_id,
+            timeline_id,
             pack_id,
             shortcode,
-        } => send_sticker(&client, room_id, &pack_id, &shortcode)
+        } => send_sticker(&client, &timeline_id, &pack_id, &shortcode)
             .await
             .map(|()| CommandOutput::Done),
         PackCommand::Rehost(mxc) => rehost(&client, mxc, None, max_bytes)
@@ -365,21 +366,38 @@ async fn insert(
 
 async fn send_sticker(
     client: &Client,
-    room_id: OwnedRoomId,
+    timeline_id: &TimelineId,
     pack_id: &str,
     shortcode: &str,
 ) -> Result<(), Error> {
-    let room = client.get_room(&room_id).ok_or_else(Error::room_unknown)?;
+    if matches!(timeline_id, TimelineId::Pinned(_)) {
+        return Err(Error::new(
+            ErrorKind::Invalid,
+            "the pinned timeline can't send or paginate",
+        ));
+    }
+    let room = client
+        .get_room(timeline_id.room_id())
+        .ok_or_else(Error::room_unknown)?;
     let image = pack_image(client, pack_id, shortcode).await?;
     let url = image
         .get("url")
         .and_then(mxc)
         .ok_or_else(|| Error::new(ErrorKind::Invalid, "that image has no usable url"))?;
-    let content = json!({
+    let mut content = json!({
         "body": sticker_body(&image, shortcode),
         "url": url,
         "info": image.get("info").cloned().unwrap_or_else(|| json!({})),
     });
+    // the same fallback the send queue gives a threaded attachment with no reply
+    if let Some(root) = timeline_id.thread_root() {
+        content["m.relates_to"] = json!({
+            "rel_type": "m.thread",
+            "event_id": root,
+            "is_falling_back": true,
+            "m.in_reply_to": { "event_id": root },
+        });
+    }
     room.send_queue()
         .send_raw(raw(&object(content)), "m.sticker".to_owned())
         .await

Modified file: src/engine/repair.rs+2 additions−3 deletions@@ -309,9 +309,8 @@ async fn fill_gap(
             };
             // the sdk answers an already unavailable gap without asking the server, and a joined
             // one with NotFound. an empty first page that hits the end looks the same, uncounted
-            let settled_before = report.pages == 0
-                && events == 0
-                && gap.status == HistoryGapStatus::Unavailable;
+            let settled_before =
+                report.pages == 0 && events == 0 && gap.status == HistoryGapStatus::Unavailable;
             if !settled_before {
                 report.pages += 1;
                 committed = true;

Modified file: src/model.rs+2 additions−1 deletions@@ -409,8 +409,9 @@ pub enum MediaCommand {
 #[non_exhaustive]
 pub enum PackCommand {
     /// body defaults to the shortcode
+    /// into a thread with the thread relation. the pinned timeline refuses it
     SendSticker {
-        room_id: OwnedRoomId,
+        timeline_id: TimelineId,
         pack_id: String,
         shortcode: String,
     },

Modified file: src/transport.rs+2 additions−2 deletions@@ -934,12 +934,12 @@ impl ClientHandle {
     /// body defaults to the shortcode
     pub async fn send_sticker(
         &self,
-        room_id: OwnedRoomId,
+        timeline_id: TimelineId,
         pack_id: String,
         shortcode: String,
     ) -> Result<(), Error> {
         self.run(Command::Pack(PackCommand::SendSticker {
-            room_id,
+            timeline_id,
             pack_id,
             shortcode,
         }))

macltok

Commit 924b7c011591

Commit `924b7c011591`