-
Notifications
You must be signed in to change notification settings - Fork 10.9k
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.
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sampaiodiego
approved these changes
May 4, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch! Thanks :D
sampaiodiego
changed the title
[FIX] Federation attachment
[FIX] Federation attachment URL for audio and video files
May 4, 2020
ggazzo
added a commit
that referenced
this pull request
May 5, 2020
…n-refactor * 'develop' of github.com:RocketChat/Rocket.Chat: Allow to filter omnichannel analytics dashboards per departments. (#17463) [FIX] Uncessary updates on Settings, Roles and Permissions on startup (#17160) [NEW] Add the ability to send Livechat offline messages to a channel (#17442) [FIX] Federation attachment URL for audio and video files (#16430) [NEW] Add Livechat website URL to the offline message e-mail (#17429)
ggazzo
added a commit
that referenced
this pull request
May 6, 2020
…/new-threads * 'develop' of github.com:RocketChat/Rocket.Chat: (42 commits) [FIX] Invalid CSS syntax (#17541) [NEW] Rewrite admin pages (#17388) [FIX] Replace postcss Meteor package (#15929) [FIX] Increasing highlight time in 3 seconds (#17540) [IMPROVE] Add new webhooks to the Omnichannel integration feature (#17503) [BREAK] Remove deprecated Omnichannel Knowledge Base feature (#17387) [FIX] Reactions may present empty names of who reacted when using Real Names (#17536) Allow to filter omnichannel analytics dashboards per departments. (#17463) [FIX] Uncessary updates on Settings, Roles and Permissions on startup (#17160) [NEW] Add the ability to send Livechat offline messages to a channel (#17442) [FIX] Federation attachment URL for audio and video files (#16430) [NEW] Add Livechat website URL to the offline message e-mail (#17429) LingoHub based on develop (#17520) RegExp improvements suggested by LGTM (#17500) [FIX] Replace obsolete X-FRAME-OPTIONS header on Livechat route (#17419) [FIX] LDAP login error on Enterprise version (#17497) [IMPROVE] [Apps-Engine] App user as the default notifier (#17050) [NEW] [Apps-Engine] New Livechat event handlers (#17033) [FIX] Change email verification label (#17450) Priority system messages were always created (#17479) ...
gabriellsh
added a commit
that referenced
this pull request
May 6, 2020
…to integrations * 'admin-refactor' of github.com:RocketChat/Rocket.Chat: fix all paddings and mixed content between screens (#17538) [IMPROVE] Add new webhooks to the Omnichannel integration feature (#17503) [BREAK] Remove deprecated Omnichannel Knowledge Base feature (#17387) [FIX] Reactions may present empty names of who reacted when using Real Names (#17536) [IMPROVE] Custom sounds refactor (#17485) Allow to filter omnichannel analytics dashboards per departments. (#17463) [FIX] Uncessary updates on Settings, Roles and Permissions on startup (#17160) [NEW] Add the ability to send Livechat offline messages to a channel (#17442) [FIX] Federation attachment URL for audio and video files (#16430) [NEW] Add Livechat website URL to the offline message e-mail (#17429)
ggazzo
added a commit
that referenced
this pull request
May 7, 2020
* 'develop' of github.com:RocketChat/Rocket.Chat: Regression: Fix Avatar Url Provider when CDN_PREFIX_ALL is false (#17542) [FIX] Invalid CSS syntax (#17541) [NEW] Rewrite admin pages (#17388) [FIX] Replace postcss Meteor package (#15929) [FIX] Increasing highlight time in 3 seconds (#17540) [IMPROVE] Add new webhooks to the Omnichannel integration feature (#17503) [BREAK] Remove deprecated Omnichannel Knowledge Base feature (#17387) [FIX] Reactions may present empty names of who reacted when using Real Names (#17536) Allow to filter omnichannel analytics dashboards per departments. (#17463) [FIX] Uncessary updates on Settings, Roles and Permissions on startup (#17160) [NEW] Add the ability to send Livechat offline messages to a channel (#17442) [FIX] Federation attachment URL for audio and video files (#16430) [NEW] Add Livechat website URL to the offline message e-mail (#17429) LingoHub based on develop (#17520) RegExp improvements suggested by LGTM (#17500) [FIX] Replace obsolete X-FRAME-OPTIONS header on Livechat route (#17419) [FIX] LDAP login error on Enterprise version (#17497)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix sending attachments via federation.
Currently for every attachment send via Federation on the receiving server the attribute "image_url" is read.
The problem is that this attribute only exists for images, every other data type creates an exception which result in the message not being delivered.
This fix mirrors the check which is done for image/video/audio and everything else seen in "Rocket.Chat/app/file-upload/server/methods/sendFileMessage.js:43".
This fix was successfully tested on our two server setup on the current 2.4.6 version.