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

fix: mention local users in replies (#7975)

Browse source 
* mention local users in replies

* fix merge
This commit is contained in:
nullobsi 2021-11-12 02:31:56 -08:00 committed by GitHub
parent 926eb34680
commit c038892795
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/client/src/components/post-form.vue
View file

@ -278,8 +278,8 @@ export default defineComponent({
this.text += ' '; this.text += ' ';
} }
if (this.reply && this.reply.user.host != null) { if (this.reply && (this.reply.user.username != this.$i.username || (this.reply.user.host != null && this.reply.user.host != host))) {
this.text = `@${this.reply.user.username}@${toASCII(this.reply.user.host)} `; this.text = `@${this.reply.user.username}${this.reply.user.host != null ? '@' + toASCII(this.reply.user.host) : ''} `;
} }
if (this.reply && this.reply.text != null) { if (this.reply && this.reply.text != null) {

4
packages/client/src/ui/chat/post-form.vue
View file

@ -206,8 +206,8 @@ export default defineComponent({
this.text += ' '; this.text += ' ';
} }
if (this.reply && this.reply.user.host != null) { if (this.reply && (this.reply.user.username != this.$i.username || (this.reply.user.host != null && this.reply.user.host != host))) {
this.text = `@${this.reply.user.username}@${toASCII(this.reply.user.host)} `; this.text = `@${this.reply.user.username}${this.reply.user.host != null ? '@' + toASCII(this.reply.user.host) : ''} `;
} }
if (this.reply && this.reply.text != null) { if (this.reply && this.reply.text != null) {