From 3cf6c3731c1ead91b64ea116b3e36fa10a3155e5 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@waah.day>
Date: Thu, 28 Sep 2023 19:56:03 -0400
Subject: [PATCH] fix: mitigate pinned note error

---
 packages/backend/src/db/scylla.ts             | 13 ++++----
 .../backend/src/models/repositories/user.ts   | 33 +++++++++++++------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/packages/backend/src/db/scylla.ts b/packages/backend/src/db/scylla.ts
index d7845fb503..527654b2dd 100644
--- a/packages/backend/src/db/scylla.ts
+++ b/packages/backend/src/db/scylla.ts
@@ -14,6 +14,8 @@ import type { UserProfile } from "@/models/entities/user-profile.js";
 import { scyllaQueries } from "@/db/cql.js";
 import { notificationTypes } from "@/types.js";
 
+export const scyllaLogger = new Logger("scylla");
+
 function newClient(): Client | null {
 	if (!config.scylla) {
 		return null;
@@ -38,26 +40,25 @@ function newClient(): Client | null {
 		credentials: config.scylla.credentials,
 	});
 
-	const logger = new Logger("scylla");
 	client.on("log", (level, loggerName, message, _furtherInfo) => {
 		const msg = `${loggerName} - ${message}`;
 		switch (level) {
 			case "info":
-				logger.info(msg);
+				scyllaLogger.info(msg);
 				break;
 			case "warning":
-				logger.warn(msg);
+				scyllaLogger.warn(msg);
 				break;
 			case "error":
-				logger.error(msg);
+				scyllaLogger.error(msg);
 				break;
 		}
 	});
 	client.on("slow", (message) => {
-		logger.warn(message);
+		scyllaLogger.warn(message);
 	});
 	client.on("large", (message) => {
-		logger.warn(message);
+		scyllaLogger.warn(message);
 	});
 
 	return client;
diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index 9427518a43..303e638385 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -37,7 +37,12 @@ import {
 } from "../index.js";
 import type { Instance } from "../entities/instance.js";
 import { userDenormalizedCache } from "@/services/user-cache.js";
-import { parseScyllaNote, prepared, scyllaClient } from "@/db/scylla.js";
+import {
+	parseScyllaNote,
+	prepared,
+	scyllaClient,
+	scyllaLogger,
+} from "@/db/scylla.js";
 import type { UserNotePining } from "@/models/entities/user-note-pining.js";
 import type { Note } from "@/models/entities/note.js";
 
@@ -423,15 +428,23 @@ export const UserRepository = db.getRepository(User).extend({
 			}).then((notes) => notes.map(({ noteId }) => noteId));
 
 			if (pinnedNoteIds.length > 0) {
-				if (scyllaClient) {
-					const result = await scyllaClient.execute(
-						prepared.note.select.byIds,
-						[pinnedNoteIds],
-						{ prepare: true },
-					);
-					pinnedNotes = result.rows.map(parseScyllaNote);
-				} else {
-					pinnedNotes = await Notes.findBy({ id: In(pinnedNoteIds) });
+				try {
+					if (scyllaClient) {
+						const result = await scyllaClient.execute(
+							prepared.note.select.byIds,
+							[pinnedNoteIds],
+							{ prepare: true },
+						);
+						pinnedNotes = result.rows.map(parseScyllaNote);
+					} else {
+						pinnedNotes = await Notes.findBy({ id: In(pinnedNoteIds) });
+					}
+				} catch (e) {
+					scyllaLogger.error("Failed to fetch pinned notes", {
+						pinnedNoteIds,
+						error: e,
+					});
+					pinnedNotes = [];
 				}
 			}
 		}