diff options
| author | Henry Jameson <me@hjkos.com> | 2023-03-20 22:48:38 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2023-03-20 22:48:38 +0200 |
| commit | 819cd41cf0c4b2140470bba2a36eb15ed811c5b7 (patch) | |
| tree | 0608e5f10fa4028391e1100729e5fade4d3ba08c /src/services | |
| parent | 332ad77e3579d2b512ba236b3f2c94ad8875864d (diff) | |
| parent | fa532b1f005220743d036b7d103c47a043be7ae4 (diff) | |
Merge remote-tracking branch 'origin/develop' into improve_settings_reusability
* origin/develop:
Translated using Weblate (Chinese (Simplified))
Generalize IntegerSetting into NumberSetting, add Integer/Float wrappers
Allow custom emoji reactions: add option to scale reaction buttons
Fix user-profile route crash on pinned favorites route
Hide custom emoji in reaction picker when BE does not advertise pleroma_custom_emoji_reactions
Allow custom emoji reactions
Diffstat (limited to 'src/services')
| -rw-r--r-- | src/services/entity_normalizer/entity_normalizer.service.js | 1 | ||||
| -rw-r--r-- | src/services/style_setter/style_setter.js | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 53c3108c..adefc5a5 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -441,6 +441,7 @@ export const parseNotification = (data) => { : parseUser(data.target) output.from_profile = parseUser(data.account) output.emoji = data.emoji + output.emoji_url = data.emoji_url if (data.report) { output.report = data.report output.report.content = data.report.content diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index d6e973a1..43fe3c73 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -21,8 +21,8 @@ export const applyTheme = (input) => { body.classList.remove('hidden') } -const configColumns = ({ sidebarColumnWidth, contentColumnWidth, notifsColumnWidth }) => - ({ sidebarColumnWidth, contentColumnWidth, notifsColumnWidth }) +const configColumns = ({ sidebarColumnWidth, contentColumnWidth, notifsColumnWidth, emojiReactionsScale }) => + ({ sidebarColumnWidth, contentColumnWidth, notifsColumnWidth, emojiReactionsScale }) const defaultConfigColumns = configColumns(defaultState) |