instead of filtering nulls, let's just not have them in the first place
This commit is contained in:
parent
06d39b62a8
commit
a6a162177b
|
@ -1,5 +1,5 @@
|
|||
import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
|
||||
import { compact, map, each, merge, find, omitBy } from 'lodash'
|
||||
import { compact, map, each, merge, find } from 'lodash'
|
||||
import { set } from 'vue'
|
||||
import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js'
|
||||
import oauthApi from '../services/new_api/oauth'
|
||||
|
@ -11,7 +11,7 @@ export const mergeOrAdd = (arr, obj, item) => {
|
|||
const oldItem = obj[item.id]
|
||||
if (oldItem) {
|
||||
// We already have this, so only merge the new info.
|
||||
merge(oldItem, omitBy(item, _ => _ === null))
|
||||
merge(oldItem, item)
|
||||
return { item: oldItem, new: false }
|
||||
} else {
|
||||
// This is a new item, prepare it
|
||||
|
@ -39,7 +39,7 @@ export const mutations = {
|
|||
},
|
||||
setCurrentUser (state, user) {
|
||||
state.lastLoginName = user.screen_name
|
||||
state.currentUser = merge(state.currentUser || {}, omitBy(user, _ => _ === null))
|
||||
state.currentUser = merge(state.currentUser || {}, user)
|
||||
},
|
||||
clearCurrentUser (state) {
|
||||
state.currentUser = false
|
||||
|
|
|
@ -39,10 +39,10 @@ export const parseUser = (data) => {
|
|||
return output
|
||||
}
|
||||
|
||||
output.name = null // missing
|
||||
// output.name = ??? missing
|
||||
output.name_html = data.display_name
|
||||
|
||||
output.description = null // missing
|
||||
// output.description = ??? missing
|
||||
output.description_html = data.note
|
||||
|
||||
// Utilize avatar_static for gif avatars?
|
||||
|
@ -83,7 +83,7 @@ export const parseUser = (data) => {
|
|||
|
||||
output.friends_count = data.friends_count
|
||||
|
||||
output.bot = null // missing
|
||||
// output.bot = ??? missing
|
||||
|
||||
output.statusnet_profile_url = data.statusnet_profile_url
|
||||
|
||||
|
@ -134,7 +134,7 @@ const parseAttachment = (data) => {
|
|||
output.meta = data.meta // not present in BE yet
|
||||
} else {
|
||||
output.mimetype = data.mimetype
|
||||
output.meta = null // missing
|
||||
// output.meta = ??? missing
|
||||
}
|
||||
|
||||
output.url = data.url
|
||||
|
@ -166,7 +166,7 @@ export const parseStatus = (data) => {
|
|||
output.in_reply_to_user_id = data.in_reply_to_account_id
|
||||
|
||||
// Missing!! fix in UI?
|
||||
output.in_reply_to_screen_name = null
|
||||
// output.in_reply_to_screen_name = ???
|
||||
|
||||
// Not exactly the same but works
|
||||
output.statusnet_conversation_id = data.id
|
||||
|
@ -179,8 +179,7 @@ export const parseStatus = (data) => {
|
|||
output.summary_html = data.spoiler_text
|
||||
output.external_url = data.url
|
||||
|
||||
// FIXME missing!!
|
||||
output.is_local = false
|
||||
// output.is_local = ??? missing
|
||||
} else {
|
||||
output.favorited = data.favorited
|
||||
output.fave_num = data.fave_num
|
||||
|
@ -259,7 +258,7 @@ export const parseNotification = (data) => {
|
|||
|
||||
if (masto) {
|
||||
output.type = mastoDict[data.type] || data.type
|
||||
output.seen = null // missing
|
||||
// output.seen = ??? missing
|
||||
output.status = parseStatus(data.status)
|
||||
output.action = output.status // not sure
|
||||
output.from_profile = parseUser(data.account)
|
||||
|
|
Loading…
Reference in New Issue