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] Allow federated rooms with the same name per servers #27559

Merged
merged 24 commits into from Feb 1, 2023

Conversation

MarcosSpessatto
Copy link
Contributor

@MarcosSpessatto MarcosSpessatto commented Dec 15, 2022

Proposed changes (including videos or screenshots)

The main purpose for this PR is to allow the room creation with the same name, but from different servers, for example:
room1 from matrix.org
room1 from my-matrix.server
room1 from my-matrix2.server
...

We are still enforcing to have only one room with a specific name per server, for example:
room1 from my-local-server.com
room1 from my-local-server.com <= This is not allowed.

Issue(s)

Steps to test or reproduce

Further comments

FED-66

@codecov
Copy link

codecov bot commented Dec 16, 2022

Codecov Report

❗ No coverage uploaded for pull request base (feat/federation-feat-2@5c34c33). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head 602953f differs from pull request most recent head 9e727f6. Consider uploading reports for the commit 9e727f6 to get more accurate results

Impacted file tree graph

@@                    Coverage Diff                    @@
##             feat/federation-feat-2   #27559   +/-   ##
=========================================================
  Coverage                          ?   41.85%           
=========================================================
  Files                             ?      845           
  Lines                             ?    17817           
  Branches                          ?     2024           
=========================================================
  Hits                              ?     7457           
  Misses                            ?    10092           
  Partials                          ?      268           
Flag Coverage Δ
e2e 41.85% <0.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

@MarcosSpessatto MarcosSpessatto marked this pull request as ready for review December 22, 2022 11:34
@MarcosSpessatto MarcosSpessatto requested review from a team as code owners December 22, 2022 11:34
Copy link
Contributor

@pierre-lehnen-rc pierre-lehnen-rc left a comment

Choose a reason for hiding this comment

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

I stopped reviewing when I found a possible bug, will review the rest later.

apps/meteor/server/models/raw/Rooms.js Outdated Show resolved Hide resolved
@MarcosSpessatto MarcosSpessatto merged commit 4cab013 into feat/federation-feat-2 Feb 1, 2023
@MarcosSpessatto MarcosSpessatto deleted the fix/duplicated-name branch February 1, 2023 16:13
gabriellsh added a commit that referenced this pull request Feb 3, 2023
…etChat/Rocket.Chat into matrixSearch

* 'feat/federation-search-public-rooms' of github.com:RocketChat/Rocket.Chat:
  fix: fix wrong condition
  Chore: Federation E2E tests to ensure the room creation with the same name per servers (#27578)
  Chore: Federation E2E tests for messaging + admin (#27282)
  Chore: Federation e2e tests for channels (#27115)
  [FIX] Matrix Federation send message when multiple users are involved was not working (#27327)
  [FIX] Allow federated rooms with the same name per servers (#27559)
  [FIX] Support the whole Matrix Markdown spec (#27725)
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Feb 13, 2023
@sampaiodiego sampaiodiego mentioned this pull request Mar 9, 2023
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants