Merge branch 'develop' into feat/report-notification

src/services/entity_normalizer/entity_normalizer.service.js

@@ -188,7 +188,12 @@ export const parseUser = (data) => {
     output.follow_request_count = data.pleroma.follow_request_count
 
     output.tags = data.pleroma.tags
-    output.deactivated = data.pleroma.deactivated
+
+    // deactivated was changed to is_active in Pleroma 2.3.0
+    // so check if is_active is present
+    output.deactivated = typeof data.pleroma.is_active !== 'undefined'
+      ? !data.pleroma.is_active // new backend
+      : data.pleroma.deactivated // old backend
 
     output.notification_settings = data.pleroma.notification_settings
     output.unread_chat_count = data.pleroma.unread_chat_count

src/services/locale/locale.service.js

@@ -0,0 +1,12 @@
+const specialLanguageCodes = {
+  'ja_easy': 'ja',
+  'zh_Hant': 'zh-HANT'
+}
+
+const internalToBrowserLocale = code => specialLanguageCodes[code] || code
+
+const localeService = {
+  internalToBrowserLocale
+}
+
+export default localeService

src/services/style_setter/style_setter.js

@@ -242,9 +242,18 @@ export const generateShadows = (input, colors) => {
     panelHeader: 'panel',
     input: 'input'
   }
-  const inputShadows = input.shadows && !input.themeEngineVersion
-    ? shadows2to3(input.shadows, input.opacity)
-    : input.shadows || {}
+
+  const cleanInputShadows = Object.fromEntries(
+    Object.entries(input.shadows)
+      .map(([name, shadowSlot]) => [
+        name,
+        // defaulting color to black to avoid potential problems
+        shadowSlot.map(shadowDef => ({ color: '#000000', ...shadowDef }))
+      ])
+  )
+  const inputShadows = cleanInputShadows && !input.themeEngineVersion
+    ? shadows2to3(cleanInputShadows, input.opacity)
+    : cleanInputShadows || {}
   const shadows = Object.entries({
     ...DEFAULT_SHADOWS,
     ...inputShadows