diff options
| author | Aya Morisawa <AyaMorisawa4869@gmail.com> | 2018-12-27 01:24:57 +0900 |
|---|---|---|
| committer | Aya Morisawa <AyaMorisawa4869@gmail.com> | 2018-12-27 01:26:03 +0900 |
| commit | 21f8dbf2deb0d766496c3503f036d07705da4238 (patch) | |
| tree | a97518ef3a92dcd6d2907c1719d9ea6c168bb8b8 /src/client | |
| parent | Feature to show only my posts in the user page (#3753) (diff) | |
| download | misskey-21f8dbf2deb0d766496c3503f036d07705da4238.tar.gz misskey-21f8dbf2deb0d766496c3503f036d07705da4238.tar.bz2 misskey-21f8dbf2deb0d766496c3503f036d07705da4238.zip | |
Resolve #3248
Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/views/components/messaging-room.message.vue | 15 | ||||
| -rw-r--r-- | src/client/app/common/views/components/messaging-room.vue | 8 |
2 files changed, 19 insertions, 4 deletions
diff --git a/src/client/app/common/views/components/messaging-room.message.vue b/src/client/app/common/views/components/messaging-room.message.vue index 872dc2d89e..16588da9a5 100644 --- a/src/client/app/common/views/components/messaging-room.message.vue +++ b/src/client/app/common/views/components/messaging-room.message.vue @@ -3,9 +3,9 @@ <mk-avatar class="avatar" :user="message.user" target="_blank"/> <div class="content"> <div class="balloon" :data-no-text="message.text == null"> - <!-- <button class="delete-button" v-if="isMe" :title="$t('@.delete')"> - <img src="/assets/desktop/messaging/delete.png" alt="Delete"/> - </button> --> + <button class="delete-button" v-if="isMe" :title="$t('@.delete')" @click="del"> + <img src="/assets/desktop/remove.png" alt="Delete"/> + </button> <div class="content" v-if="!message.isDeleted"> <misskey-flavored-markdown class="text" v-if="message.text" ref="text" :text="message.text" :i="$store.state.i"/> <div class="file" v-if="message.file"> @@ -16,7 +16,7 @@ </a> </div> </div> - <div class="content" v-if="message.isDeleted"> + <div class="content" v-else> <p class="is-deleted">{{ $t('deleted') }}</p> </div> </div> @@ -58,6 +58,13 @@ export default Vue.extend({ return null; } } + }, + methods: { + del() { + this.$root.api('messaging/messages/delete', { + messageId: this.message.id + }); + } } }); </script> diff --git a/src/client/app/common/views/components/messaging-room.vue b/src/client/app/common/views/components/messaging-room.vue index 29aacd3bae..6f13d50c1e 100644 --- a/src/client/app/common/views/components/messaging-room.vue +++ b/src/client/app/common/views/components/messaging-room.vue @@ -79,6 +79,7 @@ export default Vue.extend({ this.connection.on('message', this.onMessage); this.connection.on('read', this.onRead); + this.connection.on('deleted', this.onDeleted); if (this.isNaked) { window.addEventListener('scroll', this.onScroll, { passive: true }); @@ -204,6 +205,13 @@ export default Vue.extend({ } }, + onDeleted(id) { + const msg = this.messages.find(m => m.id === id); + if (msg) { + this.messages = this.messages.filter(m => m.id !== msg.id); + } + }, + isBottom() { const asobi = 64; const current = this.isNaked |