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.

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

merged 10 commits into from
May 4, 2020

Conversation

qwertiko
Copy link
Contributor

@qwertiko qwertiko commented Feb 3, 2020

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.

@qwertiko qwertiko changed the title [Fix] Federation attachment [FIX] Federation attachment Feb 4, 2020
@qwertiko qwertiko requested a review from rodrigok February 5, 2020 15:44
@CLAassistant
Copy link

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@sampaiodiego sampaiodiego left a 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 sampaiodiego changed the title [FIX] Federation attachment [FIX] Federation attachment URL for audio and video files May 4, 2020
@sampaiodiego sampaiodiego merged commit 5182d59 into RocketChat:develop 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)
This was referenced May 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants