From ca2dc0a9b7807e95a4894819e83018f20f36ac60 Mon Sep 17 00:00:00 2001 From: Yonle Date: Fri, 27 Mar 2026 04:51:55 +0700 Subject: [PATCH 1/2] entity_normalizer: treat gifv attachment like it is video as we have handled this already. --- src/components/emoji_reactions/emoji_reactions.scss | 4 ++-- src/components/rich_content/rich_content.scss | 2 +- src/services/entity_normalizer/entity_normalizer.service.js | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/emoji_reactions/emoji_reactions.scss b/src/components/emoji_reactions/emoji_reactions.scss index 8ea45e1b4..f4b7d3fb0 100644 --- a/src/components/emoji_reactions/emoji_reactions.scss +++ b/src/components/emoji_reactions/emoji_reactions.scss @@ -41,7 +41,7 @@ margin: 0; .reaction-emoji { - width: var(--emoji-size); + width: auto; height: var(--emoji-size); margin-right: 0.25em; line-height: var(--emoji-size); @@ -55,7 +55,7 @@ .reaction-emoji-content { max-width: 100%; max-height: 100%; - width: var(--emoji-size); + width: auto; height: var(--emoji-size); line-height: inherit; overflow: hidden; diff --git a/src/components/rich_content/rich_content.scss b/src/components/rich_content/rich_content.scss index d2ec77dcb..b1a9337e0 100644 --- a/src/components/rich_content/rich_content.scss +++ b/src/components/rich_content/rich_content.scss @@ -73,7 +73,7 @@ .emoji { display: inline-block; - width: var(--emoji-size, 32px); + width: auto; height: var(--emoji-size, 32px); } diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 909a014ce..9864cb302 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -299,7 +299,8 @@ export const parseAttachment = (data) => { } if (data.type !== 'unknown') { - output.type = data.type + // treat gifv like it is "video" + output.type = data.type === 'gifv' ? 'video' : data.type } else { output.type = fileTypeService.fileType(output.mimetype) } From e0d9434512484d74a31a4acaeba2a3b52ee8de59 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 7 Jun 2026 23:40:05 +0300 Subject: [PATCH 2/2] remove unrelated changes --- src/components/emoji_reactions/emoji_reactions.scss | 4 ++-- src/components/rich_content/rich_content.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/emoji_reactions/emoji_reactions.scss b/src/components/emoji_reactions/emoji_reactions.scss index f4b7d3fb0..8ea45e1b4 100644 --- a/src/components/emoji_reactions/emoji_reactions.scss +++ b/src/components/emoji_reactions/emoji_reactions.scss @@ -41,7 +41,7 @@ margin: 0; .reaction-emoji { - width: auto; + width: var(--emoji-size); height: var(--emoji-size); margin-right: 0.25em; line-height: var(--emoji-size); @@ -55,7 +55,7 @@ .reaction-emoji-content { max-width: 100%; max-height: 100%; - width: auto; + width: var(--emoji-size); height: var(--emoji-size); line-height: inherit; overflow: hidden; diff --git a/src/components/rich_content/rich_content.scss b/src/components/rich_content/rich_content.scss index b1a9337e0..d2ec77dcb 100644 --- a/src/components/rich_content/rich_content.scss +++ b/src/components/rich_content/rich_content.scss @@ -73,7 +73,7 @@ .emoji { display: inline-block; - width: auto; + width: var(--emoji-size, 32px); height: var(--emoji-size, 32px); }