mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-30 05:13:09 +02:00
enhance(client): ロールをより簡単に付与できるように
This commit is contained in:
parent
abc1bdf218
commit
040f9927dd
3 changed files with 28 additions and 0 deletions
|
@ -13,6 +13,7 @@ You should also include the user name that made the change.
|
||||||
|
|
||||||
### Improvements
|
### Improvements
|
||||||
- コンディショナルロールもバッジとして表示可能に
|
- コンディショナルロールもバッジとして表示可能に
|
||||||
|
- enhance(client): ロールをより簡単に付与できるように
|
||||||
- enhance(client): 一度見たノートのRenoteは省略して表示するように
|
- enhance(client): 一度見たノートのRenoteは省略して表示するように
|
||||||
- 一部のMFM構文をopt-outに
|
- 一部のMFM構文をopt-outに
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
<p>{{ $ts.followers }}</p><span>{{ user.followersCount }}</span>
|
<p>{{ $ts.followers }}</p><span>{{ user.followersCount }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<button class="menu _button" @click="showMenu"><i class="ti ti-dots"></i></button>
|
||||||
<MkFollowButton v-if="$i && user.id != $i.id" class="koudoku-button" :user="user" mini/>
|
<MkFollowButton v-if="$i && user.id != $i.id" class="koudoku-button" :user="user" mini/>
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
|
@ -40,6 +41,7 @@ import * as misskey from 'misskey-js';
|
||||||
import MkFollowButton from '@/components/MkFollowButton.vue';
|
import MkFollowButton from '@/components/MkFollowButton.vue';
|
||||||
import { userPage } from '@/filters/user';
|
import { userPage } from '@/filters/user';
|
||||||
import * as os from '@/os';
|
import * as os from '@/os';
|
||||||
|
import { getUserMenu } from '@/scripts/get-user-menu';
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
showing: boolean;
|
showing: boolean;
|
||||||
|
@ -58,6 +60,10 @@ let user = $ref<misskey.entities.UserDetailed | null>(null);
|
||||||
let top = $ref(0);
|
let top = $ref(0);
|
||||||
let left = $ref(0);
|
let left = $ref(0);
|
||||||
|
|
||||||
|
function showMenu(ev: MouseEvent) {
|
||||||
|
os.popupMenu(getUserMenu(user), ev.currentTarget ?? ev.target);
|
||||||
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
if (typeof props.q === 'object') {
|
if (typeof props.q === 'object') {
|
||||||
user = props.q;
|
user = props.q;
|
||||||
|
@ -174,6 +180,13 @@ onMounted(() => {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
> .menu {
|
||||||
|
position: absolute;
|
||||||
|
top: 8px;
|
||||||
|
right: 42px;
|
||||||
|
padding: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
> .koudoku-button {
|
> .koudoku-button {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 8px;
|
top: 8px;
|
||||||
|
|
|
@ -203,6 +203,20 @@ export function getUserMenu(user, router: Router = mainRouter) {
|
||||||
action: () => {
|
action: () => {
|
||||||
router.push('/user-info/' + user.id + '#moderation');
|
router.push('/user-info/' + user.id + '#moderation');
|
||||||
},
|
},
|
||||||
|
}, {
|
||||||
|
icon: 'ti ti-badges',
|
||||||
|
text: i18n.ts.roles,
|
||||||
|
action: async () => {
|
||||||
|
const roles = await os.api('admin/roles/list');
|
||||||
|
|
||||||
|
const { canceled, result: roleId } = await os.select({
|
||||||
|
title: i18n.ts._role.chooseRoleToAssign,
|
||||||
|
items: roles.map(r => ({ text: r.name, value: r.id })),
|
||||||
|
});
|
||||||
|
if (canceled) return;
|
||||||
|
|
||||||
|
await os.apiWithDialog('admin/roles/assign', { roleId, userId: user.id });
|
||||||
|
},
|
||||||
}]);
|
}]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue