deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-29 11:52:28 +02:00
Code Issues Projects Releases Wiki Activity

linkify: don't monkey patch the normalize function

Browse source 
Overriding the built in is poor form, as this prevents adding
a new type handler with its own normalize handler.

Rather, explicitly do the transformation so that we don't need
to type assert anything. That way, the compiler can actually help
us find issues.
This commit is contained in:
Reto Brunner 2024-01-21 18:04:18 +01:00
parent ae6bae69ac
commit 24dbefe4dd
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
shared/linkify.ts
View file

@ -11,25 +11,27 @@ export type LinkPart = {
link: string;
};
LinkifyIt.prototype.normalize = function normalize(match: NoSchemaMatch) {
match.noschema = false;
function normalizeMatch(match: Match): NoSchemaMatch {
const res: NoSchemaMatch = {...match, noschema: false};
if (!match.schema) {
match.schema = "http:";
match.url = "http://" + match.url;
match.noschema = true;
if (!res.schema) {
res.schema = "http:";
res.url = "http://" + res.url;
res.noschema = true;
}
if (match.schema === "//") {
match.schema = "http:";
match.url = "http:" + match.url;
match.noschema = true;
if (res.schema === "//") {
res.schema = "http:";
res.url = "http:" + res.url;
res.noschema = true;
}
if (match.schema === "mailto:" && !/^mailto:/i.test(match.url)) {
match.url = "mailto:" + match.url;
if (res.schema === "mailto:" && !/^mailto:/i.test(res.url)) {
res.url = "mailto:" + res.url;
}
};
return res;
}
const linkify = LinkifyIt().tlds(tlds).tlds("onion", true);
@ -73,18 +75,17 @@ linkify.add("web+", {
},
normalize(match) {
match.schema = match.text.slice(0, match.text.indexOf(":") + 1);
LinkifyIt.prototype.normalize(match); // hand over to the global override
},
});
export function findLinks(text: string) {
const matches = linkify.match(text) as NoSchemaMatch[];
const matches = linkify.match(text);
if (!matches) {
return [];
}
return matches.map(makeLinkPart);
return matches.map(normalizeMatch).map(makeLinkPart);
}
export function findLinksWithSchema(text: string) {
@ -94,7 +95,10 @@ export function findLinksWithSchema(text: string) {
return [];
}
return matches.filter((url) => !url.noschema).map(makeLinkPart);
return matches
.map(normalizeMatch)
.filter((url) => !url.noschema)
.map(makeLinkPart);
}
function makeLinkPart(url: NoSchemaMatch): LinkPart {