From f8940613204d1893cd109e230aace898c1eda262 Mon Sep 17 00:00:00 2001 From: Sasha Weiss Date: Wed, 23 Oct 2024 14:53:15 -0700 Subject: [PATCH] Tweaks to SMS and Quote messages --- .../ChatItemStandardMessageSmsTestCase.kt | 19 ++++---- ...hatItemStandardMessageWithQuoteTestCase.kt | 43 ++++++++++------- ...chat_item_standard_message_sms_02.binproto | Bin 1138 -> 959 bytes ...chat_item_standard_message_sms_02.txtproto | 45 +++++------------- ...chat_item_standard_message_sms_05.binproto | Bin 1144 -> 965 bytes ...chat_item_standard_message_sms_05.txtproto | 45 +++++------------- ...chat_item_standard_message_sms_08.binproto | Bin 1138 -> 959 bytes ...chat_item_standard_message_sms_08.txtproto | 45 +++++------------- ...chat_item_standard_message_sms_11.binproto | Bin 1142 -> 963 bytes ...chat_item_standard_message_sms_11.txtproto | 45 +++++------------- ...chat_item_standard_message_sms_14.binproto | Bin 1140 -> 961 bytes ...chat_item_standard_message_sms_14.txtproto | 45 +++++------------- ...em_standard_message_with_quote_01.binproto | Bin 601 -> 764 bytes ...em_standard_message_with_quote_01.txtproto | 24 +++++++++- ...em_standard_message_with_quote_02.binproto | Bin 1117 -> 1283 bytes ...em_standard_message_with_quote_02.txtproto | 28 ++++++++++- ...em_standard_message_with_quote_03.binproto | Bin 626 -> 778 bytes ...em_standard_message_with_quote_03.txtproto | 20 ++++++++ ...em_standard_message_with_quote_04.binproto | Bin 521 -> 521 bytes ...em_standard_message_with_quote_04.txtproto | 2 +- ...em_standard_message_with_quote_05.binproto | Bin 727 -> 858 bytes ...em_standard_message_with_quote_05.txtproto | 26 +++++++++- ...em_standard_message_with_quote_06.binproto | Bin 714 -> 824 bytes ...em_standard_message_with_quote_06.txtproto | 22 +++++++++ ...em_standard_message_with_quote_07.binproto | Bin 674 -> 744 bytes ...em_standard_message_with_quote_07.txtproto | 17 ++++++- ...em_standard_message_with_quote_08.binproto | Bin 734 -> 846 bytes ...em_standard_message_with_quote_08.txtproto | 22 ++++++++- ...em_standard_message_with_quote_09.binproto | Bin 678 -> 841 bytes ...em_standard_message_with_quote_09.txtproto | 22 +++++++++ ...em_standard_message_with_quote_10.binproto | Bin 640 -> 810 bytes ...em_standard_message_with_quote_10.txtproto | 26 +++++++++- ...em_standard_message_with_quote_11.binproto | Bin 712 -> 862 bytes ...em_standard_message_with_quote_11.txtproto | 24 +++++++++- ...em_standard_message_with_quote_12.binproto | Bin 621 -> 747 bytes ...em_standard_message_with_quote_12.txtproto | 19 ++++++++ ...em_standard_message_with_quote_13.binproto | Bin 826 -> 826 bytes ...em_standard_message_with_quote_13.txtproto | 2 +- ...em_standard_message_with_quote_14.binproto | Bin 588 -> 588 bytes ...em_standard_message_with_quote_14.txtproto | 4 +- 40 files changed, 343 insertions(+), 202 deletions(-) diff --git a/src/main/kotlin/tests/ChatItemStandardMessageSmsTestCase.kt b/src/main/kotlin/tests/ChatItemStandardMessageSmsTestCase.kt index 3a3fda4..ee87bc8 100644 --- a/src/main/kotlin/tests/ChatItemStandardMessageSmsTestCase.kt +++ b/src/main/kotlin/tests/ChatItemStandardMessageSmsTestCase.kt @@ -2,7 +2,6 @@ package tests import PermutationScope import TestCase -import asList import org.thoughtcrime.securesms.backup.v2.proto.* /** @@ -37,14 +36,16 @@ object ChatItemStandardMessageSmsTestCase : TestCase("chat_item_standard_message text = Text( body = someNonEmptyString() ), - attachments = Generators.permutation { - frames += MessageAttachment( - pointer = some(Generators.smsAttachmentFilePointer()), - flag = MessageAttachment.Flag.NONE, - wasDownloaded = someBoolean(), - clientUuid = null - ) - }.asList(0, 1, 5).let { some(it) } + attachments = Generators.lists(listOf(0, 1, 4)) { + Generators.permutation { + frames += MessageAttachment( + pointer = some(Generators.smsAttachmentFilePointer()), + flag = MessageAttachment.Flag.NONE, + wasDownloaded = someBoolean(), + clientUuid = null + ) + } + }.let { some(it) } ) ) ) diff --git a/src/main/kotlin/tests/ChatItemStandardMessageWithQuoteTestCase.kt b/src/main/kotlin/tests/ChatItemStandardMessageWithQuoteTestCase.kt index eecace7..705a2b1 100644 --- a/src/main/kotlin/tests/ChatItemStandardMessageWithQuoteTestCase.kt +++ b/src/main/kotlin/tests/ChatItemStandardMessageWithQuoteTestCase.kt @@ -81,13 +81,27 @@ object ChatItemStandardMessageWithQuoteTestCase : TestCase("chat_item_standard_m checkNotNull(targetMessage.chatItem) - val quoteThumbnailGenerator: Generator = Generators.quoteFilePointer().map { pointer -> - MessageAttachment( - pointer = pointer, - flag = MessageAttachment.Flag.NONE, - wasDownloaded = someBoolean(), - clientUuid = some(Generators.uuids().nullable())?.toByteArray()?.toByteString() + val quoteThumbnail: MessageAttachment = some( + Generators.quoteFilePointer().map { pointer -> + MessageAttachment( + pointer = pointer, + flag = MessageAttachment.Flag.NONE, + wasDownloaded = someBoolean() + ) + } + ) + + val quoteAttachmentContentType: String? = targetMessage.chatItem.stickerMessage?.sticker?.data_?.contentType + ?: targetMessage.chatItem.standardMessage?.attachments?.firstOrNull()?.pointer?.contentType + + val quoteAttachment: Quote.QuotedAttachment? = if (quoteAttachmentContentType != null) { + Quote.QuotedAttachment( + contentType = quoteAttachmentContentType, + fileName = quoteThumbnail.pointer?.fileName, + thumbnail = quoteThumbnail ) + } else { + null } frames += Frame( @@ -114,18 +128,11 @@ object ChatItemStandardMessageWithQuoteTestCase : TestCase("chat_item_standard_m } else { Quote.Type.NORMAL }, - attachments = quoteThumbnailGenerator - .map { thumbnail -> - val targetContentType = targetMessage.chatItem.stickerMessage?.sticker?.data_?.contentType - ?: targetMessage.chatItem.standardMessage?.attachments?.firstOrNull()?.pointer?.contentType - Quote.QuotedAttachment( - contentType = targetContentType, - fileName = thumbnail.pointer?.fileName, - thumbnail = thumbnail.takeUnless { targetContentType == null } - ) - } - .map { listOf(it).filter { q -> q.thumbnail != null } } - .let { some(it) } + attachments = if (quoteAttachment != null) { + listOf(quoteAttachment) + } else { + listOf() + } ), reactions = some(Generators.reactions(2, StandardFrames.recipientSelf.recipient!!, StandardFrames.recipientAlice.recipient)) ) diff --git a/test-cases/chat_item_standard_message_sms_02.binproto b/test-cases/chat_item_standard_message_sms_02.binproto index c6727cc931919c08f41b60a1b8711ba870b2939a..92d45326b5a1bfe9aeff7f80c900713bb65887cc 100644 GIT binary patch delta 71 zcmV-N0J#712)_rgkpVWW1R|*f2m%lR7_iZt?ej1=0ZIl61PBBg09ug*5(f$eaAavp dS{h&qTp|i-ZDD6+FKTdQXOn#cQ?s}Mr2+OT6)6A! delta 160 zcmV;R0AK&V2l5E8kpU*(1tQ!92m%lR7_iZt?ej1=0ZIl61PBBg09wQa5(f$eaAavp zTC*7frU4)ta0+Z94`Fa{Y-wX*bZKvHFK}dLIthALS4MGRV|sU!#{pAApaBY<0U`=% zZDD6+FKTdQXF3dIdPq!9Z);6jP;F{J@)St)7+M@mWJyn0KTbtCSu|9Ba8giGYDF + key = + mediaName = "8a72bebb4db939e0342ae035ddbe7fe4" + size = 891929939 + } + contentType = "image/jpeg" + } + wasDownloaded = true + }, MessageAttachment { flag = Flag.NONE pointer = FilePointer { @@ -180,38 +193,6 @@ Frame { height = 3329 width = 257 } - }, - MessageAttachment { - flag = Flag.NONE - pointer = FilePointer { - backupLocator = BackupLocator { - digest = <8a72bebb4db939e0342ae035ddbe7fe4> - key = - mediaName = "8a72bebb4db939e0342ae035ddbe7fe4" - size = 891929939 - } - contentType = "application/pdf" - fileName = "zWWFqaczw" - } - wasDownloaded = true - }, - MessageAttachment { - flag = Flag.NONE - pointer = FilePointer { - backupLocator = BackupLocator { - cdnNumber = 2 - digest = <6dc1e0cd18b0df35d2dda82a4ffea322> - key = <0a038863ebb03fed8486f4196b6e656c> - mediaName = "6dc1e0cd18b0df35d2dda82a4ffea322" - size = 1267987916 - transitCdnKey = "ySkLQGERtwS" - } - blurHash = "LdIOX?NE9Y4T~pRPRjE1X9f5jrt6" - contentType = "image/jpeg" - fileName = "dzHLOokMZPmj" - height = 3188 - width = 2674 - } } ] text = Text { diff --git a/test-cases/chat_item_standard_message_sms_05.binproto b/test-cases/chat_item_standard_message_sms_05.binproto index fb62ed6db346670e6926b25fa49b5f5a5f7a3789..6b02d08a5c9b9c06ba7248783a1fbed46b05447d 100644 GIT binary patch delta 77 zcmV-T0J8u12*n4mkpVoi1R}2l2m%lR7_-rw?ej1=0ZIr81_%Ty0tf+Gl>`zC3JF

+ key = + mediaName = "8a72bebb4db939e0342ae035ddbe7fe4" + size = 891929939 + } + contentType = "image/jpeg" + } + wasDownloaded = true + }, MessageAttachment { flag = Flag.NONE pointer = FilePointer { @@ -182,38 +195,6 @@ Frame { height = 3329 width = 257 } - }, - MessageAttachment { - flag = Flag.NONE - pointer = FilePointer { - backupLocator = BackupLocator { - digest = <8a72bebb4db939e0342ae035ddbe7fe4> - key = - mediaName = "8a72bebb4db939e0342ae035ddbe7fe4" - size = 891929939 - } - contentType = "application/pdf" - fileName = "zWWFqaczw" - } - wasDownloaded = true - }, - MessageAttachment { - flag = Flag.NONE - pointer = FilePointer { - backupLocator = BackupLocator { - cdnNumber = 2 - digest = <6dc1e0cd18b0df35d2dda82a4ffea322> - key = <0a038863ebb03fed8486f4196b6e656c> - mediaName = "6dc1e0cd18b0df35d2dda82a4ffea322" - size = 1267987916 - transitCdnKey = "ySkLQGERtwS" - } - blurHash = "LdIOX?NE9Y4T~pRPRjE1X9f5jrt6" - contentType = "image/jpeg" - fileName = "dzHLOokMZPmj" - height = 3188 - width = 2674 - } } ] text = Text { diff --git a/test-cases/chat_item_standard_message_sms_08.binproto b/test-cases/chat_item_standard_message_sms_08.binproto index a76900cadb17b6f2c42a7a2a83d14e56fc36fde5..4a83aa731b40c629bf5916bbe7e17201b2971a0b 100644 GIT binary patch delta 71 zcmV-N0J#712)_rgkpVWW1R|*f2m%lR7`D-z?ej1=0ZIl61PBB&09ug*5(f$eaAavp dS{h&qTp|i-ZDD6+FKTdQXOn#cQ?s}Mr2+d86-NL7 delta 160 zcmV;R0AK&V2l5E8kpU*(1tQ!92m%lR7`D-z?ej1=0ZIl61PBB&09wQa5(f$eaAavp zTC*7frU4)ta0+Z94`Fa{Y-wX*bZKvHFK}dLIthALS4MGRV|sU!#{pAApaBY<0U`=% zZDD6+FKTdQXF3dIdPq!9Z);6jP;F{J@)St)7+M@mWJyn0KTbtCSu|9Ba8giGYDF + key = + mediaName = "8a72bebb4db939e0342ae035ddbe7fe4" + size = 891929939 + } + contentType = "image/jpeg" + } + wasDownloaded = true + }, MessageAttachment { flag = Flag.NONE pointer = FilePointer { @@ -180,38 +193,6 @@ Frame { height = 3329 width = 257 } - }, - MessageAttachment { - flag = Flag.NONE - pointer = FilePointer { - backupLocator = BackupLocator { - digest = <8a72bebb4db939e0342ae035ddbe7fe4> - key = - mediaName = "8a72bebb4db939e0342ae035ddbe7fe4" - size = 891929939 - } - contentType = "application/pdf" - fileName = "zWWFqaczw" - } - wasDownloaded = true - }, - MessageAttachment { - flag = Flag.NONE - pointer = FilePointer { - backupLocator = BackupLocator { - cdnNumber = 2 - digest = <6dc1e0cd18b0df35d2dda82a4ffea322> - key = <0a038863ebb03fed8486f4196b6e656c> - mediaName = "6dc1e0cd18b0df35d2dda82a4ffea322" - size = 1267987916 - transitCdnKey = "ySkLQGERtwS" - } - blurHash = "LdIOX?NE9Y4T~pRPRjE1X9f5jrt6" - contentType = "image/jpeg" - fileName = "dzHLOokMZPmj" - height = 3188 - width = 2674 - } } ] text = Text { diff --git a/test-cases/chat_item_standard_message_sms_11.binproto b/test-cases/chat_item_standard_message_sms_11.binproto index cc6c23947fb2fa13bd7240b3d8f6d3bf2d0ada83..dde524f9a30249f56b28ee3ef0f2860a77db6da4 100644 GIT binary patch delta 75 zcmV-R0JQ)12*U@kkpVie1R|{j2m%lR7`f4$?ej1=0ZIl61PBB|09us<5(^3mSyyI6 hRA+EWN*Z7aTp|i-ZDD6+FKTdQXOn>gQ?tAQr2$$S7P$Zb delta 164 zcmV;V09*gV2lfcCkpU{>1tQ=D2m%lR7`f4$?ej1=0ZIl61PBB|09wce5(^3mSyyI6 zRA+EWO0yjTrU4)ta0+Z94`Fa{Y-wX*bZKvHFK}dLIthALS4MGRV|sU!%K=kEpaBY< z0U`=%ZDD6+FKTdQXF3dIdPq!9Z);6jP;F{J@)St)7+M@mWJyn0KTbtCSu|9Ba8giG SYDF@XW7&OrU diff --git a/test-cases/chat_item_standard_message_sms_11.txtproto b/test-cases/chat_item_standard_message_sms_11.txtproto index fc24721..0e06977 100644 --- a/test-cases/chat_item_standard_message_sms_11.txtproto +++ b/test-cases/chat_item_standard_message_sms_11.txtproto @@ -129,6 +129,19 @@ Frame { sms = true standardMessage = StandardMessage { attachments = [ + MessageAttachment { + flag = Flag.NONE + pointer = FilePointer { + backupLocator = BackupLocator { + digest = <8a72bebb4db939e0342ae035ddbe7fe4> + key = + mediaName = "8a72bebb4db939e0342ae035ddbe7fe4" + size = 891929939 + } + contentType = "image/jpeg" + } + wasDownloaded = true + }, MessageAttachment { flag = Flag.NONE pointer = FilePointer { @@ -180,38 +193,6 @@ Frame { height = 3329 width = 257 } - }, - MessageAttachment { - flag = Flag.NONE - pointer = FilePointer { - backupLocator = BackupLocator { - digest = <8a72bebb4db939e0342ae035ddbe7fe4> - key = - mediaName = "8a72bebb4db939e0342ae035ddbe7fe4" - size = 891929939 - } - contentType = "application/pdf" - fileName = "zWWFqaczw" - } - wasDownloaded = true - }, - MessageAttachment { - flag = Flag.NONE - pointer = FilePointer { - backupLocator = BackupLocator { - cdnNumber = 2 - digest = <6dc1e0cd18b0df35d2dda82a4ffea322> - key = <0a038863ebb03fed8486f4196b6e656c> - mediaName = "6dc1e0cd18b0df35d2dda82a4ffea322" - size = 1267987916 - transitCdnKey = "ySkLQGERtwS" - } - blurHash = "LdIOX?NE9Y4T~pRPRjE1X9f5jrt6" - contentType = "image/jpeg" - fileName = "dzHLOokMZPmj" - height = 3188 - width = 2674 - } } ] text = Text { diff --git a/test-cases/chat_item_standard_message_sms_14.binproto b/test-cases/chat_item_standard_message_sms_14.binproto index 9cdaa5c58273eaa1bc964a25dd4ed09c793d0d7f..67c39e4164be4a822c0acad4d212cb6f422e5b2e 100644 GIT binary patch delta 73 zcmV-P0Ji`12*C%ikpVca1R|>h2m%lR7`)M(?ej1=0ZIr81_%U70tf-1tQ)B2m%lR7`)M(?ej1=0ZIr81_%U70tf>QAR2HAY$6X~aBysCV_|e@Z*DJeWM(=EdRJFQabaV6cazBhQ$wHu3Y`HW z3TbU&XJs#HaAjvY3}kvpOiyoXO + key = + mediaName = "8a72bebb4db939e0342ae035ddbe7fe4" + size = 891929939 + } + contentType = "image/jpeg" + } + wasDownloaded = true + }, MessageAttachment { flag = Flag.NONE pointer = FilePointer { @@ -182,38 +195,6 @@ Frame { height = 3329 width = 257 } - }, - MessageAttachment { - flag = Flag.NONE - pointer = FilePointer { - backupLocator = BackupLocator { - digest = <8a72bebb4db939e0342ae035ddbe7fe4> - key = - mediaName = "8a72bebb4db939e0342ae035ddbe7fe4" - size = 891929939 - } - contentType = "application/pdf" - fileName = "zWWFqaczw" - } - wasDownloaded = true - }, - MessageAttachment { - flag = Flag.NONE - pointer = FilePointer { - backupLocator = BackupLocator { - cdnNumber = 2 - digest = <6dc1e0cd18b0df35d2dda82a4ffea322> - key = <0a038863ebb03fed8486f4196b6e656c> - mediaName = "6dc1e0cd18b0df35d2dda82a4ffea322" - size = 1267987916 - transitCdnKey = "ySkLQGERtwS" - } - blurHash = "LdIOX?NE9Y4T~pRPRjE1X9f5jrt6" - contentType = "image/jpeg" - fileName = "dzHLOokMZPmj" - height = 3188 - width = 2674 - } } ] text = Text { diff --git a/test-cases/chat_item_standard_message_with_quote_01.binproto b/test-cases/chat_item_standard_message_with_quote_01.binproto index 1c9329854ff44b3c58c51a54dd7ed94940fe9a2a..87b0349bd234977a48f5071b796073ce5cd9ddb2 100644 GIT binary patch delta 224 zcmcb~@`rT;9~0{vMx~dGlLeV%>Q6Irt!3n36kw5J<6=oHPDxXm!^p*znVXoNs-IPm znl9DL$koNDge2n7D(Z2HGfKuM%_qYwEI-lG&okV<+|NxnKi@~!I@~eBBEOO=f=j{J z$SBz$+0fWD$s*0zGRe%;(9GB{Db*r1F)78!FvVPeNlL)q&vlu|;>oKxyU$;I81?ov$nuiWRX$-M`B@eW8jM0fm*!;_=NJicv3!_6 RsX>5IqUXT-lN(JH7y*LCM~naf delta 67 zcmV-J0KEVF1=$3!4gxMpB1i}V5Cj;gv-pv2Q#W4_~{Dje)G+HYP4hR7d Z1R4ek1YvVzW|Q9n6$tb5<^HBHAOT5?86E%t diff --git a/test-cases/chat_item_standard_message_with_quote_01.txtproto b/test-cases/chat_item_standard_message_with_quote_01.txtproto index 5398720..4d445fb 100644 --- a/test-cases/chat_item_standard_message_with_quote_01.txtproto +++ b/test-cases/chat_item_standard_message_with_quote_01.txtproto @@ -157,6 +157,28 @@ Frame { } standardMessage = StandardMessage { quote = Quote { + attachments = [ + QuotedAttachment { + contentType = "image/jpeg" + thumbnail = MessageAttachment { + flag = Flag.NONE + pointer = FilePointer { + backupLocator = BackupLocator { + cdnNumber = 2 + digest = <322c0c135b8f39b651631be8eabd21d7> + key = <4f45a614a393aa098bcfd1e15af7d69e> + mediaName = "322c0c135b8f39b651631be8eabd21d7" + size = 1256611453 + transitCdnKey = "zLVToj" + } + blurHash = "LfLh6Voa9NIW?wNF-ooL-;WAX8oy" + contentType = "image/jpeg" + height = 1226 + width = 2693 + } + } + } + ] authorId = 4 targetSentTimestamp = 1 text = Text { @@ -168,7 +190,7 @@ Frame { Reaction { authorId = 1 emoji = "💀" - sentTimestamp = 1659733899763 + sentTimestamp = 1834374389772 sortOrder = 1 } ] diff --git a/test-cases/chat_item_standard_message_with_quote_02.binproto b/test-cases/chat_item_standard_message_with_quote_02.binproto index 37973a913fce4c96669d17ca69bee4ce4fe631cb..fc32c26eca9949a9678b4c5415a456b07f1cbd14 100644 GIT binary patch delta 221 zcmcc1(ag1BKXbq#CZ+vM983a?5-Xp~+xE`Pi;atggGGuVY9$lbW=0N10TwBsNMdnH zn$jXhF3!x{#Pn4Cg1mI8DU4kGj7nS(fvkembcZ)=9_z#=uVj)>h~-i+GEFs0O0-Nh zPBKolNHa_`vM^6GG)po`G`2J|GD}MnV3rb4?h<*GzHyq?@!69VUN)K)DG8`P+cnSH zu3uiGUTn+aX=?v9eoZ~o%xc6P>6aE!6`156QQ&XEB*8fO1#^^i&w=+RH<~Ii8VPc- Qe3(D6SAa#L7b3(201D$slmGw# delta 81 zcmZqXy34U)KeOf>Mx~jI983a?5-Xp~+xE`Pi;atggGGuVs+p0CkAqQwMG7d8Se%kJ hxsN4E`t#?f|CSjjFd7MRv3!_6u~&da;tNEG2>{KJ8b|;D diff --git a/test-cases/chat_item_standard_message_with_quote_02.txtproto b/test-cases/chat_item_standard_message_with_quote_02.txtproto index add6bb1..4080196 100644 --- a/test-cases/chat_item_standard_message_with_quote_02.txtproto +++ b/test-cases/chat_item_standard_message_with_quote_02.txtproto @@ -209,6 +209,30 @@ Frame { } standardMessage = StandardMessage { quote = Quote { + attachments = [ + QuotedAttachment { + contentType = "image/png" + thumbnail = MessageAttachment { + flag = Flag.NONE + pointer = FilePointer { + backupLocator = BackupLocator { + cdnNumber = 3 + digest = <25e6ba9e3b3e8f1f287f16b4a39626ff> + key = <238a14ea67b1962ac79b9320e9813672> + mediaName = "25e6ba9e3b3e8f1f287f16b4a39626ff" + size = 1349716730 + transitCdnKey = "YNfXzQbGXpO" + transitCdnNumber = 2 + } + blurHash = "LGG*f,-i.l-o?G$~?Zt7pHN1=tE3" + contentType = "image/jpeg" + height = 2862 + width = 876 + } + wasDownloaded = true + } + } + ] authorId = 4 targetSentTimestamp = 1 text = Text { @@ -220,13 +244,13 @@ Frame { Reaction { authorId = 1 emoji = "💀" - sentTimestamp = 1659733899763 + sentTimestamp = 1834374389772 sortOrder = 1 }, Reaction { authorId = 4 emoji = "👍" - sentTimestamp = 1659733899764 + sentTimestamp = 1834374389773 sortOrder = 2 } ] diff --git a/test-cases/chat_item_standard_message_with_quote_03.binproto b/test-cases/chat_item_standard_message_with_quote_03.binproto index 2aae319620adf23e9508084adc9ecdc7dc0f6e0f..78007e2f07cfa1448c0acd3dc35587ce4421c21f 100644 GIT binary patch delta 180 zcmV;l089V!1d0Z*1_A|w0wVtblL-PHf8YTMngIv_5CkHT0SXCWb!2I8FKuu$8iN4} zfB_;3X>DO=WiM)QWoJO`7)Z+pS{zJdNl#cmPDMFcG*o_YQczNAMKM@8W;JSZbT$f3 z3LrOSH8V9cF*#yoF*q_aFgIi}Fl1vgVKXr@Gh{enV=@o`8W64$__p0DauTsv9?`;; i7~ + key = + mediaName = "7e535319be182307d20dc2a3123d8ac2" + size = 1597131413 + } + blurHash = "LdIOX?NE9Y4T~pRPRjE1X9f5jrt6" + contentType = "image/jpeg" + height = 971 + width = 3181 + } + } + } + ] authorId = 4 targetSentTimestamp = 1 type = Type.NORMAL diff --git a/test-cases/chat_item_standard_message_with_quote_04.binproto b/test-cases/chat_item_standard_message_with_quote_04.binproto index 017223ec4c849e1b886015c460955fe79c56f301..1581947fe459a350a752b06294439db95f2eed98 100644 GIT binary patch delta 16 XcmeBV>15f!$i&fe;Qh&srV5MzFaQPN delta 16 XcmeBV>15f!$i(sa^V5IJ3=|jvH7^F1 diff --git a/test-cases/chat_item_standard_message_with_quote_04.txtproto b/test-cases/chat_item_standard_message_with_quote_04.txtproto index f1785bb..3a5b503 100644 --- a/test-cases/chat_item_standard_message_with_quote_04.txtproto +++ b/test-cases/chat_item_standard_message_with_quote_04.txtproto @@ -163,7 +163,7 @@ Frame { Reaction { authorId = 1 emoji = "💀" - sentTimestamp = 1659733899763 + sentTimestamp = 1834374389772 sortOrder = 1 } ] diff --git a/test-cases/chat_item_standard_message_with_quote_05.binproto b/test-cases/chat_item_standard_message_with_quote_05.binproto index 8ef246b191ec2119916242631f9e938557cd7c3d..d5fe390032d7211e02cb89cdf6bde280c695fd78 100644 GIT binary patch delta 206 zcmcc4dW&s?15^DBCZ(xN983a?5^J8!+xE`Pi-U`egGGypgE8taBUd{k2crOsQau-E zW^Q77s(wLUx>ONYff5&ln^lmS?$9dgaf&la#>dmwsy4{U!d^GdM=!-B)?Y6#+dICf z)YCpcMaYheE6b%Ipd#1DBg9XDN#fqNdH?2^DhX7nypWJAwz-T1M#qweP#9jdwiC%~h69A<; BMhE}^ delta 74 zcmcb`cAa&D1C!EJMx{xN983a?5^J8!+xE`Pi-U`egGGypgE6Wa$YK;=nf#O~O8WEX ar~j52C@>lca + key = <7ae8055414258305f7761bd507132457> + size = 134427160 + uploadTimestamp = 1828847065950 + } + blurHash = "LIM:}RB8?-^L.d4]O.nkK_ruI?od" + contentType = "image/jpeg" + height = 1226 + width = 2693 + } + } + } + ] authorId = 4 targetSentTimestamp = 1 type = Type.NORMAL @@ -167,13 +189,13 @@ Frame { Reaction { authorId = 1 emoji = "💀" - sentTimestamp = 1659733899763 + sentTimestamp = 1834374389772 sortOrder = 1 }, Reaction { authorId = 4 emoji = "👍" - sentTimestamp = 1659733899764 + sentTimestamp = 1834374389773 sortOrder = 2 } ] diff --git a/test-cases/chat_item_standard_message_with_quote_06.binproto b/test-cases/chat_item_standard_message_with_quote_06.binproto index d64bf938db9e477908cc19ac25025b7d8f77c7b2..40ba701095509d1ffbd4896e96c3acd59f3735f3 100644 GIT binary patch delta 160 zcmX@bx`S;)0#p4pMy1P)983a?5^JB#+xE`Pi$V-=s<_cGW^0Nw3(;eQhd8`u?a^~XmaB_6?_HYVG^ephp_7-54 zn6~A9W0#SVz`}-E57j>V&JtZP>COC0FDGdU?5GKtBC=bt-s>HY)cd&iLQMwuj`eJ1 Ll3<+N%H#?F + key = + size = 648225630 + uploadTimestamp = 1720674933270 + } + contentType = "image/jpeg" + height = 2862 + width = 876 + } + wasDownloaded = true + } + } + ] authorId = 4 targetSentTimestamp = 1 type = Type.NORMAL diff --git a/test-cases/chat_item_standard_message_with_quote_07.binproto b/test-cases/chat_item_standard_message_with_quote_07.binproto index 3a8c68f6a081894a459de125a6d6a99d47fb2826..fb79aba473b6230b045e477c745fb62dc5b51aa6 100644 GIT binary patch delta 122 zcmZ3)`hs;s9208?qf#s5YQqyi}uE+ZumF($$7WOdO0+%3N$5i~=kg gj6!T&EP0v5IYxq9EFb1iY5?l_{Q2p>Wd;h207`%swg3PC diff --git a/test-cases/chat_item_standard_message_with_quote_07.txtproto b/test-cases/chat_item_standard_message_with_quote_07.txtproto index a9e3e3f..00038e5 100644 --- a/test-cases/chat_item_standard_message_with_quote_07.txtproto +++ b/test-cases/chat_item_standard_message_with_quote_07.txtproto @@ -166,6 +166,21 @@ Frame { } standardMessage = StandardMessage { quote = Quote { + attachments = [ + QuotedAttachment { + contentType = "image/webp" + thumbnail = MessageAttachment { + flag = Flag.NONE + pointer = FilePointer { + blurHash = "LfLh6Voa9NIW?wNF-ooL-;WAX8oy" + contentType = "image/jpeg" + height = 971 + invalidAttachmentLocator = InvalidAttachmentLocator {} + width = 3181 + } + } + } + ] authorId = 4 targetSentTimestamp = 1 type = Type.NORMAL @@ -174,7 +189,7 @@ Frame { Reaction { authorId = 1 emoji = "💀" - sentTimestamp = 1659733899763 + sentTimestamp = 1834374389772 sortOrder = 1 } ] diff --git a/test-cases/chat_item_standard_message_with_quote_08.binproto b/test-cases/chat_item_standard_message_with_quote_08.binproto index 5ccbb4fbe274eb0e5689ce0adda7934184c4c22e..945dfb7fb79741b33bce53e94a30f696ed9cff80 100644 GIT binary patch delta 185 zcmcb|dX8;_CsTbhlTrf{2a^D!#QG=mw!Jg+V&h`rU@>Bddd0|9%E2hWqLjdBw15{#2G fnWCh74!l3P(NuxaNRW%=!~BW80xS}}5FsW2%>Fw0 delta 72 zcmX@dc8_&~CzHZtMx_ai983a?66>GL+xE`Pi;atggT;s;s+x<9gHeEG@=c~F>Cc~^ Z{#$0Cz-T1M#qweP#9jdwi7yZ#CIBom7=-`; diff --git a/test-cases/chat_item_standard_message_with_quote_08.txtproto b/test-cases/chat_item_standard_message_with_quote_08.txtproto index 3447c9b..487b2c8 100644 --- a/test-cases/chat_item_standard_message_with_quote_08.txtproto +++ b/test-cases/chat_item_standard_message_with_quote_08.txtproto @@ -159,6 +159,24 @@ Frame { } standardMessage = StandardMessage { quote = Quote { + attachments = [ + QuotedAttachment { + contentType = "image/png" + thumbnail = MessageAttachment { + flag = Flag.NONE + pointer = FilePointer { + backupLocator = BackupLocator { + digest = + key = <9129a09738137f02d0ed083b7d018514> + mediaName = "b617fb3b1afd2f1773bd392a824beb3c" + size = 1597131413 + } + contentType = "image/jpeg" + } + wasDownloaded = true + } + } + ] authorId = 4 targetSentTimestamp = 1 type = Type.NORMAL @@ -167,13 +185,13 @@ Frame { Reaction { authorId = 1 emoji = "💀" - sentTimestamp = 1659733899763 + sentTimestamp = 1834374389772 sortOrder = 1 }, Reaction { authorId = 4 emoji = "👍" - sentTimestamp = 1659733899764 + sentTimestamp = 1834374389773 sortOrder = 2 } ] diff --git a/test-cases/chat_item_standard_message_with_quote_09.binproto b/test-cases/chat_item_standard_message_with_quote_09.binproto index faf4244b8f9d3ec12601309b5b815d1f92ef7113..d1a8d1c3d18ba897ad11d165909d24d7a70246fe 100644 GIT binary patch delta 191 zcmZ3+dXjB}6%%VOlTsJcWLqZL`qzwHOBp#B1z42kFmiEa<|d}6>L(WDrAzfPa&<8( zK}E6(Qqvt;MLkY&M#=c3`DB=d_TCYhNUni(4=rCOvWCZ!k|rkD#bNeTG7E)!Wic@<~3=J|^cqrP98rzBvc o!y_EsZ@DcnS^CARy^7a0{_dH1oyCZ)$|o!&Kg)t)aw3x}01*{D`~Uy| delta 27 icmX@fwv2Uy6%%u|Qs!iPCRuiGE;bHE0hY-u%&q`q69umT diff --git a/test-cases/chat_item_standard_message_with_quote_09.txtproto b/test-cases/chat_item_standard_message_with_quote_09.txtproto index 0bda869..418193b 100644 --- a/test-cases/chat_item_standard_message_with_quote_09.txtproto +++ b/test-cases/chat_item_standard_message_with_quote_09.txtproto @@ -161,6 +161,28 @@ Frame { } standardMessage = StandardMessage { quote = Quote { + attachments = [ + QuotedAttachment { + contentType = "image/apng" + thumbnail = MessageAttachment { + flag = Flag.NONE + pointer = FilePointer { + backupLocator = BackupLocator { + cdnNumber = 2 + digest = <322c0c135b8f39b651631be8eabd21d7> + key = <4f45a614a393aa098bcfd1e15af7d69e> + mediaName = "322c0c135b8f39b651631be8eabd21d7" + size = 1256611453 + transitCdnKey = "zLVToj" + } + blurHash = "LfLh6Voa9NIW?wNF-ooL-;WAX8oy" + contentType = "image/jpeg" + height = 1226 + width = 2693 + } + } + } + ] authorId = 4 targetSentTimestamp = 1 type = Type.NORMAL diff --git a/test-cases/chat_item_standard_message_with_quote_10.binproto b/test-cases/chat_item_standard_message_with_quote_10.binproto index 2a5e665d64f1f47ff70db3c261c41c0b2956a125..a848fe92e7e22a2806120d47286207c9b3d3752d 100644 GIT binary patch delta 223 zcmZo*UB$M+j*0aZqtbK6$&O6Y^`{uQ)-ZA~3a}_GX5`|^%uP&B)h|y?Dv+AO$korN z1Qp3DNKJQm!{)J0EK0`5-CZk9M>kV1M>pTzU8T-Gs>Hm&!_UyR#MPK9mP^6NG}SCA z(K6LI$vD*_%`nZ#!aU8;EXgF%*wW0%EGTrc-d%Hq$HsF zY}Y(%yMB3%da*5wr>Xtd_%-!RGpiAIq+eP@RbY~PM1j8rlLVs%qYxVxOI~Jij*%c2 V%ZK@s8Uz?6dJeolxzSXC5dcM|MjikF delta 74 zcmZ3**1)>Kj>*YU$)1BrfKg)OlX=_TnR)SYadWT;te<;o>1snOhA3q&HV#Gs77a!r eHZGRD%;Fp)K`xdL^CvX`b$tH(^xrZA1x5f2Q5G!# diff --git a/test-cases/chat_item_standard_message_with_quote_10.txtproto b/test-cases/chat_item_standard_message_with_quote_10.txtproto index 7b0c95e..d2fd26f 100644 --- a/test-cases/chat_item_standard_message_with_quote_10.txtproto +++ b/test-cases/chat_item_standard_message_with_quote_10.txtproto @@ -163,6 +163,30 @@ Frame { } standardMessage = StandardMessage { quote = Quote { + attachments = [ + QuotedAttachment { + contentType = "image/webp" + thumbnail = MessageAttachment { + flag = Flag.NONE + pointer = FilePointer { + backupLocator = BackupLocator { + cdnNumber = 3 + digest = <25e6ba9e3b3e8f1f287f16b4a39626ff> + key = <238a14ea67b1962ac79b9320e9813672> + mediaName = "25e6ba9e3b3e8f1f287f16b4a39626ff" + size = 1349716730 + transitCdnKey = "YNfXzQbGXpO" + transitCdnNumber = 2 + } + blurHash = "LGG*f,-i.l-o?G$~?Zt7pHN1=tE3" + contentType = "image/jpeg" + height = 2862 + width = 876 + } + wasDownloaded = true + } + } + ] authorId = 4 targetSentTimestamp = 1 type = Type.NORMAL @@ -171,7 +195,7 @@ Frame { Reaction { authorId = 1 emoji = "💀" - sentTimestamp = 1659733899763 + sentTimestamp = 1834374389772 sortOrder = 1 } ] diff --git a/test-cases/chat_item_standard_message_with_quote_11.binproto b/test-cases/chat_item_standard_message_with_quote_11.binproto index ce95c97deb9fe43201ffc4f3e2946858dd7880a3..7281e9ff487d867678635fb73275962e5d777466 100644 GIT binary patch delta 223 zcmX@XdXH^`F;o3YCZ%Oe983a?5}TgP+xE`Pi;atggT;vB4K0&W4K0j}4a`%F3{sNKjS`Iwjf_()5|fPt7^DQ&3H{i1 zSF1>9W5mTnQzahVQWB^O4wl>}q0D}X_t0V?+pa?zQ>UK%$vQchDN4HM!26RMO%)i8 T1i4r~%%9jRz#`EL5n=)WBPU3z delta 72 zcmcb|c7k<-F_Xe%Mx_ai983a?5}TgP+xE`Pi;atggT;vCc~^ Z{#$0Cz-T1M#qweP#9jdwi7yZ#CIBiQ7>ob_ diff --git a/test-cases/chat_item_standard_message_with_quote_11.txtproto b/test-cases/chat_item_standard_message_with_quote_11.txtproto index 1d35398..6ec1073 100644 --- a/test-cases/chat_item_standard_message_with_quote_11.txtproto +++ b/test-cases/chat_item_standard_message_with_quote_11.txtproto @@ -161,6 +161,26 @@ Frame { } standardMessage = StandardMessage { quote = Quote { + attachments = [ + QuotedAttachment { + contentType = "image/png" + thumbnail = MessageAttachment { + flag = Flag.NONE + pointer = FilePointer { + backupLocator = BackupLocator { + digest = <7e535319be182307d20dc2a3123d8ac2> + key = + mediaName = "7e535319be182307d20dc2a3123d8ac2" + size = 1597131413 + } + blurHash = "LdIOX?NE9Y4T~pRPRjE1X9f5jrt6" + contentType = "image/jpeg" + height = 971 + width = 3181 + } + } + } + ] authorId = 4 targetSentTimestamp = 1 type = Type.NORMAL @@ -169,13 +189,13 @@ Frame { Reaction { authorId = 1 emoji = "💀" - sentTimestamp = 1659733899763 + sentTimestamp = 1834374389772 sortOrder = 1 }, Reaction { authorId = 4 emoji = "👍" - sentTimestamp = 1659733899764 + sentTimestamp = 1834374389773 sortOrder = 2 } ] diff --git a/test-cases/chat_item_standard_message_with_quote_12.binproto b/test-cases/chat_item_standard_message_with_quote_12.binproto index 2634c90ffc5beeb1b3f63323b1e7ae395fe7e701..288b29bdf3c0cdea698f91a9ea6b315f1f956647 100644 GIT binary patch delta 176 zcmaFM@|tx6GgJLDMy1D$983a?5}TjQ+xE`PiyfTOi$HMEXYfj%Hm2>g7UKpQq!Yke7u5m%*;~t>YOV|Rekb(d~1S@RE@*K zJ@bomg{-*vJe(XIy*->l5c|0|F&!B4-E!5CIso + key = + size = 1909353420 + } + blurHash = "LJR,66e.~Cxu%LoLM|S2%3WWIosm" + contentType = "image/jpeg" + } + wasDownloaded = true + } + } + ] authorId = 4 targetSentTimestamp = 1 type = Type.NORMAL diff --git a/test-cases/chat_item_standard_message_with_quote_13.binproto b/test-cases/chat_item_standard_message_with_quote_13.binproto index 76992f7e93a76629e5bdce5a9ec676c9cfea8356..87fcde55f242aa7326a263aa12d62dae9d595e3d 100644 GIT binary patch delta 16 YcmdnRwu^0p5i>{6f%hjjnkp~?05}^4c>n+a delta 16 YcmdnRwu^0p5i`f<&rkm?Gf-dz06j_vE&u=k diff --git a/test-cases/chat_item_standard_message_with_quote_13.txtproto b/test-cases/chat_item_standard_message_with_quote_13.txtproto index baa19f6..ceabd1b 100644 --- a/test-cases/chat_item_standard_message_with_quote_13.txtproto +++ b/test-cases/chat_item_standard_message_with_quote_13.txtproto @@ -156,7 +156,7 @@ Frame { Reaction { authorId = 1 emoji = "💀" - sentTimestamp = 1659733899763 + sentTimestamp = 1834374389772 sortOrder = 1 } ] diff --git a/test-cases/chat_item_standard_message_with_quote_14.binproto b/test-cases/chat_item_standard_message_with_quote_14.binproto index ecbf6015612b18c21f16c83cc6fd2bc8a7971c2f..4bc6838fbd8f9a414a97f2eb6f118181730abcc5 100644 GIT binary patch delta 35 ncmX@Za)xDtA(M2^f%hjjnkq0F339P~m_M;sfJLGgBE$p${6r1m delta 35 ncmX@Za)xDtA(Qmy&rkm?Gf-eO669j}Fn?mN0E@&Ih!7J16d(^v diff --git a/test-cases/chat_item_standard_message_with_quote_14.txtproto b/test-cases/chat_item_standard_message_with_quote_14.txtproto index 1e044ae..8aa8bdb 100644 --- a/test-cases/chat_item_standard_message_with_quote_14.txtproto +++ b/test-cases/chat_item_standard_message_with_quote_14.txtproto @@ -159,13 +159,13 @@ Frame { Reaction { authorId = 1 emoji = "💀" - sentTimestamp = 1659733899763 + sentTimestamp = 1834374389772 sortOrder = 1 }, Reaction { authorId = 4 emoji = "👍" - sentTimestamp = 1659733899764 + sentTimestamp = 1834374389773 sortOrder = 2 } ]