macltok

public

Star0

Fork 0

Watch0

58 commits 3 branches 0 tags 0 releases3.0 MiB

Commit `2656c1d26d6b`

tarball

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

3 files changed+148-9

packs: preserve clone usage and outgoing sticker names

Modified file: src/engine/packs.rs+108 additions−9 deletions@@ -220,8 +220,10 @@ pub(super) async fn run_detached(
             from_pack,
             shortcode,
             to,
+            usage,
         } => {
-            let image = pack_image(&client, &from_pack, &shortcode).await?;
+            let mut image = pack_image(&client, &from_pack, &shortcode).await?;
+            apply_usage(&mut image, usage);
             let image = rehost_image(&client, image, max_bytes).await?;
             insert(&mutations, to, vec![(shortcode, image)], None, Vec::new()).await
         }
@@ -230,8 +232,12 @@ pub(super) async fn run_detached(
             event_id,
             to,
             shortcode,
+            usage,
         } => {
-            let image = sticker_image(&client, room_id, event_id).await?;
+            let mut image = sticker_image(&client, room_id, event_id).await?;
+            let body = sticker_body(&image, &shortcode);
+            image.insert("body".to_owned(), body.into());
+            apply_usage(&mut image, usage);
             let image = rehost_image(&client, image, max_bytes).await?;
             insert(&mutations, to, vec![(shortcode, image)], None, Vec::new()).await
         }
@@ -239,7 +245,19 @@ pub(super) async fn run_detached(
             from_pack,
             to,
             display_name,
-        } => clone_pack(&client, &mutations, max_bytes, &from_pack, to, display_name).await,
+            usage,
+        } => {
+            clone_pack(
+                &client,
+                &mutations,
+                max_bytes,
+                &from_pack,
+                to,
+                display_name,
+                usage,
+            )
+            .await
+        }
         _ => Err(Error::new(ErrorKind::Other, "pack command was misrouted")),
     }
 }
