Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug in embed handler where getMeta would not return undefined

Browse Source
This commit is contained in:
Madeline 2023-09-03 13:41:45 +10:00
parent c64a115729
commit fb7409947c
No known key found for this signature in database
GPG Key ID: 1958E017C36F2E47
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/util/utility/EmbedHandlers.ts
View File

@ -78,7 +78,8 @@ export const getProxyUrl = (
const getMeta = ($: cheerio.CheerioAPI, name: string): string | undefined => { const getMeta = ($: cheerio.CheerioAPI, name: string): string | undefined => {
let elem = $(`meta[property="${name}"]`); let elem = $(`meta[property="${name}"]`);
if (!elem.length) elem = $(`meta[name="${name}"]`); if (!elem.length) elem = $(`meta[name="${name}"]`);
return elem.attr("content") || elem.text(); const ret = elem.attr("content") || elem.text();
return ret.trim().length == 0 ? undefined : ret;
}; };
export const getMetaDescriptions = (text: string) => { export const getMetaDescriptions = (text: string) => {
@ -168,7 +169,8 @@ export const EmbedHandlers: {
const response = await doFetch(url); const response = await doFetch(url);
if (!response) return null; if (!response) return null;
const metas = getMetaDescriptions(await response.text()); const text = await response.text();
const metas = getMetaDescriptions(text);
// TODO: handle video // TODO: handle video
@ -189,7 +191,7 @@ export const EmbedHandlers: {
if (metas.type == "object") embedType = EmbedType.article; // github if (metas.type == "object") embedType = EmbedType.article; // github
if (metas.type == "rich") embedType = EmbedType.rich; if (metas.type == "rich") embedType = EmbedType.rich;
if (metas.width < 400) embedType = EmbedType.link; if (metas.width && metas.width < 400) embedType = EmbedType.link;
return { return {
url: url.href, url: url.href,