diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-08 04:27:18 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-08 04:27:18 +0900 |
| commit | 05862a420f7d97e1a9781036a4eb62311cd35b20 (patch) | |
| tree | 157725f75c909ed1d445938e040e875ae3d1f776 /src/client/app/common/scripts | |
| parent | https://github.com/syuilo/misskey/pull/4549#discussion_r287750004 (diff) | |
| parent | :art: (diff) | |
| download | sharkey-05862a420f7d97e1a9781036a4eb62311cd35b20.tar.gz sharkey-05862a420f7d97e1a9781036a4eb62311cd35b20.tar.bz2 sharkey-05862a420f7d97e1a9781036a4eb62311cd35b20.zip | |
Merge branch 'develop' into pr/4549
Diffstat (limited to 'src/client/app/common/scripts')
| -rw-r--r-- | src/client/app/common/scripts/post-form.ts | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/client/app/common/scripts/post-form.ts b/src/client/app/common/scripts/post-form.ts index 85a578484f..1d93b4c268 100644 --- a/src/client/app/common/scripts/post-form.ts +++ b/src/client/app/common/scripts/post-form.ts @@ -151,9 +151,16 @@ export default (opts) => ({ // 公開以外へのリプライ時は元の公開範囲を引き継ぐ if (this.reply && ['home', 'followers', 'specified'].includes(this.reply.visibility)) { this.visibility = this.reply.visibility; + if (this.reply.visibility === 'specified') { + this.$root.api('users/show', { + userIds: this.reply.visibleUserIds.filter(uid => uid !== this.$store.state.i.id && uid !== this.reply.userId) + }).then(users => { + this.visibleUsers.push(...users); + }); + } } - if (this.reply) { + if (this.reply && this.reply.userId !== this.$store.state.i.id) { this.$root.api('users/show', { userId: this.reply.userId }).then(user => { this.visibleUsers.push(user); }); @@ -238,7 +245,7 @@ export default (opts) => ({ }, upload(file) { - (this.$refs.uploader as any).upload(file); + (this.$refs.uploader as any).upload(file, this.$store.state.settings.uploadFolder); }, onChangeUploadings(uploads) { |