From 4988ebd51e432f7af2dd3441d2953e0908f77ab4 Mon Sep 17 00:00:00 2001 From: flamingos-cant Date: Tue, 12 Mar 2024 16:43:12 +0000 Subject: [PATCH 1/3] Add URL blocklist --- src/index.ts | 1 + src/types/EditSite.ts | 1 + src/types/GetSiteResponse.ts | 2 ++ src/types/LemmyErrorType.ts | 1 + src/types/LocalSiteUrlBlocklist.ts | 8 ++++++++ 5 files changed, 13 insertions(+) create mode 100644 src/types/LocalSiteUrlBlocklist.ts diff --git a/src/index.ts b/src/index.ts index 695fa450..9529ea28 100644 --- a/src/index.ts +++ b/src/index.ts @@ -140,6 +140,7 @@ export { LocalImage } from "./types/LocalImage"; export { LocalSite } from "./types/LocalSite"; export { LocalSiteId } from "./types/LocalSiteId"; export { LocalSiteRateLimit } from "./types/LocalSiteRateLimit"; +export { LocalSiteUrlBlocklist } from "./types/LocalSiteUrlBlocklist"; export { LocalUser } from "./types/LocalUser"; export { LocalUserId } from "./types/LocalUserId"; export { LocalUserView } from "./types/LocalUserView"; diff --git a/src/types/EditSite.ts b/src/types/EditSite.ts index b7b312db..ef98f5e1 100644 --- a/src/types/EditSite.ts +++ b/src/types/EditSite.ts @@ -44,6 +44,7 @@ export interface EditSite { captcha_difficulty?: string; allowed_instances?: Array; blocked_instances?: Array; + blocked_urls?: Array; taglines?: Array; registration_mode?: RegistrationMode; reports_email_admins?: boolean; diff --git a/src/types/GetSiteResponse.ts b/src/types/GetSiteResponse.ts index ea138902..04199011 100644 --- a/src/types/GetSiteResponse.ts +++ b/src/types/GetSiteResponse.ts @@ -2,6 +2,7 @@ import type { CustomEmojiView } from "./CustomEmojiView"; import type { Language } from "./Language"; import type { LanguageId } from "./LanguageId"; +import type { LocalSiteUrlBlocklist } from "./LocalSiteUrlBlocklist"; import type { MyUserInfo } from "./MyUserInfo"; import type { PersonView } from "./PersonView"; import type { SiteView } from "./SiteView"; @@ -16,4 +17,5 @@ export interface GetSiteResponse { discussion_languages: Array; taglines: Array; custom_emojis: Array; + blocked_urls: Array; } diff --git a/src/types/LemmyErrorType.ts b/src/types/LemmyErrorType.ts index 712e0717..885e9ea7 100644 --- a/src/types/LemmyErrorType.ts +++ b/src/types/LemmyErrorType.ts @@ -125,6 +125,7 @@ export type LemmyErrorType = | { error: "couldnt_set_all_registrations_accepted" } | { error: "couldnt_set_all_email_verified" } | { error: "banned" } + | { error: "blocked_url" } | { error: "couldnt_get_comments" } | { error: "couldnt_get_posts" } | { error: "invalid_url" } diff --git a/src/types/LocalSiteUrlBlocklist.ts b/src/types/LocalSiteUrlBlocklist.ts new file mode 100644 index 00000000..44a5d0fe --- /dev/null +++ b/src/types/LocalSiteUrlBlocklist.ts @@ -0,0 +1,8 @@ +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export interface LocalSiteUrlBlocklist { + id: number; + url: string; + published: string; + updated: string | null; +} From b81d73a2e2d62394da7cf8611f3595530762a92a Mon Sep 17 00:00:00 2001 From: flamingos-cant Date: Wed, 13 Mar 2024 16:16:08 +0000 Subject: [PATCH 2/3] Regenerate blocklist. --- src/types/LocalSiteUrlBlocklist.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/types/LocalSiteUrlBlocklist.ts b/src/types/LocalSiteUrlBlocklist.ts index 44a5d0fe..063f3d7e 100644 --- a/src/types/LocalSiteUrlBlocklist.ts +++ b/src/types/LocalSiteUrlBlocklist.ts @@ -4,5 +4,5 @@ export interface LocalSiteUrlBlocklist { id: number; url: string; published: string; - updated: string | null; + updated?: string; } From 3570a51cb57d3f6a819236fd38bf30c69b4296d9 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 13 Mar 2024 12:37:59 -0400 Subject: [PATCH 3/3] 0.19.4-alpha.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 87e44861..3e82c949 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "lemmy-js-client", "description": "A javascript / typescript client for Lemmy", - "version": "0.19.4-alpha.7", + "version": "0.19.4-alpha.8", "author": "Dessalines ", "license": "AGPL-3.0", "main": "./dist/index.js",