Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Federation attachment URL for audio and video files #16430

Merged
merged 10 commits into from
May 4, 2020
Merged

[FIX] Federation attachment URL for audio and video files #16430

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fc11f09
Fix Federation attachment
qwertiko Feb 3, 2020
dfede57
Fix syntax federation attachment
qwertiko Feb 3, 2020
c07a58a
Fix description Federation Attachment Update
qwertiko Feb 9, 2020
1602433
Merge branch 'develop' into develop
qwertiko Mar 24, 2020
268705f
Merge branch 'develop' into develop
qwertiko Mar 27, 2020
bd4e1a2
Merge branch 'develop' into develop
qwertiko Mar 31, 2020
956d717
Merge branch 'develop' into develop
qwertiko Apr 3, 2020
510e913
Merge branch 'develop' into develop
qwertiko Apr 15, 2020
5d98dc5
Merge branch 'develop' into develop
qwertiko Apr 21, 2020
eb0443b
Merge branch 'develop' into develop
qwertiko Apr 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions app/federation/server/endpoints/dispatch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,16 @@ const eventHandlers = {
// Update the message's file
denormalizedMessage.file._id = upload._id;

// Update the message's attachments
// Update the message's attachments dependent on type
for (const attachment of denormalizedMessage.attachments) {
attachment.title_link = attachment.title_link.replace(oldUploadId, upload._id);
attachment.image_url = attachment.image_url.replace(oldUploadId, upload._id);
if (/^image\/.+/.test(denormalizedMessage.file.type)) {
attachment.image_url = attachment.image_url.replace(oldUploadId, upload._id);
} else if (/^audio\/.+/.test(denormalizedMessage.file.type)) {
attachment.audio_url = attachment.audio_url.replace(oldUploadId, upload._id);
} else if (/^video\/.+/.test(denormalizedMessage.file.type)) {
attachment.video_url = attachment.video_url.replace(oldUploadId, upload._id);
}
}
}

Expand Down