From 452256874930093d07ad6734f72293b4334a3b9e Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Thu, 6 Dec 2018 10:02:04 +0900 Subject: [PATCH] Emoji support in profile (#3514) * Emoji in profile * Add emojis to fields --- .../common/views/components/autocomplete.vue | 4 ++- .../app/common/views/components/emoji.vue | 14 +++++++- src/client/app/common/views/components/mfm.ts | 9 ++++-- .../common/views/components/note-header.vue | 4 ++- .../app/common/views/components/renote.vue | 4 ++- .../views/components/welcome-timeline.vue | 4 ++- src/client/app/common/views/pages/follow.vue | 6 ++-- .../views/components/friends-maker.vue | 4 ++- .../desktop/views/components/note-detail.vue | 4 ++- .../views/components/notifications.vue | 32 ++++++++++++++----- .../desktop/views/components/post-form.vue | 4 ++- .../received-follow-requests-window.vue | 4 ++- .../desktop/views/components/user-card.vue | 6 ++-- .../desktop/views/components/user-preview.vue | 8 +++-- .../views/pages/deck/deck.notification.vue | 20 +++++++++--- .../views/pages/deck/deck.user-column.vue | 6 ++-- .../pages/user-following-or-followers.vue | 4 ++- .../desktop/views/pages/user/user.header.vue | 6 ++-- .../app/desktop/views/widgets/profile.vue | 4 ++- .../app/desktop/views/widgets/users.vue | 4 ++- .../app/mobile/views/components/note-card.vue | 4 ++- .../mobile/views/components/note-detail.vue | 4 ++- .../views/components/notification-preview.vue | 16 +++++----- .../mobile/views/components/notification.vue | 10 +++--- .../app/mobile/views/components/post-form.vue | 5 ++- .../app/mobile/views/components/ui.nav.vue | 4 ++- .../app/mobile/views/components/user-card.vue | 4 ++- .../mobile/views/components/user-preview.vue | 8 +++-- .../views/pages/received-follow-requests.vue | 4 ++- .../app/mobile/views/pages/user-list.vue | 4 ++- src/client/app/mobile/views/pages/user.vue | 8 +++-- .../app/mobile/views/widgets/profile.vue | 4 ++- src/mfm/parse.ts | 6 ++-- src/mfm/parser.ts | 23 +++++++++++++ src/models/user.ts | 13 ++++++++ src/remote/activitypub/models/note.ts | 2 +- src/remote/activitypub/models/person.ts | 27 +++++++++++++++- src/remote/activitypub/renderer/note.ts | 2 +- src/remote/activitypub/renderer/person.ts | 10 ++++++ src/server/api/endpoints/i/update.ts | 20 ++++++++++++ src/services/note/create.ts | 2 +- 41 files changed, 261 insertions(+), 70 deletions(-) diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue index d61c598ec0..af68d8374e 100644 --- a/src/client/app/common/views/components/autocomplete.vue +++ b/src/client/app/common/views/components/autocomplete.vue @@ -3,7 +3,9 @@
  1. - {{ user | userName }} + + + @{{ user | acct }}
diff --git a/src/client/app/common/views/components/emoji.vue b/src/client/app/common/views/components/emoji.vue index a8fef35b8a..4ea2ea941c 100644 --- a/src/client/app/common/views/components/emoji.vue +++ b/src/client/app/common/views/components/emoji.vue @@ -1,5 +1,5 @@ @@ -70,7 +80,9 @@

- {{ notification.note.user | userName }} + + +

{{ getNoteSummary(notification.note) }}
@@ -80,7 +92,9 @@

- {{ notification.note.user | userName }} + + +

{{ getNoteSummary(notification.note) }}
@@ -89,7 +103,9 @@