@@ -251,6 +269,7 @@ async fn clone_pack(
     from_pack: &str,
     to: ImagePackSource,
     display_name: Option<String>,
+    usage: Option<Vec<PackUsage>>,
 ) -> Result<CommandOutput, Error> {
     let source = resolve_pack_id(client, from_pack)
         .ok_or_else(|| Error::new(ErrorKind::Invalid, "no pack has that id"))?;
@@ -265,7 +284,8 @@ async fn clone_pack(
         Some(JsonValue::Object(images)) => images
             .iter()
             .filter_map(|(shortcode, image)| {
-                let image = with_pack_usage(image.as_object()?.clone(), &meta);
+                let mut image = with_pack_usage(image.as_object()?.clone(), &meta);
+                apply_usage(&mut image, usage.clone());
                 Some((shortcode.clone(), image))
             })
             .collect(),
@@ -340,7 +360,7 @@ async fn send_sticker(
         .and_then(mxc)
         .ok_or_else(|| Error::new(ErrorKind::Invalid, "that image has no usable url"))?;
     let content = json!({
-        "body": image.get("body").and_then(JsonValue::as_str).unwrap_or(shortcode),
+        "body": sticker_body(&image, shortcode),
         "url": url,
         "info": image.get("info").cloned().unwrap_or_else(|| json!({})),
     });
@@ -487,12 +507,43 @@ async fn write_pack(
 }
 
 fn with_pack_usage(mut image: JsonObject, meta: &JsonObject) -> JsonObject {
-    if !image.contains_key("usage")
-        && let Some(usage) = meta.get("usage")
-    {
-        image.insert("usage".to_owned(), usage.clone());
+    let usage = known_usage(image.get("usage"))
+        .or_else(|| known_usage(meta.get("usage")))
+        .unwrap_or_else(|| vec![PackUsage::Emoticon, PackUsage::Sticker]);
+    image.insert("usage".to_owned(), usage_json(usage));
+    image
+}
+
+fn known_usage(value: Option<&JsonValue>) -> Option<Vec<PackUsage>> {
+    let values = value?.as_array()?;
+    let usage = [
+        ("emoticon", PackUsage::Emoticon),
+        ("sticker", PackUsage::Sticker),
+    ]
+    .into_iter()
+    .filter_map(|(name, usage)| {
+        values
+            .iter()
+            .any(|value| value.as_str() == Some(name))
+            .then_some(usage)
+    })
+    .collect::<Vec<_>>();
+    (!usage.is_empty()).then_some(usage)
+}
+
+fn apply_usage(image: &mut JsonObject, usage: Option<Vec<PackUsage>>) {
+    if let Some(usage) = usage {
+        image.insert("usage".to_owned(), usage_json(usage));
     }
+}
+
+fn sticker_body(image: &JsonObject, shortcode: &str) -> String {
     image
+        .get("body")
+        .and_then(JsonValue::as_str)
+        .filter(|body| !body.trim().is_empty())
+        .unwrap_or(shortcode)
+        .to_owned()
 }
 
 fn free_shortcode(images: &JsonObject, wanted: &str) -> String {
@@ -573,6 +624,54 @@ fn object(value: JsonValue) -> JsonObject {
     }
 }
 
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn pack_usage_inherits_known_values_then_defaults() {
+        let pack = object(json!({ "usage": ["sticker", "unknown"] }));
+        let inherited = with_pack_usage(object(json!({ "usage": [] })), &pack);
+        assert_eq!(inherited.get("usage"), Some(&json!(["sticker"])));
+
+        let pack = object(json!({ "usage": ["emoticon"] }));
+        let inherited = with_pack_usage(object(json!({ "usage": ["unknown"] })), &pack);
+        assert_eq!(inherited.get("usage"), Some(&json!(["emoticon"])));
+
+        let pack = object(json!({ "usage": ["sticker"] }));
+        let inherited = with_pack_usage(object(json!({ "usage": ["emoticon", "unknown"] })), &pack);
+        assert_eq!(inherited.get("usage"), Some(&json!(["emoticon"])));
+
+        let pack = object(json!({ "usage": [] }));
+        let inherited = with_pack_usage(object(json!({})), &pack);
+        assert_eq!(
+            inherited.get("usage"),
+            Some(&json!(["emoticon", "sticker"]))
+        );
+
+        let pack = object(json!({ "usage": ["unknown"] }));
+        let inherited = with_pack_usage(object(json!({})), &pack);
+        assert_eq!(
+            inherited.get("usage"),
+            Some(&json!(["emoticon", "sticker"]))
+        );
+    }
+
+    #[test]
+    fn sticker_body_falls_back_when_missing_or_blank() {
+        assert_eq!(sticker_body(&object(json!({})), "wave"), "wave");
+        assert_eq!(sticker_body(&object(json!({ "body": "" })), "wave"), "wave");
+        assert_eq!(
+            sticker_body(&object(json!({ "body": " \t\n " })), "wave"),
+            "wave"
+        );
+        assert_eq!(
+            sticker_body(&object(json!({ "body": "  hello  " })), "wave"),
+            "  hello  "
+        );
+    }
+}
+
 fn parse(json: &str) -> Result<JsonObject, Error> {
     serde_json::from_str(json)
         .map_err(|source| Error::with_source(ErrorKind::Server, "the pack is malformed", source))

Modified file: src/model.rs+3 additions@@ -455,12 +455,14 @@ pub enum PackCommand {
         from_pack: String,
         shortcode: String,
         to: ImagePackSource,
+        usage: Option<Vec<PackUsage>>,
     },
     CloneSticker {
         room_id: OwnedRoomId,
         event_id: OwnedEventId,
         to: ImagePackSource,
         shortcode: String,
+        usage: Option<Vec<PackUsage>>,
     },
     /// makes the room pack if its state key is free, else merges. images that can't be
     /// fetched are skipped and listed, the rest are written
@@ -468,6 +470,7 @@ pub enum PackCommand {
         from_pack: String,
         to: ImagePackSource,
         display_name: Option<String>,
+        usage: Option<Vec<PackUsage>>,
     },
 }
 

Modified file: src/transport.rs+37 additions@@ -1097,11 +1097,23 @@ impl ClientHandle {
         shortcode: String,
         to: ImagePackSource,
     ) -> Result<String, Error> {
+        self.clone_pack_image_with_usage(from_pack, shortcode, to, None)
+            .await
+    }
+
+    pub async fn clone_pack_image_with_usage(
+        &self,
+        from_pack: String,
+        shortcode: String,
+        to: ImagePackSource,
+        usage: Option<Vec<PackUsage>>,
+    ) -> Result<String, Error> {
         let (mut shortcodes, _) = self
             .run_clone(PackCommand::CloneImage {
                 from_pack,
                 shortcode,
                 to,
+                usage,
             })
             .await?;
         shortcodes
@@ -1117,12 +1129,25 @@ impl ClientHandle {
         to: ImagePackSource,
         shortcode: String,
     ) -> Result<String, Error> {
+        self.clone_sticker_with_usage(room_id, event_id, to, shortcode, None)
+            .await
+    }
+
+    pub async fn clone_sticker_with_usage(
+        &self,
+        room_id: OwnedRoomId,
+        event_id: OwnedEventId,
+        to: ImagePackSource,
+        shortcode: String,
+        usage: Option<Vec<PackUsage>>,
+    ) -> Result<String, Error> {
         let (mut shortcodes, _) = self
             .run_clone(PackCommand::CloneSticker {
                 room_id,
                 event_id,
                 to,
                 shortcode,
+                usage,
             })
             .await?;
         shortcodes
@@ -1137,11 +1162,23 @@ impl ClientHandle {
         to: ImagePackSource,
         display_name: Option<String>,
     ) -> Result<Vec<String>, Error> {
+        self.clone_pack_with_usage(from_pack, to, display_name, None)
+            .await
+    }
+
+    pub async fn clone_pack_with_usage(
+        &self,
+        from_pack: String,
+        to: ImagePackSource,
+        display_name: Option<String>,
+        usage: Option<Vec<PackUsage>>,
+    ) -> Result<Vec<String>, Error> {
         let (_, skipped) = self
             .run_clone(PackCommand::ClonePack {
                 from_pack,
                 to,
                 display_name,
+                usage,
             })
             .await?;
         Ok(skipped)

macltok

Commit 2656c1d26d6b

Commit `2656c1d26d6b`