diff --git a/src/lib/auth.svelte.ts b/src/lib/auth.svelte.ts index fae67371..70d018de 100644 --- a/src/lib/auth.svelte.ts +++ b/src/lib/auth.svelte.ts @@ -5,7 +5,7 @@ import { isAdmin, } from '$lib/components/lemmy/moderation/moderation.js' import { DEFAULT_INSTANCE_URL } from '$lib/instance.svelte.js' -import { client, getClient } from '$lib/client/lemmy.svelte' +import { client, getClient, site } from '$lib/client/lemmy.svelte' import { instanceToURL, moveItem } from '$lib/util.svelte' import { MINIMUM_VERSION, versionIsSupported } from '$lib/version.js' import { @@ -16,7 +16,6 @@ import { import { toast } from 'mono-svelte' import { writable } from 'svelte/store' import { t } from './i18n/translations' -import { site } from './lemmy.svelte' import { errorMessage } from './lemmy/error' import { publishedToDate } from './components/util/date' diff --git a/src/lib/client/base.ts b/src/lib/client/base.ts index a6743a7e..b04288de 100644 --- a/src/lib/client/base.ts +++ b/src/lib/client/base.ts @@ -1,102 +1,205 @@ -abstract class BaseClient { - abstract getSite() - abstract createSite(form) - abstract editSite(form) - abstract leaveAdmin() - abstract generateTotpSecret() - abstract exportSettings() - abstract importSettings(form) - abstract listLogins() - abstract validateAuth() - abstract listMedia(form) - abstract listAllMedia(form) - abstract updateTotp(form) - abstract getModlog(form) - abstract search(form) - abstract resolveObject(form) - abstract createCommunity(form) - abstract getCommunity(form) - abstract editCommunity(form) - abstract listCommunities(form) - abstract followCommunity(form) - abstract blockCommunity(form) - abstract deleteCommunity(form) - abstract hideCommunity(form) - abstract removeCommunity(form) - abstract transferCommunity(form) - abstract banFromCommunity(form) - abstract addModToCommunity(form) - abstract createPost(form) - abstract getPost(form) - abstract editPost(form) - abstract deletePost(form) - abstract removePost(form) - abstract markPostAsRead(form) - abstract hidePost(form) - abstract lockPost(form) - abstract featurePost(form) - abstract getPosts(form) - abstract likePost(form) - abstract listPostLikes(form) - abstract savePost(form) - abstract createPostReport(form) - abstract resolvePostReport(form) - abstract listPostReports(form) - abstract getSiteMetadata(form) - abstract createComment(form) - abstract editComment(form) - abstract deleteComment(form) - abstract removeComment(form) - abstract markCommentReplyAsRead(form) - abstract likeComment(form) - abstract listCommentLikes(form) - abstract saveComment(form) - abstract distinguishComment(form) - abstract getComments(form) - abstract getComment(form) - abstract createCommentReport(form) - abstract resolveCommentReport(form) - abstract listCommentReports(form) - abstract getPrivateMessages(form) - abstract createPrivateMessage(form) - abstract editPrivateMessage(form) - abstract deletePrivateMessage(form) - abstract markPrivateMessageAsRead(form) - abstract createPrivateMessageReport(form) - abstract resolvePrivateMessageReport(form) - abstract listPrivateMessageReports(form) - abstract register(form) - abstract login(form) - abstract logout() - abstract getPersonDetails(form) - abstract getPersonMentions(form) - abstract markPersonMentionAsRead(form) - abstract getReplies(form) - abstract banPerson(form) - abstract getBannedPersons() - abstract blockPerson(form) - abstract getCaptcha() - abstract deleteAccount(form) - abstract passwordReset(form) - abstract passwordChangeAfterReset(form) - abstract markAllAsRead() - abstract saveUserSettings(form) - abstract changePassword(form) - abstract getReportCount(form) - abstract getUnreadCount() - abstract verifyEmail(form) - abstract addAdmin(form) - abstract getUnreadRegistrationApplicationCount() - abstract listRegistrationApplications(form) - abstract approveRegistrationApplication(form) - abstract getRegistrationApplication(form) - abstract purgePerson(form) - abstract purgeCommunity(form) - abstract purgePost(form) - abstract purgeComment(form) - abstract createCustomEmoji(form) - abstract editCustomEmoji(form) - abstract deleteCustomEmoji(form) - abstract getFederatedInstances() - abstract blockInstance(form) +import * as types from './types' + +export abstract class BaseClient { + static type: 'lemmy' | 'piefed' + + abstract getSite(): Promise + abstract generateTotpSecret(): Promise + abstract listLogins(): Promise + abstract listAllMedia(form: types.ListMedia): Promise + abstract updateTotp(form: types.UpdateTotp): Promise + abstract getModlog(form: types.GetModlog): Promise + abstract search(form: types.Search): Promise + abstract resolveObject( + form: types.ResolveObject, + ): Promise + abstract createCommunity( + form: types.CreateCommunity, + ): Promise + abstract getCommunity( + form: types.GetCommunity, + ): Promise + abstract editCommunity( + form: types.EditCommunity, + ): Promise + abstract listCommunities( + form: types.ListCommunities, + ): Promise + abstract followCommunity( + form: types.FollowCommunity, + ): Promise + abstract blockCommunity( + form: types.BlockCommunity, + ): Promise + abstract deleteCommunity( + form: types.DeleteCommunity, + ): Promise + abstract hideCommunity( + form: types.HideCommunity, + ): Promise + abstract removeCommunity( + form: types.RemoveCommunity, + ): Promise + abstract banFromCommunity( + form: types.BanFromCommunity, + ): Promise + abstract addModToCommunity( + form: types.AddModToCommunity, + ): Promise + abstract createPost(form: types.CreatePost): Promise + abstract getPost(form: types.GetPost): Promise + abstract editPost(form: types.EditPost): Promise + abstract deletePost(form: types.DeletePost): Promise + abstract removePost(form: types.RemovePost): Promise + abstract markPostAsRead( + form: types.MarkPostAsRead, + ): Promise + abstract hidePost(form: types.HidePost): Promise + abstract lockPost(form: types.LockPost): Promise + abstract featurePost(form: types.FeaturePost): Promise + abstract getPosts(form: types.GetPosts): Promise + abstract likePost(form: types.CreatePostLike): Promise + abstract listPostLikes( + form: types.ListPostLikes, + ): Promise + abstract savePost(form: types.SavePost): Promise + // TODO should unify these reports probably + abstract createPostReport( + form: types.CreatePostReport, + ): Promise + abstract resolvePostReport( + form: types.ResolvePostReport, + ): Promise + abstract listPostReports( + form: types.ListPostReports, + ): Promise + abstract getSiteMetadata( + form: types.GetSiteMetadata, + ): Promise + abstract createComment( + form: types.CreateComment, + ): Promise + abstract editComment(form: types.EditComment): Promise + abstract deleteComment( + form: types.DeleteComment, + ): Promise + abstract removeComment( + form: types.RemoveComment, + ): Promise + abstract markCommentReplyAsRead( + form: types.MarkCommentReplyAsRead, + ): Promise + abstract likeComment( + form: types.CreateCommentLike, + ): Promise + abstract listCommentLikes( + form: types.ListCommentLikes, + ): Promise + // TODO unify saving with posts too + // i have options for unifying these since I'm making the API client myself now + abstract saveComment(form: types.SaveComment): Promise + abstract distinguishComment( + form: types.DistinguishComment, + ): Promise + abstract getComments( + form: types.GetComments, + ): Promise + abstract getComment(form: types.GetComment): Promise + abstract createCommentReport( + form: types.CreateCommentReport, + ): Promise + abstract resolveCommentReport( + form: types.ResolveCommentReport, + ): Promise + abstract listCommentReports( + form: types.ListCommentReports, + ): Promise + abstract getPrivateMessages( + form: types.GetPrivateMessages, + ): Promise + abstract createPrivateMessage( + form: types.CreatePrivateMessage, + ): Promise + abstract editPrivateMessage( + form: types.EditPrivateMessage, + ): Promise + abstract deletePrivateMessage( + form: types.DeletePrivateMessage, + ): Promise + abstract markPrivateMessageAsRead( + form: types.MarkPrivateMessageAsRead, + ): Promise + abstract createPrivateMessageReport( + form: types.CreatePrivateMessageReport, + ): Promise + abstract resolvePrivateMessageReport( + form: types.ResolvePrivateMessageReport, + ): Promise + abstract listPrivateMessageReports( + form: types.ListPrivateMessageReports, + ): Promise + abstract register(form: types.Register): Promise + abstract login(form: types.Login): Promise + abstract logout(): Promise + abstract getPersonDetails( + form: types.GetPersonDetails, + ): Promise + // TODO unify these inbox things too + abstract getPersonMentions( + form: types.GetPersonMentions, + ): Promise + abstract markPersonMentionAsRead( + form: types.MarkPersonMentionAsRead, + ): Promise + abstract getReplies(form: types.GetReplies): Promise + abstract banPerson(form: types.BanPerson): Promise + abstract getBannedPersons(): Promise + abstract blockPerson( + form: types.BlockPerson, + ): Promise + abstract getCaptcha(): Promise + abstract deleteAccount( + form: types.DeleteAccount, + ): Promise + abstract passwordReset( + form: types.PasswordReset, + ): Promise + abstract passwordChangeAfterReset( + form: types.PasswordChangeAfterReset, + ): Promise + abstract markAllAsRead(): Promise + abstract saveUserSettings( + form: types.SaveUserSettings, + ): Promise + abstract changePassword( + form: types.ChangePassword, + ): Promise + abstract getReportCount( + form: types.GetReportCount, + ): Promise + abstract getUnreadCount(): Promise + abstract verifyEmail(form: types.VerifyEmail): Promise + abstract addAdmin(form: types.AddAdmin): Promise + abstract getUnreadRegistrationApplicationCount(): Promise + abstract listRegistrationApplications( + form: types.ListRegistrationApplications, + ): Promise + abstract approveRegistrationApplication( + form: types.ApproveRegistrationApplication, + ): Promise + abstract getRegistrationApplication( + form: types.GetRegistrationApplication, + ): Promise + abstract purgePerson(form: types.PurgePerson): Promise + abstract purgeCommunity( + form: types.PurgeCommunity, + ): Promise + abstract purgePost(form: types.PurgePost): Promise + abstract purgeComment( + form: types.PurgeComment, + ): Promise + abstract getFederatedInstances(): Promise + abstract blockInstance( + form: types.BlockInstance, + ): Promise } diff --git a/src/lib/client/lemmy.svelte.ts b/src/lib/client/lemmy.svelte.ts index 632ac4f4..aac37291 100644 --- a/src/lib/client/lemmy.svelte.ts +++ b/src/lib/client/lemmy.svelte.ts @@ -2,7 +2,8 @@ import { profile } from '$lib/auth.svelte' import { DEFAULT_INSTANCE_URL } from '$lib/instance.svelte.js' import { instanceToURL } from '$lib/util.svelte' import { error } from '@sveltejs/kit' -import { LemmyHttp, type GetSiteResponse } from 'lemmy-js-client' +import { type GetSiteResponse } from 'lemmy-js-client' +import { LemmyClient } from './lemmy/lemmy' class SiteData { #data = $state() @@ -67,9 +68,8 @@ export function client({ const headers = jwt ? { authorization: `Bearer ${jwt}` } : {} - return new LemmyHttp(instanceToURL(instanceURL), { + return new LemmyClient(instanceToURL(instanceURL), { fetchFunction: (input, init) => customFetch(func, input, init, jwt), - // @ts-expect-error headers thing headers: headers, }) } @@ -81,7 +81,7 @@ export function getClient( init?: RequestInit | undefined, ) => Promise, auth?: string, -): LemmyHttp { +) { return client({ instanceURL, func, auth }) } diff --git a/src/lib/client/lemmy/lemmy.ts b/src/lib/client/lemmy/lemmy.ts new file mode 100644 index 00000000..4ba6bcbd --- /dev/null +++ b/src/lib/client/lemmy/lemmy.ts @@ -0,0 +1,464 @@ +import { LemmyHttp } from 'lemmy-js-client' +import type { BaseClient } from '../base' + +export class LemmyClient implements BaseClient { + static type = 'lemmy' + + #client: LemmyHttp + + constructor( + baseUrl: string, + args: { + fetchFunction: (input: any, init: any) => Promise + headers: any + }, + ) { + this.#client = new LemmyHttp(baseUrl, args) + } + + async getSite( + ...params: Parameters + ): ReturnType { + return await this.#client.getSite(...params) + } + async generateTotpSecret( + ...params: Parameters + ): ReturnType { + return await this.#client.generateTotpSecret(...params) + } + async listLogins( + ...params: Parameters + ): ReturnType { + return await this.#client.listLogins(...params) + } + async listAllMedia( + ...params: Parameters + ): ReturnType { + return await this.#client.listAllMedia(...params) + } + async updateTotp( + ...params: Parameters + ): ReturnType { + return await this.#client.updateTotp(...params) + } + async getModlog( + ...params: Parameters + ): ReturnType { + return await this.#client.getModlog(...params) + } + async search( + ...params: Parameters + ): ReturnType { + return await this.#client.search(...params) + } + async resolveObject( + ...params: Parameters + ): ReturnType { + return await this.#client.resolveObject(...params) + } + async createCommunity( + ...params: Parameters + ): ReturnType { + return await this.#client.createCommunity(...params) + } + async getCommunity( + ...params: Parameters + ): ReturnType { + return await this.#client.getCommunity(...params) + } + async editCommunity( + ...params: Parameters + ): ReturnType { + return await this.#client.editCommunity(...params) + } + async listCommunities( + ...params: Parameters + ): ReturnType { + return await this.#client.listCommunities(...params) + } + async followCommunity( + ...params: Parameters + ): ReturnType { + return await this.#client.followCommunity(...params) + } + async blockCommunity( + ...params: Parameters + ): ReturnType { + return await this.#client.blockCommunity(...params) + } + async deleteCommunity( + ...params: Parameters + ): ReturnType { + return await this.#client.deleteCommunity(...params) + } + async hideCommunity( + ...params: Parameters + ): ReturnType { + return await this.#client.hideCommunity(...params) + } + async removeCommunity( + ...params: Parameters + ): ReturnType { + return await this.#client.removeCommunity(...params) + } + async banFromCommunity( + ...params: Parameters + ): ReturnType { + return await this.#client.banFromCommunity(...params) + } + async addModToCommunity( + ...params: Parameters + ): ReturnType { + return await this.#client.addModToCommunity(...params) + } + async createPost( + ...params: Parameters + ): ReturnType { + return await this.#client.createPost(...params) + } + async getPost( + ...params: Parameters + ): ReturnType { + return await this.#client.getPost(...params) + } + async editPost( + ...params: Parameters + ): ReturnType { + return await this.#client.editPost(...params) + } + async deletePost( + ...params: Parameters + ): ReturnType { + return await this.#client.deletePost(...params) + } + async removePost( + ...params: Parameters + ): ReturnType { + return await this.#client.removePost(...params) + } + async markPostAsRead( + ...params: Parameters + ): ReturnType { + return await this.#client.markPostAsRead(...params) + } + async hidePost( + ...params: Parameters + ): ReturnType { + return await this.#client.hidePost(...params) + } + async lockPost( + ...params: Parameters + ): ReturnType { + return await this.#client.lockPost(...params) + } + async featurePost( + ...params: Parameters + ): ReturnType { + return await this.#client.featurePost(...params) + } + async getPosts( + ...params: Parameters + ): ReturnType { + return await this.#client.getPosts(...params) + } + async likePost( + ...params: Parameters + ): ReturnType { + return await this.#client.likePost(...params) + } + async listPostLikes( + ...params: Parameters + ): ReturnType { + return await this.#client.listPostLikes(...params) + } + async savePost( + ...params: Parameters + ): ReturnType { + return await this.#client.savePost(...params) + } + async createPostReport( + ...params: Parameters + ): ReturnType { + return await this.#client.createPostReport(...params) + } + async resolvePostReport( + ...params: Parameters + ): ReturnType { + return await this.#client.resolvePostReport(...params) + } + async listPostReports( + ...params: Parameters + ): ReturnType { + return await this.#client.listPostReports(...params) + } + async getSiteMetadata( + ...params: Parameters + ): ReturnType { + return await this.#client.getSiteMetadata(...params) + } + async createComment( + ...params: Parameters + ): ReturnType { + return await this.#client.createComment(...params) + } + async editComment( + ...params: Parameters + ): ReturnType { + return await this.#client.editComment(...params) + } + async deleteComment( + ...params: Parameters + ): ReturnType { + return await this.#client.deleteComment(...params) + } + async removeComment( + ...params: Parameters + ): ReturnType { + return await this.#client.removeComment(...params) + } + async markCommentReplyAsRead( + ...params: Parameters + ): ReturnType { + return await this.#client.markCommentReplyAsRead(...params) + } + async likeComment( + ...params: Parameters + ): ReturnType { + return await this.#client.likeComment(...params) + } + async listCommentLikes( + ...params: Parameters + ): ReturnType { + return await this.#client.listCommentLikes(...params) + } + async saveComment( + ...params: Parameters + ): ReturnType { + return await this.#client.saveComment(...params) + } + async distinguishComment( + ...params: Parameters + ): ReturnType { + return await this.#client.distinguishComment(...params) + } + async getComments( + ...params: Parameters + ): ReturnType { + return await this.#client.getComments(...params) + } + async getComment( + ...params: Parameters + ): ReturnType { + return await this.#client.getComment(...params) + } + async createCommentReport( + ...params: Parameters + ): ReturnType { + return await this.#client.createCommentReport(...params) + } + async resolveCommentReport( + ...params: Parameters + ): ReturnType { + return await this.#client.resolveCommentReport(...params) + } + async listCommentReports( + ...params: Parameters + ): ReturnType { + return await this.#client.listCommentReports(...params) + } + async getPrivateMessages( + ...params: Parameters + ): ReturnType { + return await this.#client.getPrivateMessages(...params) + } + async createPrivateMessage( + ...params: Parameters + ): ReturnType { + return await this.#client.createPrivateMessage(...params) + } + async editPrivateMessage( + ...params: Parameters + ): ReturnType { + return await this.#client.editPrivateMessage(...params) + } + async deletePrivateMessage( + ...params: Parameters + ): ReturnType { + return await this.#client.deletePrivateMessage(...params) + } + async markPrivateMessageAsRead( + ...params: Parameters + ): ReturnType { + return await this.#client.markPrivateMessageAsRead(...params) + } + async createPrivateMessageReport( + ...params: Parameters + ): ReturnType { + return await this.#client.createPrivateMessageReport(...params) + } + async resolvePrivateMessageReport( + ...params: Parameters + ): ReturnType { + return await this.#client.resolvePrivateMessageReport(...params) + } + async listPrivateMessageReports( + ...params: Parameters + ): ReturnType { + return await this.#client.listPrivateMessageReports(...params) + } + async register( + ...params: Parameters + ): ReturnType { + return await this.#client.register(...params) + } + async login( + ...params: Parameters + ): ReturnType { + return await this.#client.login(...params) + } + async logout( + ...params: Parameters + ): ReturnType { + return await this.#client.logout(...params) + } + async getPersonDetails( + ...params: Parameters + ): ReturnType { + return await this.#client.getPersonDetails(...params) + } + async getPersonMentions( + ...params: Parameters + ): ReturnType { + return await this.#client.getPersonMentions(...params) + } + async markPersonMentionAsRead( + ...params: Parameters + ): ReturnType { + return await this.#client.markPersonMentionAsRead(...params) + } + async getReplies( + ...params: Parameters + ): ReturnType { + return await this.#client.getReplies(...params) + } + async banPerson( + ...params: Parameters + ): ReturnType { + return await this.#client.banPerson(...params) + } + async getBannedPersons( + ...params: Parameters + ): ReturnType { + return await this.#client.getBannedPersons(...params) + } + async blockPerson( + ...params: Parameters + ): ReturnType { + return await this.#client.blockPerson(...params) + } + async getCaptcha( + ...params: Parameters + ): ReturnType { + return await this.#client.getCaptcha(...params) + } + async deleteAccount( + ...params: Parameters + ): ReturnType { + return await this.#client.deleteAccount(...params) + } + async passwordReset( + ...params: Parameters + ): ReturnType { + return await this.#client.passwordReset(...params) + } + async passwordChangeAfterReset( + ...params: Parameters + ): ReturnType { + return await this.#client.passwordChangeAfterReset(...params) + } + async markAllAsRead( + ...params: Parameters + ): ReturnType { + return await this.#client.markAllAsRead(...params) + } + async saveUserSettings( + ...params: Parameters + ): ReturnType { + return await this.#client.saveUserSettings(...params) + } + async changePassword( + ...params: Parameters + ): ReturnType { + return await this.#client.changePassword(...params) + } + async getReportCount( + ...params: Parameters + ): ReturnType { + return await this.#client.getReportCount(...params) + } + async getUnreadCount( + ...params: Parameters + ): ReturnType { + return await this.#client.getUnreadCount(...params) + } + async verifyEmail( + ...params: Parameters + ): ReturnType { + return await this.#client.verifyEmail(...params) + } + async addAdmin( + ...params: Parameters + ): ReturnType { + return await this.#client.addAdmin(...params) + } + async getUnreadRegistrationApplicationCount( + ...params: Parameters + ): ReturnType { + return await this.#client.getUnreadRegistrationApplicationCount(...params) + } + async listRegistrationApplications( + ...params: Parameters + ): ReturnType { + return await this.#client.listRegistrationApplications(...params) + } + async approveRegistrationApplication( + ...params: Parameters + ): ReturnType { + return await this.#client.approveRegistrationApplication(...params) + } + async getRegistrationApplication( + ...params: Parameters + ): ReturnType { + return await this.#client.getRegistrationApplication(...params) + } + async purgePerson( + ...params: Parameters + ): ReturnType { + return await this.#client.purgePerson(...params) + } + async purgeCommunity( + ...params: Parameters + ): ReturnType { + return await this.#client.purgeCommunity(...params) + } + async purgePost( + ...params: Parameters + ): ReturnType { + return await this.#client.purgePost(...params) + } + async purgeComment( + ...params: Parameters + ): ReturnType { + return await this.#client.purgeComment(...params) + } + async getFederatedInstances( + ...params: Parameters + ): ReturnType { + return await this.#client.getFederatedInstances(...params) + } + async blockInstance( + ...params: Parameters + ): ReturnType { + return await this.#client.blockInstance(...params) + } +}