diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue index 8837fde6b..5c8f61a2a 100644 --- a/src/client/app/common/views/components/autocomplete.vue +++ b/src/client/app/common/views/components/autocomplete.vue @@ -3,8 +3,8 @@
  1. - {{ getUserName(user) }} - @{{ getAcct(user) }} + {{ user | userName }} + @{{ user | acct }}
    @@ -21,17 +21,17 @@ import Vue from 'vue'; import * as emojilib from 'emojilib'; import contains from '../../../common/scripts/contains'; -import getAcct from '../../../../../acct/render'; -import getUserName from '../../../../../renderers/get-user-name'; const lib = Object.entries(emojilib.lib).filter((x: any) => { return x[1].category != 'flags'; }); + const emjdb = lib.map((x: any) => ({ emoji: x[1].char, name: x[0], alias: null })); + lib.forEach((x: any) => { if (x[1].keywords) { x[1].keywords.forEach(k => { @@ -43,6 +43,7 @@ lib.forEach((x: any) => { }); } }); + emjdb.sort((a, b) => a.name.length - b.name.length); export default Vue.extend({ @@ -107,8 +108,6 @@ export default Vue.extend({ }); }, methods: { - getAcct, - getUserName, exec() { this.select = -1; if (this.$refs.suggests) { diff --git a/src/client/app/common/views/components/messaging.vue b/src/client/app/common/views/components/messaging.vue index 9b1449daa..751e4de50 100644 --- a/src/client/app/common/views/components/messaging.vue +++ b/src/client/app/common/views/components/messaging.vue @@ -14,8 +14,8 @@ tabindex="-1" > - {{ getUserName(user) }} - @{{ getAcct(user) }} + {{ user | userName }} + @{{ user | acct }}
@@ -33,8 +33,8 @@
- {{ getUserName(isMe(message) ? message.recipient : message.user) }} - @{{ getAcct(isMe(message) ? message.recipient : message.user) }} + {{ isMe(message) ? message.recipient : message.use | userName }} + @{{ isMe(message) ? message.recipient : message.user | acct }}
@@ -51,8 +51,6 @@ diff --git a/src/client/app/desktop/views/components/following-window.vue b/src/client/app/desktop/views/components/following-window.vue index cbd8ec5f9..cc3d77198 100644 --- a/src/client/app/desktop/views/components/following-window.vue +++ b/src/client/app/desktop/views/components/following-window.vue @@ -1,7 +1,7 @@ diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue index 483f5aaf3..de32f0a74 100644 --- a/src/client/app/mobile/views/components/note-detail.vue +++ b/src/client/app/mobile/views/components/note-detail.vue @@ -17,24 +17,20 @@

- + avatar - %fa:retweet% - - {{ name }} - - がRenote + %fa:retweet%{{ note.user | userName }}がRenote

- + avatar
- {{ pName }} - @{{ pAcct }} + {{ p.user | userName }} + @{{ p.user | acct }}
@@ -80,8 +76,6 @@ diff --git a/src/client/app/mobile/views/components/note.sub.vue b/src/client/app/mobile/views/components/note.sub.vue index 96f8265cc..d489f3a05 100644 --- a/src/client/app/mobile/views/components/note.sub.vue +++ b/src/client/app/mobile/views/components/note.sub.vue @@ -1,13 +1,13 @@