diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-23 14:17:47 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-23 14:17:47 +0000 |
| commit | f86a5dc80421f496a893efaa98f12f831da0adcb (patch) | |
| tree | 99dad3fd66344c97e5ab73b912470566ca9cf5af | |
| parent | e9b58f1af7d3f67b57757855422617125f348ebe (diff) | |
| parent | d70928792d34b6da6ef3af3db2d9da7a269c5435 (diff) | |
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
| -rw-r--r-- | src/services/entity_normalizer/entity_normalizer.service.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index e831963a..57a6adf9 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -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) } |