Skip to content

Commit

Permalink
Matrix matrix scheme permalink constructor not stripping query params (
Browse files Browse the repository at this point in the history
  • Loading branch information
t3chguy committed Jun 9, 2023
1 parent 5264aa6 commit a861a54
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/utils/permalinks/MatrixSchemePermalinkConstructor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ export default class MatrixSchemePermalinkConstructor extends PermalinkConstruct
throw new Error("Does not appear to be a permalink");
}

const parts = fullUrl.substring("matrix:".length).split("/");
const url = new URL(fullUrl);
const parts = url.pathname.split("/");

const identifier = parts[0];
const entityNoSigil = parts[1];
Expand Down
30 changes: 30 additions & 0 deletions test/utils/permalinks/MatrixSchemePermalinkConstructor-test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
Copyright 2023 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

import { PermalinkParts } from "../../../src/utils/permalinks/PermalinkConstructor";
import MatrixSchemePermalinkConstructor from "../../../src/utils/permalinks/MatrixSchemePermalinkConstructor";

describe("MatrixSchemePermalinkConstructor", () => {
const peramlinkConstructor = new MatrixSchemePermalinkConstructor();

describe("parsePermalink", () => {
it("should strip ?action=chat from user links", () => {
expect(peramlinkConstructor.parsePermalink("matrix:u/user:example.com?action=chat")).toEqual(
new PermalinkParts(null, null, "@user:example.com", null),
);
});
});
});

0 comments on commit a861a54

Please sign in to comment.