diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-12-03 08:46:33 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-12-03 08:48:01 +0100 |
| commit | 31b2e3a9056cfaa0e088d3941baec749d97a6173 (patch) | |
| tree | b721e95d92974cf7cc37c7885ba0f1856aef35d2 /src | |
| parent | f8ada2757e4c1269a85cb62f495fa962b0d838c0 (diff) | |
Fix timeline entries
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/TimelineEntry.vue | 17 | ||||
| -rw-r--r-- | src/store/timeline.js | 1 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/components/TimelineEntry.vue b/src/components/TimelineEntry.vue index 4d9014a0..167d3fd6 100644 --- a/src/components/TimelineEntry.vue +++ b/src/components/TimelineEntry.vue @@ -1,20 +1,17 @@ <template> <div class="timeline-entry"> <div class="entry-content"> - <div class="post-avatar"> - <avatar v-if="item.actor_info" :size="32" :user="item.actor_info.preferredUsername" /> - <avatar :size="32" :url="avatarUrl" /> + <div v-if="item.actor_info" class="post-avatar"> + <avatar v-if="item.local" :size="32" :user="item.actor_info.preferredUsername" + :display-name="item.actor_info.account" /> + <avatar v-else :size="32" :url="avatarUrl" /> </div> <div class="post-content"> <div class="post-author-wrapper"> - <router-link v-if="item.actor_info && item.actor_info.local" :to="{ name: 'profile', params: { account: item.actor_info.preferredUsername }}"> + <router-link v-if="item.actor_info && item.local" :to="{ name: 'profile', params: { account: item.actor_info.preferredUsername }}"> <span class="post-author">{{ item.actor_info.preferredUsername }}</span> <span class="post-author-id">{{ item.actor_info.account }}</span> </router-link> - <a v-else-if="item.local" :href="item.id"> - <span class="post-author">{{ item.actor_info.preferredUsername }}</span> - <span class="post-author-id">{{ item.actor_info.account }}</span> - </a> <a v-else :href="item.actor_info.url"> <span class="post-author">{{ item.actor_info.preferredUsername }}</span> <span class="post-author-id">{{ item.actor_info.account }}</span> @@ -58,8 +55,8 @@ export default { message = this.$twemoji.parse(message) return message }, - avatarUrl: function() { - return OC.generateUrl('/apps/social/api/v1/actor/avatar?id=' + this.item.attributedTo) + avatarUrl() { + return OC.generateUrl('/apps/social/api/v1/global/actor/avatar?id=' + this.item.attributedTo) } } } diff --git a/src/store/timeline.js b/src/store/timeline.js index a77fcb4e..cadbd990 100644 --- a/src/store/timeline.js +++ b/src/store/timeline.js @@ -32,7 +32,6 @@ const mutations = { addToTimeline(state, data) { for (let item in data) { state.since = data[item].publishedTime - data[item].actor_info = {} Vue.set(state.timeline, data[item].id, data[item]) } }, |