From 14321336cdff7a5519257821332aa98d3b846ee2 Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Sun, 15 Jan 2023 16:21:46 +1100
Subject: Add an error log if embed handler fails, in addition to the existing
 sentry log

---
 src/api/util/handlers/Message.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/api/util')

diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts
index 93dc3bf4..d6fe48bd 100644
--- a/src/api/util/handlers/Message.ts
+++ b/src/api/util/handlers/Message.ts
@@ -223,6 +223,7 @@ export async function postHandleMessage(message: Message) {
 				data.embeds.push(embed);
 			}
 		} catch (e) {
+			console.error(`[Embeds] Error while generating embed`, e);
 			Sentry.captureException(e, (scope) => {
 				scope.clear();
 				scope.setContext("request", { url });
-- 
cgit 1.5.1


From b8e5f7343c65779a78d02c07c833d2bd183aab31 Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Mon, 16 Jan 2023 00:03:51 +1100
Subject: Update dead lines

---
 README.md                             | 6 ++----
 src/api/util/utility/EmbedHandlers.ts | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/api/util')

diff --git a/README.md b/README.md
index 8ec423ed..2133865d 100644
--- a/README.md
+++ b/README.md
@@ -23,8 +23,6 @@ This repository contains:
 -   [HTTP CDN Server](/src/cdn)
 -   [Utility and Database Models](/src/util)
 
-## [Resources](https://docs.fosscord.com/resources/)
+## [Contributing](https://docs.fosscord.com/contributing/)
 
--   [Contributing](https://docs.fosscord.com/contributing/server/)
-
-## [Setup](https://docs.fosscord.com/server/setup/)
+## [Setup](https://docs.fosscord.com/setup/server/)
diff --git a/src/api/util/utility/EmbedHandlers.ts b/src/api/util/utility/EmbedHandlers.ts
index 2549937e..0e4146d1 100644
--- a/src/api/util/utility/EmbedHandlers.ts
+++ b/src/api/util/utility/EmbedHandlers.ts
@@ -43,7 +43,7 @@ export const getProxyUrl = (
 
 	// TODO: Imagor documentation
 	console.log(
-		"Imagor has not been set up correctly. docs.fosscord.com/set/up/a/page/about/this",
+		"Imagor has not been set up correctly. https://docs.fosscord.com/setup/server/configuration/imagor/",
 	);
 	return "";
 };
-- 
cgit 1.5.1


From 49a311f5d07025d3bdca2603ac2e8cf427d81f77 Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Mon, 16 Jan 2023 14:20:17 +1100
Subject: Return embed proxy url even if imagor not set up. Also make warning
 nicer

---
 src/api/util/utility/EmbedHandlers.ts | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'src/api/util')

diff --git a/src/api/util/utility/EmbedHandlers.ts b/src/api/util/utility/EmbedHandlers.ts
index 0e4146d1..6ec4cac0 100644
--- a/src/api/util/utility/EmbedHandlers.ts
+++ b/src/api/util/utility/EmbedHandlers.ts
@@ -3,6 +3,7 @@ import fetch, { Response } from "node-fetch";
 import * as cheerio from "cheerio";
 import probe from "probe-image-size";
 import crypto from "crypto";
+import { yellow } from "picocolors";
 
 export const DEFAULT_FETCH_OPTIONS: any = {
 	redirect: "follow",
@@ -16,6 +17,8 @@ export const DEFAULT_FETCH_OPTIONS: any = {
 	method: "GET",
 };
 
+let hasWarnedAboutImagor = false;
+
 export const getProxyUrl = (
 	url: URL,
 	width: number,
@@ -41,11 +44,17 @@ export const getProxyUrl = (
 		return `${imagorServerUrl}/${hash}/${path}`;
 	}
 
-	// TODO: Imagor documentation
-	console.log(
-		"Imagor has not been set up correctly. https://docs.fosscord.com/setup/server/configuration/imagor/",
-	);
-	return "";
+	if (!hasWarnedAboutImagor) {
+		hasWarnedAboutImagor = true;
+		console.log(
+			"[Embeds]",
+			yellow(
+				"Imagor has not been set up correctly. https://docs.fosscord.com/setup/server/configuration/imagor/",
+			),
+		);
+	}
+
+	return url.toString();
 };
 
 const getMeta = ($: cheerio.CheerioAPI, name: string): string | undefined => {
-- 
cgit 1.5.1