Beefox/fox-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

#436 - merge develop & resolve conflict

Browse source
This commit is contained in:
dave 2019-04-01 12:13:11 -04:00
commit 0af2f8e4fd
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/notification/notification.js
View file

@ -31,6 +31,15 @@ const Notification = {
const highlight = this.$store.state.config.highlight
const user = this.notification.from_profile
return highlightStyle(highlight[user.screen_name])
},
userInStore () {
return this.$store.getters.findUser(this.notification.action.user.id)
},
user () {
if (this.userInStore) {
return this.userInStore
}
return {}
}
}
}

3
src/components/user_profile/user_profile.js
View file

@ -72,9 +72,6 @@ const UserProfile = {
return this.$store.getters.findUser(this.fetchedUserId || routeParams.name || routeParams.id)
},
user () {
if (this.timeline.statuses[0]) {
return this.timeline.statuses[0].user
}
if (this.userInStore) {
return this.userInStore
}