Merge branch 'issue-448-status-text-null' into 'develop'

#448 - fix timeline fetch error when status text is null

Closes #448

See merge request pleroma/pleroma-fe!700
This commit is contained in:
Shpuld Shpludson 2019-03-23 14:17:47 +00:00
commit f86a5dc804

View file

@ -293,5 +293,5 @@ export const parseNotification = (data) => {
const isNsfw = (status) => {
const nsfwRegex = /#nsfw/i
return (status.tags || []).includes('nsfw') || !!status.text.match(nsfwRegex)
return (status.tags || []).includes('nsfw') || !!(status.text || '').match(nsfwRegex)
}