diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-03-20 20:31:20 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2023-03-20 20:31:20 +0000 |
| commit | fa532b1f005220743d036b7d103c47a043be7ae4 (patch) | |
| tree | 09d5e4d409f7298a328e3feaac6a062e9082df4d /src/services | |
| parent | 19618db1929f1aea6183de3102581844298d1d39 (diff) | |
| parent | 493120b5456282756d05d9afaf66b11a2f87d8fc (diff) | |
Merge branch 'pleroma-akkoma-emoji-port' into 'develop'
Custom emoji reaction support
See merge request pleroma/pleroma-fe!1792
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) |