therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

notifications now also undergo some parsing, hypothetically could use MastoAPI

Browse source 
notifications, maybe.
This commit is contained in:
Henry Jameson 2019-01-14 22:38:37 +03:00
parent e0fd6d12ed
commit 790fcf37d2
4 changed files with 53 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/services/api/api.service.js
View file

@ -44,7 +44,7 @@ const SUGGESTIONS_URL = '/api/v1/suggestions'
const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
import { each, map } from 'lodash'
import { parseStatus, parseUser } from '../status_normalizer/status_normalizer.service.js'
import { parseStatus, parseUser, parseNotification } from '../status_normalizer/status_normalizer.service.js'
import 'whatwg-fetch'
const oldfetch = window.fetch
@ -347,7 +347,7 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false, use
throw new Error('Error fetching timeline')
})
.then((data) => data.json())
.then((data) => data.map(isNotifications ? _ => _ : parseStatus))
.then((data) => data.map(isNotifications ? parseNotification : parseStatus))
}
const verifyCredentials = (user) => {

39
src/services/status_normalizer/status_normalizer.service.js
View file

@ -23,10 +23,6 @@ const qvitterStatusType = (status) => {
return 'unknown'
}
const isMastoAPI = (status) => {
return status.hasOwnProperty('account')
}
export const parseUser = (data) => {
const output = {}
const masto = data.hasOwnProperty('acct')
@ -95,6 +91,7 @@ export const parseUser = (data) => {
}
const parseAttachment = (data) => {
// TODO A little bit messy ATM but works with both APIs
return {
...data,
mimetype: data.mimetype || data.type
@ -103,11 +100,12 @@ const parseAttachment = (data) => {
export const parseStatus = (data) => {
const output = {}
const masto = isMastoAPI(data)
const masto = data.hasOwnProperty('account')
output.raw = data
console.log(masto ? 'MAMMAL' : 'OLD SHIT')
console.log(data)
if (masto) {
output.favorited = data.favourited
output.fave_num = data.favourites_count
@ -172,6 +170,37 @@ export const parseStatus = (data) => {
return output
}
export const parseNotification = (data) => {
const mastoDict = {
'favourite': 'like',
'reblog': 'repeat'
}
const masto = !data.hasOwnProperty('ntype')
const output = {}
if (masto) {
output.type = mastoDict[data.type] || data.type
output.seen = null // missing
output.status = parseStatus(data.status)
output.action = null // missing
output.from_profile = parseUser(data.account)
} else {
const parsedNotice = parseStatus(data.notice)
output.type = data.ntype
output.seen = data.is_seen
output.status = output.type === 'like'
? parseStatus(data.notice.favorited_status)
: parsedNotice
output.action = parsedNotice
output.from_profile = parseUser(data.from_profile)
}
output.created_at = new Date(data.created_at)
output.id = data.id
return output
}
const isNsfw = (status) => {
const nsfwRegex = /#nsfw/i
return (status.tags || []).includes('nsfw') || !!status.text.match(nsfwRegex)