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

Add client base url support for permalinks #4027

Merged
merged 6 commits into from
Sep 29, 2021
Merged

Conversation

Florian14
Copy link
Contributor

@Florian14 Florian14 commented Sep 16, 2021

This PR adds a field clientPermalinkBaseUrl into the MatrixConfiguration object.
If not null, this base url will be used to generate custom permalinks instead of usual matrix.to links.
eg. "https://www.example.org/#" for "https://www.example.org/#/room/#element-android:matrix.org"

@github-actions
Copy link

github-actions bot commented Sep 16, 2021

Unit Test Results

  42 files  ±0    42 suites  ±0   43s ⏱️ ±0s
  83 tests ±0    83 ✔️ ±0  0 💤 ±0  0 ±0 
220 runs  ±0  220 ✔️ ±0  0 💤 ±0  0 ±0 

Results for commit c0adde5. ± Comparison against base commit c0adde5.

♻️ This comment has been updated with latest results.

@Florian14 Florian14 force-pushed the feature/fre/permalink branch 3 times, most recently from 3968131 to 1d5ece7 Compare September 16, 2021 15:01
@Florian14 Florian14 requested a review from bmarty September 16, 2021 15:01
@Florian14 Florian14 marked this pull request as ready for review September 16, 2021 15:02
Copy link
Member

@bmarty bmarty left a comment

Choose a reason for hiding this comment

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

Thanks for the PR, nice work!
I've made some remarks.
Also @ganfra can you make a review too please?

@Florian14 Florian14 force-pushed the feature/fre/permalink branch from 1d5ece7 to 054fc96 Compare September 17, 2021 14:46
Copy link
Member

@ganfra ganfra left a comment

Choose a reason for hiding this comment

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

Just one remark for me. Otherwise LGTM, but not tested

Also convert links to matrix.to before permalink parsing
@Florian14 Florian14 force-pushed the feature/fre/permalink branch from 054fc96 to 86dc340 Compare September 17, 2021 15:19
@Florian14 Florian14 force-pushed the feature/fre/permalink branch from 86dc340 to 3c82187 Compare September 20, 2021 08:35
@Florian14 Florian14 force-pushed the feature/fre/permalink branch from 3c82187 to fa3abec Compare September 20, 2021 13:18
@Florian14 Florian14 requested a review from bmarty September 21, 2021 10:13
Copy link
Member

@bmarty bmarty left a comment

Choose a reason for hiding this comment

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

Thanks for the update!

@bmarty bmarty merged commit c0adde5 into develop Sep 29, 2021
@bmarty bmarty deleted the feature/fre/permalink branch September 29, 2021 15:08
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.

5 participants