hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'pleroma/develop' into birthdays

Browse source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2022-08-05 11:53:44 +02:00
commit 6649baaac9
316 changed files with 12331 additions and 6859 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/services/entity_normalizer/entity_normalizer.service.js
View file

@ -39,11 +39,12 @@ const qvitterStatusType = (status) => {
export const parseUser = (data) => {
const output = {}
const masto = data.hasOwnProperty('acct')
const masto = Object.prototype.hasOwnProperty.call(data, 'acct')
// case for users in "mentions" property for statuses in MastoAPI
const mastoShort = masto && !data.hasOwnProperty('avatar')
const mastoShort = masto && !Object.prototype.hasOwnProperty.call(data, 'avatar')
output.id = String(data.id)
output._original = data // used for server-side settings
if (masto) {
output.screen_name = data.acct
@ -227,7 +228,7 @@ export const parseUser = (data) => {
export const parseAttachment = (data) => {
const output = {}
const masto = !data.hasOwnProperty('oembed')
const masto = !Object.prototype.hasOwnProperty.call(data, 'oembed')
if (masto) {
// Not exactly same...
@ -248,7 +249,7 @@ export const parseAttachment = (data) => {
export const parseStatus = (data) => {
const output = {}
const masto = data.hasOwnProperty('account')
const masto = Object.prototype.hasOwnProperty.call(data, 'account')
if (masto) {
output.favorited = data.favourited
@ -373,10 +374,10 @@ export const parseStatus = (data) => {
export const parseNotification = (data) => {
const mastoDict = {
'favourite': 'like',
'reblog': 'repeat'
favourite: 'like',
reblog: 'repeat'
}
const masto = !data.hasOwnProperty('ntype')
const masto = !Object.prototype.hasOwnProperty.call(data, 'ntype')
const output = {}
if (masto) {