From 581e3e836ad6c8a9a211eb09d7eaa1fbaf830da2 Mon Sep 17 00:00:00 2001 From: eal Date: Mon, 20 Nov 2017 20:32:51 +0200 Subject: Add completion for normal emoji. --- src/components/post_status_form/post_status_form.js | 8 ++++++-- src/components/post_status_form/post_status_form.vue | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/components') diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 6fc84407..2eb091f4 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -64,14 +64,15 @@ const PostStatusForm = { img: profile_image_url_original })) } else if (firstchar === ':') { - const matchedEmoji = filter(this.emoji, (emoji) => emoji.shortcode.match(this.textAtCaret.slice(1))) + const matchedEmoji = filter(this.emoji.concat(this.customEmoji), (emoji) => emoji.shortcode.match(this.textAtCaret.slice(1))) if (matchedEmoji.length <= 0) { return false } - return map(take(matchedEmoji, 5), ({shortcode, image_url}) => ({ + return map(take(matchedEmoji, 5), ({shortcode, image_url, utf}) => ({ // eslint-disable-next-line camelcase screen_name: `:${shortcode}:`, name: '', + utf: utf || '', img: image_url })) } else { @@ -90,6 +91,9 @@ const PostStatusForm = { }, emoji () { return this.$store.state.config.emoji || [] + }, + customEmoji () { + return this.$store.state.config.customEmoji || [] } }, methods: { diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index d0210286..8a2ec24d 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -6,8 +6,9 @@
-
- +
+ + {{candidate.utf}} {{candidate.screen_name}} {{candidate.name}} -- cgit v1.2.3-70-g09d2 From 84b0d54cd01898f684fc2f08b5d1034375e02bb1 Mon Sep 17 00:00:00 2001 From: aka <0xcebb@protonmail.ch> Date: Wed, 31 Jan 2018 14:48:09 -0300 Subject: Fixes issue #58 --- src/components/post_status_form/post_status_form.js | 1 + 1 file changed, 1 insertion(+) (limited to 'src/components') diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index acc97c86..59c14eac 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -104,6 +104,7 @@ const PostStatusForm = { }, postStatus (newStatus) { if (this.posting) { return } + if (this.submitDisabled) { return } if (this.newStatus.status === '') { if (this.newStatus.files.length > 0) { -- cgit v1.2.3-70-g09d2 From fe2e5ba6f04e9fd32aa62f4889c752cd2bb7eede Mon Sep 17 00:00:00 2001 From: eal Date: Thu, 1 Feb 2018 17:18:51 +0200 Subject: Align custom emoji to middle of line --- src/components/status/status.vue | 1 + 1 file changed, 1 insertion(+) (limited to 'src/components') diff --git a/src/components/status/status.vue b/src/components/status/status.vue index d6c8cdb3..d5c904a2 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -248,6 +248,7 @@ img, video { max-width: 100%; max-height: 400px; + vertical-align: middle; object-fit: contain; } -- cgit v1.2.3-70-g09d2 From 689afecb65019f838fb6ef4d9dd7756cb12c05fb Mon Sep 17 00:00:00 2001 From: eal Date: Thu, 1 Feb 2018 21:30:49 +0200 Subject: Add remote follow button to local user profiles. --- .../user_card_content/user_card_content.js | 5 +++++ .../user_card_content/user_card_content.vue | 20 ++++++++++++++++++++ src/i18n/messages.js | 3 ++- 3 files changed, 27 insertions(+), 1 deletion(-) (limited to 'src/components') diff --git a/src/components/user_card_content/user_card_content.js b/src/components/user_card_content/user_card_content.js index 6e67a321..32d62ebb 100644 --- a/src/components/user_card_content/user_card_content.js +++ b/src/components/user_card_content/user_card_content.js @@ -22,6 +22,11 @@ export default { isOtherUser () { return this.user.id !== this.$store.state.users.currentUser.id }, + subscribeUrl () { + // eslint-disable-next-line no-undef + const serverUrl = new URL(this.user.statusnet_profile_url) + return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus` + }, loggedIn () { return this.$store.state.users.currentUser }, diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index 4c40c55f..ef000c94 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -46,6 +46,15 @@
+
+
+ + + +
+