From a292e46f84c4b01a942e447960cc587c849bae9d Mon Sep 17 00:00:00 2001 From: PrivateGER Date: Mon, 7 Oct 2024 11:56:18 +0200 Subject: Pack other side of relation into response as well --- packages/backend/src/server/api/endpoints/federation/followers.ts | 2 +- packages/backend/src/server/api/endpoints/federation/following.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/backend/src/server') diff --git a/packages/backend/src/server/api/endpoints/federation/followers.ts b/packages/backend/src/server/api/endpoints/federation/followers.ts index ce4dd13067..f114363eec 100644 --- a/packages/backend/src/server/api/endpoints/federation/followers.ts +++ b/packages/backend/src/server/api/endpoints/federation/followers.ts @@ -54,7 +54,7 @@ export default class extends Endpoint { // eslint- .limit(ps.limit) .getMany(); - return await this.followingEntityService.packMany(followings, me, { populateFollowee: true }); + return await this.followingEntityService.packMany(followings, me, { populateFollowee: true, populateFollower: true }); }); } } diff --git a/packages/backend/src/server/api/endpoints/federation/following.ts b/packages/backend/src/server/api/endpoints/federation/following.ts index 1a793889c7..9f574f124e 100644 --- a/packages/backend/src/server/api/endpoints/federation/following.ts +++ b/packages/backend/src/server/api/endpoints/federation/following.ts @@ -54,7 +54,7 @@ export default class extends Endpoint { // eslint- .limit(ps.limit) .getMany(); - return await this.followingEntityService.packMany(followings, me, { populateFollowee: true }); + return await this.followingEntityService.packMany(followings, me, { populateFollowee: true, populateFollower: true }); }); } } -- cgit v1.2.3-freya From 1c3495ef59a9bd1cfa61c27fc15873a4d8ecf99f Mon Sep 17 00:00:00 2001 From: PrivateGER Date: Mon, 7 Oct 2024 16:23:24 +0200 Subject: Make including followers in response a parameter --- packages/backend/src/server/api/endpoints/federation/followers.ts | 3 ++- packages/backend/src/server/api/endpoints/federation/following.ts | 3 ++- packages/frontend/src/pages/instance-info.vue | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'packages/backend/src/server') diff --git a/packages/backend/src/server/api/endpoints/federation/followers.ts b/packages/backend/src/server/api/endpoints/federation/followers.ts index f114363eec..c7630bed93 100644 --- a/packages/backend/src/server/api/endpoints/federation/followers.ts +++ b/packages/backend/src/server/api/endpoints/federation/followers.ts @@ -33,6 +33,7 @@ export const paramDef = { sinceId: { type: 'string', format: 'misskey:id' }, untilId: { type: 'string', format: 'misskey:id' }, limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, + includeFollower: { type: 'boolean', default: false }, }, required: ['host'], } as const; @@ -54,7 +55,7 @@ export default class extends Endpoint { // eslint- .limit(ps.limit) .getMany(); - return await this.followingEntityService.packMany(followings, me, { populateFollowee: true, populateFollower: true }); + return await this.followingEntityService.packMany(followings, me, { populateFollowee: true, populateFollower: ps.includeFollower }); }); } } diff --git a/packages/backend/src/server/api/endpoints/federation/following.ts b/packages/backend/src/server/api/endpoints/federation/following.ts index 9f574f124e..516cf7b56a 100644 --- a/packages/backend/src/server/api/endpoints/federation/following.ts +++ b/packages/backend/src/server/api/endpoints/federation/following.ts @@ -33,6 +33,7 @@ export const paramDef = { sinceId: { type: 'string', format: 'misskey:id' }, untilId: { type: 'string', format: 'misskey:id' }, limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, + includeFollower: { type: 'boolean', default: false }, }, required: ['host'], } as const; @@ -54,7 +55,7 @@ export default class extends Endpoint { // eslint- .limit(ps.limit) .getMany(); - return await this.followingEntityService.packMany(followings, me, { populateFollowee: true, populateFollower: true }); + return await this.followingEntityService.packMany(followings, me, { populateFollowee: true, populateFollower: ps.includeFollower }); }); } } diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue index b8d9434498..19007401e5 100644 --- a/packages/frontend/src/pages/instance-info.vue +++ b/packages/frontend/src/pages/instance-info.vue @@ -220,6 +220,7 @@ const followingPagination = { limit: 10, params: { host: props.host, + includeFollower: true, }, offsetMode: false, }; @@ -229,6 +230,7 @@ const followersPagination = { limit: 10, params: { host: props.host, + includeFollower: true, }, offsetMode: false, }; -- cgit v1.2.3-freya From 46e53e294e2b65ca9630f68347f2399983aee015 Mon Sep 17 00:00:00 2001 From: PrivateGER Date: Mon, 7 Oct 2024 16:47:15 +0200 Subject: Parameterize followee as well --- packages/backend/src/server/api/endpoints/federation/followers.ts | 3 ++- packages/backend/src/server/api/endpoints/federation/following.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'packages/backend/src/server') diff --git a/packages/backend/src/server/api/endpoints/federation/followers.ts b/packages/backend/src/server/api/endpoints/federation/followers.ts index c7630bed93..45a38e86d9 100644 --- a/packages/backend/src/server/api/endpoints/federation/followers.ts +++ b/packages/backend/src/server/api/endpoints/federation/followers.ts @@ -34,6 +34,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, includeFollower: { type: 'boolean', default: false }, + includeFollowee: { type: 'boolean', default: true }, }, required: ['host'], } as const; @@ -55,7 +56,7 @@ export default class extends Endpoint { // eslint- .limit(ps.limit) .getMany(); - return await this.followingEntityService.packMany(followings, me, { populateFollowee: true, populateFollower: ps.includeFollower }); + return await this.followingEntityService.packMany(followings, me, { populateFollowee: ps.includeFollowee, populateFollower: ps.includeFollower }); }); } } diff --git a/packages/backend/src/server/api/endpoints/federation/following.ts b/packages/backend/src/server/api/endpoints/federation/following.ts index 516cf7b56a..23257ae926 100644 --- a/packages/backend/src/server/api/endpoints/federation/following.ts +++ b/packages/backend/src/server/api/endpoints/federation/following.ts @@ -34,6 +34,7 @@ export const paramDef = { untilId: { type: 'string', format: 'misskey:id' }, limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 }, includeFollower: { type: 'boolean', default: false }, + includeFollowee: { type: 'boolean', default: true }, }, required: ['host'], } as const; @@ -55,7 +56,7 @@ export default class extends Endpoint { // eslint- .limit(ps.limit) .getMany(); - return await this.followingEntityService.packMany(followings, me, { populateFollowee: true, populateFollower: ps.includeFollower }); + return await this.followingEntityService.packMany(followings, me, { populateFollowee: ps.includeFollowee, populateFollower: ps.includeFollower }); }); } } -- cgit v1.2.3-freya