lint fix
This commit is contained in:
parent
3d79428b35
commit
9818d1ab9e
|
|
@ -3,7 +3,7 @@
|
||||||
* SPDX-License-Identifier: AGPL-3.0-only
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { Inject, Injectable, OnModuleInit, forwardRef } from '@nestjs/common';
|
import { Inject, Injectable, OnModuleInit } from '@nestjs/common';
|
||||||
import { ModuleRef } from '@nestjs/core';
|
import { ModuleRef } from '@nestjs/core';
|
||||||
import { DataSource, IsNull } from 'typeorm';
|
import { DataSource, IsNull } from 'typeorm';
|
||||||
import type { MiLocalUser, MiPartialLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser } from '@/models/User.js';
|
import type { MiLocalUser, MiPartialLocalUser, MiPartialRemoteUser, MiRemoteUser, MiUser } from '@/models/User.js';
|
||||||
|
|
@ -28,9 +28,8 @@ import { MetaService } from '@/core/MetaService.js';
|
||||||
import { CacheService } from '@/core/CacheService.js';
|
import { CacheService } from '@/core/CacheService.js';
|
||||||
import type { Config } from '@/config.js';
|
import type { Config } from '@/config.js';
|
||||||
import { AccountMoveService } from '@/core/AccountMoveService.js';
|
import { AccountMoveService } from '@/core/AccountMoveService.js';
|
||||||
|
import { shouldSilenceInstance } from '@/misc/should-block-instance.js';
|
||||||
import Logger from '../logger.js';
|
import Logger from '../logger.js';
|
||||||
import { shouldSilenceInstance } from "@/misc/should-block-instance.js";
|
|
||||||
|
|
||||||
|
|
||||||
const logger = new Logger('following/create');
|
const logger = new Logger('following/create');
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,15 +4,14 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { Inject, Injectable } from '@nestjs/common';
|
import { Inject, Injectable } from '@nestjs/common';
|
||||||
|
import { DataSource } from 'typeorm';
|
||||||
import type { Packed } from '@/misc/json-schema.js';
|
import type { Packed } from '@/misc/json-schema.js';
|
||||||
import type { } from '@/models/Blocking.js';
|
|
||||||
import type { MiInstance } from '@/models/Instance.js';
|
import type { MiInstance } from '@/models/Instance.js';
|
||||||
import { MetaService } from '@/core/MetaService.js';
|
import { MetaService } from '@/core/MetaService.js';
|
||||||
import { bindThis } from '@/decorators.js';
|
import { bindThis } from '@/decorators.js';
|
||||||
|
import { shouldSilenceInstance } from '@/misc/should-block-instance.js';
|
||||||
|
import { DI } from '@/di-symbols.js';
|
||||||
import { UtilityService } from '../UtilityService.js';
|
import { UtilityService } from '../UtilityService.js';
|
||||||
import {shouldSilenceInstance} from "@/misc/should-block-instance.js";
|
|
||||||
import { DataSource } from 'typeorm';
|
|
||||||
import {DI} from "@/di-symbols.js";
|
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class InstanceEntityService {
|
export class InstanceEntityService {
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import { DataSource } from 'typeorm';
|
import { DataSource } from 'typeorm';
|
||||||
import { MiMeta } from "@/models/Meta.js";
|
import { MiMeta } from '@/models/Meta.js';
|
||||||
|
|
||||||
let cache: MiMeta;
|
let cache: MiMeta;
|
||||||
|
|
||||||
|
|
@ -10,7 +10,7 @@ export async function fetchMeta(noCache = false , db: DataSource): Promise<MiMet
|
||||||
// New IDs are prioritized because multiple records may have been created due to past bugs.
|
// New IDs are prioritized because multiple records may have been created due to past bugs.
|
||||||
const metas = await transactionalEntityManager.find(MiMeta, {
|
const metas = await transactionalEntityManager.find(MiMeta, {
|
||||||
order: {
|
order: {
|
||||||
id: "DESC",
|
id: 'DESC',
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -25,9 +25,9 @@ export async function fetchMeta(noCache = false , db: DataSource): Promise<MiMet
|
||||||
.upsert(
|
.upsert(
|
||||||
MiMeta,
|
MiMeta,
|
||||||
{
|
{
|
||||||
id: "x",
|
id: 'x',
|
||||||
},
|
},
|
||||||
["id"],
|
['id'],
|
||||||
)
|
)
|
||||||
.then((x) =>
|
.then((x) =>
|
||||||
transactionalEntityManager.findOneByOrFail(MiMeta, x.identifiers[0]),
|
transactionalEntityManager.findOneByOrFail(MiMeta, x.identifiers[0]),
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
import { fetchMeta } from "@/misc/fetch-meta.js";
|
import { DataSource } from 'typeorm';
|
||||||
import type { MiInstance } from "@/models/Instance.js";
|
import { fetchMeta } from '@/misc/fetch-meta.js';
|
||||||
import type { MiMeta } from "@/models/Meta.js";
|
import type { MiInstance } from '@/models/Instance.js';
|
||||||
import { DataSource } from "typeorm";
|
import type { MiMeta } from '@/models/Meta.js';
|
||||||
|
|
||||||
export async function shouldSilenceInstance(
|
export async function shouldSilenceInstance(
|
||||||
host: MiInstance["host"],
|
host: MiInstance['host'],
|
||||||
db : DataSource,
|
db : DataSource,
|
||||||
meta?: MiMeta,
|
meta?: MiMeta,
|
||||||
): Promise<boolean> {
|
): Promise<boolean> {
|
||||||
|
|
|
||||||
|
|
@ -23,22 +23,22 @@ export const paramDef = {
|
||||||
pinnedUsers: {
|
pinnedUsers: {
|
||||||
type: 'array', nullable: true, items: {
|
type: 'array', nullable: true, items: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
hiddenTags: {
|
hiddenTags: {
|
||||||
type: 'array', nullable: true, items: {
|
type: 'array', nullable: true, items: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
blockedHosts: {
|
blockedHosts: {
|
||||||
type: 'array', nullable: true, items: {
|
type: 'array', nullable: true, items: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
sensitiveWords: {
|
sensitiveWords: {
|
||||||
type: 'array', nullable: true, items: {
|
type: 'array', nullable: true, items: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
themeColor: { type: 'string', nullable: true, pattern: '^#[0-9a-fA-F]{6}$' },
|
themeColor: { type: 'string', nullable: true, pattern: '^#[0-9a-fA-F]{6}$' },
|
||||||
mascotImageUrl: { type: 'string', nullable: true },
|
mascotImageUrl: { type: 'string', nullable: true },
|
||||||
|
|
@ -78,7 +78,7 @@ export const paramDef = {
|
||||||
langs: {
|
langs: {
|
||||||
type: 'array', items: {
|
type: 'array', items: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
}
|
},
|
||||||
},
|
},
|
||||||
summalyProxy: { type: 'string', nullable: true },
|
summalyProxy: { type: 'string', nullable: true },
|
||||||
deeplAuthKey: { type: 'string', nullable: true },
|
deeplAuthKey: { type: 'string', nullable: true },
|
||||||
|
|
@ -126,10 +126,10 @@ export const paramDef = {
|
||||||
perUserListTimelineCacheMax: { type: 'integer' },
|
perUserListTimelineCacheMax: { type: 'integer' },
|
||||||
notesPerOneAd: { type: 'integer' },
|
notesPerOneAd: { type: 'integer' },
|
||||||
silencedHosts: {
|
silencedHosts: {
|
||||||
type: "array",
|
type: 'array',
|
||||||
nullable: true,
|
nullable: true,
|
||||||
items: {
|
items: {
|
||||||
type: "string",
|
type: 'string',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
@ -165,11 +165,11 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
||||||
set.sensitiveWords = ps.sensitiveWords.filter(Boolean);
|
set.sensitiveWords = ps.sensitiveWords.filter(Boolean);
|
||||||
}
|
}
|
||||||
if (Array.isArray(ps.silencedHosts)) {
|
if (Array.isArray(ps.silencedHosts)) {
|
||||||
let lastValue = "";
|
let lastValue = '';
|
||||||
set.silencedHosts = ps.silencedHosts.sort().filter((h) => {
|
set.silencedHosts = ps.silencedHosts.sort().filter((h) => {
|
||||||
const lv = lastValue;
|
const lv = lastValue;
|
||||||
lastValue = h;
|
lastValue = h;
|
||||||
return h !== "" && h !== lv && !set.blockedHosts?.includes(h);
|
return h !== '' && h !== lv && !set.blockedHosts?.includes(h);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (ps.themeColor !== undefined) {
|
if (ps.themeColor !== undefined) {
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ const pagination = {
|
||||||
function getStatus(instance) {
|
function getStatus(instance) {
|
||||||
if (instance.isSuspended) return 'Suspended';
|
if (instance.isSuspended) return 'Suspended';
|
||||||
if (instance.isBlocked) return 'Blocked';
|
if (instance.isBlocked) return 'Blocked';
|
||||||
if (instance.isSilenced) return 'Silenced'
|
if (instance.isSilenced) return 'Silenced';
|
||||||
if (instance.isNotResponding) return 'Error';
|
if (instance.isNotResponding) return 'Error';
|
||||||
return 'Alive';
|
return 'Alive';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<MkStickyContainer>
|
<MkStickyContainer>
|
||||||
<template #header><XHeader :actions="headerActions" v-model:tab="tab" :tabs="headerTabs"/></template>
|
<template #header><XHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
|
||||||
<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
|
<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
|
||||||
<FormSuspense :p="init">
|
<FormSuspense :p="init">
|
||||||
<MkTextarea v-if="tab === 'block'" v-model="blockedHosts">
|
<MkTextarea v-if="tab === 'block'" v-model="blockedHosts">
|
||||||
|
|
@ -14,9 +14,11 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
</MkTextarea>
|
</MkTextarea>
|
||||||
<MkTextarea v-else-if="tab === 'silence'" v-model="silencedHosts" class="_formBlock">
|
<MkTextarea v-else-if="tab === 'silence'" v-model="silencedHosts" class="_formBlock">
|
||||||
<span>{{ i18n.ts.silencedInstances }}</span>
|
<span>{{ i18n.ts.silencedInstances }}</span>
|
||||||
<template #caption>{{
|
<template #caption>
|
||||||
|
{{
|
||||||
i18n.ts.silencedInstancesDescription
|
i18n.ts.silencedInstancesDescription
|
||||||
}}</template>
|
}}
|
||||||
|
</template>
|
||||||
</MkTextarea>
|
</MkTextarea>
|
||||||
<MkButton primary @click="save"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
|
<MkButton primary @click="save"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
|
||||||
</FormSuspense>
|
</FormSuspense>
|
||||||
|
|
@ -25,7 +27,6 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { } from 'vue';
|
|
||||||
import XHeader from './_header_.vue';
|
import XHeader from './_header_.vue';
|
||||||
import MkButton from '@/components/MkButton.vue';
|
import MkButton from '@/components/MkButton.vue';
|
||||||
import MkTextarea from '@/components/MkTextarea.vue';
|
import MkTextarea from '@/components/MkTextarea.vue';
|
||||||
|
|
@ -36,8 +37,8 @@ import { i18n } from '@/i18n.js';
|
||||||
import { definePageMetadata } from '@/scripts/page-metadata.js';
|
import { definePageMetadata } from '@/scripts/page-metadata.js';
|
||||||
|
|
||||||
let blockedHosts: string = $ref('');
|
let blockedHosts: string = $ref('');
|
||||||
let silencedHosts: string = $ref("");
|
let silencedHosts: string = $ref('');
|
||||||
let tab = $ref("block");
|
let tab = $ref('block');
|
||||||
|
|
||||||
async function init() {
|
async function init() {
|
||||||
const meta = await os.api('admin/meta');
|
const meta = await os.api('admin/meta');
|
||||||
|
|
@ -48,7 +49,7 @@ async function init() {
|
||||||
function save() {
|
function save() {
|
||||||
os.apiWithDialog('admin/update-meta', {
|
os.apiWithDialog('admin/update-meta', {
|
||||||
blockedHosts: blockedHosts.split('\n') || [],
|
blockedHosts: blockedHosts.split('\n') || [],
|
||||||
silencedHosts: silencedHosts.split("\n") || [],
|
silencedHosts: silencedHosts.split('\n') || [],
|
||||||
|
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
fetchInstance();
|
fetchInstance();
|
||||||
|
|
@ -59,14 +60,14 @@ const headerActions = $computed(() => []);
|
||||||
|
|
||||||
const headerTabs = $computed(() => [
|
const headerTabs = $computed(() => [
|
||||||
{
|
{
|
||||||
key: "block",
|
key: 'block',
|
||||||
title: i18n.ts.block,
|
title: i18n.ts.block,
|
||||||
icon: "ph-prohibit ph-bold ph-lg",
|
icon: 'ph-prohibit ph-bold ph-lg',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: "silence",
|
key: 'silence',
|
||||||
title: i18n.ts.silence,
|
title: i18n.ts.silence,
|
||||||
icon: "ph-eye-slash ph-bold ph-lg",
|
icon: 'ph-eye-slash ph-bold ph-lg',
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue