Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge: all upstream changes

Browse source
This commit is contained in:
Mar0xy 2023-10-13 19:01:17 +02:00
commit f8f128b347
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
170 changed files with 4490 additions and 2218 deletions
Download patch file Download diff file Expand all files Collapse all files

110
packages/backend/src/server/api/endpoints/admin/meta.ts
View file

@ -105,40 +105,32 @@ export const meta = {
type: 'boolean',
optional: false, nullable: false,
},
userStarForReactionFallback: {
type: 'boolean',
optional: true, nullable: false,
},
pinnedUsers: {
type: 'array',
optional: true, nullable: false,
optional: false, nullable: false,
items: {
type: 'string',
optional: false, nullable: false,
},
},
hiddenTags: {
type: 'array',
optional: true, nullable: false,
optional: false, nullable: false,
items: {
type: 'string',
optional: false, nullable: false,
},
},
blockedHosts: {
type: 'array',
optional: true, nullable: false,
optional: false, nullable: false,
items: {
type: 'string',
optional: false, nullable: false,
},
},
sensitiveWords: {
type: 'array',
optional: true, nullable: false,
optional: false, nullable: false,
items: {
type: 'string',
optional: false, nullable: false,
},
},
preservedUsernames: {
@ -146,129 +138,124 @@ export const meta = {
optional: false, nullable: false,
items: {
type: 'string',
optional: false, nullable: false,
},
},
hcaptchaSecretKey: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
recaptchaSecretKey: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
turnstileSecretKey: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
sensitiveMediaDetection: {
type: 'string',
optional: true, nullable: false,
optional: false, nullable: false,
},
sensitiveMediaDetectionSensitivity: {
type: 'string',
optional: true, nullable: false,
optional: false, nullable: false,
},
setSensitiveFlagAutomatically: {
type: 'boolean',
optional: true, nullable: false,
optional: false, nullable: false,
},
enableSensitiveMediaDetectionForVideos: {
type: 'boolean',
optional: true, nullable: false,
optional: false, nullable: false,
},
proxyAccountId: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
format: 'id',
},
summaryProxy: {
type: 'string',
optional: true, nullable: true,
},
email: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
smtpSecure: {
type: 'boolean',
optional: true, nullable: false,
optional: false, nullable: false,
},
smtpHost: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
smtpPort: {
type: 'number',
optional: true, nullable: true,
optional: false, nullable: true,
},
smtpUser: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
smtpPass: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
swPrivateKey: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
useObjectStorage: {
type: 'boolean',
optional: true, nullable: false,
optional: false, nullable: false,
},
objectStorageBaseUrl: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
objectStorageBucket: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
objectStoragePrefix: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
objectStorageEndpoint: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
objectStorageRegion: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
objectStoragePort: {
type: 'number',
optional: true, nullable: true,
optional: false, nullable: true,
},
objectStorageAccessKey: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
objectStorageSecretKey: {
type: 'string',
optional: true, nullable: true,
optional: false, nullable: true,
},
objectStorageUseSSL: {
type: 'boolean',
optional: true, nullable: false,
optional: false, nullable: false,
},
objectStorageUseProxy: {
type: 'boolean',
optional: true, nullable: false,
optional: false, nullable: false,
},
objectStorageSetPublicRead: {
type: 'boolean',
optional: true, nullable: false,
optional: false, nullable: false,
},
enableIpLogging: {
type: 'boolean',
optional: true, nullable: false,
optional: false, nullable: false,
},
enableActiveEmailValidation: {
type: 'boolean',
optional: true, nullable: false,
optional: false, nullable: false,
},
enableChartsForRemoteUser: {
type: 'boolean',
@ -292,12 +279,32 @@ export const meta = {
},
manifestJsonOverride: {
type: 'string',
optional: true, nullable: false,
optional: false, nullable: false,
},
policies: {
type: 'object',
optional: false, nullable: false,
},
perLocalUserUserTimelineCacheMax: {
type: 'number',
optional: false, nullable: false,
},
perRemoteUserUserTimelineCacheMax: {
type: 'number',
optional: false, nullable: false,
},
perUserHomeTimelineCacheMax: {
type: 'number',
optional: false, nullable: false,
},
perUserListTimelineCacheMax: {
type: 'number',
optional: false, nullable: false,
},
notesPerOneAd: {
type: 'number',
optional: false, nullable: false,
},
},
},
} as const;
@ -317,7 +324,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
private metaService: MetaService,
) {
super(meta, paramDef, async (ps, me) => {
super(meta, paramDef, async () => {
const instance = await this.metaService.fetch(true);
return {
@ -332,6 +339,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
tosUrl: instance.termsOfServiceUrl,
repositoryUrl: instance.repositoryUrl,
feedbackUrl: instance.feedbackUrl,
impressumUrl: instance.impressumUrl,
privacyPolicyUrl: instance.privacyPolicyUrl,
disableRegistration: instance.disableRegistration,
emailRequiredForSignup: instance.emailRequiredForSignup,
enableHcaptcha: instance.enableHcaptcha,
@ -404,6 +413,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
enableIdenticonGeneration: instance.enableIdenticonGeneration,
policies: { ...DEFAULT_POLICIES, ...instance.policies },
manifestJsonOverride: instance.manifestJsonOverride,
perLocalUserUserTimelineCacheMax: instance.perLocalUserUserTimelineCacheMax,
perRemoteUserUserTimelineCacheMax: instance.perRemoteUserUserTimelineCacheMax,
perUserHomeTimelineCacheMax: instance.perUserHomeTimelineCacheMax,
perUserListTimelineCacheMax: instance.perUserListTimelineCacheMax,
notesPerOneAd: instance.notesPerOneAd,
};
});
}