Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(api): re-evaluate link embeds when a message is edited (#1622)

Hampus78d81dd407e2
diff --git a/fluxer_api/src/api/channel/services/message/MessagePersistenceService.ts b/fluxer_api/src/api/channel/services/message/MessagePersistenceService.ts
index 1df44580b..16a75428b 100644
--- a/fluxer_api/src/api/channel/services/message/MessagePersistenceService.ts
+++ b/fluxer_api/src/api/channel/services/message/MessagePersistenceService.ts
@@ -295,10 +295,7 @@ export class MessagePersistenceService {
return null;
}
const uploadUserId = params.attachmentUploadUserId;
- assert(
- uploadUserId !== undefined,
- 'Attachment upload actor must be resolved before processing new attachments',
- );
+ assert(uploadUserId !== undefined, 'Attachment upload actor must be resolved before processing new attachments');
return this.attachmentService.computeAttachments({
message: {
id: params.messageId,
@@ -528,7 +525,8 @@ export class MessagePersistenceService {
}
hasChanges = true;
}
- if (allowEmbeds && (data.embeds !== undefined || (data.content !== undefined && message.embeds.length === 0))) {
+ const embedsExplicitlyProvided = data.embeds !== undefined;
+ if (allowEmbeds && (embedsExplicitlyProvided || data.content !== undefined)) {
const attachmentsForResolution = updatedRowData.attachments || [];
const resolvedEmbeds = this.embedAttachmentResolver.resolveEmbedAttachmentUrls({
embeds: data.embeds,
@@ -546,7 +544,15 @@ export class MessagePersistenceService {
nsfwMode: isNSFWAllowed ? 'allow' : 'block',
isBugHunterBot: params.isBugHunterBot,
});
- updatedRowData.embeds = initialEmbeds;
+ if (embedsExplicitlyProvided) {
+ updatedRowData.embeds = initialEmbeds;
+ } else {
+ const preservedEmbeds = message.embeds
+ .map((embed) => embed.toMessageEmbed())
+ .filter((embed) => embed.type === 'rich');
+ const nextEmbeds = [...preservedEmbeds, ...(initialEmbeds ?? [])];
+ updatedRowData.embeds = nextEmbeds.length > 0 ? nextEmbeds : null;
+ }
hasUncachedUrls = embedUrls;
hasChanges = true;
}
diff --git a/fluxer_api/src/api/worker/tasks/ExtractEmbeds.ts b/fluxer_api/src/api/worker/tasks/ExtractEmbeds.ts
index 4970fe0c7..34cfb2dee 100644
--- a/fluxer_api/src/api/worker/tasks/ExtractEmbeds.ts
+++ b/fluxer_api/src/api/worker/tasks/ExtractEmbeds.ts
@@ -18,7 +18,6 @@ import type {IGatewayService} from '../../infrastructure/IGatewayService';
import type {MediaProxyNsfwMode} from '../../infrastructure/IMediaService';
import {Logger} from '../../Logger';
import type {Channel} from '../../models/Channel';
-import {Embed} from '../../models/Embed';
import {Message} from '../../models/Message';
import {deleteMessageSearchDocuments} from '../../search/MessageSearchIndexCleanup';
import * as UnfurlerUtils from '../../utils/UnfurlerUtils';
@@ -368,13 +367,15 @@ async function updateMessageEmbeds(
orderedEmbeds: Array<MessageEmbed>,
): Promise<Message | null> {
const existingEmbeds = (freshMessage.embeds ?? []).map((embed) => embed.toMessageEmbed());
- if (areEmbedsEquivalent(existingEmbeds, orderedEmbeds)) {
+ const preservedEmbeds = existingEmbeds.filter((embed) => embed.type === 'rich');
+ const nextEmbeds = [...preservedEmbeds, ...orderedEmbeds];
+ if (areEmbedsEquivalent(existingEmbeds, nextEmbeds)) {
Logger.debug({messageId: freshMessage.id.toString()}, 'Embeds unchanged, skipping update');
return freshMessage;
}
const messageWithEmbeds = new Message({
...freshMessage.toRow(),
- embeds: orderedEmbeds.length > 0 ? orderedEmbeds : null,
+ embeds: nextEmbeds.length > 0 ? nextEmbeds : null,
});
await channelRepository.updateEmbeds(messageWithEmbeds);
return messageWithEmbeds;
@@ -382,7 +383,6 @@ async function updateMessageEmbeds(
interface DispatchEmbedUpdateParams {
latestMessage: Message;
- orderedEmbeds: Array<MessageEmbed>;
channel: Channel;
guildId: GuildID | null;
gatewayService: IGatewayService;
@@ -390,15 +390,13 @@ interface DispatchEmbedUpdateParams {
async function dispatchEmbedUpdate({
latestMessage,
- orderedEmbeds,
channel,
guildId,
gatewayService,
}: DispatchEmbedUpdateParams): Promise<void> {
- const embedObjects = orderedEmbeds.length > 0 ? orderedEmbeds.map((e) => new Embed(e)) : latestMessage.embeds;
const messageWithUpdatedEmbeds = new Message({
...latestMessage.toRow(),
- embeds: embedObjects.map((e) => e.toMessageEmbed()),
+ embeds: latestMessage.embeds.map((e) => e.toMessageEmbed()),
});
const messageData = await buildBroadcastMessageData({
channel,
@@ -512,7 +510,6 @@ const extractEmbeds: WorkerTaskHandler = async (payload, helpers) => {
if (!(latestMessage.flags & MessageFlags.SUPPRESS_EMBEDS)) {
await dispatchEmbedUpdate({
latestMessage,
- orderedEmbeds,
channel,
guildId,
gatewayService,