From e21d1f6196c3adf9c6e464b9c1753d4009a65540 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Fri, 5 Sep 2025 14:50:34 -0700 Subject: [PATCH] stage3: implement all of lemmy compatible piefed api --- src/lib/client/base.ts | 4 +- src/lib/client/piefed/piefed.ts | 322 ++++++++++++------ .../components/lemmy/dropdowns/Sort.svelte | 28 +- .../post/[instance]/[id=integer]/+page.ts | 1 - src/routes/search/+page.ts | 9 +- 5 files changed, 246 insertions(+), 118 deletions(-) diff --git a/src/lib/client/base.ts b/src/lib/client/base.ts index 92e14485..fe731e1d 100644 --- a/src/lib/client/base.ts +++ b/src/lib/client/base.ts @@ -97,7 +97,7 @@ export abstract class BaseClient { ): Promise abstract markCommentReplyAsRead( form: types.MarkCommentReplyAsRead, - ): Promise + ): Promise abstract likeComment( form: types.CreateCommentLike, ): Promise @@ -159,7 +159,7 @@ export abstract class BaseClient { ): Promise abstract markPersonMentionAsRead( form: types.MarkPersonMentionAsRead, - ): Promise + ): Promise abstract getReplies(form: types.GetReplies): Promise abstract banPerson(form: types.BanPerson): Promise abstract getBannedPersons(): Promise diff --git a/src/lib/client/piefed/piefed.ts b/src/lib/client/piefed/piefed.ts index 6374ed65..341573f7 100644 --- a/src/lib/client/piefed/piefed.ts +++ b/src/lib/client/piefed/piefed.ts @@ -1,4 +1,3 @@ -/* eslint-disable */ import createClient from 'openapi-fetch' import type { BaseClient, ClientType } from '../base' import { @@ -10,6 +9,7 @@ import { fromGetReplies, fromListCommunities, fromSearch, + toComment, toCommentReplyView, toCommentSortType, toCommentView, @@ -20,8 +20,10 @@ import { toPerson, toPersonMentionView, toPersonView, + toPost, toPostView, toPrivateMessageView, + toSortType, } from './rewrite' import type { paths } from './schema' @@ -46,8 +48,6 @@ export class PiefedClient implements BaseClient { } async getSite(): ReturnType { - // throw new Error('unimplemented') - const response = (await this.#client.GET('/site')).data! return { @@ -165,10 +165,15 @@ export class PiefedClient implements BaseClient { async likePost( params: Parameters[0], ): ReturnType { - // TODO remove any - return (await this.#client.POST('/post/like', { - body: { ...params }, - })) as any + const response = ( + await this.#client.POST('/post/like', { + body: { ...params }, + }) + ).data! + + return { + post_view: toPostView(response.post_view), + } } async generateTotpSecret(): ReturnType { @@ -332,18 +337,26 @@ export class PiefedClient implements BaseClient { async banFromCommunity( params: Parameters[0], ): ReturnType { - const response = ( - await this.#client.POST('/community/moderate/ban', { - body: { - ...params, - expiredAt: new Date( - params.expires ?? '6767-06-07T00:00:00.000Z', - ).toISOString(), - user_id: params.person_id, - reason: params.reason ?? 'No reason provided.', - }, - }) - ).data! + const response = // piefed has separate methods for ban/unban + ( + params.ban + ? await this.#client.POST('/community/moderate/ban', { + body: { + ...params, + expiredAt: new Date( + params.expires ?? '6767-06-07T00:00:00.000Z', + ).toISOString(), + user_id: params.person_id, + reason: params.reason ?? 'No reason provided.', + }, + }) + : await this.#client.PUT('/community/moderate/unban', { + body: { + community_id: params.community_id, + user_id: params.person_id, + }, + }) + ).data! return { banned: params.ban, @@ -354,34 +367,56 @@ export class PiefedClient implements BaseClient { }, } } - async addModToCommunity() // ...params: Parameters - : ReturnType { - throw new Error('unimplemented') + async addModToCommunity( + params: Parameters[0], + ): ReturnType { + const response = ( + await this.#client.POST('/community/mod', { body: params }) + ).data! + + return { + moderators: response.moderators.map(i => ({ + community: toCommunity(i.community), + moderator: toPerson(i.moderator), + })), + } } async markPostAsRead( params: Parameters[0], ): ReturnType { - const response = await this.#client.POST('/post/mark_as_read', { + await this.#client.POST('/post/mark_as_read', { body: { ...params }, }) - // TODO remove any - return response.data as any + return { + success: true, + } } - async hidePost( - ...params: Parameters - ): ReturnType { - throw new Error('unimplemented') + async hidePost(): ReturnType { + throw new Error('unsupported') } async lockPost( - ...params: Parameters + params: Parameters[0], ): ReturnType { - throw new Error('unimplemented') + const response = (await this.#client.POST('/post/lock', { body: params })) + .data! + + return { + ...response, + post_view: toPostView(response.post_view), + } } async featurePost( - ...params: Parameters + params: Parameters[0], ): ReturnType { - throw new Error('unimplemented') + const response = ( + await this.#client.POST('/post/feature', { body: params }) + ).data! + + return { + ...response, + post_view: toPostView(response.post_view), + } } async listPostLikes(): ReturnType { throw new Error('unsupported') @@ -397,24 +432,36 @@ export class PiefedClient implements BaseClient { } } async createPostReport( - ...params: Parameters + params: Parameters[0], ): ReturnType { - throw new Error('unimplemented') + const response = (await this.#client.POST('/post/report', { body: params })) + .data! + + return { + post_report_view: { + ...response.post_report_view, + community: toCommunity(response.post_report_view.community), + post: toPost(response.post_report_view.post), + creator: toPerson(response.post_report_view.creator), + resolver: response.post_report_view.resolver + ? toPerson(response.post_report_view.resolver) + : undefined, + post_creator: toPerson(response.post_report_view.post_creator), + read: false, + hidden: false, + creator_banned_from_community: false, + unread_comments: -1, + }, + } } - async resolvePostReport( - ...params: Parameters - ): ReturnType { - throw new Error('unimplemented') + async resolvePostReport(): ReturnType { + throw new Error('unsupported') } - async listPostReports( - ...params: Parameters - ): ReturnType { - throw new Error('unimplemented') + async listPostReports(): ReturnType { + throw new Error('unsupported') } - async getSiteMetadata( - ...params: Parameters - ): ReturnType { - throw new Error('unimplemented') + async getSiteMetadata(): ReturnType { + throw new Error('unsupported') } async createComment( @@ -468,31 +515,45 @@ export class PiefedClient implements BaseClient { } } async markCommentReplyAsRead( - ...params: Parameters + params: Parameters[0], ): ReturnType { - throw new Error('unimplemented') + await this.#client.POST('/comment/mark_as_read', { + body: params, + }) } async likeComment( params: Parameters[0], ): ReturnType { // TODO remove any - return (await this.#client.POST('/comment/like', { - body: params, - })) as any + const response = ( + await this.#client.POST('/comment/like', { + body: params, + }) + ).data! + + return { + comment_view: toCommentView(response.comment_view), + recipient_ids: [], + } } async listCommentLikes(): ReturnType { throw new Error('unsupported') } async saveComment( - ...params: Parameters + params: Parameters[0], ): ReturnType { - throw new Error('unimplemented') + const response = (await this.#client.PUT('/comment/save', { body: params })) + .data! + + return { + ...response, + comment_view: toCommentView(response.comment_view), + recipient_ids: [], + } } - async distinguishComment( - ...params: Parameters - ): ReturnType { - throw new Error('unimplemented') + async distinguishComment(): ReturnType { + throw new Error('unsupported') } async getComments( @@ -524,19 +585,32 @@ export class PiefedClient implements BaseClient { } } async createCommentReport( - ...params: Parameters + params: Parameters[0], ): ReturnType { - throw new Error('unimplemented') + const response = ( + await this.#client.POST('/comment/report', { body: params }) + ).data! + + return { + ...response, + comment_report_view: { + ...response.comment_report_view, + comment: toComment(response.comment_report_view.comment), + community: toCommunity(response.comment_report_view.community), + comment_creator: toPerson(response.comment_report_view.comment_creator), + creator: toPerson(response.comment_report_view.creator), + post: toPost(response.comment_report_view.post), + resolver: response.comment_report_view.resolver + ? toPerson(response.comment_report_view.resolver) + : undefined, + }, + } } - async resolveCommentReport( - ...params: Parameters - ): ReturnType { - throw new Error('unimplemented') + async resolveCommentReport(): ReturnType { + throw new Error('unsupported') } - async listCommentReports( - ...params: Parameters - ): ReturnType { - throw new Error('unimplemented') + async listCommentReports(): ReturnType { + throw new Error('unsupported') } async getPrivateMessages( params: Parameters[0], @@ -553,39 +627,67 @@ export class PiefedClient implements BaseClient { } } async createPrivateMessage( - ...params: Parameters + params: Parameters[0], ): ReturnType { - throw new Error('unimplemented') + const response = ( + await this.#client.POST('/private_message', { body: params }) + ).data! + + return { + ...response, + private_message_view: toPrivateMessageView(response.private_message_view), + } } async editPrivateMessage( - ...params: Parameters + params: Parameters[0], ): ReturnType { - throw new Error('unimplemented') + const response = ( + await this.#client.PUT('/private_message', { body: params }) + ).data! + + return { + ...response, + private_message_view: toPrivateMessageView(response.private_message_view), + } } async deletePrivateMessage( - ...params: Parameters + params: Parameters[0], ): ReturnType { - throw new Error('unimplemented') + const response = ( + await this.#client.POST('/private_message/delete', { body: params }) + ).data! + + return { + ...response, + private_message_view: toPrivateMessageView(response.private_message_view), + } } async markPrivateMessageAsRead( - ...params: Parameters + params: Parameters[0], ): ReturnType { - throw new Error('unimplemented') + const response = ( + await this.#client.POST('/private_message/mark_as_read', { body: params }) + ).data! + + return { + ...response, + private_message_view: toPrivateMessageView(response.private_message_view), + } } - async createPrivateMessageReport( - ...params: Parameters - ): ReturnType { - throw new Error('unimplemented') + async createPrivateMessageReport(): ReturnType< + BaseClient['createPrivateMessageReport'] + > { + throw new Error('unsupported') } - async resolvePrivateMessageReport( - ...params: Parameters - ): ReturnType { - throw new Error('unimplemented') + async resolvePrivateMessageReport(): ReturnType< + BaseClient['resolvePrivateMessageReport'] + > { + throw new Error('unsupported') } - async listPrivateMessageReports( - ...params: Parameters - ): ReturnType { - throw new Error('unimplemented') + async listPrivateMessageReports(): ReturnType< + BaseClient['listPrivateMessageReports'] + > { + throw new Error('unsupported') } async register(): ReturnType { throw new Error('unsupported') @@ -603,15 +705,34 @@ export class PiefedClient implements BaseClient { jwt: response.data?.jwt, } } - async logout( - ...params: Parameters - ): ReturnType { - throw new Error('unimplemented') + async logout(): ReturnType { + throw new Error('unsupported') } async getPersonDetails( - ...params: Parameters + params: Parameters[0], ): ReturnType { - throw new Error('unimplemented') + const response = ( + await this.#client.GET('/user', { + params: { + query: { + ...params, + // @ts-expect-error more param cursedness + include_content: true, + sort: toSortType(params.sort), + }, + }, + }) + ).data! + + return { + comments: response.comments.map(toCommentView), + moderates: response.moderates.map(i => ({ + community: toCommunity(i.community), + moderator: toPerson(i.moderator), + })), + person_view: toPersonView(response.person_view), + posts: response.posts.map(toPostView), + } } async getPersonMentions( params: Parameters[0], @@ -630,7 +751,10 @@ export class PiefedClient implements BaseClient { async markPersonMentionAsRead( params: Parameters[0], ): ReturnType { - throw new Error('unimplemented') + // @ts-expect-error this method isnt documented + await this.#client.POST('/mention/mark_as_read', { + body: params, + }) } async getReplies( params: Parameters[0], @@ -740,10 +864,10 @@ export class PiefedClient implements BaseClient { async purgeComment(): ReturnType { throw new Error('unsupported') } - async getFederatedInstances( - ...params: Parameters - ): ReturnType { - throw new Error('unimplemented') + async getFederatedInstances(): ReturnType< + BaseClient['getFederatedInstances'] + > { + return (await this.#client.GET('/federated_instances')).data! } async blockInstance( params: Parameters[0], diff --git a/src/lib/components/lemmy/dropdowns/Sort.svelte b/src/lib/components/lemmy/dropdowns/Sort.svelte index 1381f23a..5620700c 100644 --- a/src/lib/components/lemmy/dropdowns/Sort.svelte +++ b/src/lib/components/lemmy/dropdowns/Sort.svelte @@ -1,5 +1,7 @@