mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-05-19 10:05:38 +02:00
Merge branch 'develop' into renovate/major-backend-update-dependencies
This commit is contained in:
@@ -83,7 +83,7 @@ export const DEFAULT_POLICIES: RolePolicies = {
|
||||
canUseTranslator: true,
|
||||
canHideAds: false,
|
||||
driveCapacityMb: 100,
|
||||
maxFileSizeMb: 10,
|
||||
maxFileSizeMb: 30,
|
||||
alwaysMarkNsfw: false,
|
||||
canUpdateBioMedia: true,
|
||||
pinLimit: 5,
|
||||
|
||||
@@ -28,7 +28,7 @@ export const paramDef = {
|
||||
type: 'object',
|
||||
properties: {
|
||||
queue: { type: 'string', enum: QUEUE_TYPES },
|
||||
state: { type: 'array', items: { type: 'string', enum: ['active', 'wait', 'delayed', 'completed', 'failed'] } },
|
||||
state: { type: 'array', items: { type: 'string', enum: ['active', 'wait', 'delayed', 'completed', 'failed', 'paused'] } },
|
||||
search: { type: 'string' },
|
||||
},
|
||||
required: ['queue', 'state'],
|
||||
|
||||
@@ -116,9 +116,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||
private apiLoggerService: ApiLoggerService,
|
||||
) {
|
||||
super(meta, paramDef, async (ps, me, _1, _2, _3, ip) => {
|
||||
if (this.serverSettings.ugcVisibilityForVisitor === 'none' && me == null) {
|
||||
throw new ApiError(meta.errors.noSuchUser);
|
||||
}
|
||||
// ログイン時にusers/showできなくなってしまう
|
||||
//if (this.serverSettings.ugcVisibilityForVisitor === 'none' && me == null) {
|
||||
// throw new ApiError(meta.errors.noSuchUser);
|
||||
//}
|
||||
|
||||
let user;
|
||||
|
||||
|
||||
@@ -94,8 +94,8 @@ export class UrlPreviewService {
|
||||
summary.icon = this.wrap(summary.icon);
|
||||
summary.thumbnail = this.wrap(summary.thumbnail);
|
||||
|
||||
// Cache 7days
|
||||
reply.header('Cache-Control', 'max-age=604800, immutable');
|
||||
// Cache 1day
|
||||
reply.header('Cache-Control', 'max-age=86400, immutable');
|
||||
|
||||
return summary;
|
||||
} catch (err) {
|
||||
|
||||
Reference in New Issue
Block a user