Merge remote-tracking branch 'upstream/main' into custom-emojis

This commit is contained in:
Anon 2023-02-18 10:25:55 -06:00
commit 0c25b7cfd2
3 changed files with 4 additions and 1 deletions

View file

@ -1,6 +1,6 @@
{ {
"name": "lemmy-js-client", "name": "lemmy-js-client",
"version": "0.17.0-rc.62", "version": "0.17.2-rc.1",
"description": "A javascript / typescript client for Lemmy", "description": "A javascript / typescript client for Lemmy",
"repository": "https://github.com/LemmyNet/lemmy-js-client", "repository": "https://github.com/LemmyNet/lemmy-js-client",
"license": "AGPL-3.0", "license": "AGPL-3.0",

View file

@ -102,6 +102,7 @@ export interface CreateSite {
default_theme?: string; default_theme?: string;
default_post_listing_type?: string; default_post_listing_type?: string;
application_email_admins?: boolean; application_email_admins?: boolean;
reports_email_admins?: boolean;
hide_modlog_mod_names?: boolean; hide_modlog_mod_names?: boolean;
discussion_languages?: number[]; discussion_languages?: number[];
legal_information?: string; legal_information?: string;
@ -147,6 +148,7 @@ export interface EditSite {
default_post_listing_type?: string; default_post_listing_type?: string;
legal_information?: string; legal_information?: string;
application_email_admins?: boolean; application_email_admins?: boolean;
reports_email_admins?: boolean;
hide_modlog_mod_names?: boolean; hide_modlog_mod_names?: boolean;
discussion_languages?: number[]; discussion_languages?: number[];
slur_filter_regex?: string; slur_filter_regex?: string;

View file

@ -79,6 +79,7 @@ export interface LocalSite {
legal_information?: string; legal_information?: string;
hide_modlog_mod_names: boolean; hide_modlog_mod_names: boolean;
application_email_admins: boolean; application_email_admins: boolean;
reports_email_admins: boolean;
slur_filter_regex?: string; slur_filter_regex?: string;
actor_name_max_length: number; actor_name_max_length: number;
federation_enabled: boolean; federation_enabled: boolean;