From 4ce90892f0df459361ffceaf59ff5a1624954b87 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Sun, 6 Sep 2020 17:10:07 +0300
Subject: Stop using ID field from telegram metadata in widget

---
 web/index.js      | 2 +-
 web/widget-api.js | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'web')

diff --git a/web/index.js b/web/index.js
index 1e5c625..ab39761 100644
--- a/web/index.js
+++ b/web/index.js
@@ -143,7 +143,7 @@ const Pack = ({ pack }) => html`
 		<h1>${pack.title}</h1>
 		<div class="sticker-list">
 			${pack.stickers.map(sticker => html`
-				<${Sticker} key=${sticker["net.maunium.telegram.sticker"].id} content=${sticker}/>
+				<${Sticker} key=${sticker.id} content=${sticker}/>
 			`)}
 		</div>
 	</section>
diff --git a/web/widget-api.js b/web/widget-api.js
index 6d81107..8787262 100644
--- a/web/widget-api.js
+++ b/web/widget-api.js
@@ -35,17 +35,19 @@ window.onmessage = event => {
 
 export function sendSticker(content) {
 	const data = {
-		content,
+		content: {...content},
 		// `name` is for Element Web (and also the spec)
 		// Element Android uses content -> body as the name
 		name: content.body,
 	}
+	// Custom field that stores the ID even for non-telegram stickers
+	delete data.content.id
 
 	// This is for Element iOS
 	const widgetData = {
 		...data,
 		description: content.body,
-		file: `${content["net.maunium.telegram.sticker"].id}.png`,
+		file: `${content.id}.png`,
 	}
 	// Element iOS explodes if there are extra fields present
 	delete widgetData.content["net.maunium.telegram.sticker"]
-- 
cgit v1.2.3