Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into feat/report-notification

2022-03-20 09:53:57 +01:00 · 2022-03-20 09:53:57 +01:00 · d0bfd9a808
commit d0bfd9a808
parent f9393b0dab 6f1d953642
57 changed files with 3745 additions and 1467 deletions
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@ -44,6 +44,7 @@ export const parseUser = (data) => {
  const mastoShort = masto && !data.hasOwnProperty('avatar')

  output.id = String(data.id)
+  output._original = data // used for server-side settings

  if (masto) {
    output.screen_name = data.acct