Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Increased the number of notifications retrieved in admin-x-activitypub (#21925)

Browse source 
refs
[AP-626](https://linear.app/ghost/issue/AP-626/wrong-posts-showing-up-in-notifications)

Increased the number of notifications retrieved in `admin-x-activitypub`
to account for notifications being grouped and reduce the amount of time
waiting on requests to finish (by making fewer requests)
This commit is contained in:
Michael Barrett 2024-12-19 13:19:26 +00:00 • committed by GitHub
parent c438f9442f
commit e08959a1b5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/admin-x-activitypub/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "@tryghost/admin-x-activitypub", "name": "@tryghost/admin-x-activitypub",
"version": "0.3.40", "version": "0.3.41",
"license": "MIT", "license": "MIT",
"repository": { "repository": {
"type": "git", "type": "git",

7
apps/admin-x-activitypub/src/api/activitypub.ts
View file

@ -214,12 +214,13 @@ export class ActivityPubAPI {
includeOwn: boolean = false, includeOwn: boolean = false,
includeReplies: boolean = false, includeReplies: boolean = false,
filter: {type?: string[]} | null = null, filter: {type?: string[]} | null = null,
limit: number = 50,
cursor?: string cursor?: string
): Promise<{data: Activity[], next: string | null}> { ): Promise<{data: Activity[], next: string | null}> {
const LIMIT = 50;
const url = new URL(this.activitiesApiUrl); const url = new URL(this.activitiesApiUrl);
url.searchParams.set('limit', LIMIT.toString());
url.searchParams.set('limit', limit.toString());
if (includeOwn) { if (includeOwn) {
url.searchParams.set('includeOwn', includeOwn.toString()); url.searchParams.set('includeOwn', includeOwn.toString());
} }

1
apps/admin-x-activitypub/src/components/Activities.tsx
View file

@ -185,6 +185,7 @@ const Activities: React.FC<ActivitiesProps> = ({}) => {
filter: { filter: {
type: ['Follow', 'Like', `Create:Note`] type: ['Follow', 'Like', `Create:Note`]
}, },
limit: 250,
key: GET_ACTIVITIES_QUERY_KEY_NOTIFICATIONS key: GET_ACTIVITIES_QUERY_KEY_NOTIFICATIONS
}); });

4
apps/admin-x-activitypub/src/hooks/useActivityPubQueries.ts
View file

@ -267,12 +267,14 @@ export function useActivitiesForUser({
includeOwn = false, includeOwn = false,
includeReplies = false, includeReplies = false,
filter = null, filter = null,
limit = undefined,
key = null key = null
}: { }: {
handle: string; handle: string;
includeOwn?: boolean; includeOwn?: boolean;
includeReplies?: boolean; includeReplies?: boolean;
filter?: {type?: string[]} | null; filter?: {type?: string[]} | null;
limit?: number;
key?: string | null; key?: string | null;
}) { }) {
const queryKey = [`activities:${handle}`, key, {includeOwn, includeReplies, filter}]; const queryKey = [`activities:${handle}`, key, {includeOwn, includeReplies, filter}];
@ -283,7 +285,7 @@ export function useActivitiesForUser({
async queryFn({pageParam}: {pageParam?: string}) { async queryFn({pageParam}: {pageParam?: string}) {
const siteUrl = await getSiteUrl(); const siteUrl = await getSiteUrl();
const api = createActivityPubAPI(handle, siteUrl); const api = createActivityPubAPI(handle, siteUrl);
return api.getActivities(includeOwn, includeReplies, filter, pageParam); return api.getActivities(includeOwn, includeReplies, filter, limit, pageParam);
}, },
getNextPageParam(prevPage) { getNextPageParam(prevPage) {
return prevPage.next; return prevPage.next;