mirrors/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-04 07:16:14 +02:00
Code Releases Activity

ユーザーグループ

Browse Source 
Resolve #3218
This commit is contained in:
syuilo
2019-05-18 20:36:33 +09:00
parent 61f54f8f74
commit c7cc3dcdfd
65 changed files with 1797 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/client/app/desktop/views/components/messaging-room-window.vue
View File

@@ -1,7 +1,7 @@
<template>
<mk-window ref="window" width="500px" height="560px" :popout-url="popout" @closed="destroyDom">
<template #header><fa icon="comments"/> {{ $t('@.messaging') }}: <mk-user-name :user="user"/></template>
<x-messaging-room :user="user" :class="$style.content"/>
<template #header><fa icon="comments"/> {{ $t('@.messaging') }}: <mk-user-name v-if="user" :user="user"/><span v-else>{{ group.name }}</span></template>
<x-messaging-room :user="user" :group="group" :class="$style.content"/>
</mk-window>
</template>
@@ -16,10 +16,14 @@ export default Vue.extend({
components: {
XMessagingRoom: () => import('../../../common/views/components/messaging-room.vue').then(m => m.default)
},
props: ['user'],
props: ['user', 'group'],
computed: {
popout(): string {
return `${url}/i/messaging/${getAcct(this.user)}`;
if (this.user) {
return `${url}/i/messaging/${getAcct(this.user)}`;
} else if (this.group) {
return `${url}/i/messaging/group/${this.group.id}`;
}
}
}
});