wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-10 11:49:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: support mobile twitter links (#3066)

Browse Source
This commit is contained in:
Wyatt Johnson
2020-08-03 16:51:15 +00:00
committed by GitHub
parent 79627af8d6
commit d602cf873c
2 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/common/helpers/findMediaLinks.spec.ts
+45
View File
@@ -0,0 +1,45 @@
import { findMediaLinks } from "./findMediaLinks";
it("can detect links", () => {
const bodies = [
// YouTube
"http://www.youtube.com/watch?v=o3LJPaYBqgU",
"http://youtube.com/watch?v=o3LJPaYBqgU",
"http://youtu.be/o3LJPaYBqgU",
"https://www.youtube.com/watch?v=o3LJPaYBqgU",
"https://youtube.com/watch?v=o3LJPaYBqgU",
"https://youtu.be/o3LJPaYBqgU",
// Twitter
"http://twitter.com/coralproject/status/1280903734478987265",
"http://www.twitter.com/coralproject/status/1280903734478987265",
"http://mobile.twitter.com/coralproject/status/1280903734478987265",
"https://twitter.com/coralproject/status/1280903734478987265",
"https://www.twitter.com/coralproject/status/1280903734478987265",
"https://mobile.twitter.com/coralproject/status/1280903734478987265",
];
for (const body of bodies) {
const links = findMediaLinks(body);
expect(links).toHaveLength(1);
expect(links[0].url).toEqual(body);
}
});
it("will force https on links without a scheme", () => {
const bodies = [
// YouTube
"www.youtube.com/watch?v=o3LJPaYBqgU",
"twitter.com/coralproject/status/1280903734478987265",
"youtu.be/o3LJPaYBqgU",
// Twitter
"www.twitter.com/coralproject/status/1280903734478987265",
"mobile.twitter.com/coralproject/status/1280903734478987265",
"youtube.com/watch?v=o3LJPaYBqgU",
];
for (const body of bodies) {
const links = findMediaLinks(body);
expect(links).toHaveLength(1);
expect(links[0].url).toEqual(`https://${body}`);
}
});
src/core/common/helpers/findMediaLinks.ts
+25 -10
View File
@@ -19,24 +19,39 @@ export function isMediaLink<T extends {}>(
return false;
}
function formatLink(type: MediaType, link: string): MediaLink {
function formatLink(type: MediaType, url: string): MediaLink {
return {
url: link,
url: url.startsWith("http") ? url : `https://${url}`,
type,
};
}
const youtubeRegex = /(https?:\/\/)?(www\.)?(youtube\.com\/watch\?v=[-_a-zA-z0-9]{1,12}|youtu\.be\/[-_a-zA-z0-9]{1,12})/g;
const twitterRegex = /(https?:\/\/)?(www\.)?(twitter\.com\/[a-zA-z0-9]+\/status\/[0-9]+)/g;
const patterns: Array<{ type: MediaType; pattern: RegExp }> = [
{
type: "youtube",
pattern: /(https?:\/\/)?(www\.)?(youtube\.com\/watch\?v=[-_a-zA-z0-9]{1,12}|youtu\.be\/[-_a-zA-z0-9]{1,12})/g,
},
{
type: "twitter",
pattern: /(https?:\/\/)?(www\.|mobile\.)?(twitter\.com\/[a-zA-z0-9]+\/status\/[0-9]+)/g,
},
];
export function findMediaLinks(body: string): MediaLink[] {
const foundYouTubeLinks = new Set(body.match(youtubeRegex) || []);
const foundTwitterLinks = new Set(body.match(twitterRegex) || []);
const media: MediaLink[] = [];
const media = [
...[...foundYouTubeLinks].map((l) => formatLink("youtube", l)),
...[...foundTwitterLinks].map((l) => formatLink("twitter", l)),
];
// For each of the patterns available...
for (const { type, pattern } of patterns) {
// Find all urls in the body with the pattern and put it into a set to
// deduplicate it.
const urls = new Set(body.match(pattern) || []);
// For each of the unique urls, format the url to a media link and push it
// in.
Array.from(urls).forEach((url) => {
media.push(formatLink(type, url));
});
}
return media;
}