From 5054a65d21da3efbba8bb941fbab3a3f467b8163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 3 Dec 2018 17:32:05 +0100 Subject: [PATCH 1/3] Fix avatar/search in composer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- src/App.vue | 6 ++++-- src/components/Composer.vue | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/App.vue b/src/App.vue index 5108225b..bc26bd4c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,7 +9,7 @@

{{ t('social', 'Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud can\'t configure this automatically. To use Social, the admin of this Nextcloud instance needs to manually configure the .well-known redirects: ') }}{{ t('social', 'Open documentation') }} ↗

- + @@ -178,7 +178,9 @@ export default { this.$store.commit('setServerData', JSON.parse(document.getElementById('serverData').dataset.server)) } - this.search = new OCA.Search(this.search, this.resetSearch) + if (!this.serverData.public) { + this.search = new OCA.Search(this.search, this.resetSearch) + } }, methods: { hideInfo() { diff --git a/src/components/Composer.vue b/src/components/Composer.vue index d2b9513e..da3ae720 100644 --- a/src/components/Composer.vue +++ b/src/components/Composer.vue @@ -349,7 +349,7 @@ export default { key: user.preferredUsername, value: user.account, url: user.url, - avatar: user.local ? OC.generateUrl(`/avatar/${user.preferredUsername}/32`) : ''// TODO: use real avatar from server + avatar: user.local ? OC.generateUrl(`/avatar/${user.preferredUsername}/32`) : OC.generateUrl(`apps/social/api/v1/global/actor/avatar?id=${user.id}`) }) } cb(users) @@ -496,7 +496,7 @@ export default { }) }, remoteSearch(text) { - return axios.get(OC.generateUrl('apps/social/api/v1/accounts/search?search=' + text)) + return axios.get(OC.generateUrl('apps/social/api/v1/global/accounts/search?search=' + text)) } } } From e08e64477ec1713843bef43d88e0d1d0c9e54346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 3 Dec 2018 17:32:41 +0100 Subject: [PATCH 2/3] Add space after emoji and hide popover MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- src/components/Composer.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Composer.vue b/src/components/Composer.vue index da3ae720..eda636e6 100644 --- a/src/components/Composer.vue +++ b/src/components/Composer.vue @@ -445,8 +445,9 @@ export default { }, methods: { insert(emoji) { - this.post += this.$twemoji.parse(emoji) + this.post += this.$twemoji.parse(emoji) + ' ' this.$refs.composerInput.innerHTML = this.post + this.hidePopoverMenu() }, togglePopoverMenu() { this.menuOpened = !this.menuOpened From da6bcc1450181251f12a6e493d3d00520a84c528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 3 Dec 2018 17:33:09 +0100 Subject: [PATCH 3/3] Fix centering of timeline and search MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- src/components/Composer.vue | 16 ++++++++++++---- src/components/Search.vue | 2 +- src/components/TimelineEntry.vue | 6 ++++-- src/views/Timeline.vue | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/components/Composer.vue b/src/components/Composer.vue index eda636e6..11f20a0e 100644 --- a/src/components/Composer.vue +++ b/src/components/Composer.vue @@ -35,14 +35,16 @@
- +
- +
@@ -445,9 +447,15 @@ export default { }, methods: { insert(emoji) { + if (typeof emoji === 'object') { + let category = Object.keys(emoji)[0] + let emojis = emoji[category] + let firstEmoji = Object.keys(emojis)[0] + emoji = emojis[firstEmoji] + } this.post += this.$twemoji.parse(emoji) + ' ' - this.$refs.composerInput.innerHTML = this.post - this.hidePopoverMenu() + this.$refs.composerInput.innerHTML += this.$twemoji.parse(emoji) + ' ' + this.$refs.emojiPicker.hide() }, togglePopoverMenu() { this.menuOpened = !this.menuOpened diff --git a/src/components/Search.vue b/src/components/Search.vue index bd3f81b8..312d8d21 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -21,7 +21,7 @@ -->