mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-27 14:28:53 +09:00
Code

fix/tweak 61bfadc2

Browse Source 
test

test

test

test
This commit is contained in:
NoriDev 2024-10-01 16:43:42 +09:00
parent 61bfadc286
commit fa4b122924
2 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/frontend/src/pages/admin-user.vue
View File

@ -493,10 +493,6 @@ watch(user, () => {
}); });
}); });
onMounted(() => {
globalEvents.on('refreshUser', () => updateRemoteUser());
});
const headerActions = computed(() => []); const headerActions = computed(() => []);
const headerTabs = computed(() => [{ const headerTabs = computed(() => [{

56
packages/frontend/src/scripts/get-user-menu.ts
View File

@ -20,7 +20,6 @@ import { antennasCache, rolesCache, userListsCache } from '@/cache.js';
import { mainRouter } from '@/router/main.js'; import { mainRouter } from '@/router/main.js';
import { genEmbedCode } from '@/scripts/get-embed-code.js'; import { genEmbedCode } from '@/scripts/get-embed-code.js';
import { editNickname } from '@/scripts/edit-nickname.js'; import { editNickname } from '@/scripts/edit-nickname.js';
import { globalEvents } from '@/events.js';
export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter = mainRouter) { export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter = mainRouter) {
const meId = $i ? $i.id : null; const meId = $i ? $i.id : null;
@ -52,13 +51,32 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
const meta = ref<Misskey.entities.AdminMetaResponse | null>(null); const meta = ref<Misskey.entities.AdminMetaResponse | null>(null);
const instance = ref<Misskey.entities.FederationInstance | null>(null); const instance = ref<Misskey.entities.FederationInstance | null>(null);
const isInstanceBlocked = ref(false);
const isInstanceSilenced = ref(false);
const isInstanceMediaSilenced = ref(false);
async function fetch(): Promise<void> {
if (iAmAdmin) {
meta.value = await misskeyApi('admin/meta');
}
instance.value = await misskeyApi('federation/show-instance', {
host: user.host ?? host,
});
isInstanceBlocked.value = instance.value?.isBlocked ?? false;
isInstanceSilenced.value = instance.value?.isSilenced ?? false;
isInstanceMediaSilenced.value = instance.value?.isMediaSilenced ?? false;
}
fetch();
async function toggleInstanceBlock(): Promise<void> { async function toggleInstanceBlock(): Promise<void> {
if (!iAmAdmin) return; if (!iAmAdmin) return;
if (!meta.value) throw new Error('No meta?'); if (!meta.value) throw new Error('No meta?');
if (!instance.value) throw new Error('No instance?'); if (!instance.value) throw new Error('No instance?');
const { instanceHost } = instance.value; // eslint-disable-next-line no-shadow
const { host } = instance.value;
await misskeyApi('admin/update-meta', { await misskeyApi('admin/update-meta', {
blockedHosts: isBlocked.value ? meta.value.blockedHosts.concat([instanceHost]) : meta.value.blockedHosts.filter(x => x !== instanceHost), blockedHosts: isInstanceBlocked.value ? meta.value.blockedHosts.concat([host]) : meta.value.blockedHosts.filter(x => x !== host),
}); });
} }
@ -66,10 +84,11 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
if (!iAmAdmin) return; if (!iAmAdmin) return;
if (!meta.value) throw new Error('No meta?'); if (!meta.value) throw new Error('No meta?');
if (!instance.value) throw new Error('No instance?'); if (!instance.value) throw new Error('No instance?');
const { instanceHost } = instance.value; // eslint-disable-next-line no-shadow
const { host } = instance.value;
const silencedHosts = meta.value.silencedHosts ?? []; const silencedHosts = meta.value.silencedHosts ?? [];
await misskeyApi('admin/update-meta', { await misskeyApi('admin/update-meta', {
silencedHosts: isSilenced.value ? silencedHosts.concat([instanceHost]) : silencedHosts.filter(x => x !== instanceHost), silencedHosts: isInstanceSilenced.value ? silencedHosts.concat([host]) : silencedHosts.filter(x => x !== host),
}); });
} }
@ -77,10 +96,11 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
if (!iAmAdmin) return; if (!iAmAdmin) return;
if (!meta.value) throw new Error('No meta?'); if (!meta.value) throw new Error('No meta?');
if (!instance.value) throw new Error('No instance?'); if (!instance.value) throw new Error('No instance?');
const { instanceHost } = instance.value; // eslint-disable-next-line no-shadow
const { host } = instance.value;
const mediaSilencedHosts = meta.value.mediaSilencedHosts ?? []; const mediaSilencedHosts = meta.value.mediaSilencedHosts ?? [];
await misskeyApi('admin/update-meta', { await misskeyApi('admin/update-meta', {
mediaSilencedHosts: isMediaSilenced.value ? mediaSilencedHosts.concat([instanceHost]) : mediaSilencedHosts.filter(x => x !== instanceHost), mediaSilencedHosts: isInstanceMediaSilenced.value ? mediaSilencedHosts.concat([host]) : mediaSilencedHosts.filter(x => x !== host),
}); });
} }
@ -160,10 +180,6 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
}); });
} }
function refreshUser() {
globalEvents.emit('refreshUser');
}
async function getConfirmed(text: string): Promise<boolean> { async function getConfirmed(text: string): Promise<boolean> {
const confirm = await os.confirm({ const confirm = await os.confirm({
type: 'warning', type: 'warning',
@ -211,6 +227,18 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
}); });
} }
watch(isInstanceBlocked, () => {
toggleInstanceBlock();
});
watch(isInstanceSilenced, () => {
toggleInstanceSilenced();
});
watch(isInstanceMediaSilenced, () => {
toggleInstanceMediaSilenced();
});
const menuItems: MenuItem[] = []; const menuItems: MenuItem[] = [];
menuItems.push({ menuItems.push({
@ -462,11 +490,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
menuItems.push({ type: 'divider' }); menuItems.push({ type: 'divider' });
const isInstanceBlocked = ref(instance.value?.isBlocked ?? false); if (iAmAdmin && user.host !== null) {
const isInstanceSilenced = ref(instance.value?.isSilenced ?? false);
const isInstanceMediaSilenced = ref(instance.value?.isMediaSilenced ?? false);
if (iAmAdmin && (meta.value || instance.value)) {
menuItems.push({ menuItems.push({
type: 'parent', type: 'parent',
icon: 'ti ti-server-cog', icon: 'ti ti-server-cog',