From 61723305e5d683ec291db2693f48822859c0ec59 Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Sun, 7 Apr 2024 11:44:36 -1000
Subject: [PATCH] Fix for misbehaving clients

---
 cli.ts                                           | 6 +++---
 server/api/api/v1/favourites/index.ts            | 2 +-
 server/api/api/v1/follow_requests/index.ts       | 2 +-
 server/api/api/v1/notifications/index.ts         | 2 +-
 server/api/api/v1/statuses/[id]/favourited_by.ts | 2 +-
 server/api/api/v1/statuses/[id]/reblogged_by.ts  | 2 +-
 server/api/api/v1/timelines/home.ts              | 2 +-
 server/api/api/v1/timelines/public.ts            | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cli.ts b/cli.ts
index a974061e..28ac6210 100644
--- a/cli.ts
+++ b/cli.ts
@@ -515,7 +515,7 @@ const cliBuilder = new CliBuilder([
                 include: {
                     instance: true,
                 },
-                take: limit,
+                take: Number(limit),
             });
 
             if (redact) {
@@ -994,7 +994,7 @@ const cliBuilder = new CliBuilder([
                     author: true,
                     instance: true,
                 },
-                take: limit,
+                take: Number(limit),
             });
 
             if (redact) {
@@ -1473,7 +1473,7 @@ const cliBuilder = new CliBuilder([
                 where: {
                     instanceId: null,
                 },
-                take: limit,
+                take: Number(limit),
             });
 
             if (format === "json") {
diff --git a/server/api/api/v1/favourites/index.ts b/server/api/api/v1/favourites/index.ts
index 821b846a..19a6d628 100644
--- a/server/api/api/v1/favourites/index.ts
+++ b/server/api/api/v1/favourites/index.ts
@@ -46,7 +46,7 @@ export default apiRoute<{
             },
         },
         include: statusAndUserRelations,
-        take: limit,
+        take: Number(limit),
         orderBy: {
             id: "desc",
         },
diff --git a/server/api/api/v1/follow_requests/index.ts b/server/api/api/v1/follow_requests/index.ts
index 4916f63f..a7c20f9b 100644
--- a/server/api/api/v1/follow_requests/index.ts
+++ b/server/api/api/v1/follow_requests/index.ts
@@ -47,7 +47,7 @@ export default apiRoute<{
             },
         },
         include: userRelations,
-        take: limit,
+        take: Number(limit),
         orderBy: {
             id: "desc",
         },
diff --git a/server/api/api/v1/notifications/index.ts b/server/api/api/v1/notifications/index.ts
index aa535ca3..41b5ca7f 100644
--- a/server/api/api/v1/notifications/index.ts
+++ b/server/api/api/v1/notifications/index.ts
@@ -75,7 +75,7 @@ export default apiRoute<{
         orderBy: {
             id: "desc",
         },
-        take: limit,
+        take: Number(limit),
     });
 
     // Constuct HTTP Link header (next and prev)
diff --git a/server/api/api/v1/statuses/[id]/favourited_by.ts b/server/api/api/v1/statuses/[id]/favourited_by.ts
index 980f1eda..6d20de6a 100644
--- a/server/api/api/v1/statuses/[id]/favourited_by.ts
+++ b/server/api/api/v1/statuses/[id]/favourited_by.ts
@@ -74,7 +74,7 @@ export default apiRoute<{
                 },
             },
         },
-        take: limit,
+        take: Number(limit),
         orderBy: {
             id: "desc",
         },
diff --git a/server/api/api/v1/statuses/[id]/reblogged_by.ts b/server/api/api/v1/statuses/[id]/reblogged_by.ts
index d132fe28..50c109f8 100644
--- a/server/api/api/v1/statuses/[id]/reblogged_by.ts
+++ b/server/api/api/v1/statuses/[id]/reblogged_by.ts
@@ -75,7 +75,7 @@ export default apiRoute<{
                 include: statusAndUserRelations,
             },
         },
-        take: limit,
+        take: Number(limit),
         orderBy: {
             id: "desc",
         },
diff --git a/server/api/api/v1/timelines/home.ts b/server/api/api/v1/timelines/home.ts
index c48bf2c1..f0d62a4c 100644
--- a/server/api/api/v1/timelines/home.ts
+++ b/server/api/api/v1/timelines/home.ts
@@ -71,7 +71,7 @@ export default apiRoute<{
             ],
         },
         include: statusAndUserRelations,
-        take: limit,
+        take: Number(limit),
         orderBy: {
             id: "desc",
         },
diff --git a/server/api/api/v1/timelines/public.ts b/server/api/api/v1/timelines/public.ts
index 386238d0..843f2688 100644
--- a/server/api/api/v1/timelines/public.ts
+++ b/server/api/api/v1/timelines/public.ts
@@ -60,7 +60,7 @@ export default apiRoute<{
                   : undefined,
         },
         include: statusAndUserRelations,
-        take: limit,
+        take: Number(limit),
         orderBy: {
             id: "desc",
         },