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

Jump to bottom

[IMPROVE] Add user to room on "Click to Join!" button press #24041

Merged
merged 17 commits into from
Feb 10, 2022
Merged

[IMPROVE] Add user to room on "Click to Join!" button press #24041

merged 17 commits into from
Feb 10, 2022

Conversation

matheusbsilva137
Copy link
Member

Proposed changes (including videos or screenshots)

  • Add user to room on "Click to Join!" button press;
  • Display the "Join" button in discussions inside channels (keeping the behavior consistent with discussions inside groups).

Issue(s)

Fix #19420

Steps to test or reproduce

  1. Start a new Jitsi call in a channel or discussion (logged in as a member of the room). Then, access the room as another user and press the "Click to Join!" button. Expected behavior: the user should join the room (if they're not already a member).
  2. Access a discussion inside a channel (public room). Expected behavior: If the user is not a member of the discussion, a "Join" button should be displayed in the message box.

Further comments

tassoevan
tassoevan previously requested changes Jan 6, 2022
View reviewed changes
app/videobridge/client/actionLink.js Outdated Show resolved Hide resolved
app/videobridge/client/actionLink.js Outdated Show resolved Hide resolved
app/videobridge/client/actionLink.js Outdated Show resolved Hide resolved
@tassoevan tassoevan requested a review from a team January 6, 2022 14:46
@tassoevan tassoevan marked this pull request as draft January 7, 2022 03:41
@pierre-lehnen-rc pierre-lehnen-rc marked this pull request as ready for review January 7, 2022 07:07
ostjen
ostjen suggested changes Feb 9, 2022
View reviewed changes
app/action-links/server/lib/actionLinks.js Outdated Show resolved Hide resolved
ostjen
ostjen suggested changes Feb 10, 2022
View reviewed changes
server/lib/messages/getMessageForUser.ts Outdated Show resolved Hide resolved
ostjen
ostjen approved these changes Feb 10, 2022
View reviewed changes
Copy link
Contributor

@ostjen ostjen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@matheusbsilva137 matheusbsilva137 merged commit 993c6fb into develop Feb 10, 2022
@matheusbsilva137 matheusbsilva137 deleted the improve/click-to-join branch February 10, 2022 20:43
gabriellsh added a commit that referenced this pull request Feb 15, 2022
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into mess…
ec9e09c 
…age-template-2

* 'develop' of github.com:RocketChat/Rocket.Chat: (29 commits)
  Bump vm2 from 3.9.5 to 3.9.7 in /ee/server/services (#24509)
  [IMPROVE] ChatBox Text to File Description (#24451)
  Chore: Update Meteor to 2.5.6 (#24461)
  Chore: Update ws package (#24477)
  Bump underscore.string from 3.3.5 to 3.3.6 in /ee/server/services (#24498)
  Bump follow-redirects from 1.14.7 to 1.14.8 in /ee/server/services (#24491)
  Language update from LingoHub 🤖 (#24493)
  Covert to typescript the unarchive slash commands files (#24331)
  [IMPROVE] Add tooltips on action buttons of Canned Response message composer (#24483)
  Chore: Delete unused file (NewAdminInfoPage.js) (#24196)
  [IMPROVE][ENTERPRISE] Improve how micro services are loaded (#24388)
  [IMPROVE] Add return button in chats opened from the list of current chats (#24458)
  Bump express from 4.17.1 to 4.17.2 in /ee/server/services (#24469)
  Bump cookie from 0.4.1 to 0.4.2 in /ee/server/services (#24472)
  [IMPROVE] Close modal on esc and outside click (#24275)
  Chore(deps-dev): Bump ts-node in /ee/server/services (#24435)
  [IMPROVE] Add user to room on "Click to Join!" button press (#24041)
  [FIX] Implement client errors on ddp-streamer (#24310)
  Bump body-parser from 1.19.0 to 1.19.1 in /ee/server/services (#23963)
  Bump jaeger-client from 3.18.1 to 3.19.0 in /ee/server/services (#23961)
  ...
@pierre-lehnen-rc pierre-lehnen-rc mentioned this pull request Mar 1, 2022
Merged
@artlive89
Copy link

4.7.0 not working again :(

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ostjen ostjen ostjen approved these changes

@tassoevan tassoevan Awaiting requested review from tassoevan

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Click to Join button does not work if a user joins late
5 participants
@matheusbsilva137 @artlive89 @tassoevan @ostjen @pierre-lehnen-rc