mirror of
https://github.com/paricafe/misskey.git
synced 2024-11-24 12:56:43 -06:00
fix: mention local users in replies (#7975)
* mention local users in replies * fix merge
This commit is contained in:
parent
926eb34680
commit
c038892795
2 changed files with 4 additions and 4 deletions
|
@ -278,8 +278,8 @@ export default defineComponent({
|
|||
this.text += ' ';
|
||||
}
|
||||
|
||||
if (this.reply && this.reply.user.host != null) {
|
||||
this.text = `@${this.reply.user.username}@${toASCII(this.reply.user.host)} `;
|
||||
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}${this.reply.user.host != null ? '@' + toASCII(this.reply.user.host) : ''} `;
|
||||
}
|
||||
|
||||
if (this.reply && this.reply.text != null) {
|
||||
|
|
|
@ -206,8 +206,8 @@ export default defineComponent({
|
|||
this.text += ' ';
|
||||
}
|
||||
|
||||
if (this.reply && this.reply.user.host != null) {
|
||||
this.text = `@${this.reply.user.username}@${toASCII(this.reply.user.host)} `;
|
||||
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}${this.reply.user.host != null ? '@' + toASCII(this.reply.user.host) : ''} `;
|
||||
}
|
||||
|
||||
if (this.reply && this.reply.text != null) {
|
||||
|
|
Loading…
Reference in a new issue