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

[NEW][Jitsi] Setting to use room's name instead of room's id to generate the URL #17481

Merged
merged 1 commit into from
Aug 20, 2020
Merged

[NEW][Jitsi] Setting to use room's name instead of room's id to generate the URL #17481

merged 1 commit into from
Aug 20, 2020

Conversation

jbguerraz
Copy link
Contributor

Closes #17389

image

This adds a switcher that allows to choose if Jitsi room name should be plain or using the hash (default to hash, so no BC break)

@CLAassistant
Copy link

CLAassistant commented Apr 29, 2020 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@jbguerraz jbguerraz force-pushed the jitsi-plain-room-name branch 7 times, most recently from 1ce64c1 to 3b33261 Compare May 1, 2020 08:30
@jbguerraz jbguerraz changed the title [NEW] Jitsi room name hash or plain [IMPROVE] Jitsi room name hash or plain May 1, 2020
@jbguerraz jbguerraz force-pushed the jitsi-plain-room-name branch 4 times, most recently from 038bddb to 3d337cd Compare May 7, 2020 15:48
geekgonecrazy
geekgonecrazy previously approved these changes May 8, 2020
View reviewed changes
@jbguerraz jbguerraz force-pushed the jitsi-plain-room-name branch from 3d337cd to c07234a Compare May 8, 2020 11:20
@jbguerraz
Copy link
Contributor Author

jbguerraz commented May 8, 2020 •
edited
Loading

@geekgonecrazy thank you for the review! I rebased on top of develop so that is not anymore out of date. Didn't want to "dismissed geekgonecrazy’s stale review " ;) if you could review one more time. sorry!

@jbguerraz jbguerraz force-pushed the jitsi-plain-room-name branch from c07234a to 4025486 Compare May 8, 2020 13:56
geekgonecrazy
geekgonecrazy previously approved these changes May 9, 2020
View reviewed changes
@geekgonecrazy
Copy link
Contributor

No worries! Thanks for the contribution

@jbguerraz
Copy link
Contributor Author

@geekgonecrazy When do you think that could get merged ? fret not, that's just for better planning our operations :)

@jbguerraz jbguerraz force-pushed the jitsi-plain-room-name branch 3 times, most recently from 478cfb6 to e51b4cc Compare June 30, 2020 16:30
@jbguerraz
Copy link
Contributor Author

Hello!

Since #17950 got merged and conflicted this PR, I re-rolled it.
Please @geekgonecrazy or maybe @rodrigok ? or even @engelgabriel ? could you review it once again ?
Thank you!

