From 2162ef20b0d00a098c9968ca6c141bccd5efb29f Mon Sep 17 00:00:00 2001 From: eal Date: Tue, 19 Sep 2017 22:43:20 +0300 Subject: [PATCH 1/5] Add emoji completion. --- .../post_status_form/post_status_form.js | 20 +++++++++++++++++-- .../post_status_form/post_status_form.vue | 4 ++-- src/main.js | 10 ++++++++++ src/services/completion/completion.js | 2 +- 4 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 86bf2fa707..6fc84407c0 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -50,17 +50,30 @@ const PostStatusForm = { }, computed: { candidates () { - if (this.textAtCaret.charAt(0) === '@') { + const firstchar = this.textAtCaret.charAt(0) + if (firstchar === '@') { const matchedUsers = filter(this.users, (user) => (String(user.name + user.screen_name)).match(this.textAtCaret.slice(1))) if (matchedUsers.length <= 0) { return false } // eslint-disable-next-line camelcase return map(take(matchedUsers, 5), ({screen_name, name, profile_image_url_original}) => ({ - screen_name: screen_name, + // eslint-disable-next-line camelcase + screen_name: `@${screen_name}`, name: name, img: profile_image_url_original })) + } else if (firstchar === ':') { + const matchedEmoji = filter(this.emoji, (emoji) => emoji.shortcode.match(this.textAtCaret.slice(1))) + if (matchedEmoji.length <= 0) { + return false + } + return map(take(matchedEmoji, 5), ({shortcode, image_url}) => ({ + // eslint-disable-next-line camelcase + screen_name: `:${shortcode}:`, + name: '', + img: image_url + })) } else { return false } @@ -74,6 +87,9 @@ const PostStatusForm = { }, users () { return this.$store.state.users.users + }, + emoji () { + return this.$store.state.config.emoji || [] } }, methods: { diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index b46fbf3a1e..5a6e02e515 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -6,10 +6,10 @@
-
+
- @{{candidate.screen_name}} + {{candidate.screen_name}} {{candidate.name}}
diff --git a/src/main.js b/src/main.js index d1f99fa516..a13569d6ad 100644 --- a/src/main.js +++ b/src/main.js @@ -102,3 +102,13 @@ window.fetch('/static/terms-of-service.html') .then((html) => { store.dispatch('setOption', { name: 'tos', value: html }) }) + +window.fetch('/static/emoji.txt') + .then((res) => res.text()) + .then((csv) => { + const emoji = csv.split('\n').map((row) => { + const values = row.split(', ') + return { shortcode: values[0], url: values[1] } + }) + store.dispatch('setOption', { name: 'emoji', value: emoji }) + }) diff --git a/src/services/completion/completion.js b/src/services/completion/completion.js index 8788d837ff..11c4586715 100644 --- a/src/services/completion/completion.js +++ b/src/services/completion/completion.js @@ -37,7 +37,7 @@ export const addPositionToWords = (words) => { export const splitIntoWords = (str) => { // Split at word boundaries const regex = /\b/ - const triggers = /[@#]+$/ + const triggers = /[@#:]+$/ let split = str.split(regex) From 70d66c48ad6db4e8e3d2142001cdf8ed5344a9d4 Mon Sep 17 00:00:00 2001 From: eal Date: Tue, 19 Sep 2017 22:50:08 +0300 Subject: [PATCH 2/5] Fix image url. --- src/components/post_status_form/post_status_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 6fc84407c0..6d89b0514c 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -72,7 +72,7 @@ const PostStatusForm = { // eslint-disable-next-line camelcase screen_name: `:${shortcode}:`, name: '', - img: image_url + img: url })) } else { return false From f4b1319eff7562ff71181a75f967de6ec52337c2 Mon Sep 17 00:00:00 2001 From: eal Date: Tue, 19 Sep 2017 22:54:54 +0300 Subject: [PATCH 3/5] Actually fix image url. --- src/components/post_status_form/post_status_form.js | 2 +- src/main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 6d89b0514c..2e0aafd03a 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -72,7 +72,7 @@ const PostStatusForm = { // eslint-disable-next-line camelcase screen_name: `:${shortcode}:`, name: '', - img: url + img: image-url })) } else { return false diff --git a/src/main.js b/src/main.js index a13569d6ad..2ab548a6ce 100644 --- a/src/main.js +++ b/src/main.js @@ -108,7 +108,7 @@ window.fetch('/static/emoji.txt') .then((csv) => { const emoji = csv.split('\n').map((row) => { const values = row.split(', ') - return { shortcode: values[0], url: values[1] } + return { shortcode: values[0], image-url: values[1] } }) store.dispatch('setOption', { name: 'emoji', value: emoji }) }) From 447ec911766a9c5b6d5512a9e054fdbbe39df92a Mon Sep 17 00:00:00 2001 From: eal Date: Tue, 19 Sep 2017 22:58:15 +0300 Subject: [PATCH 4/5] Actually actually fix image url. --- src/components/post_status_form/post_status_form.js | 2 +- src/main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 2e0aafd03a..6fc84407c0 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -72,7 +72,7 @@ const PostStatusForm = { // eslint-disable-next-line camelcase screen_name: `:${shortcode}:`, name: '', - img: image-url + img: image_url })) } else { return false diff --git a/src/main.js b/src/main.js index 2ab548a6ce..bac4d0f7ba 100644 --- a/src/main.js +++ b/src/main.js @@ -108,7 +108,7 @@ window.fetch('/static/emoji.txt') .then((csv) => { const emoji = csv.split('\n').map((row) => { const values = row.split(', ') - return { shortcode: values[0], image-url: values[1] } + return { shortcode: values[0], image_url: values[1] } }) store.dispatch('setOption', { name: 'emoji', value: emoji }) }) From ba9b04a8bacc62be0264c4fdd3dbcf34f12f7e4b Mon Sep 17 00:00:00 2001 From: eal Date: Thu, 19 Oct 2017 23:39:21 +0300 Subject: [PATCH 5/5] Use the API endpoint for emoji completion. --- src/main.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main.js b/src/main.js index bac4d0f7ba..b994e15426 100644 --- a/src/main.js +++ b/src/main.js @@ -103,12 +103,11 @@ window.fetch('/static/terms-of-service.html') store.dispatch('setOption', { name: 'tos', value: html }) }) -window.fetch('/static/emoji.txt') - .then((res) => res.text()) - .then((csv) => { - const emoji = csv.split('\n').map((row) => { - const values = row.split(', ') - return { shortcode: values[0], image_url: values[1] } +window.fetch('/api/pleroma/emoji.json') + .then((res) => res.json()) + .then((values) => { + const emoji = Object.keys(values).map((key) => { + return { shortcode: key, image_url: values[key] } }) store.dispatch('setOption', { name: 'emoji', value: emoji }) })