Merge remote-tracking branch 'misskey-dev/develop' into io

This commit is contained in:
まっちゃとーにゅ 2024-02-02 21:42:42 +09:00
commit a409eb14d6
No known key found for this signature in database
GPG key ID: 143DE582A97FE052
41 changed files with 482 additions and 142 deletions

View file

@ -45,7 +45,7 @@ async function init() {
}
function chooseProxyAccount() {
os.selectUser().then(user => {
os.selectUser({ localOnly: true }).then(user => {
proxyAccount.value = user;
proxyAccountId.value = user.id;
save();

View file

@ -116,9 +116,7 @@ async function del() {
}
async function assign() {
const user = await os.selectUser({
includeSelf: true,
});
const user = await os.selectUser({ includeSelf: true });
const { canceled: canceled2, result: period } = await os.select({
title: i18n.ts.period,

View file

@ -90,7 +90,7 @@ const pagination = {
};
function searchUser() {
os.selectUser().then(user => {
os.selectUser({ includeSelf: true }).then(user => {
show(user);
});
}

View file

@ -129,7 +129,7 @@ async function deleteAntenna() {
}
function addUser() {
os.selectUser().then(user => {
os.selectUser({ includeSelf: true }).then(user => {
users.value = users.value.trim();
users.value += '\n@' + Misskey.acct.toString(user as any);
users.value = users.value.trim();

View file

@ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_gaps_m">
<MkSwitch v-model="isLocalOnly">{{ i18n.ts.localOnly }}</MkSwitch>
<MkFolder>
<MkFolder :defaultOpen="true">
<template #label>{{ i18n.ts.specifyUser }}</template>
<template v-if="user" #suffix>@{{ user.username }}</template>
@ -64,7 +64,7 @@ const user = ref<any>(null);
const isLocalOnly = ref(false);
function selectUser() {
os.selectUser().then(_user => {
os.selectUser({ includeSelf: true }).then(_user => {
user.value = _user;
});
}

View file

@ -96,7 +96,7 @@ const headerTabs = computed(() => user.value ? [{
key: 'achievements',
title: i18n.ts.achievements,
icon: 'ti ti-medal',
}] : []), ...($i && ($i.id === user.value.id)) || user.value.publicReactions ? [{
}] : []), ...($i && ($i.id === user.value.id || $i.isAdmin || $i.isModerator)) || user.value.publicReactions ? [{
key: 'reactions',
title: i18n.ts.reaction,
icon: 'ti ti-mood-happy',