@jbguerraz jbguerraz requested a review from geekgonecrazy June 30, 2020 16:42
@jbguerraz jbguerraz requested a review from geekgonecrazy July 1, 2020 19:04
@jbguerraz jbguerraz force-pushed the jitsi-plain-room-name branch from 4622d66 to 437b5e8 Compare July 23, 2020 13:13
@jbguerraz jbguerraz force-pushed the jitsi-plain-room-name branch from 437b5e8 to 25bc6ec Compare July 23, 2020 14:48
@jbguerraz jbguerraz force-pushed the jitsi-plain-room-name branch from 25bc6ec to 01e0a08 Compare August 3, 2020 14:19
@rodrigok rodrigok added this to the 3.6.0 milestone Aug 20, 2020
@rodrigok rodrigok merged commit 28cf942 into RocketChat:develop Aug 20, 2020
tassoevan added a commit that referenced this pull request Aug 22, 2020
@tassoevan
Refactor: Omnichannel Current Chats (#18627)
c6c96f4 
Squashed commit of the following:

commit 3d28fb9
Author: Guilherme Gazzo <guilherme@gazzo.xyz>
Date:   Fri Aug 21 17:25:15 2020 -0300

    Review

commit b560888
Merge: 2e5417c 40c7226
Author: Guilherme Gazzo <guilherme@gazzo.xyz>
Date:   Fri Aug 21 17:05:37 2020 -0300

    Merge branch 'ref/omni' of github.com:RocketChat/Rocket.Chat into ref/omni-curr-chats

commit 40c7226
Merge: ab78f68 575df22
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date:   Fri Aug 21 17:04:51 2020 -0300

    Merge branch 'develop' into ref/omni

commit 2e5417c
Merge: da8388b 6b04ba5
Author: Guilherme Gazzo <guilherme@gazzo.xyz>
Date:   Fri Aug 21 16:23:21 2020 -0300

    Merge branch 'ref/omni-curr-chats' of github.com:RocketChat/Rocket.Chat into ref/omni-curr-chats

commit da8388b
Merge: 07f2e89 ab78f68
Author: Guilherme Gazzo <guilherme@gazzo.xyz>
Date:   Fri Aug 21 16:22:43 2020 -0300

    Merge branch 'ref/omni' of github.com:RocketChat/Rocket.Chat into ref/omni-curr-chats

commit 575df22
Author: Anton Kazarinov <askazarinov@gmail.com>
Date:   Fri Aug 21 23:31:45 2020 +0500

    [IMPROVE] Slack bridge: add support to threads (#15992)

    Co-authored-by: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
    Co-authored-by: pierre-lehnen-rc <55164754+pierre-lehnen-rc@users.noreply.github.com>

commit 40520f4
Author: Douglas Gubert <d-gubert@users.noreply.github.com>
Date:   Fri Aug 21 15:16:10 2020 -0300

    [NEW][APPS-ENGINE] Implement new IPostLivechatRoomTransferred event (#18625)

    * Implement new IPostLivechatRoomTransferred event

    * Move event trigger to correct place

    * Update Apps-Engine version

commit ab78f68
Merge: 3aca1b0 06467a6
Author: Guilherme Gazzo <guilherme@gazzo.xyz>
Date:   Fri Aug 21 13:57:53 2020 -0300

    Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into ref/omni

commit 6b04ba5
Author: Martin <martin.schoeler@rocket.chat>
Date:   Fri Aug 21 03:39:05 2020 -0300

    Remove old files

commit 47c92ce
Author: Martin <martin.schoeler@rocket.chat>
Date:   Fri Aug 21 03:33:21 2020 -0300

    Revert develop merge

commit 4a23db7
Author: Martin <martin.schoeler@rocket.chat>
Date:   Fri Aug 21 03:27:45 2020 -0300

    add tags

commit 06467a6
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date:   Fri Aug 21 03:10:31 2020 -0300

    [IMPROVE] UserCard and UserInfo Show Real Names Setting (#18628)

commit ebcfbd3
Author: Martin <martin.schoeler@rocket.chat>
Date:   Fri Aug 21 01:30:35 2020 -0300

    remove test data

commit 07f2e89
Author: Guilherme Gazzo <guilherme@gazzo.xyz>
Date:   Fri Aug 21 01:25:12 2020 -0300

    Fix

commit 7cb736b
Merge: d7840be 7d60bee
Author: Guilherme Gazzo <guilherme@gazzo.xyz>
Date:   Fri Aug 21 00:48:02 2020 -0300

    Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into ref/omni-curr-chats

commit d7840be
Author: Martin <martin.schoeler@rocket.chat>
Date:   Fri Aug 21 00:21:26 2020 -0300

    use old url

commit cfb5a33
Author: Martin <martin.schoeler@rocket.chat>
Date:   Fri Aug 21 00:09:45 2020 -0300

    lint

commit 2cfbafb
Author: Martin <martin.schoeler@rocket.chat>
Date:   Fri Aug 21 00:08:27 2020 -0300

    Current Chats wip

commit 7d60bee
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date:   Thu Aug 20 22:45:51 2020 -0300

    [FIX] MarkdownText usage (#18621)

commit 3aca1b0
Author: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date:   Thu Aug 20 22:43:22 2020 -0300

    Refactor: Omnichannel Facebook Integration (#18624)

    Co-authored-by: Guilherme Gazzo <guilherme@gazzo.xyz>

commit 528fbe7
Author: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date:   Thu Aug 20 22:42:05 2020 -0300

    Anonymous user were being created based on manually approve users (#17427)

commit 88649be
Author: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date:   Thu Aug 20 22:14:08 2020 -0300

    Fix Triggers (#18626)

commit abae419
Author: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date:   Thu Aug 20 22:00:41 2020 -0300

    Update dependencies (#18593)

commit 09b825d
Author: pierre-lehnen-rc <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date:   Thu Aug 20 21:15:39 2020 -0300

    [NEW] Banner for servers in the middle of the registration process (#18623)

commit bce223a
Author: Murtaza Patrawala <34130764+murtaza98@users.noreply.github.com>
Date:   Fri Aug 21 04:11:42 2020 +0530

    [NEW]Add new endpoint to change Omnichannel room's visitor (#18528)

    * add new endpoint to change room visitor

    * Apply suggestions from code review

    Co-authored-by: Renato Becker <renato.augusto.becker@gmail.com>

    * fix errors in previous commit

    * modify livechat.config endpoint to support new param - roomId

    * Apply suggestions from code review

    Co-authored-by: Renato Becker <renato.augusto.becker@gmail.com>

    * remove changes to livechat-config endpoint

    * move permission check into Livechat lib

    * refactor code

    * Apply suggestions from code review

    Co-authored-by: Renato Becker <renato.augusto.becker@gmail.com>

    * query optimization and fix return value

    * return whole room object

    * limit room fields from while loading from DB

    * Remove unecessary promise statement.

    Co-authored-by: Renato Becker <renato.augusto.becker@gmail.com>

commit a0a4948
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Aug 20 14:10:47 2020 -0300

    Bump bcrypt from 3.0.7 to 5.0.0 (#18622)

    Bumps [bcrypt](https://github.com/kelektiv/node.bcrypt.js) from 3.0.7 to 5.0.0.
    - [Release notes](https://github.com/kelektiv/node.bcrypt.js/releases)
    - [Changelog](https://github.com/kelektiv/node.bcrypt.js/blob/master/CHANGELOG.md)
    - [Commits](kelektiv/node.bcrypt.js@v3.0.7...v5.0.0)

    Signed-off-by: dependabot[bot] <support@github.com>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 4a2636d
Author: Paulo Bernardo <paulo.bernardo@ilhasoft.com.br>
Date:   Thu Aug 20 11:45:56 2020 -0300

    [FIX] Agents enabledDepartment attribute not set on collection (#18614)

commit 28cf942
Author: jbguerraz <861556+jbguerraz@users.noreply.github.com>
Date:   Thu Aug 20 14:43:29 2020 +0200

    [IMPROVE] Jitsi room name hash or plain (#17481)

commit 452589f
Author: Diego Sampaio <chinello@gmail.com>
Date:   Wed Aug 19 20:22:40 2020 -0300

    Explain why issue is closed when not using an issue template (#18420)

commit b491b26
Author: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date:   Wed Aug 19 18:36:51 2020 -0300

    Prevent directory API to return emails if the user has no permission (#18478)

commit 0a2d8ca
Author: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date:   Wed Aug 19 18:20:16 2020 -0300

    Set default timeout of 20s for HTTP calls (#18549)

commit 0e2309e
Author: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date:   Wed Aug 19 18:07:36 2020 -0300

    [FIX] UIKit Select and Multiselects not working (#18598)

commit dc549a5
Author: Martin Schoeler <martin.schoeler@rocket.chat>
Date:   Wed Aug 19 10:27:34 2020 -0300

    [IMPROVE] Add agentId parameter to changeLivechatStatus method (#18571)

    * Add agentId parameter to changeLivechatStatus method

    * Fix reviews

    * fix problems

    * return if the same as before

    * Update app/livechat/server/methods/changeLivechatStatus.js

    Co-authored-by: Renato Becker <renato.augusto.becker@gmail.com>

    * Fix review

    Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
    Co-authored-by: Renato Becker <renato.augusto.becker@gmail.com>
    Co-authored-by: Guilherme Gazzo <guilherme@gazzo.xyz>

commit fdda142
Author: Martin Schoeler <martin.schoeler@rocket.chat>
Date:   Wed Aug 19 04:11:26 2020 -0300

    [FIX] Auto complete user suggestions (#18437)

    Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
@rodrigok rodrigok changed the title [IMPROVE] Jitsi room name hash or plain [NEW][Jitsi] Setting to use room's name instead of room's id to generate the URL Aug 24, 2020
@sampaiodiego sampaiodiego mentioned this pull request Aug 29, 2020
Merged
@qchn
Copy link

qchn commented Sep 10, 2020

I think this a fix for my issue as well, isn't it?: #14836
Could you please take a look at it and if you agree, I'll close my issue.

Best,
R.

@jbguerraz
Copy link
Contributor Author

@qchn I don't think it solves #14836 since this give an option to use the room name instead of the hash but it doesn't change the way the hash is built and so the hash is still predictable.

@qchn
Copy link

qchn commented Sep 11, 2020

Thank you very much for the feedback, @jbguerraz
I will leave my issue open since it is still a thing.

@ankar84 ankar84 mentioned this pull request Sep 29, 2020
Closed
@diegolmello diegolmello mentioned this pull request Feb 15, 2021
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rodrigok rodrigok rodrigok approved these changes

@geekgonecrazy geekgonecrazy Awaiting requested review from geekgonecrazy

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

Successfully merging this pull request may close these issues.

Jitsi: Add option to make jitsi room name the same as the channel it started from
5 participants
@jbguerraz @CLAassistant @geekgonecrazy @qchn @rodrigok