src/lib/utils.js

@@ -70,9 +70,7 @@ function readableTime(number) {
 }
 
 async function isGif(url) {
-  const type = await fetch(url, {method: "HEAD"}).then((res) =>
+  const type = await fetch(url).then((res) => res.headers.get("Content-Type"));
-    res.headers.get("Content-Type")
-  );
   return type == "image/gif";
 }
 
@@ -117,11 +115,11 @@ async function getImage(msg, str) {
     const attachments = [...refMsg.attachments.values()];
     if (attachments[0]?.url) {
       return attachments[0].url;
-    } else if (/<a?:[a-zA-Z0-9_]+:([0-9]+)>/.test(refMsg.content)) {
+    } else if (/<a?:[a-zA-Z0-9_]*:([0-9]*)>/.test(refMsg.content)) {
-      const id = refMsg.content.match(/<a?:[a-zA-Z0-9_]+:([0-9]+)>/)[1];
+      const id = refMsg.content.match(/<a?:[a-zA-Z0-9_]*:([0-9]*)>/)[1];
       return `https://cdn.discordapp.com/emojis/${id}.png?v=1`;
-    } else if (/<@!?([0-9]+)>/.test(refMsg.content)) {
+    } else if (/<@!?([0-9]*)>/.test(refMsg.content)) {
-      const id = refMsg.content.match(/<@!?([0-9]+)>/)[1];
+      const id = refMsg.content.match(/<@!?([0-9]*)>/)[1];
       const user = await hf.bot.requestHandler.request(
         "GET",
         "/users/" + id,
@@ -142,11 +140,11 @@ async function getImage(msg, str) {
     return attachments[0]?.url;
   } else if (urlRegex.test(str)) {
     return str;
-  } else if (/<a?:[a-zA-Z0-9_]+:([0-9]+)>/.test(str)) {
+  } else if (/<a?:[a-zA-Z0-9_]*:([0-9]*)>/.test(str)) {
-    const id = str.match(/<a?:[a-zA-Z0-9_]+:([0-9]+)>/)[1];
+    const id = str.match(/<a?:[a-zA-Z0-9_]*:([0-9]*)>/)[1];
     return `https://cdn.discordapp.com/emojis/${id}.png?v=1`;
-  } else if (/<@!?([0-9]+)>/.test(str)) {
+  } else if (/<@!?([0-9]*)>/.test(str)) {
-    const id = str.match(/<@!?([0-9]+)>/)[1];
+    const id = str.match(/<@!?([0-9]*)>/)[1];
     const user = await hf.bot.requestHandler.request(
       "GET",
       "/users/" + id,
@@ -327,20 +325,12 @@ async function lookupUser(msg, str, filter) {
       return user;
     } else if (
       user.username.toLowerCase().indexOf(str.toLowerCase()) > -1 ||
-      (user.nick && user.nick.toLowerCase().indexOf(str.toLowerCase()) > -1) ||
+      (user.nick && user.nick.indexOf(str.toLowerCase()) > -1)
-      (user.globalName &&
-        user.globalName.toLowerCase().indexOf(str.toLowerCase()) > -1)
     ) {
       selection.push({
         value: user,
         key: user.id,
-        display: `${formatUsername(user)}${
+        display: `${formatUsername(user)}${user.nick ? ` (${user.nick})` : ""}`,
-          user.nick
-            ? ` (${user.nick})`
-            : user.globalName
-            ? ` (${user.globalName})`
-            : ""
-        }`,
       });
     }
   }

src/modules/fedimbed.js

@@ -24,8 +24,7 @@ const PATH_REGEX = {
   misskey: /^\/notes\/[a-z0-9]+\/?/,
   gotosocial: /^\/@(.+?)\/statuses\/[0-9A-Z]+\/?/,
   lemmy: /^\/post\/\d+\/?/,
-  honk: /^\/u\/(.+?)\/h\/(.+?)\/?/,
+  honk: /^\/u\/(.+?)\/h\/(.+?)\/?$/,
-  cohost: /^\/[A-Za-z0-9]+\/post\/\d+-[A-Za-z0-9-]+\/?/,
 };
 
 const PLATFORM_COLORS = {
@@ -39,12 +38,9 @@ const PLATFORM_COLORS = {
   lemmy: 0x14854f,
   birdsitelive: 0x1da1f2,
   iceshrimp: 0x8e82f9, // YCbCr interpolated as the accent color is a gradient
-  cohost: 0x83254f,
 };
 
 const domainCache = new Map();
-domainCache.set("cohost.org", "cohost"); // no nodeinfo
-
 async function resolvePlatform(url) {
   const urlObj = new URL(url);
   if (domainCache.has(urlObj.hostname)) return domainCache.get(urlObj.hostname);
@@ -141,8 +137,7 @@ async function processUrl(msg, url, spoiler = false) {
   let platformName = platform
     .replace("gotosocial", "GoToSocial")
     .replace("birdsitelive", '"Twitter" (BirdsiteLive)')
-    .replace(/^(.)/, (_, c) => c.toUpperCase())
+    .replace(/^(.)/, (_, c) => c.toUpperCase());
-    .replace("Cohost", "cohost");
 
   const images = [];
   const videos = [];
@@ -480,9 +475,7 @@ async function processUrl(msg, url, spoiler = false) {
     )
       .then((res) => res.json())
       .catch((err) => {
-        // only posts can be activity+json right now, reduce log spam
+        logger.error("fedimbed", `Failed to get author for "${url}": ${err}`);
-        if (platform !== "cohost")
-          logger.error("fedimbed", `Failed to get author for "${url}": ${err}`);
       });
 
     if (authorData) {
@@ -493,18 +486,6 @@ async function processUrl(msg, url, spoiler = false) {
         url: authorData.url,
         avatar: authorData.icon?.url,
       };
-    } else {
-      // bootleg author, mainly for cohost
-      const authorUrl = postData.actor ?? postData.attributedTo;
-      const authorUrlObj = new URL(authorUrl);
-      const name = authorUrlObj.pathname.substring(
-        authorUrlObj.pathname.lastIndexOf("/") + 1
-      );
-      author = {
-        name,
-        handle: `${name}@${authorUrlObj.hostname}`,
-        url: authorUrl,
-      };
     }
 
     if (postData.endTime && postData.oneOf && postData.votersCount) {
@@ -534,10 +515,6 @@ async function processUrl(msg, url, spoiler = false) {
 
   // FIXME: stop being lazy and use an html parser
   content = content.replace(/<a .*?href="([^"]+?)".*?>(.+?)<\/a>/g, "[$2]($1)");
-  content = content.replace(
-    /<img .*?src="([^"]+?)".*?alt="([^"]+?)".*?\/>/g,
-    "[$2]($1)"
-  );
   content = content.replace(/<\/?\s*br\s*\/?>/g, "\n");
   content = content.replace(/<\/p><p>/g, "\n\n");
   content = content.replace(/<ol>/g, "\n");