From 9ebd7a78acf4db3b2db5b02ccf26cea467dabd65 Mon Sep 17 00:00:00 2001 From: Pleroma Renovate Bot Date: Tue, 4 Feb 2025 09:04:28 +0000 Subject: [PATCH 01/13] Update dependency semver to v7.7.1 --- package.json | 2 +- yarn.lock | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8cb74ce40..4ccba4df7 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "sass": "1.83.4", "sass-loader": "13.3.3", "selenium-server": "3.141.59", - "semver": "7.7.0", + "semver": "7.7.1", "serviceworker-webpack5-plugin": "2.0.0", "shelljs": "0.8.5", "sinon": "15.2.0", diff --git a/yarn.lock b/yarn.lock index 7eb991e0f..a469cd35c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7476,16 +7476,21 @@ semver@7.3.5: dependencies: lru-cache "^6.0.0" -semver@7.7.0, semver@^7.0.0, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.3: - version "7.7.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.0.tgz#9c6fe61d0c6f9fa9e26575162ee5a9180361b09c" - integrity sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ== +semver@7.7.1: + version "7.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f" + integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA== semver@^6.3.0, semver@^6.3.1: version "6.3.1" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== +semver@^7.0.0, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.3: + version "7.7.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.0.tgz#9c6fe61d0c6f9fa9e26575162ee5a9180361b09c" + integrity sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ== + send@0.19.0: version "0.19.0" resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8" From e0b99405356dfb2cab1e4a4410de1bc0f2a8a023 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 5 Feb 2025 08:47:41 +0200 Subject: [PATCH 02/13] remove stuff --- src/services/style_setter/style_setter.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index 7f071a1fc..63fb0a138 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -2,11 +2,8 @@ import { init, getEngineChecksum } from '../theme_data/theme_data_3.service.js' import { getCssRules } from '../theme_data/css_utils.js' import { defaultState } from 'src/modules/default_config_state.js' import { chunk } from 'lodash' -import pako from 'pako' import localforage from 'localforage' -console.log('CONFIG', defaultState) - // On platforms where this is not supported, it will return undefined // Otherwise it will return an array const supportsAdoptedStyleSheets = !!document.adoptedStyleSheets @@ -208,7 +205,6 @@ const extractStyleConfig = ({ return result } -console.log(defaultState) const defaultStyleConfig = extractStyleConfig(defaultState) export const applyConfig = (input) => { From 7aee12bcd4a70cc51a0fd50228883fa76298cd50 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 5 Feb 2025 10:27:47 +0200 Subject: [PATCH 03/13] fix openEditStatusStore --- src/components/status_action_buttons/buttons_definitions.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/status_action_buttons/buttons_definitions.js b/src/components/status_action_buttons/buttons_definitions.js index 64a95ab85..b9dc522c4 100644 --- a/src/components/status_action_buttons/buttons_definitions.js +++ b/src/components/status_action_buttons/buttons_definitions.js @@ -1,3 +1,4 @@ +import { useEditStatusStore } from 'src/stores/editStatus.js' const PRIVATE_SCOPES = new Set(['private', 'direct']) const PUBLIC_SCOPES = new Set(['public', 'unlisted']) export const BUTTONS = [{ @@ -151,7 +152,7 @@ export const BUTTONS = [{ }, action ({ dispatch, status }) { return dispatch('fetchStatusSource', { id: status.id }) - .then(data => dispatch('openEditStatusModal', { + .then(data => useEditStatusStore().openEditStatusModal({ statusId: status.id, subject: data.spoiler_text, statusText: data.text, From 471df530b1faa3f77a64ee3f1522fa3e409e51ad Mon Sep 17 00:00:00 2001 From: Pleroma Renovate Bot Date: Wed, 5 Feb 2025 09:04:20 +0000 Subject: [PATCH 04/13] Update dependency chromedriver to v133 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4a3ad2a59..789c256b1 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "babel-plugin-lodash": "3.3.4", "chai": "4.5.0", "chalk": "5.4.1", - "chromedriver": "132.0.2", + "chromedriver": "133.0.0", "connect-history-api-fallback": "2.0.0", "copy-webpack-plugin": "12.0.2", "cross-spawn": "7.0.6", diff --git a/yarn.lock b/yarn.lock index fc5439d8a..a9f7a64c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2474,10 +2474,10 @@ chrome-trace-event@^1.0.2: resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz#05bffd7ff928465093314708c93bdfa9bd1f0f5b" integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ== -chromedriver@132.0.2: - version "132.0.2" - resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-132.0.2.tgz#9bba1d82b14346769a37d708846da7c2d3110fcd" - integrity sha512-aywIWYggkAwdFN5zkyYHXUyUBJt2hFMweS3XU0XINIdfOG386z+sqAlExB4P1A10cSz+SO5gxcCgxd8UJNBvgg== +chromedriver@133.0.0: + version "133.0.0" + resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-133.0.0.tgz#56dedd23974f986ef5fb1ec3402d2d5b845e35dc" + integrity sha512-7arRrtD9WGSlemMLE4IOoD42OSKKyOtQP/Z0x/WB5jYSaCzcI95j67EK0wQ2w1y5IjSJnYvnmXOJM6Nla4OG2w== dependencies: "@testim/chrome-version" "^1.1.4" axios "^1.7.4" From bb882afc76e71a7c3d2008147946002af2fcbc71 Mon Sep 17 00:00:00 2001 From: Pleroma Renovate Bot Date: Thu, 6 Feb 2025 09:04:31 +0000 Subject: [PATCH 05/13] Update dependency sass to v1.84.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4a3ad2a59..14911df05 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "postcss-html": "^1.5.0", "postcss-loader": "7.3.4", "postcss-scss": "^4.0.6", - "sass": "1.83.4", + "sass": "1.84.0", "sass-loader": "13.3.3", "selenium-server": "3.141.59", "semver": "7.7.0", diff --git a/yarn.lock b/yarn.lock index fc5439d8a..b24b108e0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7472,10 +7472,10 @@ sass-loader@13.3.3: dependencies: neo-async "^2.6.2" -sass@1.83.4: - version "1.83.4" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.83.4.tgz#5ccf60f43eb61eeec300b780b8dcb85f16eec6d1" - integrity sha512-B1bozCeNQiOgDcLd33e2Cs2U60wZwjUUXzh900ZyQF5qUasvMdDZYbQ566LJu7cqR+sAHlAfO6RMkaID5s6qpA== +sass@1.84.0: + version "1.84.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.84.0.tgz#da9154cbccb2d2eac7a9486091b6d9ba93ef5bad" + integrity sha512-XDAbhEPJRxi7H0SxrnOpiXFQoUJHwkR2u3Zc4el+fK/Tt5Hpzw5kkQ59qVDfvdaUq6gCrEZIbySFBM2T9DNKHg== dependencies: chokidar "^4.0.0" immutable "^5.0.2" From 3eff84502890132f14eb0747e327a714be3841e0 Mon Sep 17 00:00:00 2001 From: Pleroma Renovate Bot Date: Thu, 6 Feb 2025 09:04:43 +0000 Subject: [PATCH 06/13] Update dependency eslint-plugin-promise to v7 --- package.json | 2 +- yarn.lock | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4a3ad2a59..fe46b3a5b 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "eslint-formatter-friendly": "7.0.0", "eslint-plugin-import": "2.31.0", "eslint-plugin-n": "15.7.0", - "eslint-plugin-promise": "6.6.0", + "eslint-plugin-promise": "7.2.1", "eslint-plugin-vue": "9.32.0", "eslint-webpack-plugin": "4.2.0", "eventsource-polyfill": "0.9.6", diff --git a/yarn.lock b/yarn.lock index fc5439d8a..084a1ac49 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3629,10 +3629,12 @@ eslint-plugin-n@15.7.0: resolve "^1.22.1" semver "^7.3.8" -eslint-plugin-promise@6.6.0: - version "6.6.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-6.6.0.tgz#acd3fd7d55cead7a10f92cf698f36c0aafcd717a" - integrity sha512-57Zzfw8G6+Gq7axm2Pdo3gW/Rx3h9Yywgn61uE/3elTCOePEHVrn2i5CdfBwA1BLK0Q0WqctICIUSqXZW/VprQ== +eslint-plugin-promise@7.2.1: + version "7.2.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-7.2.1.tgz#a0652195700aea40b926dc3c74b38e373377bfb0" + integrity sha512-SWKjd+EuvWkYaS+uN2csvj0KoP43YTu7+phKQ5v+xw6+A0gutVX2yqCeCkC3uLCJFiPfR2dD8Es5L7yUsmvEaA== + dependencies: + "@eslint-community/eslint-utils" "^4.4.0" eslint-plugin-vue@9.32.0: version "9.32.0" From 24f8255d2dd5722b7e2336f72265e77ce4a7cef2 Mon Sep 17 00:00:00 2001 From: Pleroma Renovate Bot Date: Fri, 7 Feb 2025 09:04:50 +0000 Subject: [PATCH 07/13] Update dependency iso-639-1 to v3 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4a3ad2a59..b5aae77ad 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "function-bind": "1.1.2", "html-webpack-plugin": "5.6.3", "http-proxy-middleware": "2.0.7", - "iso-639-1": "2.1.15", + "iso-639-1": "3.1.5", "json-loader": "0.5.7", "karma": "6.4.4", "karma-coverage": "2.2.1", diff --git a/yarn.lock b/yarn.lock index fc5439d8a..50675fd49 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5015,10 +5015,10 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -iso-639-1@2.1.15: - version "2.1.15" - resolved "https://registry.yarnpkg.com/iso-639-1/-/iso-639-1-2.1.15.tgz#20cf78a4f691aeb802c16f17a6bad7d99271e85d" - integrity sha512-7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg== +iso-639-1@3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/iso-639-1/-/iso-639-1-3.1.5.tgz#e8205aceeeea0f64d6b12f5fac6a943b0d5b452c" + integrity sha512-gXkz5+KN7HrG0Q5UGqSMO2qB9AsbEeyLP54kF1YrMsIxmu+g4BdB7rflReZTSTZGpfj8wywu6pfPBCylPIzGQA== isobject@^3.0.1: version "3.0.1" From 6279edc1354e5032732fe893097a7cbfb1bb05c3 Mon Sep 17 00:00:00 2001 From: Pleroma Renovate Bot Date: Sat, 8 Feb 2025 08:52:12 +0000 Subject: [PATCH 08/13] Update dependency eslint to v9.20.0 --- package.json | 2 +- yarn.lock | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 4a3ad2a59..c9dda2922 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "css-loader": "7.1.2", "css-minimizer-webpack-plugin": "7.0.0", "custom-event-polyfill": "1.0.7", - "eslint": "9.19.0", + "eslint": "9.20.0", "eslint-config-standard": "17.1.0", "eslint-formatter-friendly": "7.0.0", "eslint-plugin-import": "2.31.0", diff --git a/yarn.lock b/yarn.lock index fc5439d8a..f9c8c7d6a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -882,6 +882,13 @@ dependencies: "@types/json-schema" "^7.0.15" +"@eslint/core@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.11.0.tgz#7a9226e850922e42cbd2ba71361eacbe74352a12" + integrity sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA== + dependencies: + "@types/json-schema" "^7.0.15" + "@eslint/eslintrc@^3.2.0": version "3.2.0" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.2.0.tgz#57470ac4e2e283a6bf76044d63281196e370542c" @@ -897,10 +904,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@9.19.0": - version "9.19.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.19.0.tgz#51dbb140ed6b49d05adc0b171c41e1a8713b7789" - integrity sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ== +"@eslint/js@9.20.0": + version "9.20.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.20.0.tgz#7421bcbe74889fcd65d1be59f00130c289856eb4" + integrity sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ== "@eslint/object-schema@^2.1.6": version "2.1.6" @@ -3717,17 +3724,17 @@ eslint-webpack-plugin@4.2.0: normalize-path "^3.0.0" schema-utils "^4.2.0" -eslint@9.19.0: - version "9.19.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.19.0.tgz#ffa1d265fc4205e0f8464330d35f09e1d548b1bf" - integrity sha512-ug92j0LepKlbbEv6hD911THhoRHmbdXt2gX+VDABAW/Ir7D3nqKdv5Pf5vtlyY6HQMTEP2skXY43ueqTCWssEA== +eslint@9.20.0: + version "9.20.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.20.0.tgz#6244c46c1640cd5e577a31ebc460fca87838c0b7" + integrity sha512-aL4F8167Hg4IvsW89ejnpTwx+B/UQRzJPGgbIOl+4XqffWsahVVsLEWoZvnrVuwpWmnRd7XeXmQI1zlKcFDteA== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.12.1" "@eslint/config-array" "^0.19.0" - "@eslint/core" "^0.10.0" + "@eslint/core" "^0.11.0" "@eslint/eslintrc" "^3.2.0" - "@eslint/js" "9.19.0" + "@eslint/js" "9.20.0" "@eslint/plugin-kit" "^0.2.5" "@humanfs/node" "^0.16.6" "@humanwhocodes/module-importer" "^1.0.1" From 2af00f7c7eca18764a46161770dfdd300602e65e Mon Sep 17 00:00:00 2001 From: Sean King Date: Sat, 8 Feb 2025 19:26:29 -0700 Subject: [PATCH 09/13] Move humanizeErrors to errors service file --- changelog.d/move-humanize-errors.skip | 0 src/modules/errors.js | 11 ----------- src/services/errors/errors.js | 12 +++++++++++- 3 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 changelog.d/move-humanize-errors.skip delete mode 100644 src/modules/errors.js diff --git a/changelog.d/move-humanize-errors.skip b/changelog.d/move-humanize-errors.skip new file mode 100644 index 000000000..e69de29bb diff --git a/src/modules/errors.js b/src/modules/errors.js deleted file mode 100644 index d2e241008..000000000 --- a/src/modules/errors.js +++ /dev/null @@ -1,11 +0,0 @@ -import { capitalize } from 'lodash' - -export function humanizeErrors (errors) { - return Object.entries(errors).reduce((errs, [k, val]) => { - const message = val.reduce((acc, message) => { - const key = capitalize(k.replace(/_/g, ' ')) - return acc + [key, message].join(' ') + '. ' - }, '') - return [...errs, message] - }, []) -} diff --git a/src/services/errors/errors.js b/src/services/errors/errors.js index 26a272019..f0cc6dad7 100644 --- a/src/services/errors/errors.js +++ b/src/services/errors/errors.js @@ -1,4 +1,14 @@ -import { humanizeErrors } from '../../modules/errors' +import { capitalize } from 'lodash' + +function humanizeErrors (errors) { + return Object.entries(errors).reduce((errs, [k, val]) => { + const message = val.reduce((acc, message) => { + const key = capitalize(k.replace(/_/g, ' ')) + return acc + [key, message].join(' ') + '. ' + }, '') + return [...errs, message] + }, []) +} export function StatusCodeError (statusCode, body, options, response) { this.name = 'StatusCodeError' From f8fa540af794e7640c6583e9f91bbc8aaddd736f Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 10 Feb 2025 23:02:34 +0200 Subject: [PATCH 10/13] Revert "store cache eagerly" This reverts commit 21af30f71b9500781679c164a3b3b3b751928d34. --- src/services/style_setter/style_setter.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index 63fb0a138..f04c9d10e 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -137,7 +137,6 @@ export const applyTheme = ( } } - let cache const { lazyProcessFunc } = generateTheme( input, { @@ -150,13 +149,16 @@ export const applyTheme = ( }, onEagerFinished () { adoptStyleSheets([eagerStyles]) - cache = { engineChecksum: getEngineChecksum(), data: [eagerStyles.rules, lazyStyles.rules] } - localforage.setItem('pleromafe-theme-cache', cache) onEagerFinish() }, onLazyFinished () { adoptStyleSheets([eagerStyles, lazyStyles]) + const cache = { engineChecksum: getEngineChecksum(), data: [eagerStyles.rules, lazyStyles.rules] } onFinish(cache) + const compress = (js) => { + return pako.deflate(JSON.stringify(js)) + } + localforage.setItem('pleromafe-theme-cache', compress(cache)) } }, debug From 2e78975e4c332f43a37e104d94efe114b92c62b5 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 10 Feb 2025 23:10:04 +0200 Subject: [PATCH 11/13] post-revert fix + logging --- src/services/style_setter/style_setter.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index f04c9d10e..5eb810884 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -150,15 +150,14 @@ export const applyTheme = ( onEagerFinished () { adoptStyleSheets([eagerStyles]) onEagerFinish() + console.info('Eager part of theme finished, waiting for lazy part to finish to store cache') }, onLazyFinished () { adoptStyleSheets([eagerStyles, lazyStyles]) const cache = { engineChecksum: getEngineChecksum(), data: [eagerStyles.rules, lazyStyles.rules] } onFinish(cache) - const compress = (js) => { - return pako.deflate(JSON.stringify(js)) - } - localforage.setItem('pleromafe-theme-cache', compress(cache)) + localforage.setItem('pleromafe-theme-cache', cache) + console.info('Theme cache stored') } }, debug From da73226cb133bce3dde772fbd721f7be450638ec Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 10 Feb 2025 23:15:39 +0200 Subject: [PATCH 12/13] rename + fix --- .../mobile_post_status_button/mobile_post_status_button.js | 2 +- src/components/post_status_modal/post_status_modal.js | 2 +- src/components/user_card/user_card.js | 2 +- src/stores/{postStatus.js => post_status.js} | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) rename src/stores/{postStatus.js => post_status.js} (85%) diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.js b/src/components/mobile_post_status_button/mobile_post_status_button.js index ab4d761f4..031013559 100644 --- a/src/components/mobile_post_status_button/mobile_post_status_button.js +++ b/src/components/mobile_post_status_button/mobile_post_status_button.js @@ -3,7 +3,7 @@ import { library } from '@fortawesome/fontawesome-svg-core' import { faPen } from '@fortawesome/free-solid-svg-icons' -import { usePostStatusStore } from 'src/stores/postStatus' +import { usePostStatusStore } from 'src/stores/post_status' library.add( faPen diff --git a/src/components/post_status_modal/post_status_modal.js b/src/components/post_status_modal/post_status_modal.js index 5e7c1f515..ee6cd6444 100644 --- a/src/components/post_status_modal/post_status_modal.js +++ b/src/components/post_status_modal/post_status_modal.js @@ -1,7 +1,7 @@ import PostStatusForm from '../post_status_form/post_status_form.vue' import Modal from '../modal/modal.vue' import get from 'lodash/get' -import { usePostStatusStore } from 'src/stores/postStatus' +import { usePostStatusStore } from 'src/stores/post_status' const PostStatusModal = { components: { diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index c2ddf5d80..be81b8ad5 100644 --- a/src/components/user_card/user_card.js +++ b/src/components/user_card/user_card.js @@ -11,7 +11,7 @@ import RichContent from 'src/components/rich_content/rich_content.jsx' import MuteConfirm from '../confirm_modal/mute_confirm.vue' import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' import { mapGetters } from 'vuex' -import { usePostStatusStore } from 'src/stores/postStatus' +import { usePostStatusStore } from 'src/stores/post_status' import { library } from '@fortawesome/fontawesome-svg-core' import { faBell, diff --git a/src/stores/postStatus.js b/src/stores/post_status.js similarity index 85% rename from src/stores/postStatus.js rename to src/stores/post_status.js index b9fe96d3c..a19b0dbdd 100644 --- a/src/stores/postStatus.js +++ b/src/stores/post_status.js @@ -12,6 +12,9 @@ export const usePostStatusStore = defineStore('postStatus', { }, closePostStatusModal () { this.modalActivated = false + }, + resetPostStatusModal () { + this.params = null } } }) From 3627aadeadb5a154fe21fc6e453ba31caa5bff0d Mon Sep 17 00:00:00 2001 From: Pleroma User <66706-pleromian@users.noreply.git.pleroma.social> Date: Mon, 10 Feb 2025 21:20:56 +0000 Subject: [PATCH 13/13] Fix few markup inconsistencies --- changelog.d/markup-panels.fix | 1 + src/boot/after_store.js | 1 + src/components/chat_list/chat_list.vue | 4 +- src/components/drafts/drafts.vue | 18 +- .../features_panel/features_panel.vue | 4 +- .../mrf_transparency_panel.vue | 2 +- src/components/registration/registration.js | 5 +- src/components/registration/registration.vue | 624 +++++++++--------- src/components/staff_panel/staff_panel.vue | 5 +- .../terms_of_service_panel.js | 3 + .../terms_of_service_panel.vue | 13 +- src/components/user_card/user_card.vue | 5 +- src/i18n/en.json | 3 +- src/modules/instance.js | 1 + 14 files changed, 365 insertions(+), 324 deletions(-) create mode 100644 changelog.d/markup-panels.fix diff --git a/changelog.d/markup-panels.fix b/changelog.d/markup-panels.fix new file mode 100644 index 000000000..48ea10a0c --- /dev/null +++ b/changelog.d/markup-panels.fix @@ -0,0 +1 @@ +Fix few markup panel inconsistencies; better ToS and registration diff --git a/src/boot/after_store.js b/src/boot/after_store.js index dbbbdb2e4..ada812739 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -129,6 +129,7 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => { copyInstanceOption('theme') copyInstanceOption('style') copyInstanceOption('palette') + copyInstanceOption('embeddedToS') copyInstanceOption('nsfwCensorImage') copyInstanceOption('background') copyInstanceOption('hidePostStats') diff --git a/src/components/chat_list/chat_list.vue b/src/components/chat_list/chat_list.vue index 24bbc9f4a..881df2988 100644 --- a/src/components/chat_list/chat_list.vue +++ b/src/components/chat_list/chat_list.vue @@ -34,7 +34,7 @@
{{ $t('chats.empty_chat_list_placeholder') }}
@@ -50,7 +50,7 @@ margin-bottom: 0; } -.emtpy-chat-list-alert { +.empty-chat-list-alert { padding: 3em; font-size: 1.2em; display: flex; diff --git a/src/components/drafts/drafts.vue b/src/components/drafts/drafts.vue index 9c9b3d584..1cce255da 100644 --- a/src/components/drafts/drafts.vue +++ b/src/components/drafts/drafts.vue @@ -1,15 +1,18 @@