graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-25 07:03:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

プロフィールにロールを表示するように

Browse source
This commit is contained in:
syuilo 2023-01-13 12:07:24 +09:00
parent d43a4a2d46
commit 4c21d83639
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
packages/backend/src/core/entities/UserEntityService.ts
View file

@ -448,6 +448,14 @@ export class UserEntityService implements OnModuleInit {
userId: user.id, userId: user.id,
}).then(result => result >= 1) }).then(result => result >= 1)
: false, : false,
roles: this.roleService.getUserRoles(user.id).then(roles => roles.filter(role => role.isPublic).map(role => ({
id: role.id,
name: role.name,
color: role.color,
description: role.description,
isModerator: role.isModerator,
isAdministrator: role.isAdministrator,
}))),
} : {}), } : {}),
...(opts.detail && isMe ? { ...(opts.detail && isMe ? {

20
packages/frontend/src/pages/user/home.vue
View file

@ -38,6 +38,9 @@
<span v-if="user.isBot" :title="i18n.ts.isBot"><i class="ti ti-robot"></i></span> <span v-if="user.isBot" :title="i18n.ts.isBot"><i class="ti ti-robot"></i></span>
</div> </div>
</div> </div>
<div v-if="user.roles.length > 0" class="roles">
<span v-for="role in user.roles" :key="role.id" v-tooltip="role.description" class="role" :style="{ '--color': role.color }">{{ role.name }}</span>
</div>
<div class="description"> <div class="description">
<Mfm v-if="user.description" :text="user.description" :is-note="false" :author="user" :i="$i"/> <Mfm v-if="user.description" :text="user.description" :is-note="false" :author="user" :i="$i"/>
<p v-else class="empty">{{ i18n.ts.noAccountDescription }}</p> <p v-else class="empty">{{ i18n.ts.noAccountDescription }}</p>
@ -337,6 +340,18 @@ onUnmounted(() => {
box-shadow: 1px 1px 3px rgba(#000, 0.2); box-shadow: 1px 1px 3px rgba(#000, 0.2);
} }
> .roles {
padding: 24px 24px 0 154px;
font-size: 0.95em;
> .role {
border: solid 1px var(--color, var(--divider));
border-radius: 999px;
margin-right: 4px;
padding: 3px 8px;
}
}
> .description { > .description {
padding: 24px 24px 24px 154px; padding: 24px 24px 24px 154px;
font-size: 0.95em; font-size: 0.95em;
@ -467,6 +482,11 @@ onUnmounted(() => {
margin: auto; margin: auto;
} }
> .roles {
padding: 16px 16px 0 16px;
text-align: center;
}
> .description { > .description {
padding: 16px; padding: 16px;
text-align: center; text-align: center;