From 093c23feaecf85c68e1637d0ca8b3a9c7a82e212 Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Mon, 14 Aug 2023 21:18:47 +1000
Subject: [PATCH] i love commit messages

---
 src/activitypub/util/OrderedCollection.ts | 14 +++++++++++---
 src/util/entities/User.ts                 |  1 +
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/activitypub/util/OrderedCollection.ts b/src/activitypub/util/OrderedCollection.ts
index 5a53b5555..83cf9bd91 100644
--- a/src/activitypub/util/OrderedCollection.ts
+++ b/src/activitypub/util/OrderedCollection.ts
@@ -1,16 +1,24 @@
-import { APObject, APOrderedCollection } from "activitypub-types";
+import {
+	APObject,
+	APOrderedCollection,
+	OrderedCollectionItemsField,
+} from "activitypub-types";
 import { Request } from "express";
 
 interface ActivityPubable {
 	toAP(): APObject;
 }
 
+interface CorrectOrderedCollection extends APOrderedCollection {
+	orderedItems?: OrderedCollectionItemsField[];
+}
+
 export const makeOrderedCollection = async <T extends ActivityPubable>(
 	req: Request,
 	id: string,
 	getTotalElements: () => Promise<number>,
 	getElements: (before?: string, after?: string) => Promise<T[]>,
-): Promise<APOrderedCollection> => {
+): Promise<CorrectOrderedCollection> => {
 	const { page, min_id, max_id } = req.query;
 
 	if (!page)
@@ -37,6 +45,6 @@ export const makeOrderedCollection = async <T extends ActivityPubable>(
 		first: `${id}?page=true`,
 		last: `${id}?page=true&min_id=0`,
 		totalItems: await getTotalElements(),
-		items: items,
+		orderedItems: items,
 	};
 };
diff --git a/src/util/entities/User.ts b/src/util/entities/User.ts
index 22a69a3d0..1adeae3ac 100644
--- a/src/util/entities/User.ts
+++ b/src/util/entities/User.ts
@@ -309,6 +309,7 @@ export class User extends BaseClass {
 						}/${this.avatar}`,
 				  ]
 				: undefined,
+			discoverable: true,
 
 			inbox: `https://${webDomain}/fed/user/${this.id}/inbox`,
 			outbox: `https://${webDomain}/fed/user/${this.id}/outbox`,