Fix merge conflicts

1 files changed, 7 insertions, 7 deletions

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 2a186ba1..c00e9796 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -39,9 +39,9 @@ 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
@@ -225,7 +225,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...
@@ -256,7 +256,7 @@ export const parseSource = (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
@@ -387,10 +387,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) {