diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..3de57a360 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,12 @@ +node_modules/ +dist/ +logs/ +.DS_Store +.git/ +config/local.json +pleroma-backend/ +test/e2e/reports/ +test/e2e-playwright/test-results/ +test/e2e-playwright/playwright-report/ +__screenshots__/ + diff --git a/.forgejo/issue_template/bug.yaml b/.forgejo/issue_template/bug.yaml new file mode 100644 index 000000000..082ee496e --- /dev/null +++ b/.forgejo/issue_template/bug.yaml @@ -0,0 +1,87 @@ +name: 'Bug report' +about: 'Bug report for Pleroma FE' +labels: + - Bug +body: +- type: input + id: env-browser + attributes: + label: Browser and OS + description: What browser are you using, including version, and what OS are you running? + placeholder: Firefox 140, Arch Linux + validations: + required: true +- type: input + id: env-instance + attributes: + label: Instance URL + validations: + required: false +- type: input + id: env-backend + attributes: + label: Backend version information + description: Backend version being used. (See Settings->Show advanced->Developer) + placeholder: Pleroma BE 2.10 + validations: + required: true +- type: input + id: env-frontend + attributes: + label: Frontend version information + description: Frontend version being used. (See Settings->Show advanced->Developer) + placeholder: Pleroma FE 2.10 + validations: + required: true +- type: input + id: env-extensions + attributes: + label: Browser extensions + description: List of browser extensions you are using, like uBlock, rikaichamp etc. If none leave empty. + validations: + required: false +- type: input + id: env-modifications + attributes: + label: Known instance/user customizations + description: Whether you are using a Pleroma FE fork, any mods mods or instance level styles among others. + validations: + required: false +- type: textarea + id: bug-text + attributes: + label: Bug description + description: A short description of the bug. Images can be helpful. + validations: + required: true +- type: textarea + id: bug-reproducer + attributes: + label: Reproduction steps + description: Ordered list of reproduction steps needed to make the bug happen. If you don't have reproduction steps, leave this empty. + placeholder: | + 1. Log in with a fresh browser session + 2. Open timeline X + 3. Click on button Y + 4. Z broke + validations: + required: false +- type: textarea + id: bug-seriousness + attributes: + label: Bug seriousness + value: | + * How annoying it is: + * How often does it happen: + * How many people does it affect: + * Is there a workaround for it: +- type: checkboxes + id: duplicate-issues + attributes: + label: Duplicate issues + hide_label: true + description: Before submitting this issue, search for same or similar issues on the [Pleroma FE bug tracker](https://git.pleroma.social/pleroma/pleroma-fe/issues). + options: + - label: I've searched for same or similar issues before submitting this issue. + required: true + visible: [form] diff --git a/.forgejo/issue_template/suggestion.yaml b/.forgejo/issue_template/suggestion.yaml new file mode 100644 index 000000000..c1531d8e3 --- /dev/null +++ b/.forgejo/issue_template/suggestion.yaml @@ -0,0 +1,22 @@ +name: 'Feature request / Suggestion / Improvement' +about: 'Feature requests, suggestions and improvements for Pleroma FE' +labels: + - Feature Request / Enhancement +body: +- type: textarea + id: issue-text + attributes: + label: Proposal + placeholder: Make groups happen! + validations: + required: true +- type: checkboxes + id: duplicate-issues + attributes: + label: Duplicate issues + hide_label: true + description: Before submitting this issue, search for same or similar requests on the [Pleroma FE bug tracker](https://git.pleroma.social/pleroma/pleroma-fe/issues). + options: + - label: I've searched for same or similar requests before submitting this issue. + required: true + visible: [form] diff --git a/.forgejo/pull_request_template.md b/.forgejo/pull_request_template.md new file mode 100644 index 000000000..d2d7689bd --- /dev/null +++ b/.forgejo/pull_request_template.md @@ -0,0 +1,12 @@ +### Checklist +- [ ] Adding a changelog: In the `changelog.d` directory, create a file named `.`. + + diff --git a/.gitignore b/.gitignore index 01ffda9a8..c4a96ee1e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,11 @@ dist/ npm-debug.log test/unit/coverage test/e2e/reports +test/e2e-playwright/test-results +test/e2e-playwright/playwright-report selenium-debug.log .idea/ +.gitlab-ci-local/ config/local.json src/assets/emoji.json logs/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99c85dd36..247218091 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # This file is a template, and might need editing before it works on your project. # Official framework image. Look for the different tagged releases at: # https://hub.docker.com/r/library/node/tags/ -image: node:18 +image: node:20 stages: - check-changelog @@ -34,12 +34,23 @@ check-changelog: - apk add git - sh ./tools/check-changelog -lint: +lint-eslint: stage: lint script: - yarn - - yarn lint - - yarn stylelint + - yarn ci-eslint + +lint-biome: + stage: lint + script: + - yarn + - yarn ci-biome + +lint-stylelint: + stage: lint + script: + - yarn + - yarn ci-stylelint test: stage: test @@ -60,6 +71,135 @@ test: - test/**/__screenshots__ when: on_failure +e2e-pleroma: + stage: test + image: mcr.microsoft.com/playwright:v1.57.0-jammy + services: + - name: postgres:15-alpine + alias: db + - name: $PLEROMA_IMAGE + alias: pleroma + entrypoint: ["/bin/ash", "-c"] + command: + - | + set -eu + + SEED_SENTINEL_PATH=/var/lib/pleroma/.e2e_seeded + CONFIG_OVERRIDE_PATH=/var/lib/pleroma/config.exs + + echo '-- Waiting for database...' + while ! pg_isready -U ${DB_USER:-pleroma} -d postgres://${DB_HOST:-db}:${DB_PORT:-5432}/${DB_NAME:-pleroma} -t 1; do + sleep 1s + done + + echo '-- Writing E2E config overrides...' + cat > $CONFIG_OVERRIDE_PATH </dev/null; then + kill -TERM $PLEROMA_PID + wait $PLEROMA_PID || true + fi + } + + trap cleanup INT TERM + + echo '-- Waiting for API...' + api_ok=false + for _i in $(seq 1 120); do + if wget -qO- http://127.0.0.1:4000/api/v1/instance >/dev/null 2>&1; then + api_ok=true + break + fi + sleep 1s + done + + if [ $api_ok != true ]; then + echo 'Timed out waiting for Pleroma API to become available' + exit 1 + fi + + if [ ! -f $SEED_SENTINEL_PATH ]; then + if [ -n ${E2E_ADMIN_USERNAME:-} ] && [ -n ${E2E_ADMIN_PASSWORD:-} ] && [ -n ${E2E_ADMIN_EMAIL:-} ]; then + echo '-- Seeding admin user' $E2E_ADMIN_USERNAME '...' + if ! /opt/pleroma/bin/pleroma_ctl user new $E2E_ADMIN_USERNAME $E2E_ADMIN_EMAIL --admin --password $E2E_ADMIN_PASSWORD -y; then + echo '-- User already exists or creation failed, ensuring admin + confirmed...' + /opt/pleroma/bin/pleroma_ctl user set $E2E_ADMIN_USERNAME --admin --confirmed + fi + else + echo '-- Skipping admin seeding (missing E2E_ADMIN_* env)' + fi + + touch $SEED_SENTINEL_PATH + fi + + wait $PLEROMA_PID + tags: + - amd64 + - himem + variables: + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1" + FF_NETWORK_PER_BUILD: "true" + PLEROMA_IMAGE: git.pleroma.social:5050/pleroma/pleroma:stable + POSTGRES_USER: pleroma + POSTGRES_PASSWORD: pleroma + POSTGRES_DB: pleroma + DB_USER: pleroma + DB_PASS: pleroma + DB_NAME: pleroma + DB_HOST: db + DB_PORT: 5432 + DOMAIN: localhost + INSTANCE_NAME: Pleroma E2E + E2E_ADMIN_USERNAME: admin + E2E_ADMIN_PASSWORD: adminadmin + E2E_ADMIN_EMAIL: admin@example.com + ADMIN_EMAIL: $E2E_ADMIN_EMAIL + NOTIFY_EMAIL: $E2E_ADMIN_EMAIL + VITE_PROXY_TARGET: http://pleroma:4000 + VITE_PROXY_ORIGIN: http://localhost:4000 + E2E_BASE_URL: http://localhost:8080 + script: + - npm install -g yarn@1.22.22 + - yarn --frozen-lockfile + - | + echo "-- Waiting for Pleroma API..." + api_ok="false" + for _i in $(seq 1 120); do + if wget -qO- http://pleroma:4000/api/v1/instance >/dev/null 2>&1; then + api_ok="true" + break + fi + sleep 1s + done + if [ "$api_ok" != "true" ]; then + echo "Timed out waiting for Pleroma API to become available" + exit 1 + fi + - yarn e2e:pw + artifacts: + when: on_failure + paths: + - test/e2e-playwright/test-results + - test/e2e-playwright/playwright-report + build: stage: build tags: diff --git a/.node-version b/.node-version index 08b7109d0..5bd681170 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -18.20.8 +20.19.0 diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml new file mode 100644 index 000000000..af0bb98e3 --- /dev/null +++ b/.woodpecker/build.yaml @@ -0,0 +1,43 @@ +when: + - event: pull_request + evaluate: 'CI_COMMIT_SOURCE_BRANCH != "weblate" && not(CI_COMMIT_SOURCE_BRANCH startsWith "renovate/")' + - event: push + branch: ${CI_REPO_DEFAULT_BRANCH} + - event: manual + branch: ${CI_REPO_DEFAULT_BRANCH} + +depends_on: + - test + - test-e2e + +labels: + platform: linux/amd64 + memory: 'high' + +steps: + build: + image: docker.io/node:20-alpine + commands: + - apk add --no-cache zip git + - yarn --frozen-lockfile + - yarn build + - if [ "${CI_PIPELINE_EVENT}" = "push" ] || [ "${CI_PIPELINE_EVENT}" = "manual" ]; then zip -9qr ${CI_REPO_DEFAULT_BRANCH}.zip dist/; fi + + upload-artifacts: + image: docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0 + when: + - event: push + branch: ${CI_REPO_DEFAULT_BRANCH} + - event: manual + branch: ${CI_REPO_DEFAULT_BRANCH} + settings: + user: + from_secret: pleroma-ci-user + password: + from_secret: pleroma-ci-password + update: true + owner: 'pleroma' + package_name: 'pleroma-fe-builds' + package_version: ${CI_REPO_DEFAULT_BRANCH} + file_source: ./${CI_REPO_DEFAULT_BRANCH}.zip + file_name: latest.zip diff --git a/.woodpecker/changelog.yaml b/.woodpecker/changelog.yaml new file mode 100644 index 000000000..b6c35afbb --- /dev/null +++ b/.woodpecker/changelog.yaml @@ -0,0 +1,10 @@ +when: + - event: pull_request + evaluate: 'CI_COMMIT_SOURCE_BRANCH != "weblate" && not(CI_COMMIT_SOURCE_BRANCH startsWith "renovate/")' + +steps: + check-changelog: + image: docker.io/alpine:3.23 + commands: + - apk add --no-cache git + - sh ./tools/check-changelog diff --git a/.woodpecker/lint.yaml b/.woodpecker/lint.yaml new file mode 100644 index 000000000..257887338 --- /dev/null +++ b/.woodpecker/lint.yaml @@ -0,0 +1,32 @@ +when: + - event: pull_request + evaluate: 'CI_COMMIT_SOURCE_BRANCH != "weblate" && not(CI_COMMIT_SOURCE_BRANCH startsWith "renovate/")' + - event: push + branch: ${CI_REPO_DEFAULT_BRANCH} + - event: manual + branch: ${CI_REPO_DEFAULT_BRANCH} + +steps: + install-depends: + image: &node-image + docker.io/node:20-alpine + commands: + - yarn --frozen-lockfile + + eslint: + image: *node-image + depends_on: install-depends + commands: + - yarn ci-eslint + + biome: + image: *node-image + depends_on: install-depends + commands: + - yarn ci-biome + + stylelint: + image: *node-image + depends_on: install-depends + commands: + - yarn ci-stylelint diff --git a/.woodpecker/test-e2e.yaml b/.woodpecker/test-e2e.yaml new file mode 100644 index 000000000..c0bf103cd --- /dev/null +++ b/.woodpecker/test-e2e.yaml @@ -0,0 +1,101 @@ +when: + - event: pull_request + evaluate: 'CI_COMMIT_SOURCE_BRANCH != "weblate" && not(CI_COMMIT_SOURCE_BRANCH startsWith "renovate/")' + - event: push + branch: ${CI_REPO_DEFAULT_BRANCH} + - event: manual + branch: ${CI_REPO_DEFAULT_BRANCH} + +labels: + platform: linux/amd64 + memory: 'high' + +variables: + artifacts_uploader_settings: &artifacts_uploader_settings + user: + from_secret: pleroma-ci-user + password: + from_secret: pleroma-ci-password + owner: 'pleroma' + package_name: 'pleroma-fe-test-artifacts' + script_file_entrypoint: &script_file_entrypoint + - /bin/sh + - -c + - 'printf "%s" "$CI_SCRIPT" | base64 -d > /tmp/ci-script.sh && /bin/sh -xe /tmp/ci-script.sh' + +steps: + test: + image: mcr.microsoft.com/playwright:v1.57.0-jammy + entrypoint: *script_file_entrypoint + environment: + APT_CACHE_DIR: apt-cache + DEBIAN_FRONTEND: noninteractive + E2E_BASE_URL: http://localhost:8080 + FF_NETWORK_PER_BUILD: "true" + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1" + VITE_PROXY_ORIGIN: "http://pleroma:4000" + VITE_PROXY_TARGET: "http://pleroma:4000" + commands: + - | + if [ "${CI_PIPELINE_EVENT}" != "pull_request" ]; then + mkdir -pv $APT_CACHE_DIR && apt-get -qq update + apt-get install -y zip + fi + - npm install -g yarn@1.22.22 + - yarn --frozen-lockfile + - | + echo "-- Waiting for Pleroma API..." + api_ok="false" + for _i in $(seq 1 120); do + if wget -qO- http://pleroma:4000/api/v1/instance >/dev/null 2>&1; then + api_ok="true" + break + fi + sleep 1s + done + if [ "$api_ok" != "true" ]; then + echo "Timed out waiting for Pleroma API to become available" + exit 1 + fi + - | + if ! yarn e2e:pw; then + [ "${CI_PIPELINE_EVENT}" = "pull_request" ] || zip -9qr ${CI_COMMIT_SHA:0:8}-e2e.zip ./test/e2e-playwright/test-results ./test/e2e-playwright/playwright-report + exit 1 + fi + + upload-artifacts: + image: docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0 + when: + - event: push + branch: ${CI_REPO_DEFAULT_BRANCH} + status: [failure] + - event: manual + branch: ${CI_REPO_DEFAULT_BRANCH} + status: [failure] + settings: + <<: *artifacts_uploader_settings + package_version: ${CI_REPO_DEFAULT_BRANCH}-${CI_COMMIT_SHA:0:8} + file_source: ./${CI_COMMIT_SHA:0:8}-e2e.zip + file_name: ${CI_COMMIT_SHA:0:8}-e2e.zip + +services: + postgres: + image: docker.io/postgres:13-alpine + environment: + POSTGRES_DB: pleroma_test + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + + pleroma: + image: git.pleroma.social/pleroma/pleroma:stable-e2e + environment: + ADMIN_EMAIL: "admin@example.com" + NOTIFY_EMAIL: "admin@example.com" + DB_USER: postgres + DB_PASS: postgres + DB_NAME: pleroma_test + DB_HOST: postgres + INSTANCE_NAME: Pleroma E2E + E2E_ADMIN_USERNAME: admin + E2E_ADMIN_PASSWORD: adminadmin + E2E_ADMIN_EMAIL: "admin@example.com" diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml new file mode 100644 index 000000000..acc48aacc --- /dev/null +++ b/.woodpecker/test.yaml @@ -0,0 +1,61 @@ +when: + - event: pull_request + evaluate: 'CI_COMMIT_SOURCE_BRANCH != "weblate" && not(CI_COMMIT_SOURCE_BRANCH startsWith "renovate/")' + - event: push + branch: ${CI_REPO_DEFAULT_BRANCH} + - event: manual + branch: ${CI_REPO_DEFAULT_BRANCH} + +labels: + platform: linux/amd64 + memory: 'high' + +variables: + artifacts_uploader_settings: &artifacts_uploader_settings + user: + from_secret: pleroma-ci-user + password: + from_secret: pleroma-ci-password + owner: 'pleroma' + package_name: 'pleroma-fe-test-artifacts' + script_file_entrypoint: &script_file_entrypoint + - /bin/sh + - -c + - 'printf "%s" "$CI_SCRIPT" | base64 -d > /tmp/ci-script.sh && /bin/sh -xe /tmp/ci-script.sh' + +steps: + test: + image: mcr.microsoft.com/playwright:v1.57.0-jammy + environment: + APT_CACHE_DIR: apt-cache + DEBIAN_FRONTEND: noninteractive + FF_NETWORK_PER_BUILD: "true" + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1" + entrypoint: *script_file_entrypoint + commands: + - | + if [ "${CI_PIPELINE_EVENT}" != "pull_request" ]; then + mkdir -pv $APT_CACHE_DIR && apt-get -qq update + apt-get -y install zip + fi + - yarn --frozen-lockfile + - | + if ! yarn unit-ci; then + [ "${CI_PIPELINE_EVENT}" = "pull_request" ] || zip -9qr ${CI_COMMIT_SHA:0:8}-screenshots.zip $(find . -type d -name __screenshots__) + exit 1 + fi + + upload-artifacts: + image: docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0 + when: + - event: push + branch: ${CI_REPO_DEFAULT_BRANCH} + status: [failure] + - event: manual + branch: ${CI_REPO_DEFAULT_BRANCH} + status: [failure] + settings: + <<: *artifacts_uploader_settings + package_version: ${CI_REPO_DEFAULT_BRANCH}-${CI_COMMIT_SHA:0:8} + file_source: ./${CI_COMMIT_SHA:0:8}-screenshots.zip + file_name: ${CI_COMMIT_SHA:0:8}-screenshots.zip diff --git a/CHANGELOG.md b/CHANGELOG.md index ded5c6e4d..1eb5a9cb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,40 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## 2.10.1 +### Fixed +- fixed being unable to set actor type from profile page +- fixed error when clicking mute menu itself (instead of submenu items) +- fixed mute -> domain status submenu not working + +### Internal +- Add playwright E2E-tests with an optional docker-based backend + +## 2.10.0 +### Changed +- Temporary changes modal now shows actual countdown instead of fixed timeout +- Disabled elements are more disabled now +- Rearranged and split settings to make more sense and be less of a wall of text +- On mobile settings now take up full width and presented in navigation style +improved styles for settings + +### Added +- Most of the remaining AdminFE tabs were added into Admin Dashboard +- It's now possible to customize PWA Manfiest from PleromaFE +- Make every configuration option default-overridable by instance admins + +### Fixed +- Fixed settings not appearing if user never touched "show advanced" toggle +- Fix display of the broken/deleted/banned users +- Fixed incorrect emoji display in post interaction lists +- Fixed list title not being saved when editing +- Fixed poll notifications not being expandable + + +## 2.9.3 +### Fixed +- Being unable to update profile + ## 2.9.2 ### Changed - BREAKING: due to some internal technical changes logging into AdminFE through PleromaFE is no longer possible @@ -70,8 +104,8 @@ This does not guarantee that browsers will or will not work. - Support displaying time in absolute format - Add draft management system - Compress most kinds of images on upload. -- Added option to always convert images to JPEG format instead of using WebP when compressing images. -- Added configurable image compression option in general settings, allowing users to control whether images are compressed before upload. +- Added option to always convert images to JPEG format instead of using WebP when compressing images. +- Added configurable image compression option in general settings, allowing users to control whether images are compressed before upload. - Inform users that Smithereen public polls are public - Splash screen + loading indicator to make process of identifying initialization issues and load performance - UI for making v3 themes and palettes, support for bundling v3 themes diff --git a/README.md b/README.md index 6a37195d5..16d32dcd2 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ # For Translators -To translate Pleroma-FE, use our weblate server: https://translate.pleroma.social/. If you need to add your language it should be added as a json file in [src/i18n/](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/src/i18n/) folder and added in a list within [src/i18n/languages.js](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/src/i18n/languages.js). +To translate Pleroma-FE, use our weblate server: https://translate.pleroma.social/. If you need to add your language it should be added as a json file in [src/i18n/](https://git.pleroma.social/pleroma/pleroma-fe/src/src/i18n/) folder and added in a list within [src/i18n/languages.js](https://git.pleroma.social/pleroma/pleroma-fe/src/src/i18n/languages.js). Pleroma-FE will set your language by your browser locale, but you can change language in settings. @@ -32,10 +32,10 @@ yarn unit # For Contributors: -You can create file `/config/local.json` (see [example](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/config/local.example.json)) to enable some convenience dev options: +You can create file `/config/local.json` (see [example](https://git.pleroma.social/pleroma/pleroma-fe/src/config/local.example.json)) to enable some convenience dev options: * `target`: makes local dev server redirect to some existing instance's BE instead of local BE, useful for testing things in near-production environment and searching for real-life use-cases. -* `staticConfigPreference`: makes FE's `/static/config.json` take preference of BE-served `/api/statusnet/config.json`. Only works in dev mode. +* `staticConfigPreference`: makes FE's `/static/config.json` take preference of BE-served `/api/pleroma/frontend_configurations`. Only works in dev mode. FE Build process also leaves current commit hash in global variable `___pleromafe_commit_hash` so that you can easily see which pleroma-fe commit instance is running, also helps pinpointing which commit was used when FE was bundled into BE. diff --git a/biome.json b/biome.json new file mode 100644 index 000000000..6a464a0e5 --- /dev/null +++ b/biome.json @@ -0,0 +1,149 @@ +{ + "$schema": "https://biomejs.dev/schemas/2.3.11/schema.json", + "vcs": { + "enabled": true, + "clientKind": "git", + "useIgnoreFile": true + }, + "files": { + "includes": ["**", "!!**/dist", "!!tools/emojis.json"] + }, + "formatter": { + "enabled": true, + "indentStyle": "space" + }, + "linter": { + "enabled": true, + "domains": { + "vue": "recommended" + }, + "rules": { + "recommended": false, + "complexity": { + "noAdjacentSpacesInRegex": "error", + "noExtraBooleanCast": "error", + "noUselessCatch": "error", + "noUselessEscapeInRegex": "error" + }, + "correctness": { + "noConstAssign": "error", + "noConstantCondition": "error", + "noEmptyCharacterClassInRegex": "error", + "noEmptyPattern": "error", + "noGlobalObjectCalls": "error", + "noInvalidBuiltinInstantiation": "error", + "noInvalidConstructorSuper": "error", + "noNonoctalDecimalEscape": "error", + "noPrecisionLoss": "error", + "noSelfAssign": "error", + "noSetterReturn": "error", + "noSwitchDeclarations": "error", + "noUndeclaredVariables": "error", + "noUnreachable": "error", + "noUnreachableSuper": "error", + "noUnsafeFinally": "error", + "noUnsafeOptionalChaining": "error", + "noUnusedLabels": "error", + "noUnusedPrivateClassMembers": "error", + "noUnusedVariables": "error", + "useIsNan": "error", + "useValidForDirection": "error", + "useValidTypeof": "error", + "useYield": "error" + }, + "suspicious": { + "noAsyncPromiseExecutor": "error", + "noCatchAssign": "error", + "noClassAssign": "error", + "noCompareNegZero": "error", + "noConstantBinaryExpressions": "error", + "noControlCharactersInRegex": "error", + "noDebugger": "error", + "noDuplicateCase": "error", + "noDuplicateClassMembers": "error", + "noDuplicateElseIf": "error", + "noDuplicateObjectKeys": "error", + "noDuplicateParameters": "error", + "noEmptyBlockStatements": "error", + "noFallthroughSwitchClause": "error", + "noFunctionAssign": "error", + "noGlobalAssign": "error", + "noImportAssign": "error", + "noIrregularWhitespace": "error", + "noMisleadingCharacterClass": "error", + "noPrototypeBuiltins": "error", + "noRedeclare": "error", + "noShadowRestrictedNames": "error", + "noSparseArray": "error", + "noUnsafeNegation": "error", + "noUselessRegexBackrefs": "error", + "noWith": "error", + "useGetterReturn": "error" + } + } + }, + "javascript": { + "formatter": { + "quoteStyle": "single", + "semicolons": "asNeeded" + }, + "globals": [] + }, + "overrides": [ + { + "includes": ["**/*.spec.js", "test/fixtures/*.js"], + "javascript": { + "globals": [ + "vi", + "describe", + "it", + "test", + "expect", + "before", + "beforeEach", + "after", + "afterEach" + ] + } + }, + { + "includes": ["**/*.vue"], + "linter": { + "rules": { + "style": { + "useConst": "off", + "useImportType": "off" + }, + "correctness": { + "noUnusedVariables": "off", + "noUnusedImports": "off" + } + } + } + } + ], + "assist": { + "enabled": true, + "actions": { + "source": { + "organizeImports": { + "level": "on", + "options": { + "groups": [ + [":NODE:", ":PACKAGE:", "!src/**", "!@fortawesome/**"], + ":BLANK_LINE:", + [":PATH:", "src/components/**"], + ":BLANK_LINE:", + [":PATH:", "src/stores/**"], + ":BLANK_LINE:", + [":PATH:", "src/**", "src/stores/**", "src/components/**"], + ":BLANK_LINE:", + "@fortawesome/fontawesome-svg-core", + "@fortawesome/*" + ] + } + } + } + } + } +} diff --git a/build/check-versions.mjs b/build/check-versions.mjs index 73c1eeb15..c22004b00 100644 --- a/build/check-versions.mjs +++ b/build/check-versions.mjs @@ -1,5 +1,5 @@ -import semver from 'semver' import chalk from 'chalk' +import semver from 'semver' import packageConfig from '../package.json' with { type: 'json' } @@ -7,8 +7,8 @@ var versionRequirements = [ { name: 'node', currentVersion: semver.clean(process.version), - versionRequirement: packageConfig.engines.node - } + versionRequirement: packageConfig.engines.node, + }, ] export default function () { @@ -16,20 +16,26 @@ export default function () { for (let i = 0; i < versionRequirements.length; i++) { const mod = versionRequirements[i] if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) { - warnings.push(mod.name + ': ' + - chalk.red(mod.currentVersion) + ' should be ' + - chalk.green(mod.versionRequirement) + warnings.push( + mod.name + + ': ' + + chalk.red(mod.currentVersion) + + ' should be ' + + chalk.green(mod.versionRequirement), ) } } if (warnings.length) { - console.warn(chalk.yellow('\nTo use this template, you must update following to modules:\n')) + console.warn( + chalk.yellow( + '\nTo use this template, you must update following to modules:\n', + ), + ) for (let i = 0; i < warnings.length; i++) { const warning = warnings[i] console.warn(' ' + warning) } - console.warn() process.exit(1) } } diff --git a/build/commit_hash.js b/build/commit_hash.js index c104af5d9..c60355804 100644 --- a/build/commit_hash.js +++ b/build/commit_hash.js @@ -1,8 +1,8 @@ import childProcess from 'child_process' -export const getCommitHash = (() => { - const subst = "$Format:%h$" - if(!subst.match(/Format:/)) { +export const getCommitHash = () => { + const subst = '$Format:%h$' + if (!subst.match(/Format:/)) { return subst } else { try { @@ -15,4 +15,4 @@ export const getCommitHash = (() => { return 'UNKNOWN' } } -}) +} diff --git a/build/copy_plugin.js b/build/copy_plugin.js index a783fe7ff..4f020f359 100644 --- a/build/copy_plugin.js +++ b/build/copy_plugin.js @@ -1,8 +1,8 @@ -import serveStatic from 'serve-static' -import { resolve } from 'node:path' import { cp } from 'node:fs/promises' +import { resolve } from 'node:path' +import serveStatic from 'serve-static' -const getPrefix = s => { +const getPrefix = (s) => { const padEnd = s.endsWith('/') ? s : s + '/' return padEnd.startsWith('/') ? padEnd : '/' + padEnd } @@ -13,28 +13,31 @@ const copyPlugin = ({ inUrl, inFs }) => { let copyTarget const handler = serveStatic(inFs) - return [{ - name: 'copy-plugin-serve', - apply: 'serve', - configureServer (server) { - server.middlewares.use(prefix, handler) - } - }, { - name: 'copy-plugin-build', - apply: 'build', - configResolved (config) { - copyTarget = resolve(config.root, config.build.outDir, subdir) + return [ + { + name: 'copy-plugin-serve', + apply: 'serve', + configureServer(server) { + server.middlewares.use(prefix, handler) + }, }, - closeBundle: { - order: 'post', - sequential: true, - async handler () { - console.log(`Copying '${inFs}' to ${copyTarget}...`) - await cp(inFs, copyTarget, { recursive: true }) - console.log('Done.') - } - } - }] + { + name: 'copy-plugin-build', + apply: 'build', + configResolved(config) { + copyTarget = resolve(config.root, config.build.outDir, subdir) + }, + closeBundle: { + order: 'post', + sequential: true, + async handler() { + console.info(`Copying '${inFs}' to ${copyTarget}...`) + await cp(inFs, copyTarget, { recursive: true }) + console.info('Done.') + }, + }, + }, + ] } export default copyPlugin diff --git a/build/emojis_plugin.js b/build/emojis_plugin.js index aed52066d..9872f5331 100644 --- a/build/emojis_plugin.js +++ b/build/emojis_plugin.js @@ -1,21 +1,23 @@ -import { resolve } from 'node:path' import { access } from 'node:fs/promises' -import { languages, langCodeToCldrName } from '../src/i18n/languages.js' +import { resolve } from 'node:path' + +import { languages } from '../src/i18n/languages.js' const annotationsImportPrefix = '@kazvmoe-infra/unicode-emoji-json/annotations/' const specialAnnotationsLocale = { - ja_easy: 'ja' + ja_easy: 'ja', } -const internalToAnnotationsLocale = (internal) => specialAnnotationsLocale[internal] || internal +const internalToAnnotationsLocale = (internal) => + specialAnnotationsLocale[internal] || internal // This gets all the annotations that are accessible (whose language // can be chosen in the settings). Data for other languages are // discarded because there is no way for it to be fetched. const getAllAccessibleAnnotations = async (projectRoot) => { - const imports = (await Promise.all( - languages - .map(async lang => { + const imports = ( + await Promise.all( + languages.map(async (lang) => { const destLang = internalToAnnotationsLocale(lang) const importModule = `${annotationsImportPrefix}${destLang}.json` const importFile = resolve(projectRoot, 'node_modules', importModule) @@ -23,11 +25,18 @@ const getAllAccessibleAnnotations = async (projectRoot) => { await access(importFile) return `'${lang}': () => import('${importModule}')` } catch (e) { + if (e.message.match(/ENOENT/)) { + console.warn(`Missing emoji annotations locale: ${destLang}`) + } else { + console.error('test', e.message) + } return } - }))) - .filter(k => k) - .join(',\n') + }), + ) + ) + .filter((k) => k) + .join(',\n') return ` export const annotationsLoader = { @@ -43,21 +52,21 @@ const emojisPlugin = () => { let projectRoot return { name: 'emojis-plugin', - configResolved (conf) { + configResolved(conf) { projectRoot = conf.root }, - resolveId (id) { + resolveId(id) { if (id === emojiAnnotationsId) { return emojiAnnotationsIdResolved } return null }, - async load (id) { + async load(id) { if (id === emojiAnnotationsIdResolved) { return await getAllAccessibleAnnotations(projectRoot) } return null - } + }, } } diff --git a/build/msw_plugin.js b/build/msw_plugin.js index f544348fc..c4e9098c5 100644 --- a/build/msw_plugin.js +++ b/build/msw_plugin.js @@ -1,5 +1,5 @@ -import { resolve } from 'node:path' import { readFile } from 'node:fs/promises' +import { resolve } from 'node:path' const target = 'node_modules/msw/lib/mockServiceWorker.js' @@ -8,10 +8,10 @@ const mswPlugin = () => { return { name: 'msw-plugin', apply: 'serve', - configResolved (conf) { + configResolved(conf) { projectRoot = conf.root }, - configureServer (server) { + configureServer(server) { server.middlewares.use(async (req, res, next) => { if (req.path === '/mockServiceWorker.js') { const file = await readFile(resolve(projectRoot, target)) @@ -21,7 +21,7 @@ const mswPlugin = () => { next() } }) - } + }, } } diff --git a/build/service_worker_messages.js b/build/service_worker_messages.js index c078e8563..0948aa919 100644 --- a/build/service_worker_messages.js +++ b/build/service_worker_messages.js @@ -1,11 +1,12 @@ -import { languages, langCodeToJsonName } from '../src/i18n/languages.js' import { readFile } from 'node:fs/promises' import { dirname, resolve } from 'node:path' import { fileURLToPath } from 'node:url' +import { langCodeToJsonName, languages } from '../src/i18n/languages.js' + const i18nDir = resolve( dirname(dirname(fileURLToPath(import.meta.url))), - 'src/i18n' + 'src/i18n', ) export const i18nFiles = languages.reduce((acc, lang) => { @@ -16,13 +17,15 @@ export const i18nFiles = languages.reduce((acc, lang) => { }, {}) export const generateServiceWorkerMessages = async () => { - const msgArray = await Promise.all(Object.entries(i18nFiles).map(async ([lang, file]) => { - const fileContent = await readFile(file, 'utf-8') - const msg = { - notifications: JSON.parse(fileContent).notifications || {} - } - return [lang, msg] - })) + const msgArray = await Promise.all( + Object.entries(i18nFiles).map(async ([lang, file]) => { + const fileContent = await readFile(file, 'utf-8') + const msg = { + notifications: JSON.parse(fileContent).notifications || {}, + } + return [lang, msg] + }), + ) return msgArray.reduce((acc, [lang, msg]) => { acc[lang] = msg return acc diff --git a/build/sw_plugin.js b/build/sw_plugin.js index a2c792b7d..066c8da12 100644 --- a/build/sw_plugin.js +++ b/build/sw_plugin.js @@ -1,9 +1,13 @@ -import { fileURLToPath } from 'node:url' -import { dirname, resolve } from 'node:path' import { readFile } from 'node:fs/promises' +import { dirname, resolve } from 'node:path' +import { fileURLToPath } from 'node:url' +import { exactRegex } from '@rolldown/pluginutils' import { build } from 'vite' -import * as esbuild from 'esbuild' -import { generateServiceWorkerMessages, i18nFiles } from './service_worker_messages.js' + +import { + generateServiceWorkerMessages, + i18nFiles, +} from './service_worker_messages.js' const getSWMessagesAsText = async () => { const messages = await generateServiceWorkerMessages() @@ -11,123 +15,24 @@ const getSWMessagesAsText = async () => { } const projectRoot = dirname(dirname(fileURLToPath(import.meta.url))) -const swEnvName = 'virtual:pleroma-fe/service_worker_env' -const swEnvNameResolved = '\0' + swEnvName -const getDevSwEnv = () => `self.serviceWorkerOption = { assets: [] };` -const getProdSwEnv = ({ assets }) => `self.serviceWorkerOption = { assets: ${JSON.stringify(assets)} };` - -export const devSwPlugin = ({ - swSrc, - swDest, - transformSW, - alias -}) => { - const swFullSrc = resolve(projectRoot, swSrc) - const esbuildAlias = {} - Object.entries(alias).forEach(([source, dest]) => { - esbuildAlias[source] = dest.startsWith('/') ? projectRoot + dest : dest - }) - - return { - name: 'dev-sw-plugin', - apply: 'serve', - configResolved (conf) { - }, - resolveId (id) { - const name = id.startsWith('/') ? id.slice(1) : id - if (name === swDest) { - return swFullSrc - } else if (name === swEnvName) { - return swEnvNameResolved - } - return null - }, - async load (id) { - if (id === swFullSrc) { - return readFile(swFullSrc, 'utf-8') - } else if (id === swEnvNameResolved) { - return getDevSwEnv() - } - return null - }, - /** - * vite does not bundle the service worker - * during dev, and firefox does not support ESM as service worker - * https://bugzilla.mozilla.org/show_bug.cgi?id=1360870 - */ - async transform (code, id) { - if (id === swFullSrc && transformSW) { - const res = await esbuild.build({ - entryPoints: [swSrc], - bundle: true, - write: false, - outfile: 'sw-pleroma.js', - alias: esbuildAlias, - plugins: [{ - name: 'vite-like-root-resolve', - setup (b) { - b.onResolve( - { filter: new RegExp(/^\//) }, - args => ({ - path: resolve(projectRoot, args.path.slice(1)) - }) - ) - } - }, { - name: 'sw-messages', - setup (b) { - b.onResolve( - { filter: new RegExp('^' + swMessagesName + '$') }, - args => ({ - path: args.path, - namespace: 'sw-messages' - })) - b.onLoad( - { filter: /.*/, namespace: 'sw-messages' }, - async () => ({ - contents: await getSWMessagesAsText() - })) - } - }, { - name: 'sw-env', - setup (b) { - b.onResolve( - { filter: new RegExp('^' + swEnvName + '$') }, - args => ({ - path: args.path, - namespace: 'sw-env' - })) - b.onLoad( - { filter: /.*/, namespace: 'sw-env' }, - () => ({ - contents: getDevSwEnv() - })) - } - }] - }) - const text = res.outputFiles[0].text - return text - } - } - } -} - // Idea taken from // https://github.com/vite-pwa/vite-plugin-pwa/blob/main/src/plugins/build.ts // rollup does not support compiling to iife if we want to code-split; // however, we must compile the service worker to iife because of browser support. // Run another vite build just for the service worker targeting iife at // the end of the build. -export const buildSwPlugin = ({ - swSrc, - swDest, -}) => { +export const buildSwPlugin = ({ swSrc, swDest }) => { + const swFullSrc = resolve(projectRoot, swSrc) + const swEnvName = 'virtual:pleroma-fe/service_worker_env' + const swEnvNameResolved = '\0' + swEnvName + let config + return { name: 'build-sw-plugin', enforce: 'post', - apply: 'build', - configResolved (resolvedConfig) { + configResolved(resolvedConfig) { + resolvedConfig config = { define: resolvedConfig.define, resolve: resolvedConfig.resolve, @@ -135,53 +40,81 @@ export const buildSwPlugin = ({ publicDir: false, build: { ...resolvedConfig.build, - lib: { - entry: swSrc, - formats: ['iife'], - name: 'sw_pleroma' - }, emptyOutDir: false, - rollupOptions: { + rolldownOptions: { + input: { + main: swSrc, + }, + context: 'self', output: { - entryFileNames: swDest - } - } + entryFileNames: swDest, + codeSplitting: false, + format: 'iife', + }, + }, }, - configFile: false + configFile: false, } }, generateBundle: { order: 'post', sequential: true, - async handler (_, bundle) { + async handler(_, bundle) { const assets = Object.keys(bundle) - .filter(name => !/\.map$/.test(name)) - .map(name => '/' + name) + .filter((name) => !/\.map$/.test(name)) + .map((name) => '/' + name) + config.plugins.push({ name: 'build-sw-env-plugin', - resolveId (id) { - if (id === swEnvName) { - return swEnvNameResolved - } - return null + mode: 'production', + resolveId: { + filter: { id: exactRegex(swEnvName) }, + handler: () => swEnvNameResolved, + }, + load: { + filter: { id: exactRegex(swEnvNameResolved) }, + handler() { + return `self.serviceWorkerOption = { assets: ${JSON.stringify(assets)} };` + }, }, - load (id) { - if (id === swEnvNameResolved) { - return getProdSwEnv({ assets }) - } - return null - } }) - } + }, + }, + resolveId: { + filter: { id: new RegExp(swDest) }, + handler() { + return swFullSrc + }, + }, + load: { + filter: { id: new RegExp(swFullSrc) }, + async handler() { + config.plugins.push({ + name: 'dummy-sw-env', + mode: 'development', + resolveId: { + filter: { id: exactRegex(swEnvName) }, + handler: () => swEnvNameResolved, + }, + load: { + filter: { id: exactRegex(swEnvNameResolved) }, + handler: () => 'self.serviceWorkerOption = { assets: [] }', + }, + }) + + const swBundle = await build(config) + return swBundle.output[0] + }, }, closeBundle: { order: 'post', sequential: true, - async handler () { - console.log('Building service worker for production') + async handler() { + if (process.env.VITEST) return + console.info('Building service worker for production') await build(config) - } - } + }, + }, } } @@ -191,9 +124,9 @@ const swMessagesNameResolved = '\0' + swMessagesName export const swMessagesPlugin = () => { return { name: 'sw-messages-plugin', - resolveId (id) { + resolveId(id) { if (id === swMessagesName) { - Object.values(i18nFiles).forEach(f => { + Object.values(i18nFiles).forEach((f) => { this.addWatchFile(f) }) return swMessagesNameResolved @@ -201,11 +134,11 @@ export const swMessagesPlugin = () => { return null } }, - async load (id) { + async load(id) { if (id === swMessagesNameResolved) { return await getSWMessagesAsText() } return null - } + }, } } diff --git a/build/update-emoji.js b/build/update-emoji.js index 5d578ba61..4ff7e1de8 100644 --- a/build/update-emoji.js +++ b/build/update-emoji.js @@ -1,22 +1,21 @@ - -import emojis from '@kazvmoe-infra/unicode-emoji-json/data-by-group.json' with { type: 'json' } +import emojis from '@kazvmoe-infra/unicode-emoji-json/data-by-group.json' with { + type: 'json', +} import fs from 'fs' -Object.keys(emojis) - .map(k => { - emojis[k].map(e => { - delete e.unicode_version - delete e.emoji_version - delete e.skin_tone_support_unicode_version - }) +Object.keys(emojis).map((k) => { + emojis[k].map((e) => { + delete e.unicode_version + delete e.emoji_version + delete e.skin_tone_support_unicode_version }) +}) const res = {} -Object.keys(emojis) - .map(k => { - const groupId = k.replace('&', 'and').replace(/ /g, '-').toLowerCase() - res[groupId] = emojis[k] - }) +Object.keys(emojis).map((k) => { + const groupId = k.replace('&', 'and').replace(/ /g, '-').toLowerCase() + res[groupId] = emojis[k] +}) console.info('Updating emojis...') fs.writeFileSync('src/assets/emoji.json', JSON.stringify(res)) diff --git a/changelog.d/attrs-parsing.fix b/changelog.d/attrs-parsing.fix new file mode 100644 index 000000000..e36e59a86 --- /dev/null +++ b/changelog.d/attrs-parsing.fix @@ -0,0 +1 @@ +Fix HTML attribute parsing for escaped quotes \ No newline at end of file diff --git a/changelog.d/finalfix-fr.skip b/changelog.d/ci-pr-uploads-removal.skip similarity index 100% rename from changelog.d/finalfix-fr.skip rename to changelog.d/ci-pr-uploads-removal.skip diff --git a/changelog.d/fast.change b/changelog.d/fast.change new file mode 100644 index 000000000..1f0a89092 --- /dev/null +++ b/changelog.d/fast.change @@ -0,0 +1 @@ +Migrated to Vite 8 and optimized our imports, more stuff is loaded on-demand, reducing the initial load time and transfer size diff --git a/changelog.d/fix-emojis-breaking-bio.fix b/changelog.d/fix-emojis-breaking-bio.fix new file mode 100644 index 000000000..62a607d8a --- /dev/null +++ b/changelog.d/fix-emojis-breaking-bio.fix @@ -0,0 +1 @@ +Fix emojis breaking user bio/description editing diff --git a/changelog.d/finalfix.skip b/changelog.d/instance-store-migration.skip similarity index 100% rename from changelog.d/finalfix.skip rename to changelog.d/instance-store-migration.skip diff --git a/changelog.d/minor.add b/changelog.d/minor.add new file mode 100644 index 000000000..5f4934173 --- /dev/null +++ b/changelog.d/minor.add @@ -0,0 +1,6 @@ +button to remove all drafts +option to remove forced aspect ratio for user profiles (requested) +showing user tags (mrf policies for user + custom if present) +version information now is also in about page +mention autosuggest now sorts by recent activity +non-square emoji support (toggleable by user) diff --git a/changelog.d/minor.change b/changelog.d/minor.change new file mode 100644 index 000000000..979d36955 --- /dev/null +++ b/changelog.d/minor.change @@ -0,0 +1,7 @@ +overall improved spacings in status action buttons and post form +logout confirm button is now dangerous +reply/quote now is a radio group and wraps, fixes overflow on languages where labels are too wide +personal note input is now bigger +moved "edit pinned" to the bottom for status action buttons. +dots status action button drops down instead of up to avoid hiding the action buttons +improved attachment description (alt text) input and display diff --git a/changelog.d/minor.fix b/changelog.d/minor.fix new file mode 100644 index 000000000..420836364 --- /dev/null +++ b/changelog.d/minor.fix @@ -0,0 +1,12 @@ +navbar wide logo cropping search input +danger buttons being too bright +user background upload failure no longer breaks new uploads + displays an error +importing theme from old theme editor +removed duplicate federationpolicy entry in admin tab +repeater name overflowing content +reply popover is now shown if replied-to status is muted +second language input not having header +post form's bottom left buttons not showing their toggled state +some font overrides not working +popovers opening outside of window's boundaries +occasional blank page when showing new posts diff --git a/changelog.d/mute-dropdown.fix b/changelog.d/mute-dropdown.fix new file mode 100644 index 000000000..33f12a571 --- /dev/null +++ b/changelog.d/mute-dropdown.fix @@ -0,0 +1 @@ +Fixed status action mute hiding itself on click diff --git a/changelog.d/profilebg.add b/changelog.d/profilebg.add new file mode 100644 index 000000000..a2c79074a --- /dev/null +++ b/changelog.d/profilebg.add @@ -0,0 +1 @@ +displaying other user's backgrounds (if supported by BE) diff --git a/changelog.d/quote-by-url.add b/changelog.d/quote-by-url.add new file mode 100644 index 000000000..ef401f93c --- /dev/null +++ b/changelog.d/quote-by-url.add @@ -0,0 +1 @@ +Add quoting by URL and in replies diff --git a/changelog.d/reply-quote-config.fix b/changelog.d/reply-quote-config.fix new file mode 100644 index 000000000..b6ac4e5e9 --- /dev/null +++ b/changelog.d/reply-quote-config.fix @@ -0,0 +1 @@ +Fix reply form crash when quote-reply settings are unavailable diff --git a/changelog.d/sync-config.add b/changelog.d/sync-config.add new file mode 100644 index 000000000..76a5a1cca --- /dev/null +++ b/changelog.d/sync-config.add @@ -0,0 +1,2 @@ +settings synchronization +user highlight synchronization diff --git a/changelog.d/woodpecker-pr-pipeline.skip b/changelog.d/woodpecker-pr-pipeline.skip new file mode 100644 index 000000000..e69de29bb diff --git a/docker-compose.e2e.yml b/docker-compose.e2e.yml new file mode 100644 index 000000000..75a4979a1 --- /dev/null +++ b/docker-compose.e2e.yml @@ -0,0 +1,57 @@ +services: + db: + image: postgres:15-alpine + environment: + POSTGRES_USER: pleroma + POSTGRES_PASSWORD: pleroma + POSTGRES_DB: pleroma + healthcheck: + test: ["CMD-SHELL", "pg_isready -U pleroma -d pleroma"] + interval: 2s + timeout: 2s + retries: 30 + + pleroma: + image: ${PLEROMA_IMAGE:-git.pleroma.social:5050/pleroma/pleroma:stable} + environment: + DB_USER: pleroma + DB_PASS: pleroma + DB_NAME: pleroma + DB_HOST: db + DB_PORT: 5432 + DOMAIN: localhost + INSTANCE_NAME: Pleroma E2E + ADMIN_EMAIL: ${E2E_ADMIN_EMAIL:-admin@example.com} + NOTIFY_EMAIL: ${E2E_ADMIN_EMAIL:-admin@example.com} + E2E_ADMIN_USERNAME: ${E2E_ADMIN_USERNAME:-admin} + E2E_ADMIN_PASSWORD: ${E2E_ADMIN_PASSWORD:-adminadmin} + E2E_ADMIN_EMAIL: ${E2E_ADMIN_EMAIL:-admin@example.com} + depends_on: + db: + condition: service_healthy + volumes: + - ./docker/pleroma/entrypoint.e2e.sh:/opt/pleroma/entrypoint.e2e.sh:ro + entrypoint: ["/bin/ash", "/opt/pleroma/entrypoint.e2e.sh"] + healthcheck: + # NOTE: "localhost" may resolve to ::1 in some images (IPv6) while Pleroma only + # listens on IPv4 in this container. Use 127.0.0.1 to avoid false negatives. + test: ["CMD-SHELL", "test -f /var/lib/pleroma/.e2e_seeded && wget -qO- http://127.0.0.1:4000/api/v1/instance >/dev/null || exit 1"] + interval: 5s + timeout: 3s + retries: 60 + + e2e: + build: + context: . + dockerfile: docker/e2e/Dockerfile.e2e + depends_on: + pleroma: + condition: service_healthy + environment: + CI: "1" + VITE_PROXY_TARGET: http://pleroma:4000 + VITE_PROXY_ORIGIN: http://localhost:4000 + E2E_BASE_URL: http://localhost:8080 + E2E_ADMIN_USERNAME: ${E2E_ADMIN_USERNAME:-admin} + E2E_ADMIN_PASSWORD: ${E2E_ADMIN_PASSWORD:-adminadmin} + command: ["yarn", "e2e:pw"] diff --git a/docker/e2e/Dockerfile.e2e b/docker/e2e/Dockerfile.e2e new file mode 100644 index 000000000..e84359ceb --- /dev/null +++ b/docker/e2e/Dockerfile.e2e @@ -0,0 +1,16 @@ +FROM mcr.microsoft.com/playwright:v1.57.0-jammy + +WORKDIR /app + +ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 + +RUN npm install -g yarn@1.22.22 + +COPY package.json yarn.lock ./ +RUN yarn --frozen-lockfile + +COPY . . + +ENV CI=1 + +CMD ["yarn", "e2e:pw"] diff --git a/docker/pleroma/entrypoint.e2e.sh b/docker/pleroma/entrypoint.e2e.sh new file mode 100644 index 000000000..96920eeae --- /dev/null +++ b/docker/pleroma/entrypoint.e2e.sh @@ -0,0 +1,71 @@ +#!/bin/ash + +set -eu + +SEED_SENTINEL_PATH="/var/lib/pleroma/.e2e_seeded" +CONFIG_OVERRIDE_PATH="/var/lib/pleroma/config.exs" + +echo "-- Waiting for database..." +while ! pg_isready -U "${DB_USER:-pleroma}" -d "postgres://${DB_HOST:-db}:${DB_PORT:-5432}/${DB_NAME:-pleroma}" -t 1; do + sleep 1s +done + +echo "-- Writing E2E config overrides..." +cat > "$CONFIG_OVERRIDE_PATH" <<'EOF' +import Config + +config :pleroma, Pleroma.Captcha, + enabled: false + +config :pleroma, :instance, + registrations_open: true, + account_activation_required: false, + approval_required: false +EOF + +echo "-- Running migrations..." +/opt/pleroma/bin/pleroma_ctl migrate + +echo "-- Starting!" +/opt/pleroma/bin/pleroma start & +PLEROMA_PID="$!" + +cleanup() { + if [ -n "${PLEROMA_PID:-}" ] && kill -0 "$PLEROMA_PID" 2>/dev/null; then + kill -TERM "$PLEROMA_PID" + wait "$PLEROMA_PID" || true + fi +} + +trap cleanup INT TERM + +echo "-- Waiting for API..." +api_ok="false" +for _i in $(seq 1 120); do + if wget -qO- http://127.0.0.1:4000/api/v1/instance >/dev/null 2>&1; then + api_ok="true" + break + fi + sleep 1s +done + +if [ "$api_ok" != "true" ]; then + echo "Timed out waiting for Pleroma API to become available" + exit 1 +fi + +if [ ! -f "$SEED_SENTINEL_PATH" ]; then + if [ -n "${E2E_ADMIN_USERNAME:-}" ] && [ -n "${E2E_ADMIN_PASSWORD:-}" ] && [ -n "${E2E_ADMIN_EMAIL:-}" ]; then + echo "-- Seeding admin user (${E2E_ADMIN_USERNAME})..." + if ! /opt/pleroma/bin/pleroma_ctl user new "$E2E_ADMIN_USERNAME" "$E2E_ADMIN_EMAIL" --admin --password "$E2E_ADMIN_PASSWORD" -y; then + echo "-- User already exists (or creation failed), ensuring admin + confirmed..." + /opt/pleroma/bin/pleroma_ctl user set "$E2E_ADMIN_USERNAME" --admin --confirmed + fi + else + echo "-- Skipping admin seeding (missing E2E_ADMIN_* env)" + fi + + touch "$SEED_SENTINEL_PATH" +fi + +wait "$PLEROMA_PID" diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md index dfc5f9dc3..8ca076931 100644 --- a/docs/CONFIGURATION.md +++ b/docs/CONFIGURATION.md @@ -7,9 +7,9 @@ PleromaFE gets its configuration from several sources, in order of preference (the one above overrides ones below it) -1. `/api/statusnet/config.json` - this is generated on Backend and contains multiple things including instance name, char limit etc. It also contains FE/Client-specific data, PleromaFE uses `pleromafe` field of it. For more info on changing config on BE, look [here](../backend/configuration/cheatsheet.md#frontend_configurations) -2. `/static/config.json` - this is a static FE-provided file, containing only FE specific configuration. This file is completely optional and could be removed but is useful as a fallback if some configuration JSON property isn't present in BE-provided config. It's also a reference point to check what default configuration are and what JSON properties even exist. In local dev mode it could be used to override BE configuration, more about that in HACKING.md. File is located [here](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/static/config.json). -3. Built-in defaults. Those are hard-coded defaults that are used when `/static/config.json` is not available and BE-provided configuration JSON is missing some JSON properties. ( [Code](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/src/modules/instance.js) ) +1. `/api/pleroma/frontend_configurations` - this is generated by backend and includes FE/Client-specific data. PleromaFE uses the `pleroma_fe` field of it. For more info on changing config on BE, look [here](../backend/configuration/cheatsheet.md#frontend_configurations) +2. `/static/config.json` - this is a static FE-provided file, containing only FE specific configuration. This file is completely optional and could be removed but is useful as a fallback if some configuration JSON property isn't present in BE-provided config. It's also a reference point to check what default configuration are and what JSON properties even exist. In local dev mode it could be used to override BE configuration, more about that in HACKING.md. File is located [here](https://git.pleroma.social/pleroma/pleroma-fe/src/public/static/config.json). +3. Built-in defaults. Those are hard-coded defaults that are used when `/static/config.json` is not available and BE-provided configuration JSON is missing some JSON properties. ( [Code](https://git.pleroma.social/pleroma/pleroma-fe/src/src/stores/instance.js) ) ## Instance-defaults diff --git a/docs/HACKING.md b/docs/HACKING.md index a5c491136..88760b77a 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -79,7 +79,7 @@ server { In 99% cases PleromaFE uses [MastoAPI](https://docs.joinmastodon.org/api/) with [Pleroma Extensions](../backend/API/differences_in_mastoapi_responses.md) to fetch the data. The rest is either QvitterAPI leftovers or pleroma-exclusive APIs. QvitterAPI doesn't exactly have documentation and uses different JSON structure and sometimes different parameters and workflows, [this](https://twitter-api.readthedocs.io/en/latest/index.html) could be a good reference though. Some pleroma-exclusive API may still be using QvitterAPI JSON structure. -PleromaFE supports both formats by transforming them into internal format which is basically QvitterAPI one with some additions and renaming. All data is passed trough [Entity Normalizer](https://git.pleroma.social/pleroma/pleroma-fe/-/blob/develop/src/services/entity_normalizer/entity_normalizer.service.js) which can serve as a reference of API and what's actually used, it's also a host for all the hacks and data transformation. +PleromaFE supports both formats by transforming them into internal format which is basically QvitterAPI one with some additions and renaming. All data is passed trough [Entity Normalizer](https://git.pleroma.social/pleroma/pleroma-fe/src/src/services/entity_normalizer/entity_normalizer.service.js) which can serve as a reference of API and what's actually used, it's also a host for all the hacks and data transformation. For most part, PleromaFE tries to store all the info it can get in global vuex store - every user and post are passed trough updating mechanism where data is either added or merged with existing data, reactively updating the information throughout UI, so if in newest request user's post counter increased, it will be instantly updated in open user profile cards. This is also used to find users, posts and sometimes to build timelines and/or request parameters. diff --git a/eslint.config.mjs b/eslint.config.mjs index 01bdb2038..417ff8cf3 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,37 +1,34 @@ -import vue from "eslint-plugin-vue"; -import js from "@eslint/js"; -import globals from "globals"; +import js from '@eslint/js' +import { defineConfig, globalIgnores } from 'eslint/config' +import vue from 'eslint-plugin-vue' +import globals from 'globals' - -export default [ +export default defineConfig([ ...vue.configs['flat/recommended'], - js.configs.recommended, + globalIgnores(['**/*.js', 'build/', 'dist/', 'config/']), { - files: ["**/*.js", "**/*.mjs", "**/*.vue"], - ignores: ["build/*.js", "config/*.js"], - + files: ['src/**/*.vue'], + plugins: { js }, + extends: ['js/recommended'], languageOptions: { ecmaVersion: 2024, - sourceType: "module", + sourceType: 'module', parserOptions: { - parser: "@babel/eslint-parser", + parser: '@babel/eslint-parser', }, globals: { ...globals.browser, ...globals.vitest, ...globals.chai, ...globals.commonjs, - ...globals.serviceworker - } + ...globals.serviceworker, + }, }, rules: { - 'arrow-parens': 0, - 'generator-star-spacing': 0, - 'no-debugger': 0, 'vue/require-prop-types': 0, 'vue/multi-word-component-names': 0, - } - } -] + }, + }, +]) diff --git a/package.json b/package.json index edc122760..c51d98b81 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "pleroma_fe", - "version": "2.9.2", + "version": "2.10.1", "description": "Pleroma frontend, the default frontend of Pleroma social network server", - "author": "Pleroma contributors ", + "author": "Pleroma contributors ", "private": false, "scripts": { "dev": "node build/update-emoji.js && vite dev", @@ -10,19 +10,22 @@ "unit": "node build/update-emoji.js && vitest --run", "unit-ci": "node build/update-emoji.js && vitest --run --browser.headless", "unit:watch": "node build/update-emoji.js && vitest", - "e2e": "node test/e2e/runner.js", + "e2e:pw": "playwright test --config test/e2e-playwright/playwright.config.mjs", + "e2e": "sh ./tools/e2e/run.sh", "test": "yarn run unit && yarn run e2e", - "stylelint": "yarn exec stylelint '**/*.scss' '**/*.vue'", - "lint": "eslint src test/unit/specs test/e2e/specs", - "lint-fix": "eslint --fix src test/unit/specs test/e2e/specs" + "ci-biome": "yarn exec biome check", + "ci-eslint": "yarn exec eslint", + "ci-stylelint": "yarn exec stylelint '**/*.scss' '**/*.vue'", + "lint": "yarn ci-biome; yarn ci-eslint; yarn ci-stylelint", + "lint-fix": "yarn exec eslint -- --fix; yarn exec stylelint '**/*.scss' '**/*.vue' --fix; biome check --write" }, "dependencies": { - "@babel/runtime": "7.28.3", + "@babel/runtime": "7.28.4", "@chenfengyuan/vue-qrcode": "2.0.0", - "@fortawesome/fontawesome-svg-core": "6.7.2", - "@fortawesome/free-regular-svg-icons": "6.7.2", - "@fortawesome/free-solid-svg-icons": "6.7.2", - "@fortawesome/vue-fontawesome": "3.1.1", + "@fortawesome/fontawesome-svg-core": "7.1.0", + "@fortawesome/free-regular-svg-icons": "7.1.0", + "@fortawesome/free-solid-svg-icons": "7.1.0", + "@fortawesome/vue-fontawesome": "3.1.2", "@kazvmoe-infra/pinch-zoom-element": "1.3.0", "@kazvmoe-infra/unicode-emoji-json": "0.4.0", "@ruffle-rs/ruffle": "0.1.0-nightly.2025.6.22", @@ -39,51 +42,53 @@ "js-cookie": "3.0.5", "localforage": "1.10.0", "parse-link-header": "2.0.0", - "phoenix": "1.8.0", - "pinia": "^3.0.0", + "phoenix": "1.8.1", + "pinia": "^3.0.4", "punycode.js": "2.3.1", "qrcode": "1.5.4", "querystring-es3": "0.2.1", "url": "0.11.4", "utf8": "3.0.0", "uuid": "11.1.0", - "vue": "3.5.19", + "vue": "3.5.22", "vue-i18n": "11", - "vue-router": "4.5.1", + "vue-router": "4.6.4", "vue-virtual-scroller": "^2.0.0-beta.7", "vuex": "4.1.0" }, "devDependencies": { - "@babel/core": "7.28.3", - "@babel/eslint-parser": "7.28.0", - "@babel/plugin-transform-runtime": "7.28.3", - "@babel/preset-env": "7.28.3", + "@babel/core": "7.28.5", + "@babel/eslint-parser": "7.28.5", + "@babel/plugin-transform-runtime": "7.28.5", + "@babel/preset-env": "7.28.5", "@babel/register": "7.28.3", + "@biomejs/biome": "2.3.11", + "@pinia/testing": "1.0.3", "@ungap/event-target": "0.2.4", - "@vitejs/plugin-vue": "^5.2.1", - "@vitejs/plugin-vue-jsx": "^4.1.1", + "@vitejs/devtools": "^0.3.1", + "@vitejs/plugin-vue": "^6.0.7", + "@vitejs/plugin-vue-jsx": "^5.1.5", "@vitest/browser": "^3.0.7", "@vitest/ui": "^3.0.7", "@vue/babel-helper-vue-jsx-merge-props": "1.4.0", "@vue/babel-plugin-jsx": "1.5.0", - "@vue/compiler-sfc": "3.5.19", + "@vue/compiler-sfc": "3.5.22", "@vue/test-utils": "2.4.6", "autoprefixer": "10.4.21", "babel-plugin-lodash": "3.3.4", - "chai": "5.3.2", - "chalk": "5.6.0", + "chai": "5.3.3", + "chalk": "5.6.2", "chromedriver": "135.0.4", "connect-history-api-fallback": "2.0.0", "cross-spawn": "7.0.6", "custom-event-polyfill": "1.0.7", - "eslint": "9.33.0", - "vue-eslint-parser": "10.2.0", + "eslint": "9.39.2", "eslint-config-standard": "17.1.0", "eslint-formatter-friendly": "7.0.0", "eslint-plugin-import": "2.32.0", - "eslint-plugin-n": "17.21.3", + "eslint-plugin-n": "17.23.1", "eslint-plugin-promise": "7.2.1", - "eslint-plugin-vue": "10.4.0", + "eslint-plugin-vue": "10.6.2", "eventsource-polyfill": "0.9.6", "express": "5.1.0", "function-bind": "1.1.2", @@ -92,27 +97,29 @@ "lodash": "4.17.21", "msw": "2.10.5", "nightwatch": "3.12.2", - "playwright": "1.55.0", + "oxc": "^1.0.1", + "playwright": "1.57.0", "postcss": "8.5.6", "postcss-html": "^1.5.0", "postcss-scss": "^4.0.6", - "sass": "1.89.2", + "sass-embedded": "^1.100.0", "selenium-server": "3.141.59", - "semver": "7.7.2", + "semver": "7.7.3", "serve-static": "2.2.0", "shelljs": "0.10.0", "sinon": "20.0.0", - "sinon-chai": "4.0.0", - "stylelint": "16.19.1", + "sinon-chai": "4.0.1", + "stylelint": "16.25.0", "stylelint-config-html": "^1.1.0", "stylelint-config-recommended": "^16.0.0", "stylelint-config-recommended-scss": "^14.0.0", "stylelint-config-recommended-vue": "^1.6.0", "stylelint-config-standard": "38.0.0", - "vite": "^6.1.0", - "vite-plugin-eslint2": "^5.0.3", - "vite-plugin-stylelint": "^6.0.0", - "vitest": "^3.0.7" + "vite": "^8.0.0", + "vite-plugin-eslint2": "^5.1.0", + "vite-plugin-stylelint": "^6.1.0", + "vitest": "^3.0.7", + "vue-eslint-parser": "10.2.0" }, "type": "module", "engines": { diff --git a/postcss.config.js b/postcss.config.js index 95ebbf2a6..b7fc12838 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -1,7 +1,5 @@ import autoprefixer from 'autoprefixer' export default { - plugins: [ - autoprefixer - ] + plugins: [autoprefixer], } diff --git a/public/static/palettes/index.json b/public/static/palettes/index.json index 2cd110d1e..3c4e37e44 100644 --- a/public/static/palettes/index.json +++ b/public/static/palettes/index.json @@ -1,6 +1,26 @@ { - "pleroma-dark": [ "Pleroma Dark", "#121a24", "#182230", "#b9b9ba", "#d8a070", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ], - "pleroma-light": [ "Pleroma Light", "#f2f4f6", "#dbe0e8", "#304055", "#f86f0f", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ], + "pleroma-dark": [ + "Pleroma Dark", + "#121a24", + "#182230", + "#b9b9ba", + "#d8a070", + "#d31014", + "#0fa00f", + "#0095ff", + "#ffa500" + ], + "pleroma-light": [ + "Pleroma Light", + "#f2f4f6", + "#dbe0e8", + "#304055", + "#f86f0f", + "#d31014", + "#0fa00f", + "#0095ff", + "#ffa500" + ], "classic-dark": { "name": "Classic Dark", "bg": "#161c20", @@ -12,8 +32,28 @@ "cBlue": "#0095ff", "cOrange": "#ffa500" }, - "bird": [ "Bird", "#f8fafd", "#e6ecf0", "#14171a", "#0084b8", "#e0245e", "#17bf63", "#1b95e0", "#fab81e"], - "pleroma-amoled": [ "Pleroma Dark AMOLED", "#000000", "#111111", "#b0b0b1", "#d8a070", "#aa0000", "#0fa00f", "#0095ff", "#d59500"], + "bird": [ + "Bird", + "#f8fafd", + "#e6ecf0", + "#14171a", + "#0084b8", + "#e0245e", + "#17bf63", + "#1b95e0", + "#fab81e" + ], + "pleroma-amoled": [ + "Pleroma Dark AMOLED", + "#000000", + "#111111", + "#b0b0b1", + "#d8a070", + "#aa0000", + "#0fa00f", + "#0095ff", + "#d59500" + ], "tomorrow-night": { "name": "Tomorrow Night", "bg": "#1d1f21", @@ -36,8 +76,28 @@ "cGreen": "#50FA7B", "cOrange": "#FFB86C" }, - "ir-black": [ "Ir Black", "#000000", "#242422", "#b5b3aa", "#ff6c60", "#FF6C60", "#A8FF60", "#96CBFE", "#FFFFB6" ], - "monokai": [ "Monokai", "#272822", "#383830", "#f8f8f2", "#f92672", "#F92672", "#a6e22e", "#66d9ef", "#f4bf75" ], + "ir-black": [ + "Ir Black", + "#000000", + "#242422", + "#b5b3aa", + "#ff6c60", + "#FF6C60", + "#A8FF60", + "#96CBFE", + "#FFFFB6" + ], + "monokai": [ + "Monokai", + "#272822", + "#383830", + "#f8f8f2", + "#f92672", + "#F92672", + "#a6e22e", + "#66d9ef", + "#f4bf75" + ], "purple-stream": { "name": "Purple stream", "bg": "#17171A", diff --git a/public/static/splash.css b/public/static/splash.css index f56f33d07..caf57dacb 100644 --- a/public/static/splash.css +++ b/public/static/splash.css @@ -65,16 +65,17 @@ body { z-index: 2; grid-template-rows: repeat(8, 1fr); grid-template-columns: repeat(5, 1fr); - grid-template-areas: "P P . L L" - "P P . L L" - "P P . L L" - "P P . L L" - "P P . . ." - "P P . . ." - "P P . E E" - "P P . E E"; + grid-template-areas: + "P P . L L" + "P P . L L" + "P P . L L" + "P P . L L" + "P P . . ." + "P P . . ." + "P P . E E" + "P P . E E"; - --logoChunkSize: calc(2em * 0.5 * var(--scale)) + --logoChunkSize: calc(2em * 0.5 * var(--scale)); } .chunk { @@ -84,7 +85,7 @@ body { #chunk-P { grid-area: P; - border-top-left-radius: calc(var(--logoChunkSize) / 2); + border-top-left-radius: calc(var(--logoChunkSize) / 2); } #chunk-L { diff --git a/renovate.json b/renovate.json index 39a2b6e9a..4bd832f5f 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,4 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:base" - ] + "extends": ["config:base"] } diff --git a/src/App.js b/src/App.js index 0027d908a..ea2271a75 100644 --- a/src/App.js +++ b/src/App.js @@ -1,187 +1,268 @@ -import UserPanel from './components/user_panel/user_panel.vue' -import NavPanel from './components/nav_panel/nav_panel.vue' -import InstanceSpecificPanel from './components/instance_specific_panel/instance_specific_panel.vue' -import FeaturesPanel from './components/features_panel/features_panel.vue' -import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue' -import ShoutPanel from './components/shout_panel/shout_panel.vue' -import MediaModal from './components/media_modal/media_modal.vue' -import SideDrawer from './components/side_drawer/side_drawer.vue' -import MobilePostStatusButton from './components/mobile_post_status_button/mobile_post_status_button.vue' -import MobileNav from './components/mobile_nav/mobile_nav.vue' -import DesktopNav from './components/desktop_nav/desktop_nav.vue' -import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue' -import EditStatusModal from './components/edit_status_modal/edit_status_modal.vue' -import PostStatusModal from './components/post_status_modal/post_status_modal.vue' -import StatusHistoryModal from './components/status_history_modal/status_history_modal.vue' -import GlobalNoticeList from './components/global_notice_list/global_notice_list.vue' -import { getOrCreateServiceWorker } from './services/sw/sw' -import { windowWidth, windowHeight } from './services/window_utils/window_utils' -import { mapGetters } from 'vuex' -import { defineAsyncComponent } from 'vue' -import { useShoutStore } from './stores/shout' -import { useInterfaceStore } from './stores/interface' - import { throttle } from 'lodash' +import { mapState } from 'pinia' +import { defineAsyncComponent } from 'vue' + +import DesktopNav from 'src/components/desktop_nav/desktop_nav.vue' +import FeaturesPanel from 'src/components/features_panel/features_panel.vue' +import GlobalNoticeList from 'src/components/global_notice_list/global_notice_list.vue' +import InstanceSpecificPanel from 'src/components/instance_specific_panel/instance_specific_panel.vue' +import MobileNav from 'src/components/mobile_nav/mobile_nav.vue' +import MobilePostStatusButton from 'src/components/mobile_post_status_button/mobile_post_status_button.vue' +import NavPanel from 'src/components/nav_panel/nav_panel.vue' +import UserPanel from 'src/components/user_panel/user_panel.vue' +import { getOrCreateServiceWorker } from './services/sw/sw' +import { windowHeight, windowWidth } from './services/window_utils/window_utils' + +import { useEmojiStore } from 'src/stores/emoji.js' +import { useI18nStore } from 'src/stores/i18n.js' +import { useInstanceStore } from 'src/stores/instance.js' +import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' +import { useInterfaceStore } from 'src/stores/interface.js' +import { useMergedConfigStore } from 'src/stores/merged_config.js' +import { useShoutStore } from 'src/stores/shout.js' + +import messages from 'src/i18n/messages' +import localeService from 'src/services/locale/locale.service.js' + +// Helper to unwrap reactive proxies +window.toValue = (x) => JSON.parse(JSON.stringify(x)) export default { name: 'app', components: { UserPanel, NavPanel, - Notifications: defineAsyncComponent(() => import('./components/notifications/notifications.vue')), + Notifications: defineAsyncComponent( + () => import('src/components/notifications/notifications.vue'), + ), InstanceSpecificPanel, FeaturesPanel, - WhoToFollowPanel, - ShoutPanel, - MediaModal, - SideDrawer, + WhoToFollowPanel: defineAsyncComponent( + () => + import('src/components/who_to_follow_panel/who_to_follow_panel.vue'), + ), + ShoutPanel: defineAsyncComponent( + () => import('src/components/shout_panel/shout_panel.vue'), + ), + MediaModal: defineAsyncComponent( + () => import('src/components/media_modal/media_modal.vue'), + ), MobilePostStatusButton, MobileNav, DesktopNav, - SettingsModal: defineAsyncComponent(() => import('./components/settings_modal/settings_modal.vue')), - UpdateNotification: defineAsyncComponent(() => import('./components/update_notification/update_notification.vue')), - UserReportingModal, - PostStatusModal, - EditStatusModal, - StatusHistoryModal, - GlobalNoticeList + SettingsModal: defineAsyncComponent( + () => import('src/components/settings_modal/settings_modal.vue'), + ), + UpdateNotification: defineAsyncComponent( + () => + import('src/components/update_notification/update_notification.vue'), + ), + PostStatusModal: defineAsyncComponent( + () => import('src/components/post_status_modal/post_status_modal.vue'), + ), + UserReportingModal: defineAsyncComponent( + () => + import('src/components/user_reporting_modal/user_reporting_modal.vue'), + ), + EditStatusModal: defineAsyncComponent( + () => import('src/components/edit_status_modal/edit_status_modal.vue'), + ), + StatusHistoryModal: defineAsyncComponent( + () => + import('src/components/status_history_modal/status_history_modal.vue'), + ), + GlobalNoticeList, }, data: () => ({ - mobileActivePanel: 'timeline' + mobileActivePanel: 'timeline', }), - watch: { - themeApplied () { - this.removeSplash() - }, - currentTheme () { - this.setThemeBodyClass() - }, - layoutType () { - document.getElementById('modal').classList = ['-' + this.layoutType] + provide() { + return { + allowNonSquareEmoji: useMergedConfigStore().mergedConfig.nonSquareEmoji, } }, - created () { + watch: { + themeApplied() { + this.removeSplash() + }, + currentTheme() { + this.setThemeBodyClass() + }, + layoutType() { + document.getElementById('modal').classList = ['-' + this.layoutType] + }, + }, + created() { // Load the locale from the storage - const val = this.$store.getters.mergedConfig.interfaceLanguage - this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val }) + const value = useMergedConfigStore().mergedConfig.interfaceLanguage + useI18nStore().setLanguage(value) + useEmojiStore().loadUnicodeEmojiData(value) + document.getElementById('modal').classList = ['-' + this.layoutType] // Create bound handlers this.updateScrollState = throttle(this.scrollHandler, 200) this.updateMobileState = throttle(this.resizeHandler, 200) }, - mounted () { + mounted() { window.addEventListener('resize', this.updateMobileState) this.scrollParent.addEventListener('scroll', this.updateScrollState) - if (useInterfaceStore().themeApplied) { + if (this.themeApplied) { this.setThemeBodyClass() this.removeSplash() } getOrCreateServiceWorker() }, - unmounted () { + unmounted() { window.removeEventListener('resize', this.updateMobileState) this.scrollParent.removeEventListener('scroll', this.updateScrollState) }, computed: { - themeApplied () { - return useInterfaceStore().themeApplied - }, - currentTheme () { - if (useInterfaceStore().styleDataUsed) { - const styleMeta = useInterfaceStore().styleDataUsed.find(x => x.component === '@meta') + currentTheme() { + if (this.styleDataUsed) { + const styleMeta = this.styleDataUsed.find( + (x) => x.component === '@meta', + ) if (styleMeta !== undefined) { - return styleMeta.directives.name.replaceAll(" ", "-").toLowerCase() + return styleMeta.directives.name.replaceAll(' ', '-').toLowerCase() } } return 'stock' }, - layoutModalClass () { + layoutModalClass() { return '-' + this.layoutType }, - classes () { + classes() { return [ { '-reverse': this.reverseLayout, '-no-sticky-headers': this.noSticky, - '-has-new-post-button': this.newPostButtonShown + '-has-new-post-button': this.newPostButtonShown, }, - '-' + this.layoutType + '-' + this.layoutType, ] }, - navClasses () { - const { navbarColumnStretch } = this.$store.getters.mergedConfig + navClasses() { + const { navbarColumnStretch } = useMergedConfigStore().mergedConfig return [ '-' + this.layoutType, - ...(navbarColumnStretch ? ['-column-stretch'] : []) + ...(navbarColumnStretch ? ['-column-stretch'] : []), ] }, - currentUser () { return this.$store.state.users.currentUser }, - userBackground () { return this.currentUser.background_image }, - instanceBackground () { - return this.mergedConfig.hideInstanceWallpaper - ? null - : this.$store.state.instance.background + currentUser() { + return this.$store.state.users.currentUser }, - background () { return this.userBackground || this.instanceBackground }, - bgStyle () { + userBackground() { + return this.currentUser.background_image + }, + foreignProfileBackground() { + return ( + useMergedConfigStore().mergedConfig.allowForeignUserBackground && + useInterfaceStore().foreignProfileBackground + ) + }, + instanceBackground() { + return useMergedConfigStore().mergedConfig.hideInstanceWallpaper + ? null + : this.instanceBackgroundUrl + }, + background() { + return ( + this.foreignProfileBackground || + this.userBackground || + this.instanceBackground + ) + }, + bgStyle() { if (this.background) { return { - '--body-background-image': `url(${this.background})` + '--body-background-image': `url(${this.background})`, } } }, - shout () { return useShoutStore().joined }, - suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled }, - showInstanceSpecificPanel () { - return this.$store.state.instance.showInstanceSpecificPanel && - !this.$store.getters.mergedConfig.hideISP && - this.$store.state.instance.instanceSpecificPanelContent + shoutJoined() { + return useShoutStore().joined }, - isChats () { + isChats() { return this.$route.name === 'chat' || this.$route.name === 'chats' }, - isListEdit () { + isListEdit() { return this.$route.name === 'lists-edit' }, - newPostButtonShown () { + newPostButtonShown() { if (this.isChats) return false if (this.isListEdit) return false - return this.$store.getters.mergedConfig.alwaysShowNewPostButton || this.layoutType === 'mobile' + return ( + useMergedConfigStore().mergedConfig.alwaysShowNewPostButton || + this.layoutType === 'mobile' + ) }, - showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }, - editingAvailable () { return this.$store.state.instance.editingAvailable }, - shoutboxPosition () { - return this.$store.getters.mergedConfig.alwaysShowNewPostButton || false + shoutboxPosition() { + return ( + useMergedConfigStore().mergedConfig.alwaysShowNewPostButton || false + ) }, - hideShoutbox () { - return this.$store.getters.mergedConfig.hideShoutbox + hideShoutbox() { + return useMergedConfigStore().mergedConfig.hideShoutbox }, - layoutType () { return useInterfaceStore().layoutType }, - privateMode () { return this.$store.state.instance.private }, - reverseLayout () { - const { thirdColumnMode, sidebarRight: reverseSetting } = this.$store.getters.mergedConfig + reverseLayout() { + const { thirdColumnMode, sidebarRight: reverseSetting } = + useMergedConfigStore().mergedConfig if (this.layoutType !== 'wide') { return reverseSetting } else { - return thirdColumnMode === 'notifications' ? reverseSetting : !reverseSetting + return thirdColumnMode === 'notifications' + ? reverseSetting + : !reverseSetting } }, - noSticky () { return this.$store.getters.mergedConfig.disableStickyHeaders }, - showScrollbars () { return this.$store.getters.mergedConfig.showScrollbars }, - scrollParent () { return window; /* this.$refs.appContentRef */ }, - ...mapGetters(['mergedConfig']) + noSticky() { + return useMergedConfigStore().mergedConfig.disableStickyHeaders + }, + showScrollbars() { + return useMergedConfigStore().mergedConfig.showScrollbars + }, + scrollParent() { + return window /* this.$refs.appContentRef */ + }, + showInstanceSpecificPanel() { + return ( + this.instanceSpecificPanelPresent && + !useMergedConfigStore().mergedConfig.hideISP + ) + }, + ...mapState(useMergedConfigStore, ['mergedConfig']), + ...mapState(useInterfaceStore, [ + 'themeApplied', + 'styleDataUsed', + 'layoutType', + ]), + ...mapState(useInstanceStore, ['styleDataUsed']), + ...mapState(useInstanceCapabilitiesStore, [ + 'suggestionsEnabled', + 'editingAvailable', + ]), + ...mapState(useInstanceStore, { + instanceBackgroundUrl: (store) => store.instanceIdentity.background, + showFeaturesPanel: (store) => store.instanceIdentity.showFeaturesPanel, + instanceSpecificPanelPresent: (store) => + store.instanceIdentity.showInstanceSpecificPanel && + store.instanceIdentity.instanceSpecificPanelContent, + }), }, methods: { - resizeHandler () { + resizeHandler() { useInterfaceStore().setLayoutWidth(windowWidth()) useInterfaceStore().setLayoutHeight(windowHeight()) }, - scrollHandler () { - const scrollPosition = this.scrollParent === window ? window.scrollY : this.scrollParent.scrollTop + scrollHandler() { + const scrollPosition = + this.scrollParent === window + ? window.scrollY + : this.scrollParent.scrollTop if (scrollPosition != 0) { this.$refs.appContentRef.classList.add(['-scrolled']) @@ -189,10 +270,10 @@ export default { this.$refs.appContentRef.classList.remove(['-scrolled']) } }, - setThemeBodyClass () { + setThemeBodyClass() { const themeName = this.currentTheme const classList = Array.from(document.body.classList) - const oldTheme = classList.filter(c => c.startsWith('theme-')) + const oldTheme = classList.filter((c) => c.startsWith('theme-')) if (themeName !== null && themeName !== '') { const newTheme = `theme-${themeName.toLowerCase()}` @@ -208,8 +289,10 @@ export default { document.body.classList.remove(...oldTheme) } }, - removeSplash () { - document.querySelector('#status').textContent = this.$t('splash.fun_' + Math.ceil(Math.random() * 4)) + removeSplash() { + document.querySelector('#status').textContent = this.$t( + 'splash.fun_' + Math.ceil(Math.random() * 4), + ) const splashscreenRoot = document.querySelector('#splash') splashscreenRoot.addEventListener('transitionend', () => { splashscreenRoot.remove() @@ -219,6 +302,6 @@ export default { }, 600) splashscreenRoot.classList.add('hidden') document.querySelector('#app').classList.remove('hidden') - } - } + }, + }, } diff --git a/src/App.scss b/src/App.scss index ee1654bb7..952af5b47 100644 --- a/src/App.scss +++ b/src/App.scss @@ -50,7 +50,7 @@ body { // have a cursor/pointer to operate them @media (any-pointer: fine) { * { - scrollbar-color: var(--fg) transparent; + scrollbar-color: var(--icon) transparent; &::-webkit-scrollbar { background: transparent; @@ -130,7 +130,7 @@ body { } // Body should have background to scrollbar otherwise it will use white (body color?) html { - scrollbar-color: var(--fg) var(--wallpaper); + scrollbar-color: var(--icon) var(--wallpaper); background: var(--wallpaper); } } @@ -200,6 +200,7 @@ nav { background-color: var(--wallpaper); background-image: var(--body-background-image); background-position: 50%; + transition: background-image 1s; } .underlay { @@ -513,6 +514,12 @@ nav { } } +label { + &.-disabled { + color: var(--textFaint); + } +} + input, textarea { border: none; @@ -553,6 +560,10 @@ textarea { &[disabled="disabled"], &.disabled { cursor: not-allowed; + color: var(--textFaint); + + /* stylelint-disable-next-line declaration-no-important */ + background-color: transparent !important; } &[type="range"] { @@ -578,6 +589,8 @@ textarea { & + label::before { opacity: 0.5; } + + background-color: var(--background); } + label::before { @@ -677,7 +690,8 @@ option { list-style: none; display: grid; grid-auto-flow: row dense; - grid-template-columns: 1fr 1fr; + grid-template-columns: repeat(auto-fit, minmax(20em, 1fr)); + grid-gap: 0.5em; li { border: 1px solid var(--border); @@ -698,7 +712,6 @@ option { --_roundness-right: 0; position: relative; - flex: 1 1 auto; } > *:first-child, @@ -775,6 +788,19 @@ option { padding: 0 0.25em; border-radius: var(--roundness); border: 1px solid var(--border); + + &.-dismissible { + display: flex; + padding-left: 0.5em; + margin: 0; + align-items: baseline; + line-height: 2; + + span { + display: block; + flex: 1 0 auto; + } + } } .faint { @@ -785,14 +811,19 @@ option { } .notice-dismissible { - padding-right: 4rem; - position: relative; + display: flex; + padding: 0.75em 1em; + align-items: baseline; + line-height: 1.5; + + p, + span { + display: block; + flex: 1 1 auto; + margin: 0; + } .dismiss { - position: absolute; - top: 0; - right: 0; - padding: 0.5em; color: inherit; } } diff --git a/src/App.vue b/src/App.vue index e5e088bc3..c1a7199d7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -28,10 +28,10 @@ > @@ -60,8 +60,8 @@ /> - { return null } if (!staticInitialResults) { - staticInitialResults = JSON.parse(document.getElementById('initial-results').textContent) + staticInitialResults = JSON.parse( + document.getElementById('initial-results').textContent, + ) } return staticInitialResults } @@ -54,7 +80,7 @@ const preloadFetch = async (request) => { return { ok: true, json: () => requestData, - text: () => requestData + text: () => requestData, } } @@ -63,20 +89,38 @@ const getInstanceConfig = async ({ store }) => { const res = await preloadFetch('/api/v1/instance') if (res.ok) { const data = await res.json() - const textlimit = data.max_toot_chars + const textLimit = data.max_toot_chars const vapidPublicKey = data.pleroma.vapid_public_key - store.dispatch('setInstanceOption', { name: 'pleromaExtensionsAvailable', value: data.pleroma }) - store.dispatch('setInstanceOption', { name: 'textlimit', value: textlimit }) - store.dispatch('setInstanceOption', { name: 'accountApprovalRequired', value: data.approval_required }) - store.dispatch('setInstanceOption', { name: 'birthdayRequired', value: !!data.pleroma?.metadata.birthday_required }) - store.dispatch('setInstanceOption', { name: 'birthdayMinAge', value: data.pleroma?.metadata.birthday_min_age || 0 }) + useInstanceCapabilitiesStore().set( + 'pleromaExtensionsAvailable', + data.pleroma, + ) + useInstanceStore().set({ + path: 'limits.textLimit', + value: textLimit, + }) + useInstanceStore().set({ + path: 'accountApprovalRequired', + value: data.approval_required, + }) + useInstanceStore().set({ + path: 'birthdayRequired', + value: !!data.pleroma?.metadata.birthday_required, + }) + useInstanceStore().set({ + path: 'birthdayMinAge', + value: data.pleroma?.metadata.birthday_min_age || 0, + }) if (vapidPublicKey) { - store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey }) + useInstanceStore().set({ + path: 'vapidPublicKey', + value: vapidPublicKey, + }) } } else { - throw (res) + throw res } } catch (error) { console.error('Could not load instance config, potentially fatal') @@ -93,10 +137,12 @@ const getBackendProvidedConfig = async () => { const data = await res.json() return data.pleroma_fe } else { - throw (res) + throw res } } catch (error) { - console.error('Could not load backend-provided frontend config, potentially fatal') + console.error( + 'Could not load backend-provided frontend config, potentially fatal', + ) console.error(error) } } @@ -107,11 +153,13 @@ const getStaticConfig = async () => { if (res.ok) { return res.json() } else { - throw (res) + throw res } } catch (error) { - console.warn('Failed to load static/config.json, continuing without it.') - console.warn(error) + console.warn( + 'Failed to load static/config.json, continuing without it.', + error, + ) return {} } } @@ -129,51 +177,25 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => { config = Object.assign({}, staticConfig, apiConfig) } - const copyInstanceOption = (name) => { - store.dispatch('setInstanceOption', { name, value: config[name] }) - } - - copyInstanceOption('theme') - copyInstanceOption('style') - copyInstanceOption('palette') - copyInstanceOption('embeddedToS') - copyInstanceOption('nsfwCensorImage') - copyInstanceOption('background') - copyInstanceOption('hidePostStats') - copyInstanceOption('hideBotIndication') - copyInstanceOption('hideUserStats') - copyInstanceOption('hideFilteredStatuses') - copyInstanceOption('logo') - - store.dispatch('setInstanceOption', { - name: 'logoMask', - value: typeof config.logoMask === 'undefined' - ? true - : config.logoMask + Object.keys(INSTANCE_IDENTITY_DEFAULT_DEFINITIONS).forEach((source) => { + if (source === 'name') return + if (INSTANCE_IDENTIY_EXTERNAL.has(source)) return + useInstanceStore().set({ + value: + config[source] ?? INSTANCE_IDENTITY_DEFAULT_DEFINITIONS[source].default, + path: `instanceIdentity.${source}`, + }) }) - store.dispatch('setInstanceOption', { - name: 'logoMargin', - value: typeof config.logoMargin === 'undefined' - ? 0 - : config.logoMargin - }) - copyInstanceOption('logoLeft') + Object.keys(INSTANCE_DEFAULT_CONFIG_DEFINITIONS).forEach((source) => + useInstanceStore().set({ + value: + config[source] ?? INSTANCE_DEFAULT_CONFIG_DEFINITIONS[source].default, + path: `prefsStorage.${source}`, + }), + ) + useAuthFlowStore().setInitialStrategy(config.loginMethod) - - copyInstanceOption('redirectRootNoLogin') - copyInstanceOption('redirectRootLogin') - copyInstanceOption('showInstanceSpecificPanel') - copyInstanceOption('minimalScopesMode') - copyInstanceOption('hideMutedPosts') - copyInstanceOption('collapseMessageWithSubject') - copyInstanceOption('scopeCopy') - copyInstanceOption('subjectLineBehavior') - copyInstanceOption('postContentType') - copyInstanceOption('alwaysShowSubjectInput') - copyInstanceOption('showFeaturesPanel') - copyInstanceOption('hideSitename') - copyInstanceOption('sidebarRight') } const getTOS = async ({ store }) => { @@ -181,9 +203,9 @@ const getTOS = async ({ store }) => { const res = await window.fetch('/static/terms-of-service.html') if (res.ok) { const html = await res.text() - store.dispatch('setInstanceOption', { name: 'tos', value: html }) + useInstanceStore().set({ path: 'instanceIdentity.tos', value: html }) } else { - throw (res) + throw res } } catch (e) { console.warn("Can't load TOS\n", e) @@ -195,9 +217,12 @@ const getInstancePanel = async ({ store }) => { const res = await preloadFetch('/instance/panel.html') if (res.ok) { const html = await res.text() - store.dispatch('setInstanceOption', { name: 'instanceSpecificPanelContent', value: html }) + useInstanceStore().set({ + path: 'instanceIdentity.instanceSpecificPanelContent', + value: html, + }) } else { - throw (res) + throw res } } catch (e) { console.warn("Can't load instance panel\n", e) @@ -209,25 +234,27 @@ const getStickers = async ({ store }) => { const res = await window.fetch('/static/stickers.json') if (res.ok) { const values = await res.json() - const stickers = (await Promise.all( - Object.entries(values).map(async ([name, path]) => { - const resPack = await window.fetch(path + 'pack.json') - let meta = {} - if (resPack.ok) { - meta = await resPack.json() - } - return { - pack: name, - path, - meta - } - }) - )).sort((a, b) => { + const stickers = ( + await Promise.all( + Object.entries(values).map(async ([name, path]) => { + const resPack = await window.fetch(path + 'pack.json') + let meta = {} + if (resPack.ok) { + meta = await resPack.json() + } + return { + pack: name, + path, + meta, + } + }), + ) + ).sort((a, b) => { return a.meta.title.localeCompare(b.meta.title) }) - store.dispatch('setInstanceOption', { name: 'stickers', value: stickers }) + useEmojiStore().setStickers(stickers) } else { - throw (res) + throw res } } catch (e) { console.warn("Can't load stickers\n", e) @@ -237,13 +264,19 @@ const getStickers = async ({ store }) => { const getAppSecret = async ({ store }) => { const oauth = useOAuthStore() if (oauth.userToken) { - store.commit('setBackendInteractor', backendInteractorService(oauth.getToken)) + store.commit( + 'setBackendInteractor', + backendInteractorService(oauth.getToken), + ) } } const resolveStaffAccounts = ({ store, accounts }) => { - const nicknames = accounts.map(uri => uri.split('/').pop()) - store.dispatch('setInstanceOption', { name: 'staffAccounts', value: nicknames }) + const nicknames = accounts.map((uri) => uri.split('/').pop()) + useInstanceStore().set({ + path: 'staffAccounts', + value: nicknames, + }) } const getNodeInfo = async ({ store }) => { @@ -254,87 +287,177 @@ const getNodeInfo = async ({ store }) => { const data = await res.json() const metadata = data.metadata const features = metadata.features - store.dispatch('setInstanceOption', { name: 'name', value: metadata.nodeName }) - store.dispatch('setInstanceOption', { name: 'registrationOpen', value: data.openRegistrations }) - store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: features.includes('media_proxy') }) - store.dispatch('setInstanceOption', { name: 'safeDM', value: features.includes('safe_dm_mentions') }) - store.dispatch('setInstanceOption', { name: 'shoutAvailable', value: features.includes('chat') }) - store.dispatch('setInstanceOption', { name: 'pleromaChatMessagesAvailable', value: features.includes('pleroma_chat_messages') }) - store.dispatch('setInstanceOption', { - name: 'pleromaCustomEmojiReactionsAvailable', - value: - features.includes('pleroma_custom_emoji_reactions') || - features.includes('custom_emoji_reactions') + useInstanceStore().set({ + path: 'instanceIdentity.name', + value: metadata.nodeName, }) - store.dispatch('setInstanceOption', { name: 'pleromaBookmarkFoldersAvailable', value: features.includes('pleroma:bookmark_folders') }) - store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') }) - store.dispatch('setInstanceOption', { name: 'pollsAvailable', value: features.includes('polls') }) - store.dispatch('setInstanceOption', { name: 'editingAvailable', value: features.includes('editing') }) - store.dispatch('setInstanceOption', { name: 'pollLimits', value: metadata.pollLimits }) - store.dispatch('setInstanceOption', { name: 'mailerEnabled', value: metadata.mailerEnabled }) - store.dispatch('setInstanceOption', { name: 'quotingAvailable', value: features.includes('quote_posting') }) - store.dispatch('setInstanceOption', { name: 'groupActorAvailable', value: features.includes('pleroma:group_actors') }) - store.dispatch('setInstanceOption', { name: 'blockExpiration', value: features.includes('pleroma:block_expiration') }) - store.dispatch('setInstanceOption', { name: 'localBubbleInstances', value: metadata.localBubbleInstances ?? [] }) + useInstanceStore().set({ + path: 'registrationOpen', + value: data.openRegistrations, + }) + useInstanceCapabilitiesStore().set( + 'mediaProxyAvailable', + features.includes('media_proxy'), + ) + useInstanceCapabilitiesStore().set( + 'safeDM', + features.includes('safe_dm_mentions'), + ) + useInstanceCapabilitiesStore().set( + 'shoutAvailable', + features.includes('chat'), + ) + useInstanceCapabilitiesStore().set( + 'pleromaChatMessagesAvailable', + features.includes('pleroma_chat_messages'), + ) + useInstanceCapabilitiesStore().set( + 'pleromaCustomEmojiReactionsAvailable', + features.includes('pleroma_custom_emoji_reactions') || + features.includes('custom_emoji_reactions'), + ) + useInstanceCapabilitiesStore().set( + 'pleromaBookmarkFoldersAvailable', + features.includes('pleroma:bookmark_folders'), + ) + useInstanceCapabilitiesStore().set( + 'gopherAvailable', + features.includes('gopher'), + ) + useInstanceCapabilitiesStore().set( + 'pollsAvailable', + features.includes('polls'), + ) + useInstanceCapabilitiesStore().set( + 'editingAvailable', + features.includes('editing'), + ) + useInstanceCapabilitiesStore().set( + 'mailerEnabled', + metadata.mailerEnabled, + ) + useInstanceCapabilitiesStore().set( + 'quotingAvailable', + features.includes('quote_posting'), + ) + useInstanceCapabilitiesStore().set( + 'groupActorAvailable', + features.includes('pleroma:group_actors'), + ) + useInstanceCapabilitiesStore().set( + 'blockExpiration', + features.includes('pleroma:block_expiration'), + ) + useInstanceStore().set({ + path: 'localBubbleInstances', + value: metadata.localBubbleInstances ?? [], + }) + useInstanceCapabilitiesStore().set( + 'localBubble', + (metadata.localBubbleInstances ?? []).length > 0, + ) + + useInstanceStore().set({ + path: 'limits.pollLimits', + value: metadata.pollLimits, + }) const uploadLimits = metadata.uploadLimits - store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadLimits.general) }) - store.dispatch('setInstanceOption', { name: 'avatarlimit', value: parseInt(uploadLimits.avatar) }) - store.dispatch('setInstanceOption', { name: 'backgroundlimit', value: parseInt(uploadLimits.background) }) - store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(uploadLimits.banner) }) - store.dispatch('setInstanceOption', { name: 'fieldsLimits', value: metadata.fieldsLimits }) + useInstanceStore().set({ + path: 'limits.uploadlimit', + value: parseInt(uploadLimits.general), + }) + useInstanceStore().set({ + path: 'limits.avatarlimit', + value: parseInt(uploadLimits.avatar), + }) + useInstanceStore().set({ + path: 'limits.backgroundlimit', + value: parseInt(uploadLimits.background), + }) + useInstanceStore().set({ + path: 'limits.bannerlimit', + value: parseInt(uploadLimits.banner), + }) + useInstanceStore().set({ + path: 'limits.fieldsLimits', + value: metadata.fieldsLimits, + }) - store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: metadata.restrictedNicknames }) - store.dispatch('setInstanceOption', { name: 'postFormats', value: metadata.postFormats }) + useInstanceStore().set({ + path: 'restrictedNicknames', + value: metadata.restrictedNicknames, + }) + useInstanceCapabilitiesStore().set('postFormats', metadata.postFormats) const suggestions = metadata.suggestions - store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: suggestions.enabled }) - store.dispatch('setInstanceOption', { name: 'suggestionsWeb', value: suggestions.web }) + useInstanceCapabilitiesStore().set( + 'suggestionsEnabled', + suggestions.enabled, + ) + // this is unused, why? + useInstanceCapabilitiesStore().set('suggestionsWeb', suggestions.web) const software = data.software - store.dispatch('setInstanceOption', { name: 'backendVersion', value: software.version }) - store.dispatch('setInstanceOption', { name: 'backendRepository', value: software.repository }) + useInstanceStore().set({ + path: 'backendVersion', + value: software.version, + }) + useInstanceStore().set({ + path: 'backendRepository', + value: software.repository, + }) const priv = metadata.private - store.dispatch('setInstanceOption', { name: 'private', value: priv }) + useInstanceStore().set({ path: 'privateMode', value: priv }) const frontendVersion = window.___pleromafe_commit_hash - store.dispatch('setInstanceOption', { name: 'frontendVersion', value: frontendVersion }) + useInstanceStore().set({ + path: 'frontendVersion', + value: frontendVersion, + }) const federation = metadata.federation - store.dispatch('setInstanceOption', { - name: 'tagPolicyAvailable', - value: typeof federation.mrf_policies === 'undefined' + useInstanceCapabilitiesStore().set( + 'tagPolicyAvailable', + typeof federation.mrf_policies === 'undefined' ? false - : metadata.federation.mrf_policies.includes('TagPolicy') - }) + : metadata.federation.mrf_policies.includes('TagPolicy'), + ) - store.dispatch('setInstanceOption', { name: 'federationPolicy', value: federation }) - store.dispatch('setInstanceOption', { - name: 'federating', - value: typeof federation.enabled === 'undefined' - ? true - : federation.enabled + useInstanceStore().set({ + path: 'federationPolicy', + value: federation, + }) + useInstanceStore().set({ + path: 'federating', + value: + typeof federation.enabled === 'undefined' ? true : federation.enabled, }) const accountActivationRequired = metadata.accountActivationRequired - store.dispatch('setInstanceOption', { name: 'accountActivationRequired', value: accountActivationRequired }) + useInstanceStore().set({ + path: 'accountActivationRequired', + value: accountActivationRequired, + }) const accounts = metadata.staffAccounts resolveStaffAccounts({ store, accounts }) } else { - throw (res) + throw res } } catch (e) { - console.warn('Could not load nodeinfo') - console.warn(e) + console.warn('Could not load nodeinfo', e) } } const setConfig = async ({ store }) => { // apiConfig, staticConfig - const configInfos = await Promise.all([getBackendProvidedConfig({ store }), getStaticConfig()]) + const configInfos = await Promise.all([ + getBackendProvidedConfig({ store }), + getStaticConfig(), + ]) const apiConfig = configInfos[0] const staticConfig = configInfos[1] @@ -365,29 +488,37 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => { if (process.env.NODE_ENV === 'development') { // do some checks to avoid common errors if (!Object.keys(allStores).length) { - throw new Error('No stores are available. Check the code in src/boot/after_store.js') + throw new Error( + 'No stores are available. Check the code in src/boot/after_store.js', + ) } } await Promise.all( - Object.entries(allStores) - .map(async ([name, mod]) => { - const isStoreName = name => name.startsWith('use') - if (process.env.NODE_ENV === 'development') { - if (Object.keys(mod).filter(isStoreName).length !== 1) { - throw new Error('Each store file must export exactly one store as a named export. Check your code in src/stores/') - } + Object.entries(allStores).map(async ([name, mod]) => { + const isStoreName = (name) => name.startsWith('use') + if (process.env.NODE_ENV === 'development') { + if (Object.keys(mod).filter(isStoreName).length !== 1) { + throw new Error( + 'Each store file must export exactly one store as a named export. Check your code in src/stores/', + ) } - const storeFuncName = Object.keys(mod).find(isStoreName) - if (storeFuncName && typeof mod[storeFuncName] === 'function') { - const p = mod[storeFuncName]().$persistLoaded - if (!(p instanceof Promise)) { - throw new Error(`${name} store's $persistLoaded is not a Promise. The persist plugin is not applied.`) - } - await p - } else { - throw new Error(`Store module ${name} does not export a 'use...' function`) + } + const storeFuncName = Object.keys(mod).find(isStoreName) + if (storeFuncName && typeof mod[storeFuncName] === 'function') { + const p = mod[storeFuncName]().$persistLoaded + if (!(p instanceof Promise)) { + throw new Error( + `${name} store's $persistLoaded is not a Promise. The persist plugin is not applied.`, + ) } - })) + await p + } else { + throw new Error( + `Store module ${name} does not export a 'use...' function`, + ) + } + }), + ) } try { @@ -398,30 +529,45 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => { } if (storageError) { - useInterfaceStore().pushGlobalNotice({ messageKey: 'errors.storage_unavailable', level: 'error' }) + useInterfaceStore().pushGlobalNotice({ + messageKey: 'errors.storage_unavailable', + level: 'error', + }) } useInterfaceStore().setLayoutWidth(windowWidth()) useInterfaceStore().setLayoutHeight(windowHeight()) + window.syncConfig = useSyncConfigStore() + window.mergedConfig = useMergedConfigStore() + window.localConfig = useLocalConfigStore() + window.highlightConfig = useUserHighlightStore() + FaviconService.initFaviconService() initServiceWorker(store) window.addEventListener('focus', () => updateFocus()) const overrides = window.___pleromafe_dev_overrides || {} - const server = (typeof overrides.target !== 'undefined') ? overrides.target : window.location.origin - store.dispatch('setInstanceOption', { name: 'server', value: server }) + const server = + typeof overrides.target !== 'undefined' + ? overrides.target + : window.location.origin + useInstanceStore().set({ path: 'server', value: server }) await setConfig({ store }) try { - await useInterfaceStore().applyTheme().catch((e) => { console.error('Error setting theme', e) }) + await useInterfaceStore() + .applyTheme() + .catch((e) => { + console.error('Error setting theme', e) + }) } catch (e) { window.splashError(e) return Promise.reject(e) } - applyConfig(store.state.config, i18n.global) + applyStyleConfig(useMergedConfigStore().mergedConfig, i18n.global) // Now we can try getting the server settings and logging in // Most of these are preloaded into the index.html so blocking is minimized @@ -429,8 +575,8 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => { checkOAuthToken({ store }), getInstancePanel({ store }), getNodeInfo({ store }), - getInstanceConfig({ store }) - ]).catch(e => Promise.reject(e)) + getInstanceConfig({ store }), + ]).catch((e) => Promise.reject(e)) // Start fetching things that don't need to block the UI store.dispatch('fetchMutes') @@ -443,11 +589,11 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => { history: createWebHistory(), routes: routes(store), scrollBehavior: (to, _from, savedPosition) => { - if (to.matched.some(m => m.meta.dontScroll)) { + if (to.matched.some((m) => m.meta.dontScroll)) { return false } return savedPosition || { left: 0, top: 0 } - } + }, }) useI18nStore().setI18n(i18n) @@ -469,6 +615,9 @@ const afterStoreSetup = async ({ pinia, store, storageError, i18n }) => { app.component('FAIcon', FontAwesomeIcon) app.component('FALayers', FontAwesomeLayers) + app.component('Status', Status) + app.component('RichContent', RichContent) + app.component('StillImage', StillImage) // remove after vue 3.3 app.config.unwrapInjectedRef = true diff --git a/src/boot/routes.js b/src/boot/routes.js index 02abf8ce6..4a075e955 100644 --- a/src/boot/routes.js +++ b/src/boot/routes.js @@ -1,42 +1,28 @@ -import PublicTimeline from 'components/public_timeline/public_timeline.vue' -import BubbleTimeline from 'components/bubble_timeline/bubble_timeline.vue' -import PublicAndExternalTimeline from 'components/public_and_external_timeline/public_and_external_timeline.vue' -import FriendsTimeline from 'components/friends_timeline/friends_timeline.vue' -import TagTimeline from 'components/tag_timeline/tag_timeline.vue' -import BookmarkTimeline from 'components/bookmark_timeline/bookmark_timeline.vue' -import ConversationPage from 'components/conversation-page/conversation-page.vue' -import Interactions from 'components/interactions/interactions.vue' -import DMs from 'components/dm_timeline/dm_timeline.vue' -import ChatList from 'components/chat_list/chat_list.vue' -import Chat from 'components/chat/chat.vue' -import UserProfile from 'components/user_profile/user_profile.vue' -import Search from 'components/search/search.vue' -import Registration from 'components/registration/registration.vue' -import PasswordReset from 'components/password_reset/password_reset.vue' -import FollowRequests from 'components/follow_requests/follow_requests.vue' -import OAuthCallback from 'components/oauth_callback/oauth_callback.vue' -import Notifications from 'components/notifications/notifications.vue' -import AuthForm from 'components/auth_form/auth_form.js' -import ShoutPanel from 'components/shout_panel/shout_panel.vue' -import WhoToFollow from 'components/who_to_follow/who_to_follow.vue' -import About from 'components/about/about.vue' -import RemoteUserResolver from 'components/remote_user_resolver/remote_user_resolver.vue' -import Lists from 'components/lists/lists.vue' -import ListsTimeline from 'components/lists_timeline/lists_timeline.vue' -import ListsEdit from 'components/lists_edit/lists_edit.vue' +import { defineAsyncComponent } from 'vue' + +import BookmarkTimeline from 'src/components/bookmark_timeline/bookmark_timeline.vue' +import BubbleTimeline from 'src/components/bubble_timeline/bubble_timeline.vue' +import ConversationPage from 'src/components/conversation-page/conversation-page.vue' +import DMs from 'src/components/dm_timeline/dm_timeline.vue' +import FriendsTimeline from 'src/components/friends_timeline/friends_timeline.vue' import NavPanel from 'src/components/nav_panel/nav_panel.vue' -import AnnouncementsPage from 'components/announcements_page/announcements_page.vue' -import QuotesTimeline from '../components/quotes_timeline/quotes_timeline.vue' -import Drafts from 'components/drafts/drafts.vue' -import BookmarkFolders from '../components/bookmark_folders/bookmark_folders.vue' -import BookmarkFolderEdit from '../components/bookmark_folder_edit/bookmark_folder_edit.vue' +import PublicAndExternalTimeline from 'src/components/public_and_external_timeline/public_and_external_timeline.vue' +import PublicTimeline from 'src/components/public_timeline/public_timeline.vue' +import QuotesTimeline from 'src/components/quotes_timeline/quotes_timeline.vue' +import RemoteUserResolver from 'src/components/remote_user_resolver/remote_user_resolver.vue' +import TagTimeline from 'src/components/tag_timeline/tag_timeline.vue' + +import { useInstanceStore } from 'src/stores/instance.js' +import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' export default (store) => { const validateAuthenticatedRoute = (to, from, next) => { if (store.state.users.currentUser) { next() } else { - next(store.state.instance.redirectRootNoLogin || '/main/all') + next( + useInstanceStore().instanceIdentity.redirectRootNoLogin || '/main/all', + ) } } @@ -45,64 +31,276 @@ export default (store) => { name: 'root', path: '/', redirect: () => { - return (store.state.users.currentUser - ? store.state.instance.redirectRootLogin - : store.state.instance.redirectRootNoLogin) || '/main/all' - } + return ( + (store.state.users.currentUser + ? useInstanceStore().instanceIdentity.redirectRootLogin + : useInstanceStore().instanceIdentity.redirectRootNoLogin) || + '/main/all' + ) + }, + }, + { + name: 'public-external-timeline', + path: '/main/all', + component: PublicAndExternalTimeline, + }, + { + name: 'public-timeline', + path: '/main/public', + component: PublicTimeline, + }, + { + name: 'friends', + path: '/main/friends', + component: FriendsTimeline, + beforeEnter: validateAuthenticatedRoute, }, - { name: 'public-external-timeline', path: '/main/all', component: PublicAndExternalTimeline }, - { name: 'public-timeline', path: '/main/public', component: PublicTimeline }, - { name: 'friends', path: '/main/friends', component: FriendsTimeline, beforeEnter: validateAuthenticatedRoute }, { name: 'tag-timeline', path: '/tag/:tag', component: TagTimeline }, { name: 'bookmarks', path: '/bookmarks', component: BookmarkTimeline }, { name: 'bubble', path: '/bubble', component: BubbleTimeline }, - { name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } }, + { + name: 'conversation', + path: '/notice/:id', + component: ConversationPage, + meta: { dontScroll: true }, + }, { name: 'quotes', path: '/notice/:id/quotes', component: QuotesTimeline }, { name: 'remote-user-profile-acct', path: '/remote-users/:_(@)?:username([^/@]+)@:hostname([^/@]+)', component: RemoteUserResolver, - beforeEnter: validateAuthenticatedRoute + beforeEnter: validateAuthenticatedRoute, }, { name: 'remote-user-profile', path: '/remote-users/:hostname/:username', component: RemoteUserResolver, - beforeEnter: validateAuthenticatedRoute + beforeEnter: validateAuthenticatedRoute, + }, + { + name: 'external-user-profile', + path: '/users/$:id', + component: defineAsyncComponent( + () => import('src/components/user_profile/user_profile.vue'), + ), + }, + { + name: 'interactions', + path: '/users/:username/interactions', + component: defineAsyncComponent( + () => import('src/components/interactions/interactions.vue'), + ), + beforeEnter: validateAuthenticatedRoute, + }, + { + name: 'dms', + path: '/users/:username/dms', + component: DMs, + beforeEnter: validateAuthenticatedRoute, + }, + { + name: 'registration', + path: '/registration', + component: defineAsyncComponent( + () => import('src/components/registration/registration.vue'), + ), + }, + { + name: 'password-reset', + path: '/password-reset', + component: defineAsyncComponent( + () => import('src/components/password_reset/password_reset.vue'), + ), + props: true, + }, + { + name: 'registration-token', + path: '/registration/:token', + component: defineAsyncComponent( + () => import('src/components/registration/registration.vue'), + ), + }, + { + name: 'friend-requests', + path: '/friend-requests', + component: defineAsyncComponent( + () => import('src/components/follow_requests/follow_requests.vue'), + ), + beforeEnter: validateAuthenticatedRoute, + }, + { + name: 'notifications', + path: '/:username/notifications', + component: defineAsyncComponent( + () => import('src/components/notifications/notifications.vue'), + ), + props: () => ({ disableTeleport: true }), + beforeEnter: validateAuthenticatedRoute, + }, + { + name: 'login', + path: '/login', + component: defineAsyncComponent( + () => import('src/components/auth_form/auth_form.js'), + ), + }, + { + name: 'shout-panel', + path: '/shout-panel', + component: defineAsyncComponent( + () => import('src/components/shout_panel/shout_panel.vue'), + ), + props: () => ({ floating: false }), + }, + { + name: 'oauth-callback', + path: '/oauth-callback', + component: defineAsyncComponent( + () => import('src/components/oauth_callback/oauth_callback.vue'), + ), + props: (route) => ({ code: route.query.code }), + }, + { + name: 'search', + path: '/search', + component: defineAsyncComponent( + () => import('src/components/search/search.vue'), + ), + props: (route) => ({ query: route.query.query }), + }, + { + name: 'who-to-follow', + path: '/who-to-follow', + component: defineAsyncComponent( + () => import('src/components/who_to_follow/who_to_follow.vue'), + ), + beforeEnter: validateAuthenticatedRoute, + }, + { + name: 'about', + path: '/about', + component: defineAsyncComponent( + () => import('src/components/about/about.vue'), + ), + }, + { + name: 'announcements', + path: '/announcements', + component: defineAsyncComponent( + () => + import('src/components/announcements_page/announcements_page.vue'), + ), + }, + { + name: 'drafts', + path: '/drafts', + component: defineAsyncComponent( + () => import('src/components/drafts/drafts.vue'), + ), + }, + { + name: 'user-profile', + path: '/users/:name', + component: defineAsyncComponent( + () => import('src/components/user_profile/user_profile.vue'), + ), + }, + { + name: 'legacy-user-profile', + path: '/:name', + component: defineAsyncComponent( + () => import('src/components/user_profile/user_profile.vue'), + ), + }, + { + name: 'lists', + path: '/lists', + component: defineAsyncComponent( + () => import('src/components/lists/lists.vue'), + ), + }, + { + name: 'lists-timeline', + path: '/lists/:id', + component: defineAsyncComponent( + () => import('src/components/lists_timeline/lists_timeline.vue'), + ), + }, + { + name: 'lists-edit', + path: '/lists/:id/edit', + component: defineAsyncComponent( + () => import('src/components/lists_edit/lists_edit.vue'), + ), + }, + { + name: 'lists-new', + path: '/lists/new', + component: defineAsyncComponent( + () => import('src/components/lists_edit/lists_edit.vue'), + ), + }, + { + name: 'edit-navigation', + path: '/nav-edit', + component: NavPanel, + props: () => ({ forceExpand: true, forceEditMode: true }), + beforeEnter: validateAuthenticatedRoute, + }, + { + name: 'bookmark-folders', + path: '/bookmark_folders', + component: defineAsyncComponent( + () => import('src/components/bookmark_folders/bookmark_folders.vue'), + ), + }, + { + name: 'bookmark-folder-new', + path: '/bookmarks/new-folder', + component: defineAsyncComponent( + () => + import( + 'src/components/bookmark_folder_edit/bookmark_folder_edit.vue' + ), + ), + }, + { + name: 'bookmark-folder', + path: '/bookmarks/:id', + component: BookmarkTimeline, + }, + { + name: 'bookmark-folder-edit', + path: '/bookmarks/:id/edit', + component: defineAsyncComponent( + () => + import( + 'src/components/bookmark_folder_edit/bookmark_folder_edit.vue' + ), + ), }, - { name: 'external-user-profile', path: '/users/$:id', component: UserProfile }, - { name: 'interactions', path: '/users/:username/interactions', component: Interactions, beforeEnter: validateAuthenticatedRoute }, - { name: 'dms', path: '/users/:username/dms', component: DMs, beforeEnter: validateAuthenticatedRoute }, - { name: 'registration', path: '/registration', component: Registration }, - { name: 'password-reset', path: '/password-reset', component: PasswordReset, props: true }, - { name: 'registration-token', path: '/registration/:token', component: Registration }, - { name: 'friend-requests', path: '/friend-requests', component: FollowRequests, beforeEnter: validateAuthenticatedRoute }, - { name: 'notifications', path: '/:username/notifications', component: Notifications, props: () => ({ disableTeleport: true }), beforeEnter: validateAuthenticatedRoute }, - { name: 'login', path: '/login', component: AuthForm }, - { name: 'shout-panel', path: '/shout-panel', component: ShoutPanel, props: () => ({ floating: false }) }, - { name: 'oauth-callback', path: '/oauth-callback', component: OAuthCallback, props: (route) => ({ code: route.query.code }) }, - { name: 'search', path: '/search', component: Search, props: (route) => ({ query: route.query.query }) }, - { name: 'who-to-follow', path: '/who-to-follow', component: WhoToFollow, beforeEnter: validateAuthenticatedRoute }, - { name: 'about', path: '/about', component: About }, - { name: 'announcements', path: '/announcements', component: AnnouncementsPage }, - { name: 'drafts', path: '/drafts', component: Drafts }, - { name: 'user-profile', path: '/users/:name', component: UserProfile }, - { name: 'legacy-user-profile', path: '/:name', component: UserProfile }, - { name: 'lists', path: '/lists', component: Lists }, - { name: 'lists-timeline', path: '/lists/:id', component: ListsTimeline }, - { name: 'lists-edit', path: '/lists/:id/edit', component: ListsEdit }, - { name: 'lists-new', path: '/lists/new', component: ListsEdit }, - { name: 'edit-navigation', path: '/nav-edit', component: NavPanel, props: () => ({ forceExpand: true, forceEditMode: true }), beforeEnter: validateAuthenticatedRoute }, - { name: 'bookmark-folders', path: '/bookmark_folders', component: BookmarkFolders }, - { name: 'bookmark-folder-new', path: '/bookmarks/new-folder', component: BookmarkFolderEdit }, - { name: 'bookmark-folder', path: '/bookmarks/:id', component: BookmarkTimeline }, - { name: 'bookmark-folder-edit', path: '/bookmarks/:id/edit', component: BookmarkFolderEdit } ] - if (store.state.instance.pleromaChatMessagesAvailable) { + if (useInstanceCapabilitiesStore().pleromaChatMessagesAvailable) { routes = routes.concat([ - { name: 'chat', path: '/users/:username/chats/:recipient_id', component: Chat, meta: { dontScroll: false }, beforeEnter: validateAuthenticatedRoute }, - { name: 'chats', path: '/users/:username/chats', component: ChatList, meta: { dontScroll: false }, beforeEnter: validateAuthenticatedRoute } + { + name: 'chat', + path: '/users/:username/chats/:recipient_id', + component: defineAsyncComponent( + () => import('src/components/chat/chat.vue'), + ), + meta: { dontScroll: false }, + beforeEnter: validateAuthenticatedRoute, + }, + { + name: 'chats', + path: '/users/:username/chats', + component: defineAsyncComponent( + () => import('src/components/chat_list/chat_list.vue'), + ), + meta: { dontScroll: false }, + beforeEnter: validateAuthenticatedRoute, + }, ]) } diff --git a/src/components/about/about.js b/src/components/about/about.js index 1df258450..e293895d5 100644 --- a/src/components/about/about.js +++ b/src/components/about/about.js @@ -1,8 +1,16 @@ -import InstanceSpecificPanel from '../instance_specific_panel/instance_specific_panel.vue' -import FeaturesPanel from '../features_panel/features_panel.vue' -import TermsOfServicePanel from '../terms_of_service_panel/terms_of_service_panel.vue' -import StaffPanel from '../staff_panel/staff_panel.vue' -import MRFTransparencyPanel from '../mrf_transparency_panel/mrf_transparency_panel.vue' +import { mapState } from 'pinia' + +import FeaturesPanel from 'src/components/features_panel/features_panel.vue' +import InstanceSpecificPanel from 'src/components/instance_specific_panel/instance_specific_panel.vue' +import MRFTransparencyPanel from 'src/components/mrf_transparency_panel/mrf_transparency_panel.vue' +import StaffPanel from 'src/components/staff_panel/staff_panel.vue' +import TermsOfServicePanel from 'src/components/terms_of_service_panel/terms_of_service_panel.vue' + +import { useInstanceStore } from 'src/stores/instance.js' +import { useMergedConfigStore } from 'src/stores/merged_config.js' + +const pleromaFeCommitUrl = + 'https://git.pleroma.social/pleroma/pleroma-fe/commit/' const About = { components: { @@ -10,16 +18,28 @@ const About = { FeaturesPanel, TermsOfServicePanel, StaffPanel, - MRFTransparencyPanel + MRFTransparencyPanel, }, computed: { - showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel }, - showInstanceSpecificPanel () { - return this.$store.state.instance.showInstanceSpecificPanel && - !this.$store.getters.mergedConfig.hideISP && - this.$store.state.instance.instanceSpecificPanelContent - } - } + showFeaturesPanel() { + return useInstanceStore().instanceIdentity.showFeaturesPanel + }, + frontendVersionLink() { + return pleromaFeCommitUrl + this.frontendVersion + }, + ...mapState(useInstanceStore, [ + 'backendVersion', + 'backendRepository', + 'frontendVersion', + ]), + showInstanceSpecificPanel() { + return ( + useInstanceStore().instanceIdentity.showInstanceSpecificPanel && + !useMergedConfigStore().mergedConfig.hideISP && + useInstanceStore().instanceIdentity.instanceSpecificPanelContent + ) + }, + }, } export default About diff --git a/src/components/about/about.vue b/src/components/about/about.vue index 8a551485f..f7bc0d00d 100644 --- a/src/components/about/about.vue +++ b/src/components/about/about.vue @@ -1,11 +1,47 @@ + diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js index 2ac74ea76..9b4775b97 100644 --- a/src/components/account_actions/account_actions.js +++ b/src/components/account_actions/account_actions.js @@ -1,53 +1,58 @@ -import { mapState } from 'vuex' -import ProgressButton from '../progress_button/progress_button.vue' -import Popover from '../popover/popover.vue' +import { mapState } from 'pinia' +import { defineAsyncComponent } from 'vue' + +import Popover from 'src/components/popover/popover.vue' +import ProgressButton from 'src/components/progress_button/progress_button.vue' import UserListMenu from 'src/components/user_list_menu/user_list_menu.vue' -import ConfirmModal from '../confirm_modal/confirm_modal.vue' -import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue' -import { library } from '@fortawesome/fontawesome-svg-core' -import { - faEllipsisV -} from '@fortawesome/free-solid-svg-icons' + +import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' +import { useMergedConfigStore } from 'src/stores/merged_config.js' import { useReportsStore } from 'src/stores/reports' -library.add( - faEllipsisV -) +import { library } from '@fortawesome/fontawesome-svg-core' +import { faEllipsisV } from '@fortawesome/free-solid-svg-icons' + +library.add(faEllipsisV) const AccountActions = { - props: [ - 'user', 'relationship' - ], - data () { + props: ['user', 'relationship'], + data() { return { showingConfirmBlock: false, - showingConfirmRemoveFollower: false + showingConfirmRemoveFollower: false, } }, components: { ProgressButton, Popover, UserListMenu, - ConfirmModal, - UserTimedFilterModal + ConfirmModal: defineAsyncComponent( + () => import('src/components/confirm_modal/confirm_modal.vue'), + ), + UserTimedFilterModal: defineAsyncComponent( + () => + import( + 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue' + ), + ), }, methods: { - showConfirmRemoveUserFromFollowers () { + showConfirmRemoveUserFromFollowers() { this.showingConfirmRemoveFollower = true }, - hideConfirmRemoveUserFromFollowers () { + hideConfirmRemoveUserFromFollowers() { this.showingConfirmRemoveFollower = false }, - hideConfirmBlock () { + hideConfirmBlock() { this.showingConfirmBlock = false }, - showRepeats () { + showRepeats() { this.$store.dispatch('showReblogs', this.user.id) }, - hideRepeats () { + hideRepeats() { this.$store.dispatch('hideReblogs', this.user.id) }, - blockUser () { + blockUser() { if (this.$refs.timedBlockDialog) { this.$refs.timedBlockDialog.optionallyPrompt() } else { @@ -58,46 +63,49 @@ const AccountActions = { } } }, - doBlockUser () { + doBlockUser() { this.$store.dispatch('blockUser', { id: this.user.id }) this.hideConfirmBlock() }, - unblockUser () { + unblockUser() { this.$store.dispatch('unblockUser', this.user.id) }, - removeUserFromFollowers () { + removeUserFromFollowers() { if (!this.shouldConfirmRemoveUserFromFollowers) { this.doRemoveUserFromFollowers() } else { this.showConfirmRemoveUserFromFollowers() } }, - doRemoveUserFromFollowers () { + doRemoveUserFromFollowers() { this.$store.dispatch('removeUserFromFollowers', this.user.id) this.hideConfirmRemoveUserFromFollowers() }, - reportUser () { + reportUser() { useReportsStore().openUserReportingModal({ userId: this.user.id }) }, - openChat () { + openChat() { this.$router.push({ name: 'chat', - params: { username: this.$store.state.users.currentUser.screen_name, recipient_id: this.user.id } + params: { + username: this.$store.state.users.currentUser.screen_name, + recipient_id: this.user.id, + }, }) - } + }, }, computed: { - shouldConfirmBlock () { - return this.$store.getters.mergedConfig.modalOnBlock + shouldConfirmBlock() { + return useMergedConfigStore().mergedConfig.modalOnBlock }, - shouldConfirmRemoveUserFromFollowers () { - return this.$store.getters.mergedConfig.modalOnRemoveUserFromFollowers + shouldConfirmRemoveUserFromFollowers() { + return useMergedConfigStore().mergedConfig.modalOnRemoveUserFromFollowers }, - ...mapState({ - blockExpirationSupported: state => state.instance.blockExpiration, - pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable - }) - } + ...mapState(useInstanceCapabilitiesStore, [ + 'blockExpiration', + 'pleromaChatMessagesAvailable', + ]), + }, } export default AccountActions diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue index cc00a735d..0c93872de 100644 --- a/src/components/account_actions/account_actions.vue +++ b/src/components/account_actions/account_actions.vue @@ -94,8 +94,8 @@ - - + - - + state.users.currentUser + currentUser: (state) => state.users.currentUser, }), - canEditAnnouncement () { - return this.currentUser && this.currentUser.privileges.includes('announcements_manage_announcements') + canEditAnnouncement() { + return ( + this.currentUser && + this.currentUser.privileges.includes( + 'announcements_manage_announcements', + ) + ) }, - content () { + content() { return this.announcement.content }, - isRead () { + isRead() { return this.announcement.read }, - publishedAt () { + publishedAt() { const time = this.announcement.published_at if (!time) { return } - return this.formatTimeOrDate(time, localeService.internalToBrowserLocale(this.$i18n.locale)) + return this.formatTimeOrDate( + time, + localeService.internalToBrowserLocale(this.$i18n.locale), + ) }, - startsAt () { + startsAt() { const time = this.announcement.starts_at if (!time) { return } - return this.formatTimeOrDate(time, localeService.internalToBrowserLocale(this.$i18n.locale)) + return this.formatTimeOrDate( + time, + localeService.internalToBrowserLocale(this.$i18n.locale), + ) }, - endsAt () { + endsAt() { const time = this.announcement.ends_at if (!time) { return } - return this.formatTimeOrDate(time, localeService.internalToBrowserLocale(this.$i18n.locale)) + return this.formatTimeOrDate( + time, + localeService.internalToBrowserLocale(this.$i18n.locale), + ) }, - inactive () { + inactive() { return this.announcement.inactive - } + }, }, methods: { - markAsRead () { + markAsRead() { if (!this.isRead) { - return useAnnouncementsStore().markAnnouncementAsRead(this.announcement.id) + return useAnnouncementsStore().markAnnouncementAsRead( + this.announcement.id, + ) } }, - deleteAnnouncement () { + deleteAnnouncement() { return useAnnouncementsStore().deleteAnnouncement(this.announcement.id) }, - formatTimeOrDate (time, locale) { + formatTimeOrDate(time, locale) { const d = new Date(time) - return this.announcement.all_day ? d.toLocaleDateString(locale) : d.toLocaleString(locale) + return this.announcement.all_day + ? d.toLocaleDateString(locale) + : d.toLocaleString(locale) }, - enterEditMode () { + enterEditMode() { this.editedAnnouncement.content = this.announcement.pleroma.raw_content this.editedAnnouncement.startsAt = this.announcement.starts_at this.editedAnnouncement.endsAt = this.announcement.ends_at this.editedAnnouncement.allDay = this.announcement.all_day this.editing = true }, - submitEdit () { - useAnnouncementsStore().editAnnouncement({ - id: this.announcement.id, - ...this.editedAnnouncement - }) + submitEdit() { + useAnnouncementsStore() + .editAnnouncement({ + id: this.announcement.id, + ...this.editedAnnouncement, + }) .then(() => { this.editing = false }) - .catch(error => { + .catch((error) => { this.editError = error.error }) }, - cancelEdit () { + cancelEdit() { this.editing = false }, - clearError () { + clearError() { this.editError = undefined - } - } + }, + }, } export default Announcement diff --git a/src/components/announcement_editor/announcement_editor.js b/src/components/announcement_editor/announcement_editor.js index 79a03afe1..c816083a4 100644 --- a/src/components/announcement_editor/announcement_editor.js +++ b/src/components/announcement_editor/announcement_editor.js @@ -1,13 +1,13 @@ -import Checkbox from '../checkbox/checkbox.vue' +import Checkbox from 'src/components/checkbox/checkbox.vue' const AnnouncementEditor = { components: { - Checkbox + Checkbox, }, props: { announcement: Object, - disabled: Boolean - } + disabled: Boolean, + }, } export default AnnouncementEditor diff --git a/src/components/announcements_page/announcements_page.js b/src/components/announcements_page/announcements_page.js index 9ce0b45f5..3c73198c5 100644 --- a/src/components/announcements_page/announcements_page.js +++ b/src/components/announcements_page/announcements_page.js @@ -1,59 +1,67 @@ import { mapState } from 'vuex' -import Announcement from '../announcement/announcement.vue' -import AnnouncementEditor from '../announcement_editor/announcement_editor.vue' -import { useAnnouncementsStore } from 'src/stores/announcements' + +import Announcement from 'src/components/announcement/announcement.vue' +import AnnouncementEditor from 'src/components/announcement_editor/announcement_editor.vue' + +import { useAnnouncementsStore } from 'src/stores/announcements.js' const AnnouncementsPage = { components: { Announcement, - AnnouncementEditor + AnnouncementEditor, }, - data () { + data() { return { newAnnouncement: { content: '', startsAt: undefined, endsAt: undefined, - allDay: false + allDay: false, }, posting: false, - error: undefined + error: undefined, } }, - mounted () { + mounted() { useAnnouncementsStore().fetchAnnouncements() }, computed: { ...mapState({ - currentUser: state => state.users.currentUser + currentUser: (state) => state.users.currentUser, }), - announcements () { + announcements() { return useAnnouncementsStore().announcements }, - canPostAnnouncement () { - return this.currentUser && this.currentUser.privileges.includes('announcements_manage_announcements') - } + canPostAnnouncement() { + return ( + this.currentUser && + this.currentUser.privileges.includes( + 'announcements_manage_announcements', + ) + ) + }, }, methods: { - postAnnouncement () { + postAnnouncement() { this.posting = true - useAnnouncementsStore().postAnnouncement(this.newAnnouncement) + useAnnouncementsStore() + .postAnnouncement(this.newAnnouncement) .then(() => { this.newAnnouncement.content = '' this.startsAt = undefined this.endsAt = undefined }) - .catch(error => { + .catch((error) => { this.error = error.error }) .finally(() => { this.posting = false }) }, - clearError () { + clearError() { this.error = undefined - } - } + }, + }, } export default AnnouncementsPage diff --git a/src/components/async_component_error/async_component_error.vue b/src/components/async_component_error/async_component_error.vue index 2ff8974c1..baf430950 100644 --- a/src/components/async_component_error/async_component_error.vue +++ b/src/components/async_component_error/async_component_error.vue @@ -21,10 +21,10 @@ export default { emits: ['resetAsyncComponent'], methods: { - retry () { + retry() { this.$emit('resetAsyncComponent') - } - } + }, + }, } diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index 21d793930..4b733258f 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -1,24 +1,29 @@ -import StillImage from '../still-image/still-image.vue' -import Flash from '../flash/flash.vue' -import VideoAttachment from '../video_attachment/video_attachment.vue' +import { mapState } from 'pinia' +import { defineAsyncComponent } from 'vue' + +import Popover from 'src/components/popover/popover.vue' +import VideoAttachment from 'src/components/video_attachment/video_attachment.vue' import nsfwImage from '../../assets/nsfw.png' -import fileTypeService from '../../services/file_type/file_type.service.js' -import { mapGetters } from 'vuex' + +import { useInstanceStore } from 'src/stores/instance.js' +import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' +import { useMediaViewerStore } from 'src/stores/media_viewer' +import { useMergedConfigStore } from 'src/stores/merged_config.js' + import { library } from '@fortawesome/fontawesome-svg-core' import { + faAlignRight, faFile, - faMusic, faImage, - faVideo, - faPlayCircle, - faTimes, - faStop, - faSearchPlus, - faTrashAlt, + faMusic, faPencilAlt, - faAlignRight + faPlayCircle, + faSearchPlus, + faStop, + faTimes, + faTrashAlt, + faVideo, } from '@fortawesome/free-solid-svg-icons' -import { useMediaViewerStore } from 'src/stores/media_viewer' library.add( faFile, @@ -31,7 +36,7 @@ library.add( faSearchPlus, faTrashAlt, faPencilAlt, - faAlignRight + faAlignRight, ) const Attachment = { @@ -46,72 +51,74 @@ const Attachment = { 'remove', 'shiftUp', 'shiftDn', - 'edit' + 'edit', ], - data () { + data() { return { localDescription: this.description || this.attachment.description, - nsfwImage: this.$store.state.instance.nsfwCensorImage || nsfwImage, - hideNsfwLocal: this.$store.getters.mergedConfig.hideNsfw, - preloadImage: this.$store.getters.mergedConfig.preloadImage, + nsfwImage: + useInstanceStore().instanceIdentity.nsfwCensorImage || nsfwImage, + hideNsfwLocal: useMergedConfigStore().mergedConfig.hideNsfw, + preloadImage: useMergedConfigStore().mergedConfig.preloadImage, loading: false, - img: fileTypeService.fileType(this.attachment.mimetype) === 'image' && document.createElement('img'), + img: this.attachment.type === 'image' && document.createElement('img'), modalOpen: false, showHidden: false, flashLoaded: false, - showDescription: false } }, components: { - Flash, - StillImage, - VideoAttachment + Flash: defineAsyncComponent(() => import('src/components/flash/flash.vue')), + + VideoAttachment: defineAsyncComponent( + () => import('src/components/video_attachment/video_attachment.vue'), + ), + Popover, }, computed: { - classNames () { + classNames() { return [ { '-loading': this.loading, '-nsfw-placeholder': this.hidden, '-editable': this.edit !== undefined, - '-compact': this.compact + '-compact': this.compact, }, - '-type-' + this.type, + '-type-' + this.attachment.type, this.size && '-size-' + this.size, - `-${this.useContainFit ? 'contain' : 'cover'}-fit` + `-${this.useContainFit ? 'contain' : 'cover'}-fit`, ] }, - usePlaceholder () { + usePlaceholder() { return this.size === 'hide' }, - useContainFit () { - return this.$store.getters.mergedConfig.useContainFit + useContainFit() { + return this.mergedConfig.useContainFit }, - placeholderName () { + placeholderName() { if (this.attachment.description === '' || !this.attachment.description) { - return this.type.toUpperCase() + return this.attachment.type.toUpperCase() } return this.attachment.description }, - placeholderIconClass () { - if (this.type === 'image') return 'image' - if (this.type === 'video') return 'video' - if (this.type === 'audio') return 'music' + placeholderIconClass() { + if (this.attachment.type === 'image') return 'image' + if (this.attachment.type === 'video') return 'video' + if (this.attachment.type === 'audio') return 'music' return 'file' }, - referrerpolicy () { - return this.$store.state.instance.mediaProxyAvailable ? '' : 'no-referrer' + referrerpolicy() { + return useInstanceCapabilitiesStore().mediaProxyAvailable + ? '' + : 'no-referrer' }, - type () { - return fileTypeService.fileType(this.attachment.mimetype) - }, - hidden () { + hidden() { return this.nsfw && this.hideNsfwLocal && !this.showHidden }, - isEmpty () { - return (this.type === 'html' && !this.attachment.oembed) + isEmpty() { + return this.attachment.type === 'html' && !this.attachment.oembed }, - useModal () { + useModal() { let modalTypes = [] switch (this.size) { case 'hide': @@ -124,64 +131,63 @@ const Attachment = { : ['image'] break } - return modalTypes.includes(this.type) + return modalTypes.includes(this.attachment.type) }, - videoTag () { + videoTag() { return this.useModal ? 'button' : 'span' }, - ...mapGetters(['mergedConfig']) + ...mapState(useMergedConfigStore, ['mergedConfig']), }, watch: { - 'attachment.description' (newVal) { + 'attachment.description'(newVal) { this.localDescription = newVal }, - localDescription (newVal) { + localDescription(newVal) { this.onEdit(newVal) - } + }, }, methods: { - linkClicked ({ target }) { + linkClicked({ target }) { if (target.tagName === 'A') { window.open(target.href, '_blank') } }, - openModal () { + openModal() { if (this.useModal) { this.$emit('setMedia') useMediaViewerStore().setCurrentMedia(this.attachment) - } else if (this.type === 'unknown') { + } else if (this.attachment.type === 'unknown') { window.open(this.attachment.url) } }, - openModalForce () { + openModalForce() { this.$emit('setMedia') useMediaViewerStore().setCurrentMedia(this.attachment) }, - onEdit (event) { + onEdit(event) { this.edit && this.edit(this.attachment, event) }, - onRemove () { + onRemove() { this.remove && this.remove(this.attachment) }, - onShiftUp () { + onShiftUp() { this.shiftUp && this.shiftUp(this.attachment) }, - onShiftDn () { + onShiftDn() { this.shiftDn && this.shiftDn(this.attachment) }, - stopFlash () { + stopFlash() { this.$refs.flash.closePlayer() }, - setFlashLoaded (event) { + setFlashLoaded(event) { this.flashLoaded = event }, - toggleDescription () { - this.showDescription = !this.showDescription - }, - toggleHidden (event) { + toggleHidden(event) { if ( - (this.mergedConfig.useOneClickNsfw && !this.showHidden) && - (this.type !== 'video' || this.mergedConfig.playVideosInModal) + this.mergedConfig.useOneClickNsfw && + !this.showHidden && + (this.attachment.type !== 'video' || + this.mergedConfig.playVideosInModal) ) { this.openModal(event) return @@ -201,12 +207,12 @@ const Attachment = { this.showHidden = !this.showHidden } }, - onImageLoad (image) { + onImageLoad(image) { const width = image.naturalWidth const height = image.naturalHeight this.$emit('naturalSizeLoad', { id: this.attachment.id, width, height }) - } - } + }, + }, } export default Attachment diff --git a/src/components/attachment/attachment.scss b/src/components/attachment/attachment.scss index 97515eb32..3c3ba7751 100644 --- a/src/components/attachment/attachment.scss +++ b/src/components/attachment/attachment.scss @@ -134,7 +134,7 @@ width: 2em; height: 2em; margin-left: 0.5em; - font-size: 1.25em; + font-size: 1em; } } @@ -265,3 +265,27 @@ } } } + +.description-popover { + padding: 1em; + width: 50ch; + max-width: 90vw; + overflow: hidden; + box-sizing: border-box; + + summary { + display: inline-block; + margin-bottom: 0.5em; + font-weight: bold; + pointer-events: none; + } + + span { + display: block; + overflow-y: auto; + max-height: 10.5em; + text-wrap: pretty; + line-height: 1.5; + white-space: pre-wrap; + } +} diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 696d3bb8a..1a1b84628 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -6,7 +6,7 @@ @click="openModal" >
- -

- {{ localDescription }} -

+ />
- -

- {{ localDescription }} -

+ />
diff --git a/src/components/auth_form/auth_form.js b/src/components/auth_form/auth_form.js index 243cbf574..7d853d119 100644 --- a/src/components/auth_form/auth_form.js +++ b/src/components/auth_form/auth_form.js @@ -1,28 +1,34 @@ -import { h, resolveComponent } from 'vue' -import LoginForm from '../login_form/login_form.vue' -import MFARecoveryForm from '../mfa_form/recovery_form.vue' -import MFATOTPForm from '../mfa_form/totp_form.vue' import { mapState } from 'pinia' -import { useAuthFlowStore } from 'src/stores/auth_flow' +import { h, resolveComponent } from 'vue' + +import LoginForm from 'src/components/login_form/login_form.vue' +import MFARecoveryForm from 'src/components/mfa_form/recovery_form.vue' +import MFATOTPForm from 'src/components/mfa_form/totp_form.vue' + +import { useAuthFlowStore } from 'src/stores/auth_flow.js' const AuthForm = { name: 'AuthForm', - render () { + render() { return h(resolveComponent(this.authForm)) }, computed: { - authForm () { - if (this.requiredTOTP) { return 'MFATOTPForm' } - if (this.requiredRecovery) { return 'MFARecoveryForm' } + authForm() { + if (this.requiredTOTP) { + return 'MFATOTPForm' + } + if (this.requiredRecovery) { + return 'MFARecoveryForm' + } return 'LoginForm' }, - ...mapState(useAuthFlowStore, ['requiredTOTP', 'requiredRecovery']) + ...mapState(useAuthFlowStore, ['requiredTOTP', 'requiredRecovery']), }, components: { MFARecoveryForm, MFATOTPForm, - LoginForm - } + LoginForm, + }, } export default AuthForm diff --git a/src/components/autosuggest/autosuggest.js b/src/components/autosuggest/autosuggest.js index f58f17bb6..37b7706db 100644 --- a/src/components/autosuggest/autosuggest.js +++ b/src/components/autosuggest/autosuggest.js @@ -2,51 +2,55 @@ const debounceMilliseconds = 500 export default { props: { - query: { // function to query results and return a promise + query: { + // function to query results and return a promise type: Function, - required: true + required: true, }, - filter: { // function to filter results in real time - type: Function + filter: { + // function to filter results in real time + type: Function, }, placeholder: { type: String, - default: 'Search...' - } + default: 'Search...', + }, }, - data () { + data() { return { term: '', timeout: null, results: [], - resultsVisible: false + resultsVisible: false, } }, computed: { - filtered () { + filtered() { return this.filter ? this.filter(this.results) : this.results - } + }, }, watch: { - term (val) { + term(val) { this.fetchResults(val) - } + }, }, methods: { - fetchResults (term) { + fetchResults(term) { clearTimeout(this.timeout) this.timeout = setTimeout(() => { this.results = [] if (term) { - this.query(term).then((results) => { this.results = results }) + this.query(term).then((results) => { + this.results = results + }) } }, debounceMilliseconds) }, - onInputClick () { + onInputClick() { this.resultsVisible = true }, - onClickOutside () { + onClickOutside() { this.resultsVisible = false - } - } + }, + }, } diff --git a/src/components/avatar_list/avatar_list.js b/src/components/avatar_list/avatar_list.js index 9b6301b22..7806fba81 100644 --- a/src/components/avatar_list/avatar_list.js +++ b/src/components/avatar_list/avatar_list.js @@ -1,21 +1,28 @@ -import UserAvatar from '../user_avatar/user_avatar.vue' +import UserAvatar from 'src/components/user_avatar/user_avatar.vue' + +import { useInstanceStore } from 'src/stores/instance.js' + import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' const AvatarList = { props: ['users'], computed: { - slicedUsers () { + slicedUsers() { return this.users ? this.users.slice(0, 15) : [] - } + }, }, components: { - UserAvatar + UserAvatar, }, methods: { - userProfileLink (user) { - return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames) - } - } + userProfileLink(user) { + return generateProfileLink( + user.id, + user.screen_name, + useInstanceStore().restrictedNicknames, + ) + }, + }, } export default AvatarList diff --git a/src/components/badge.style.js b/src/components/badge.style.js index 0697cac6c..ab28429cc 100644 --- a/src/components/badge.style.js +++ b/src/components/badge.style.js @@ -1,30 +1,27 @@ export default { name: 'Badge', selector: '.badge', - validInnerComponents: [ - 'Text', - 'Icon' - ], + validInnerComponents: ['Text', 'Icon'], variants: { - notification: '.-notification' + notification: '.-notification', }, defaultRules: [ { component: 'Root', directives: { - '--badgeNotification': 'color | --cRed' - } + '--badgeNotification': 'color | --cRed', + }, }, { directives: { - background: '--cGreen' - } + background: '--cGreen', + }, }, { variant: 'notification', directives: { - background: '--cRed' - } - } - ] + background: '--cRed', + }, + }, + ], } diff --git a/src/components/basic_user_card/basic_user_card.js b/src/components/basic_user_card/basic_user_card.js index 31de2d75f..1c69f81b4 100644 --- a/src/components/basic_user_card/basic_user_card.js +++ b/src/components/basic_user_card/basic_user_card.js @@ -1,24 +1,34 @@ -import UserPopover from '../user_popover/user_popover.vue' -import UserAvatar from '../user_avatar/user_avatar.vue' -import UserLink from '../user_link/user_link.vue' -import RichContent from 'src/components/rich_content/rich_content.jsx' +import UserAvatar from 'src/components/user_avatar/user_avatar.vue' +import UserLink from 'src/components/user_link/user_link.vue' +import UserPopover from 'src/components/user_popover/user_popover.vue' + +import { useInstanceStore } from 'src/stores/instance.js' +import { useMergedConfigStore } from 'src/stores/merged_config.js' + import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' const BasicUserCard = { - props: [ - 'user' - ], + props: ['user'], components: { UserPopover, UserAvatar, - RichContent, - UserLink + + UserLink, }, methods: { - userProfileLink (user) { - return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames) - } - } + userProfileLink(user) { + return generateProfileLink( + user.id, + user.screen_name, + useInstanceStore().restrictedNicknames, + ) + }, + }, + computed: { + allowNonSquareEmoji() { + return useMergedConfigStore().mergedConfig.nonSquareEmoji + }, + }, } export default BasicUserCard diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue index 29a60cd1e..572b07abb 100644 --- a/src/components/basic_user_card/basic_user_card.vue +++ b/src/components/basic_user_card/basic_user_card.vue @@ -27,6 +27,7 @@ class="basic-user-card-user-name-value" :html="user.name" :emoji="user.emoji" + :allow-non-square-emoji="allowNonSquareEmoji" />
diff --git a/src/components/block_card/block_card.js b/src/components/block_card/block_card.js index 9a618db3f..6484accff 100644 --- a/src/components/block_card/block_card.js +++ b/src/components/block_card/block_card.js @@ -1,46 +1,50 @@ -import { mapState } from 'vuex' +import { mapState } from 'pinia' -import BasicUserCard from '../basic_user_card/basic_user_card.vue' +import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue' +import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue' + +import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' const BlockCard = { props: ['userId'], computed: { - user () { + user() { return this.$store.getters.findUser(this.userId) }, - relationship () { + relationship() { return this.$store.getters.relationship(this.userId) }, - blocked () { + blocked() { return this.relationship.blocking }, - blockExpiryAvailable () { - return this.user.block_expires_at !== undefined + blockExpiryAvailable() { + return Object.hasOwn(this.user, 'block_expires_at') }, - blockExpiry () { - return this.user.block_expires_at == null + blockExpiry() { + return this.user.block_expires_at === false ? this.$t('user_card.block_expires_forever') - : this.$t('user_card.block_expires_at', [new Date(this.user.mute_expires_at).toLocaleString()]) + : this.$t('user_card.block_expires_at', [ + new Date(this.user.mute_expires_at).toLocaleString(), + ]) }, - ...mapState({ - blockExpirationSupported: state => state.instance.blockExpiration, - }) + ...mapState(useInstanceCapabilitiesStore, ['blockExpiration']), }, components: { - BasicUserCard + BasicUserCard, + UserTimedFilterModal, }, methods: { - unblockUser () { + unblockUser() { this.$store.dispatch('unblockUser', this.user.id) }, - blockUser () { - if (this.blockExpirationSupported) { + blockUser() { + if (this.blockExpiration) { this.$refs.timedBlockDialog.optionallyPrompt() } else { this.$store.dispatch('blockUser', { id: this.user.id }) } - } - } + }, + }, } export default BlockCard diff --git a/src/components/bookmark_folder_card/bookmark_folder_card.js b/src/components/bookmark_folder_card/bookmark_folder_card.js index bf274d9d7..37b3f2e5e 100644 --- a/src/components/bookmark_folder_card/bookmark_folder_card.js +++ b/src/components/bookmark_folder_card/bookmark_folder_card.js @@ -1,22 +1,15 @@ import { library } from '@fortawesome/fontawesome-svg-core' -import { - faEllipsisH -} from '@fortawesome/free-solid-svg-icons' +import { faEllipsisH } from '@fortawesome/free-solid-svg-icons' -library.add( - faEllipsisH -) +library.add(faEllipsisH) const BookmarkFolderCard = { - props: [ - 'folder', - 'allBookmarks' - ], + props: ['folder', 'allBookmarks'], computed: { - firstLetter () { + firstLetter() { return this.folder ? this.folder.name[0] : null - } - } + }, + }, } export default BookmarkFolderCard diff --git a/src/components/bookmark_folder_edit/bookmark_folder_edit.js b/src/components/bookmark_folder_edit/bookmark_folder_edit.js index bb96585bf..43aa239b2 100644 --- a/src/components/bookmark_folder_edit/bookmark_folder_edit.js +++ b/src/components/bookmark_folder_edit/bookmark_folder_edit.js @@ -1,10 +1,11 @@ -import EmojiPicker from '../emoji_picker/emoji_picker.vue' +import EmojiPicker from 'src/components/emoji_picker/emoji_picker.vue' import apiService from '../../services/api/api.service' -import { useInterfaceStore } from 'src/stores/interface' -import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders' + +import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js' +import { useInterfaceStore } from 'src/stores/interface.js' const BookmarkFolderEdit = { - data () { + data() { return { name: '', nameDraft: '', @@ -13,54 +14,59 @@ const BookmarkFolderEdit = { emojiDraft: '', emojiUrlDraft: null, emojiPickerExpanded: false, - reallyDelete: false + reallyDelete: false, } }, components: { - EmojiPicker + EmojiPicker, }, - created () { + created() { if (!this.id) return const credentials = this.$store.state.users.currentUser.credentials - apiService.fetchBookmarkFolders({ credentials }) - .then((folders) => { - const folder = folders.find(folder => folder.id === this.id) - if (!folder) return + apiService.fetchBookmarkFolders({ credentials }).then((folders) => { + const folder = folders.find((folder) => folder.id === this.id) + if (!folder) return - this.nameDraft = this.name = folder.name - this.emojiDraft = this.emoji = folder.emoji - this.emojiUrlDraft = this.emojiUrl = folder.emoji_url - }) + this.nameDraft = this.name = folder.name + this.emojiDraft = this.emoji = folder.emoji + this.emojiUrlDraft = this.emojiUrl = folder.emoji_url + }) }, computed: { - id () { + id() { return this.$route.params.id - } + }, }, methods: { - selectEmoji (event) { + selectEmoji(event) { this.emojiDraft = event.insertion this.emojiUrlDraft = event.insertionUrl }, - showEmojiPicker () { + showEmojiPicker() { if (!this.emojiPickerExpanded) { this.$refs.picker.showPicker() } }, - onShowPicker () { + onShowPicker() { this.emojiPickerExpanded = true }, - onClosePicker () { + onClosePicker() { this.emojiPickerExpanded = false }, - updateFolder () { - useBookmarkFoldersStore().updateBookmarkFolder({ folderId: this.id, name: this.nameDraft, emoji: this.emojiDraft }) + updateFolder() { + useBookmarkFoldersStore() + .updateBookmarkFolder({ + folderId: this.id, + name: this.nameDraft, + emoji: this.emojiDraft, + }) .then(() => { this.$router.push({ name: 'bookmark-folders' }) }) }, - createFolder () { - useBookmarkFoldersStore().createBookmarkFolder({ name: this.nameDraft, emoji: this.emojiDraft }) + createFolder() { + useBookmarkFoldersStore() + .createBookmarkFolder({ name: this.nameDraft, emoji: this.emojiDraft }) .then(() => { this.$router.push({ name: 'bookmark-folders' }) }) @@ -68,15 +74,15 @@ const BookmarkFolderEdit = { useInterfaceStore().pushGlobalNotice({ messageKey: 'bookmark_folders.error', messageArgs: [e.message], - level: 'error' + level: 'error', }) }) }, - deleteFolder () { + deleteFolder() { useBookmarkFoldersStore().deleteBookmarkFolder({ folderId: this.id }) this.$router.push({ name: 'bookmark-folders' }) - } - } + }, + }, } export default BookmarkFolderEdit diff --git a/src/components/bookmark_folders/bookmark_folders.js b/src/components/bookmark_folders/bookmark_folders.js index 096f3769d..9fd62dae0 100644 --- a/src/components/bookmark_folders/bookmark_folders.js +++ b/src/components/bookmark_folders/bookmark_folders.js @@ -1,28 +1,29 @@ -import BookmarkFolderCard from '../bookmark_folder_card/bookmark_folder_card.vue' -import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders' +import BookmarkFolderCard from 'src/components/bookmark_folder_card/bookmark_folder_card.vue' + +import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js' const BookmarkFolders = { - data () { + data() { return { - isNew: false + isNew: false, } }, components: { - BookmarkFolderCard + BookmarkFolderCard, }, computed: { - bookmarkFolders () { + bookmarkFolders() { return useBookmarkFoldersStore().allFolders - } + }, }, methods: { - cancelNewFolder () { + cancelNewFolder() { this.isNew = false }, - newFolder () { + newFolder() { this.isNew = true - } - } + }, + }, } export default BookmarkFolders diff --git a/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js b/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js index dc46b91b3..be1fb06ea 100644 --- a/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js +++ b/src/components/bookmark_folders_menu/bookmark_folders_menu_content.js @@ -1,20 +1,20 @@ import { mapState } from 'pinia' -import NavigationEntry from 'src/components/navigation/navigation_entry.vue' + import { getBookmarkFolderEntries } from 'src/components/navigation/filter.js' -import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders' +import NavigationEntry from 'src/components/navigation/navigation_entry.vue' + +import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js' export const BookmarkFoldersMenuContent = { - props: [ - 'showPin' - ], + props: ['showPin'], components: { - NavigationEntry + NavigationEntry, }, computed: { ...mapState(useBookmarkFoldersStore, { - folders: getBookmarkFolderEntries - }) - } + folders: getBookmarkFolderEntries, + }), + }, } export default BookmarkFoldersMenuContent diff --git a/src/components/bookmark_timeline/bookmark_timeline.js b/src/components/bookmark_timeline/bookmark_timeline.js index 9571d630f..bf633c18c 100644 --- a/src/components/bookmark_timeline/bookmark_timeline.js +++ b/src/components/bookmark_timeline/bookmark_timeline.js @@ -1,32 +1,38 @@ -import Timeline from '../timeline/timeline.vue' +import Timeline from 'src/components/timeline/timeline.vue' const Bookmarks = { - created () { + created() { this.$store.commit('clearTimeline', { timeline: 'bookmarks' }) - this.$store.dispatch('startFetchingTimeline', { timeline: 'bookmarks', bookmarkFolderId: this.folderId || null }) + this.$store.dispatch('startFetchingTimeline', { + timeline: 'bookmarks', + bookmarkFolderId: this.folderId || null, + }) }, components: { - Timeline + Timeline, }, computed: { - folderId () { + folderId() { return this.$route.params.id }, - timeline () { + timeline() { return this.$store.state.statuses.timelines.bookmarks - } + }, }, watch: { - folderId () { + folderId() { this.$store.commit('clearTimeline', { timeline: 'bookmarks' }) this.$store.dispatch('stopFetchingTimeline', 'bookmarks') - this.$store.dispatch('startFetchingTimeline', { timeline: 'bookmarks', bookmarkFolderId: this.folderId || null }) - } + this.$store.dispatch('startFetchingTimeline', { + timeline: 'bookmarks', + bookmarkFolderId: this.folderId || null, + }) + }, }, - unmounted () { + unmounted() { this.$store.commit('clearTimeline', { timeline: 'bookmarks' }) this.$store.dispatch('stopFetchingTimeline', 'bookmarks') - } + }, } export default Bookmarks diff --git a/src/components/border.style.js b/src/components/border.style.js index 7f2c30163..e7cc31c57 100644 --- a/src/components/border.style.js +++ b/src/components/border.style.js @@ -6,8 +6,8 @@ export default { { directives: { textColor: '$mod(--parent 10)', - textAuto: 'no-auto' - } - } - ] + textAuto: 'no-auto', + }, + }, + ], } diff --git a/src/components/bubble_timeline/bubble_timeline.js b/src/components/bubble_timeline/bubble_timeline.js index 6f73dd2b8..fcbc31ad2 100644 --- a/src/components/bubble_timeline/bubble_timeline.js +++ b/src/components/bubble_timeline/bubble_timeline.js @@ -1,18 +1,20 @@ -import Timeline from '../timeline/timeline.vue' +import Timeline from 'src/components/timeline/timeline.vue' + const BubbleTimeline = { components: { - Timeline + Timeline, }, computed: { - timeline () { return this.$store.state.statuses.timelines.bubble } + timeline() { + return this.$store.state.statuses.timelines.bubble + }, }, - created () { + created() { this.$store.dispatch('startFetchingTimeline', { timeline: 'bubble' }) }, - unmounted () { + unmounted() { this.$store.dispatch('stopFetchingTimeline', 'bubble') - } - + }, } export default BubbleTimeline diff --git a/src/components/button.style.js b/src/components/button.style.js index 5cffefd91..1644accc4 100644 --- a/src/components/button.style.js +++ b/src/components/button.style.js @@ -12,25 +12,22 @@ export default { focused: ':focus-within', pressed: ':active', hover: ':is(:hover, :focus-visible):not(:disabled)', - disabled: ':disabled' + disabled: ':disabled', }, // Variants are mutually exclusive, each component implicitly has "normal" variant, and all other variants inherit from it. variants: { // Variants save on computation time since adding new variant just adds one more "set". // normal: '', // you can override normal variant, it will be appenended to the main class danger: '.-danger', - transparent: '.-transparent' + transparent: '.-transparent', // Overall the compuation difficulty is N*((1/6)M^3+M) where M is number of distinct states and N is number of variants. // This (currently) is further multipled by number of places where component can exist. }, editor: { - aspect: '2 / 1' + aspect: '2 / 1', }, // This lists all other components that can possibly exist within one. Recursion is currently not supported (and probably won't be supported ever). - validInnerComponents: [ - 'Text', - 'Icon' - ], + validInnerComponents: ['Text', 'Icon'], // Default rules, used as "default theme", essentially. defaultRules: [ { @@ -39,9 +36,11 @@ export default { '--buttonDefaultHoverGlow': 'shadow | 0 0 1 2 --text / 0.4', '--buttonDefaultFocusGlow': 'shadow | 0 0 1 2 --link / 0.5', '--buttonDefaultShadow': 'shadow | 0 0 2 #000000', - '--buttonDefaultBevel': 'shadow | $borderSide(#FFFFFF top 0.2 1), $borderSide(#000000 bottom 0.2 1)', - '--buttonPressedBevel': 'shadow | inset 0 0 4 #000000, $borderSide(#FFFFFF bottom 0.2 1), $borderSide(#000000 top 0.2 1)' - } + '--buttonDefaultBevel': + 'shadow | $borderSide(#FFFFFF top 0.2 1), $borderSide(#000000 bottom 0.2 1)', + '--buttonPressedBevel': + 'shadow | inset 0 0 4 #000000, $borderSide(#FFFFFF bottom 0.2 1), $borderSide(#000000 top 0.2 1)', + }, }, { // component: 'Button', // no need to specify components every time unless you're specifying how other component should look @@ -49,128 +48,128 @@ export default { directives: { background: '--fg', shadow: ['--buttonDefaultShadow', '--buttonDefaultBevel'], - roundness: 3 - } + roundness: 3, + }, }, { variant: 'danger', directives: { - background: '--cRed' - } + background: '$blend(--cRed 0.25 --inheritedBackground)', + }, }, { variant: 'transparent', directives: { - opacity: 0.5 - } + opacity: 0.5, + }, }, { component: 'Text', parent: { component: 'Button', - variant: 'transparent' + variant: 'transparent', }, directives: { - textColor: '--text' - } + textColor: '--text', + }, }, { component: 'Icon', parent: { component: 'Button', - variant: 'transparent' + variant: 'transparent', }, directives: { - textColor: '--text' - } + textColor: '--text', + }, }, { state: ['hover'], directives: { - shadow: ['--buttonDefaultHoverGlow', '--buttonDefaultBevel'] - } + shadow: ['--buttonDefaultHoverGlow', '--buttonDefaultBevel'], + }, }, { state: ['focused'], directives: { - shadow: ['--buttonDefaultFocusGlow', '--buttonDefaultBevel'] - } + shadow: ['--buttonDefaultFocusGlow', '--buttonDefaultBevel'], + }, }, { state: ['pressed'], directives: { - shadow: ['--buttonDefaultShadow', '--buttonPressedBevel'] - } + shadow: ['--buttonDefaultShadow', '--buttonPressedBevel'], + }, }, { state: ['pressed', 'hover'], directives: { - shadow: ['--buttonPressedBevel', '--buttonDefaultHoverGlow'] - } + shadow: ['--buttonPressedBevel', '--buttonDefaultHoverGlow'], + }, }, { state: ['toggled'], directives: { background: '--accent,-24.2', - shadow: ['--buttonDefaultShadow', '--buttonPressedBevel'] - } + shadow: ['--buttonDefaultShadow', '--buttonPressedBevel'], + }, }, { state: ['toggled', 'hover'], directives: { background: '--accent,-24.2', - shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel'] - } + shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel'], + }, }, { state: ['toggled', 'focused'], directives: { background: '--accent,-24.2', - shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel'] - } + shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel'], + }, }, { state: ['toggled', 'hover', 'focused'], directives: { background: '--accent,-24.2', - shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel'] - } + shadow: ['--buttonDefaultHoverGlow', '--buttonPressedBevel'], + }, }, { state: ['toggled', 'disabled'], directives: { background: '$blend(--accent 0.25 --parent)', - shadow: ['--buttonPressedBevel'] - } + shadow: ['--buttonPressedBevel'], + }, }, { state: ['disabled'], directives: { background: '$blend(--inheritedBackground 0.25 --parent)', - shadow: ['--buttonDefaultBevel'] - } + shadow: ['--buttonDefaultBevel'], + }, }, { component: 'Text', parent: { component: 'Button', - state: ['disabled'] + state: ['disabled'], }, directives: { textOpacity: 0.25, - textOpacityMode: 'blend' - } + textOpacityMode: 'blend', + }, }, { component: 'Icon', parent: { component: 'Button', - state: ['disabled'] + state: ['disabled'], }, directives: { textOpacity: 0.25, - textOpacityMode: 'blend' - } - } - ] + textOpacityMode: 'blend', + }, + }, + ], } diff --git a/src/components/button_unstyled.style.js b/src/components/button_unstyled.style.js index 9e1a2ca90..c35fb8f69 100644 --- a/src/components/button_unstyled.style.js +++ b/src/components/button_unstyled.style.js @@ -7,91 +7,86 @@ export default { toggled: '.toggled', disabled: ':disabled', hover: ':is(:hover, :focus-visible):not(:disabled)', - focused: ':focus-within:not(:is(:focus-visible))' + focused: ':focus-within:not(:is(:focus-visible))', }, - validInnerComponents: [ - 'Text', - 'Link', - 'Icon', - 'Badge' - ], + validInnerComponents: ['Text', 'Link', 'Icon', 'Badge'], defaultRules: [ { directives: { - shadow: [] - } + shadow: [], + }, }, { component: 'Icon', parent: { component: 'ButtonUnstyled', - state: ['hover'] + state: ['hover'], }, directives: { - textColor: '--parent--text' - } + textColor: '--parent--text', + }, }, { component: 'Icon', parent: { component: 'ButtonUnstyled', - state: ['toggled'] + state: ['toggled'], }, directives: { - textColor: '--parent--text' - } + textColor: '--parent--text', + }, }, { component: 'Icon', parent: { component: 'ButtonUnstyled', - state: ['toggled', 'hover'] + state: ['toggled', 'hover'], }, directives: { - textColor: '--parent--text' - } + textColor: '--parent--text', + }, }, { component: 'Icon', parent: { component: 'ButtonUnstyled', - state: ['toggled', 'focused'] + state: ['toggled', 'focused'], }, directives: { - textColor: '--parent--text' - } + textColor: '--parent--text', + }, }, { component: 'Icon', parent: { component: 'ButtonUnstyled', - state: ['toggled', 'focused', 'hover'] + state: ['toggled', 'focused', 'hover'], }, directives: { - textColor: '--parent--text' - } + textColor: '--parent--text', + }, }, { component: 'Text', parent: { component: 'ButtonUnstyled', - state: ['disabled'] + state: ['disabled'], }, directives: { textOpacity: 0.25, - textOpacityMode: 'blend' - } + textOpacityMode: 'blend', + }, }, { component: 'Icon', parent: { component: 'ButtonUnstyled', - state: ['disabled'] + state: ['disabled'], }, directives: { textOpacity: 0.25, - textOpacityMode: 'blend' - } - } - ] + textOpacityMode: 'blend', + }, + }, + ], } diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js index 56f389e60..7428c0dc7 100644 --- a/src/components/chat/chat.js +++ b/src/components/chat/chat.js @@ -1,25 +1,27 @@ -import _ from 'lodash' -import { WSConnectionStatus } from '../../services/api/api.service.js' -import { mapGetters, mapState } from 'vuex' +import { throttle } from 'lodash' import { mapState as mapPiniaState } from 'pinia' -import ChatMessage from '../chat_message/chat_message.vue' -import PostStatusForm from '../post_status_form/post_status_form.vue' -import ChatTitle from '../chat_title/chat_title.vue' +import { mapGetters, mapState } from 'vuex' + +import ChatMessage from 'src/components/chat_message/chat_message.vue' +import ChatTitle from 'src/components/chat_title/chat_title.vue' +import PostStatusForm from 'src/components/post_status_form/post_status_form.vue' +import { WSConnectionStatus } from '../../services/api/api.service.js' import chatService from '../../services/chat_service/chat_service.js' -import { promiseInterval } from '../../services/promise_interval/promise_interval.js' -import { getScrollPosition, getNewTopPosition, isBottomedOut, isScrollable } from './chat_layout_utils.js' -import { library } from '@fortawesome/fontawesome-svg-core' -import { - faChevronDown, - faChevronLeft -} from '@fortawesome/free-solid-svg-icons' import { buildFakeMessage } from '../../services/chat_utils/chat_utils.js' +import { promiseInterval } from '../../services/promise_interval/promise_interval.js' +import { + getNewTopPosition, + getScrollPosition, + isBottomedOut, + isScrollable, +} from './chat_layout_utils.js' + import { useInterfaceStore } from 'src/stores/interface.js' -library.add( - faChevronDown, - faChevronLeft -) +import { library } from '@fortawesome/fontawesome-svg-core' +import { faChevronDown, faChevronLeft } from '@fortawesome/free-solid-svg-icons' + +library.add(faChevronDown, faChevronLeft) const BOTTOMED_OUT_OFFSET = 10 const JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET = 10 @@ -31,78 +33,95 @@ const Chat = { components: { ChatMessage, ChatTitle, - PostStatusForm + PostStatusForm, }, - data () { + data() { return { jumpToBottomButtonVisible: false, hoveredMessageChainId: undefined, lastScrollPosition: {}, scrollableContainerHeight: '100%', errorLoadingChat: false, - messageRetriers: {} + messageRetriers: {}, } }, - created () { + created() { this.startFetching() window.addEventListener('resize', this.handleResize) }, - mounted () { + mounted() { window.addEventListener('scroll', this.handleScroll) if (typeof document.hidden !== 'undefined') { - document.addEventListener('visibilitychange', this.handleVisibilityChange, false) + document.addEventListener( + 'visibilitychange', + this.handleVisibilityChange, + false, + ) } this.$nextTick(() => { this.handleResize() }) }, - unmounted () { + unmounted() { window.removeEventListener('scroll', this.handleScroll) window.removeEventListener('resize', this.handleResize) - if (typeof document.hidden !== 'undefined') document.removeEventListener('visibilitychange', this.handleVisibilityChange, false) + if (typeof document.hidden !== 'undefined') + document.removeEventListener( + 'visibilitychange', + this.handleVisibilityChange, + false, + ) this.$store.dispatch('clearCurrentChat') }, computed: { - recipient () { + recipient() { return this.currentChat && this.currentChat.account }, - recipientId () { + recipientId() { return this.$route.params.recipient_id }, - formPlaceholder () { + formPlaceholder() { if (this.recipient) { - return this.$t('chats.message_user', { nickname: this.recipient.screen_name_ui }) + return this.$t('chats.message_user', { + nickname: this.recipient.screen_name_ui, + }) } else { return '' } }, - chatViewItems () { + chatViewItems() { return chatService.getView(this.currentChatMessageService) }, - newMessageCount () { - return this.currentChatMessageService && this.currentChatMessageService.newMessageCount + newMessageCount() { + return ( + this.currentChatMessageService && + this.currentChatMessageService.newMessageCount + ) }, - streamingEnabled () { - return this.mergedConfig.useStreamingApi && this.mastoUserSocketStatus === WSConnectionStatus.JOINED + streamingEnabled() { + return ( + this.mergedConfig.useStreamingApi && + this.mastoUserSocketStatus === WSConnectionStatus.JOINED + ) }, ...mapGetters([ 'currentChat', 'currentChatMessageService', 'findOpenedChatByRecipientId', - 'mergedConfig' + 'mergedConfig', ]), ...mapPiniaState(useInterfaceStore, { - mobileLayout: store => store.layoutType === 'mobile' + mobileLayout: (store) => store.layoutType === 'mobile', }), ...mapState({ - backendInteractor: state => state.api.backendInteractor, - mastoUserSocketStatus: state => state.api.mastoUserSocketStatus, - currentUser: state => state.users.currentUser - }) + backendInteractor: (state) => state.api.backendInteractor, + mastoUserSocketStatus: (state) => state.api.mastoUserSocketStatus, + currentUser: (state) => state.users.currentUser, + }), }, watch: { - chatViewItems () { + chatViewItems() { // We don't want to scroll to the bottom on a new message when the user is viewing older messages. // Therefore we need to know whether the scroll position was at the bottom before the DOM update. const bottomedOutBeforeUpdate = this.bottomedOut(BOTTOMED_OUT_OFFSET) @@ -115,23 +134,23 @@ const Chat = { $route: function () { this.startFetching() }, - mastoUserSocketStatus (newValue) { + mastoUserSocketStatus(newValue) { if (newValue === WSConnectionStatus.JOINED) { this.fetchChat({ isFirstFetch: true }) } - } + }, }, methods: { // Used to animate the avatar near the first message of the message chain when any message belonging to the chain is hovered - onMessageHover ({ isHovered, messageChainId }) { + onMessageHover({ isHovered, messageChainId }) { this.hoveredMessageChainId = isHovered ? messageChainId : undefined }, - onFilesDropped () { + onFilesDropped() { this.$nextTick(() => { this.handleResize() }) }, - handleVisibilityChange () { + handleVisibilityChange() { this.$nextTick(() => { if (!document.hidden && this.bottomedOut(BOTTOMED_OUT_OFFSET)) { this.scrollDown({ forceRead: true }) @@ -139,7 +158,7 @@ const Chat = { }) }, // "Sticks" scroll to bottom instead of top, helps with OSK resizing the viewport - handleResize (opts = {}) { + handleResize(opts = {}) { const { delayed = false } = opts if (delayed) { @@ -160,40 +179,56 @@ const Chat = { this.lastScrollPosition = getScrollPosition() }) }, - scrollDown (options = {}) { + scrollDown(options = {}) { const { behavior = 'auto', forceRead = false } = options this.$nextTick(() => { - window.scrollTo({ top: document.documentElement.scrollHeight, behavior }) + window.scrollTo({ + top: document.documentElement.scrollHeight, + behavior, + }) }) if (forceRead) { this.readChat() } }, - readChat () { - if (!(this.currentChatMessageService && this.currentChatMessageService.maxId)) { return } - if (document.hidden) { return } + readChat() { + if ( + !( + this.currentChatMessageService && this.currentChatMessageService.maxId + ) + ) { + return + } + if (document.hidden) { + return + } const lastReadId = this.currentChatMessageService.maxId this.$store.dispatch('readChat', { id: this.currentChat.id, - lastReadId + lastReadId, }) }, - bottomedOut (offset) { + bottomedOut(offset) { return isBottomedOut(offset) }, - reachedTop () { + reachedTop() { return window.scrollY <= 0 }, - cullOlderCheck () { + cullOlderCheck() { window.setTimeout(() => { if (this.bottomedOut(JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET)) { - this.$store.dispatch('cullOlderMessages', this.currentChatMessageService.chatId) + this.$store.dispatch( + 'cullOlderMessages', + this.currentChatMessageService.chatId, + ) } }, 5000) }, - handleScroll: _.throttle(function () { + handleScroll: throttle(function () { this.lastScrollPosition = getScrollPosition() - if (!this.currentChat) { return } + if (!this.currentChat) { + return + } if (this.reachedTop()) { this.fetchChat({ maxId: this.currentChatMessageService.minId }) @@ -213,22 +248,27 @@ const Chat = { this.jumpToBottomButtonVisible = true } }, 200), - handleScrollUp (positionBeforeLoading) { + handleScrollUp(positionBeforeLoading) { const positionAfterLoading = getScrollPosition() window.scrollTo({ - top: getNewTopPosition(positionBeforeLoading, positionAfterLoading) + top: getNewTopPosition(positionBeforeLoading, positionAfterLoading), }) }, - fetchChat ({ isFirstFetch = false, fetchLatest = false, maxId }) { + fetchChat({ isFirstFetch = false, fetchLatest = false, maxId }) { const chatMessageService = this.currentChatMessageService - if (!chatMessageService) { return } - if (fetchLatest && this.streamingEnabled) { return } + if (!chatMessageService) { + return + } + if (fetchLatest && this.streamingEnabled) { + return + } const chatId = chatMessageService.chatId const fetchOlderMessages = !!maxId const sinceId = fetchLatest && chatMessageService.maxId - return this.backendInteractor.chatMessages({ id: chatId, maxId, sinceId }) + return this.backendInteractor + .chatMessages({ id: chatId, maxId, sinceId }) .then((messages) => { // Clear the current chat in case we're recovering from a ws connection loss. if (isFirstFetch) { @@ -236,28 +276,34 @@ const Chat = { } const positionBeforeUpdate = getScrollPosition() - this.$store.dispatch('addChatMessages', { chatId, messages }).then(() => { - this.$nextTick(() => { - if (fetchOlderMessages) { - this.handleScrollUp(positionBeforeUpdate) - } + this.$store + .dispatch('addChatMessages', { chatId, messages }) + .then(() => { + this.$nextTick(() => { + if (fetchOlderMessages) { + this.handleScrollUp(positionBeforeUpdate) + } - // In vertical screens, the first batch of fetched messages may not always take the - // full height of the scrollable container. - // If this is the case, we want to fetch the messages until the scrollable container - // is fully populated so that the user has the ability to scroll up and load the history. - if (!isScrollable() && messages.length > 0) { - this.fetchChat({ maxId: this.currentChatMessageService.minId }) - } + // In vertical screens, the first batch of fetched messages may not always take the + // full height of the scrollable container. + // If this is the case, we want to fetch the messages until the scrollable container + // is fully populated so that the user has the ability to scroll up and load the history. + if (!isScrollable() && messages.length > 0) { + this.fetchChat({ + maxId: this.currentChatMessageService.minId, + }) + } + }) }) - }) }) }, - async startFetching () { + async startFetching() { let chat = this.findOpenedChatByRecipientId(this.recipientId) if (!chat) { try { - chat = await this.backendInteractor.getOrCreateChat({ accountId: this.recipientId }) + chat = await this.backendInteractor.getOrCreateChat({ + accountId: this.recipientId, + }) } catch (e) { console.error('Error creating or getting a chat', e) this.errorLoadingChat = true @@ -271,13 +317,14 @@ const Chat = { this.doStartFetching() } }, - doStartFetching () { + doStartFetching() { this.$store.dispatch('startFetchingCurrentChat', { - fetcher: () => promiseInterval(() => this.fetchChat({ fetchLatest: true }), 5000) + fetcher: () => + promiseInterval(() => this.fetchChat({ fetchLatest: true }), 5000), }) this.fetchChat({ isFirstFetch: true }) }, - handleAttachmentPosting () { + handleAttachmentPosting() { this.$nextTick(() => { this.handleResize() // When the posting form size changes because of a media attachment, we need an extra resize @@ -285,11 +332,11 @@ const Chat = { this.scrollDown({ forceRead: true }) }) }, - sendMessage ({ status, media, idempotencyKey }) { + sendMessage({ status, media, idempotencyKey }) { const params = { id: this.currentChat.id, content: status, - idempotencyKey + idempotencyKey, } if (media[0]) { @@ -301,52 +348,72 @@ const Chat = { chatId: this.currentChat.id, content: status, userId: this.currentUser.id, - idempotencyKey + idempotencyKey, }) - this.$store.dispatch('addChatMessages', { - chatId: this.currentChat.id, - messages: [fakeMessage] - }).then(() => { - this.handleAttachmentPosting() - }) + this.$store + .dispatch('addChatMessages', { + chatId: this.currentChat.id, + messages: [fakeMessage], + }) + .then(() => { + this.handleAttachmentPosting() + }) - return this.doSendMessage({ params, fakeMessage, retriesLeft: MAX_RETRIES }) + return this.doSendMessage({ + params, + fakeMessage, + retriesLeft: MAX_RETRIES, + }) }, - doSendMessage ({ params, fakeMessage, retriesLeft = MAX_RETRIES }) { + doSendMessage({ params, fakeMessage, retriesLeft = MAX_RETRIES }) { if (retriesLeft <= 0) return - this.backendInteractor.sendChatMessage(params) - .then(data => { + this.backendInteractor + .sendChatMessage(params) + .then((data) => { this.$store.dispatch('addChatMessages', { chatId: this.currentChat.id, updateMaxId: false, - messages: [{ ...data, fakeId: fakeMessage.id }] + messages: [{ ...data, fakeId: fakeMessage.id }], }) return data }) - .catch(error => { + .catch((error) => { console.error('Error sending message', error) this.$store.dispatch('handleMessageError', { chatId: this.currentChat.id, fakeId: fakeMessage.id, - isRetry: retriesLeft !== MAX_RETRIES + isRetry: retriesLeft !== MAX_RETRIES, }) - if ((error.statusCode >= 500 && error.statusCode < 600) || error.message === 'Failed to fetch') { - this.messageRetriers[fakeMessage.id] = setTimeout(() => { - this.doSendMessage({ params, fakeMessage, retriesLeft: retriesLeft - 1 }) - }, 1000 * (2 ** (MAX_RETRIES - retriesLeft))) + if ( + (error.statusCode >= 500 && error.statusCode < 600) || + error.message === 'Failed to fetch' + ) { + this.messageRetriers[fakeMessage.id] = setTimeout( + () => { + this.doSendMessage({ + params, + fakeMessage, + retriesLeft: retriesLeft - 1, + }) + }, + 1000 * 2 ** (MAX_RETRIES - retriesLeft), + ) } return {} }) return Promise.resolve(fakeMessage) }, - goBack () { - this.$router.push({ name: 'chats', params: { username: this.currentUser.screen_name } }) - } - } + goBack() { + this.$router.push({ + name: 'chats', + params: { username: this.currentUser.screen_name }, + }) + }, + }, } export default Chat diff --git a/src/components/chat/chat.style.js b/src/components/chat/chat.style.js index 9ae2b7d71..55cf657c2 100644 --- a/src/components/chat/chat.style.js +++ b/src/components/chat/chat.style.js @@ -1,19 +1,13 @@ export default { name: 'Chat', selector: '.chat-message-list', - validInnerComponents: [ - 'Text', - 'Link', - 'Icon', - 'Avatar', - 'ChatMessage' - ], + validInnerComponents: ['Text', 'Link', 'Icon', 'Avatar', 'ChatMessage'], defaultRules: [ { directives: { background: '--bg', - blur: '5px' - } - } - ] + blur: '5px', + }, + }, + ], } diff --git a/src/components/chat/chat.vue b/src/components/chat/chat.vue index dfd197e56..cedbdce69 100644 --- a/src/components/chat/chat.vue +++ b/src/components/chat/chat.vue @@ -73,6 +73,7 @@ :disable-notice="true" :disable-lock-warning="true" :disable-polls="true" + :disable-quotes="true" :disable-sensitivity-checkbox="true" :disable-submit="errorLoadingChat || !currentChat" :disable-preview="true" diff --git a/src/components/chat/chat_layout_utils.js b/src/components/chat/chat_layout_utils.js index c187892d9..10d0a5e45 100644 --- a/src/components/chat/chat_layout_utils.js +++ b/src/components/chat/chat_layout_utils.js @@ -3,14 +3,17 @@ export const getScrollPosition = () => { return { scrollTop: window.scrollY, scrollHeight: document.documentElement.scrollHeight, - offsetHeight: window.innerHeight + offsetHeight: window.innerHeight, } } // A helper function that is used to keep the scroll position fixed as the new elements are added to the top // Takes two scroll positions, before and after the update. export const getNewTopPosition = (previousPosition, newPosition) => { - return previousPosition.scrollTop + (newPosition.scrollHeight - previousPosition.scrollHeight) + return ( + previousPosition.scrollTop + + (newPosition.scrollHeight - previousPosition.scrollHeight) + ) } export const isBottomedOut = (offset = 0) => { diff --git a/src/components/chat_list/chat_list.js b/src/components/chat_list/chat_list.js index 95708d1dd..597fcc709 100644 --- a/src/components/chat_list/chat_list.js +++ b/src/components/chat_list/chat_list.js @@ -1,37 +1,38 @@ -import { mapState, mapGetters } from 'vuex' -import ChatListItem from '../chat_list_item/chat_list_item.vue' -import ChatNew from '../chat_new/chat_new.vue' -import List from '../list/list.vue' +import { mapGetters, mapState } from 'vuex' + +import ChatListItem from 'src/components/chat_list_item/chat_list_item.vue' +import ChatNew from 'src/components/chat_new/chat_new.vue' +import List from 'src/components/list/list.vue' const ChatList = { components: { ChatListItem, List, - ChatNew + ChatNew, }, computed: { ...mapState({ - currentUser: state => state.users.currentUser + currentUser: (state) => state.users.currentUser, }), - ...mapGetters(['sortedChatList']) + ...mapGetters(['sortedChatList']), }, - data () { + data() { return { - isNew: false + isNew: false, } }, - created () { + created() { this.$store.dispatch('fetchChats', { latest: true }) }, methods: { - cancelNewChat () { + cancelNewChat() { this.isNew = false this.$store.dispatch('fetchChats', { latest: true }) }, - newChat () { + newChat() { this.isNew = true - } - } + }, + }, } export default ChatList diff --git a/src/components/chat_list_item/chat_list_item.js b/src/components/chat_list_item/chat_list_item.js index 8f8c491f5..3bbb93d60 100644 --- a/src/components/chat_list_item/chat_list_item.js +++ b/src/components/chat_list_item/chat_list_item.js @@ -1,31 +1,31 @@ import { mapState } from 'vuex' -import StatusBody from '../status_content/status_content.vue' -import fileType from 'src/services/file_type/file_type.service' -import UserAvatar from '../user_avatar/user_avatar.vue' -import AvatarList from '../avatar_list/avatar_list.vue' -import Timeago from '../timeago/timeago.vue' -import ChatTitle from '../chat_title/chat_title.vue' + +import AvatarList from 'src/components/avatar_list/avatar_list.vue' +import ChatTitle from 'src/components/chat_title/chat_title.vue' +import StatusBody from 'src/components/status_content/status_content.vue' +import Timeago from 'src/components/timeago/timeago.vue' +import UserAvatar from 'src/components/user_avatar/user_avatar.vue' const ChatListItem = { name: 'ChatListItem', - props: [ - 'chat' - ], + props: ['chat'], components: { UserAvatar, AvatarList, Timeago, ChatTitle, - StatusBody + StatusBody, }, computed: { ...mapState({ - currentUser: state => state.users.currentUser + currentUser: (state) => state.users.currentUser, }), - attachmentInfo () { - if (this.chat.lastMessage.attachments.length === 0) { return } + attachmentInfo() { + if (this.chat.lastMessage.attachments.length === 0) { + return + } - const types = this.chat.lastMessage.attachments.map(file => fileType.fileType(file.mimetype)) + const types = this.chat.lastMessage.attachments.map((file) => file.type) if (types.includes('video')) { return this.$t('file_type.video') } else if (types.includes('audio')) { @@ -36,34 +36,36 @@ const ChatListItem = { return this.$t('file_type.file') } }, - messageForStatusContent () { + messageForStatusContent() { const message = this.chat.lastMessage const messageEmojis = message ? message.emojis : [] const isYou = message && message.account_id === this.currentUser.id - const content = message ? (this.attachmentInfo || message.content) : '' - const messagePreview = isYou ? `${this.$t('chats.you')} ${content}` : content + const content = message ? this.attachmentInfo || message.content : '' + const messagePreview = isYou + ? `${this.$t('chats.you')} ${content}` + : content return { summary: '', emojis: messageEmojis, raw_html: messagePreview, text: messagePreview, - attachments: [] + attachments: [], } - } + }, }, methods: { - openChat () { + openChat() { if (this.chat.id) { this.$router.push({ name: 'chat', params: { username: this.currentUser.screen_name, - recipient_id: this.chat.account.id - } + recipient_id: this.chat.account.id, + }, }) } - } - } + }, + }, } export default ChatListItem diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js index 837f6d214..ba06172ed 100644 --- a/src/components/chat_message/chat_message.js +++ b/src/components/chat_message/chat_message.js @@ -1,24 +1,24 @@ -import { mapState, mapGetters } from 'vuex' import { mapState as mapPiniaState } from 'pinia' -import Popover from '../popover/popover.vue' -import Attachment from '../attachment/attachment.vue' -import UserAvatar from '../user_avatar/user_avatar.vue' -import Gallery from '../gallery/gallery.vue' -import LinkPreview from '../link-preview/link-preview.vue' -import StatusContent from '../status_content/status_content.vue' -import ChatMessageDate from '../chat_message_date/chat_message_date.vue' import { defineAsyncComponent } from 'vue' -import { library } from '@fortawesome/fontawesome-svg-core' -import { - faTimes, - faEllipsisH -} from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from 'src/stores/interface' +import { mapGetters, mapState } from 'vuex' -library.add( - faTimes, - faEllipsisH -) +import Attachment from 'src/components/attachment/attachment.vue' +import ChatMessageDate from 'src/components/chat_message_date/chat_message_date.vue' +import Gallery from 'src/components/gallery/gallery.vue' +import LinkPreview from 'src/components/link-preview/link-preview.vue' +import Popover from 'src/components/popover/popover.vue' +import StatusContent from 'src/components/status_content/status_content.vue' +import UserAvatar from 'src/components/user_avatar/user_avatar.vue' +import UserPopover from 'src/components/user_popover/user_popover.vue' + +import { useInstanceStore } from 'src/stores/instance.js' +import { useInterfaceStore } from 'src/stores/interface' +import { useMergedConfigStore } from 'src/stores/merged_config.js' + +import { library } from '@fortawesome/fontawesome-svg-core' +import { faEllipsisH, faTimes } from '@fortawesome/free-solid-svg-icons' + +library.add(faTimes, faEllipsisH) const ChatMessage = { name: 'ChatMessage', @@ -27,7 +27,7 @@ const ChatMessage = { 'edited', 'noHeading', 'chatViewItem', - 'hoveredMessageChain' + 'hoveredMessageChain', ], emits: ['hover'], components: { @@ -38,73 +38,80 @@ const ChatMessage = { Gallery, LinkPreview, ChatMessageDate, - UserPopover: defineAsyncComponent(() => import('../user_popover/user_popover.vue')) + UserPopover, }, computed: { // Returns HH:MM (hours and minutes) in local time. - createdAt () { + createdAt() { const time = this.chatViewItem.data.created_at - return time.toLocaleTimeString('en', { hour: '2-digit', minute: '2-digit', hour12: false }) + return time.toLocaleTimeString('en', { + hour: '2-digit', + minute: '2-digit', + hour12: false, + }) }, - isCurrentUser () { + isCurrentUser() { return this.message.account_id === this.currentUser.id }, - message () { + message() { return this.chatViewItem.data }, - isMessage () { + isMessage() { return this.chatViewItem.type === 'message' }, - messageForStatusContent () { + messageForStatusContent() { return { summary: '', emojis: this.message.emojis, raw_html: this.message.content || '', text: this.message.content || '', - attachments: this.message.attachments + attachments: this.message.attachments, } }, - hasAttachment () { + hasAttachment() { return this.message.attachments.length > 0 }, ...mapPiniaState(useInterfaceStore, { - betterShadow: store => store.browserSupport.cssFilter + betterShadow: (store) => store.browserSupport.cssFilter, }), ...mapState({ - currentUser: state => state.users.currentUser, - restrictedNicknames: state => state.instance.restrictedNicknames + currentUser: (state) => state.users.currentUser, + restrictedNicknames: (state) => useInstanceStore().restrictedNicknames, }), - popoverMarginStyle () { + popoverMarginStyle() { if (this.isCurrentUser) { return {} } else { return { left: 50 } } }, - ...mapGetters(['mergedConfig', 'findUser']) + ...mapPiniaState(useMergedConfigStore, ['mergedConfig', 'findUser']), }, - data () { + data() { return { hovered: false, - menuOpened: false + menuOpened: false, } }, methods: { - onHover (bool) { - this.$emit('hover', { isHovered: bool, messageChainId: this.chatViewItem.messageChainId }) + onHover(bool) { + this.$emit('hover', { + isHovered: bool, + messageChainId: this.chatViewItem.messageChainId, + }) }, - async deleteMessage () { + async deleteMessage() { const confirmed = window.confirm(this.$t('chats.delete_confirm')) if (confirmed) { await this.$store.dispatch('deleteChatMessage', { messageId: this.chatViewItem.data.id, - chatId: this.chatViewItem.data.chat_id + chatId: this.chatViewItem.data.chat_id, }) } this.hovered = false this.menuOpened = false - } - } + }, + }, } export default ChatMessage diff --git a/src/components/chat_message/chat_message.style.js b/src/components/chat_message/chat_message.style.js index 76b565823..f7632bc6f 100644 --- a/src/components/chat_message/chat_message.style.js +++ b/src/components/chat_message/chat_message.style.js @@ -2,26 +2,21 @@ export default { name: 'ChatMessage', selector: '.chat-message', variants: { - outgoing: '.outgoing' + outgoing: '.outgoing', }, - validInnerComponents: [ - 'Text', - 'Icon', - 'Border', - 'PollGraph' - ], + validInnerComponents: ['Text', 'Icon', 'Border', 'PollGraph'], defaultRules: [ { directives: { background: '--bg, 2', - backgroundNoCssColor: 'yes' - } + backgroundNoCssColor: 'yes', + }, }, { variant: 'outgoing', directives: { - background: '--bg, 5' - } - } - ] + background: '--bg, 5', + }, + }, + ], } diff --git a/src/components/chat_message_date/chat_message_date.vue b/src/components/chat_message_date/chat_message_date.vue index 98349b753..f0cadb6e7 100644 --- a/src/components/chat_message_date/chat_message_date.vue +++ b/src/components/chat_message_date/chat_message_date.vue @@ -11,16 +11,19 @@ export default { name: 'Timeago', props: ['date'], computed: { - displayDate () { + displayDate() { const today = new Date() today.setHours(0, 0, 0, 0) if (this.date.getTime() === today.getTime()) { return this.$t('display_date.today') } else { - return this.date.toLocaleDateString(localeService.internalToBrowserLocale(this.$i18n.locale), { day: 'numeric', month: 'long' }) + return this.date.toLocaleDateString( + localeService.internalToBrowserLocale(this.$i18n.locale), + { day: 'numeric', month: 'long' }, + ) } - } - } + }, + }, } diff --git a/src/components/chat_new/chat_new.js b/src/components/chat_new/chat_new.js index 71585995a..5ee2b610d 100644 --- a/src/components/chat_new/chat_new.js +++ b/src/components/chat_new/chat_new.js @@ -1,39 +1,35 @@ -import { mapState, mapGetters } from 'vuex' -import BasicUserCard from '../basic_user_card/basic_user_card.vue' -import UserAvatar from '../user_avatar/user_avatar.vue' -import { library } from '@fortawesome/fontawesome-svg-core' -import { - faSearch, - faChevronLeft -} from '@fortawesome/free-solid-svg-icons' +import { mapGetters, mapState } from 'vuex' -library.add( - faSearch, - faChevronLeft -) +import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue' +import UserAvatar from 'src/components/user_avatar/user_avatar.vue' + +import { library } from '@fortawesome/fontawesome-svg-core' +import { faChevronLeft, faSearch } from '@fortawesome/free-solid-svg-icons' + +library.add(faSearch, faChevronLeft) const chatNew = { components: { BasicUserCard, - UserAvatar + UserAvatar, }, - data () { + data() { return { suggestions: [], userIds: [], loading: false, - query: '' + query: '', } }, - async created () { + async created() { const { chats } = await this.backendInteractor.chats() - chats.forEach(chat => this.suggestions.push(chat.account)) + chats.forEach((chat) => this.suggestions.push(chat.account)) }, computed: { - users () { - return this.userIds.map(userId => this.findUser(userId)) + users() { + return this.userIds.map((userId) => this.findUser(userId)) }, - availableUsers () { + availableUsers() { if (this.query.length !== 0) { return this.users } else { @@ -41,29 +37,29 @@ const chatNew = { } }, ...mapState({ - currentUser: state => state.users.currentUser, - backendInteractor: state => state.api.backendInteractor + currentUser: (state) => state.users.currentUser, + backendInteractor: (state) => state.api.backendInteractor, }), - ...mapGetters(['findUser']) + ...mapGetters(['findUser']), }, methods: { - goBack () { + goBack() { this.$emit('cancel') }, - goToChat (user) { + goToChat(user) { this.$router.push({ name: 'chat', params: { recipient_id: user.id } }) }, - onInput () { + onInput() { this.search(this.query) }, - addUser (user) { + addUser(user) { this.selectedUserIds.push(user.id) this.query = '' }, - removeUser (userId) { - this.selectedUserIds = this.selectedUserIds.filter(id => id !== userId) + removeUser(userId) { + this.selectedUserIds = this.selectedUserIds.filter((id) => id !== userId) }, - search (query) { + search(query) { if (!query) { this.loading = false return @@ -71,13 +67,14 @@ const chatNew = { this.loading = true this.userIds = [] - this.$store.dispatch('search', { q: query, resolve: true, type: 'accounts' }) - .then(data => { + this.$store + .dispatch('search', { q: query, resolve: true, type: 'accounts' }) + .then((data) => { this.loading = false - this.userIds = data.accounts.map(a => a.id) + this.userIds = data.accounts.map((a) => a.id) }) - } - } + }, + }, } export default chatNew diff --git a/src/components/chat_title/chat_title.js b/src/components/chat_title/chat_title.js index b87211265..52d4445b6 100644 --- a/src/components/chat_title/chat_title.js +++ b/src/components/chat_title/chat_title.js @@ -1,23 +1,27 @@ -import UserAvatar from '../user_avatar/user_avatar.vue' -import RichContent from 'src/components/rich_content/rich_content.jsx' import { defineAsyncComponent } from 'vue' +import UserAvatar from 'src/components/user_avatar/user_avatar.vue' +import UserPopover from 'src/components/user_popover/user_popover.vue' + +import { useMergedConfigStore } from 'src/stores/merged_config.js' + export default { name: 'ChatTitle', components: { UserAvatar, - RichContent, - UserPopover: defineAsyncComponent(() => import('../user_popover/user_popover.vue')) + + UserPopover, }, - props: [ - 'user', 'withAvatar' - ], + props: ['user', 'withAvatar'], computed: { - title () { + title() { return this.user ? this.user.screen_name_ui : '' }, - htmlTitle () { + htmlTitle() { return this.user ? this.user.name_html : '' - } - } + }, + allowNonSquareEmoji() { + return useMergedConfigStore().mergedConfig.nonSquareEmoji + }, + }, } diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue index 00521260f..313e66ce3 100644 --- a/src/components/chat_title/chat_title.vue +++ b/src/components/chat_title/chat_title.vue @@ -19,6 +19,7 @@ :title="'@'+(user && user.screen_name_ui)" :html="htmlTitle" :emoji="user.emoji || []" + :allow-non-square-emoji="allowNonSquareEmoji" :is-local="user.is_local" />
diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue index c8bba4c44..4a3ea49bc 100644 --- a/src/components/checkbox/checkbox.vue +++ b/src/components/checkbox/checkbox.vue @@ -1,7 +1,7 @@ diff --git a/src/components/conversation-page/conversation-page.js b/src/components/conversation-page/conversation-page.js index 8f996be12..84494332d 100644 --- a/src/components/conversation-page/conversation-page.js +++ b/src/components/conversation-page/conversation-page.js @@ -1,14 +1,14 @@ -import Conversation from '../conversation/conversation.vue' +import Conversation from 'src/components/conversation/conversation.vue' const conversationPage = { components: { - Conversation + Conversation, }, computed: { - statusId () { + statusId() { return this.$route.params.id - } - } + }, + }, } export default conversationPage diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index 491a8543f..da15c79d6 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -1,25 +1,23 @@ -import { reduce, filter, findIndex, clone, get } from 'lodash' -import Status from '../status/status.vue' -import ThreadTree from '../thread_tree/thread_tree.vue' -import { WSConnectionStatus } from '../../services/api/api.service.js' -import { mapGetters, mapState } from 'vuex' +import { clone, filter, findIndex, get, reduce } from 'lodash' import { mapState as mapPiniaState } from 'pinia' -import QuickFilterSettings from '../quick_filter_settings/quick_filter_settings.vue' -import QuickViewSettings from '../quick_view_settings/quick_view_settings.vue' +import { mapState } from 'vuex' + +import QuickFilterSettings from 'src/components/quick_filter_settings/quick_filter_settings.vue' +import QuickViewSettings from 'src/components/quick_view_settings/quick_view_settings.vue' +import ThreadTree from 'src/components/thread_tree/thread_tree.vue' +import { WSConnectionStatus } from '../../services/api/api.service.js' + import { useInterfaceStore } from 'src/stores/interface' +import { useMergedConfigStore } from 'src/stores/merged_config.js' import { library } from '@fortawesome/fontawesome-svg-core' import { faAngleDoubleDown, faAngleDoubleLeft, - faChevronLeft + faChevronLeft, } from '@fortawesome/free-solid-svg-icons' -library.add( - faAngleDoubleDown, - faAngleDoubleLeft, - faChevronLeft -) +library.add(faAngleDoubleDown, faAngleDoubleLeft, faChevronLeft) const sortById = (a, b) => { const idA = a.type === 'retweet' ? a.retweeted_status.id : a.id @@ -43,23 +41,25 @@ const sortAndFilterConversation = (conversation, statusoid) => { if (statusoid.type === 'retweet') { conversation = filter( conversation, - (status) => (status.type === 'retweet' || status.id !== statusoid.retweeted_status.id) + (status) => + status.type === 'retweet' || + status.id !== statusoid.retweeted_status.id, ) } else { conversation = filter(conversation, (status) => status.type !== 'retweet') } - return conversation.filter(_ => _).sort(sortById) + return conversation.filter((_) => _).sort(sortById) } const conversation = { - data () { + data() { return { highlight: null, expanded: false, threadDisplayStatusObject: {}, // id => 'showing' | 'hidden' statusContentPropertiesObject: {}, inlineDivePosition: null, - loadStatusError: null + loadStatusError: null, } }, props: [ @@ -69,76 +69,80 @@ const conversation = { 'pinnedStatusIdsObject', 'inProfile', 'profileUserId', - 'virtualHidden' + 'virtualHidden', ], - created () { + created() { if (this.isPage) { this.fetchConversation() } }, computed: { - maxDepthToShowByDefault () { + maxDepthToShowByDefault() { // maxDepthInThread = max number of depths that is *visible* // since our depth starts with 0 and "showing" means "showing children" // there is a -2 here - const maxDepth = this.$store.getters.mergedConfig.maxDepthInThread - 2 + const maxDepth = this.mergedConfig.maxDepthInThread - 2 return maxDepth >= 1 ? maxDepth : 1 }, - streamingEnabled () { - return this.mergedConfig.useStreamingApi && this.mastoUserSocketStatus === WSConnectionStatus.JOINED + streamingEnabled() { + return ( + this.mergedConfig.useStreamingApi && + this.mastoUserSocketStatus === WSConnectionStatus.JOINED + ) }, - displayStyle () { - return this.$store.getters.mergedConfig.conversationDisplay + displayStyle() { + return this.mergedConfig.conversationDisplay }, - isTreeView () { + isTreeView() { return !this.isLinearView }, - treeViewIsSimple () { - return !this.$store.getters.mergedConfig.conversationTreeAdvanced + treeViewIsSimple() { + return !this.mergedConfig.conversationTreeAdvanced }, - isLinearView () { + isLinearView() { return this.displayStyle === 'linear' }, - shouldFadeAncestors () { - return this.$store.getters.mergedConfig.conversationTreeFadeAncestors + shouldFadeAncestors() { + return this.mergedConfig.conversationTreeFadeAncestors }, - otherRepliesButtonPosition () { - return this.$store.getters.mergedConfig.conversationOtherRepliesButton + otherRepliesButtonPosition() { + return this.mergedConfig.conversationOtherRepliesButton }, - showOtherRepliesButtonBelowStatus () { + showOtherRepliesButtonBelowStatus() { return this.otherRepliesButtonPosition === 'below' }, - showOtherRepliesButtonInsideStatus () { + showOtherRepliesButtonInsideStatus() { return this.otherRepliesButtonPosition === 'inside' }, - suspendable () { + suspendable() { if (this.isTreeView) { - return Object.entries(this.statusContentProperties) - .every(([, prop]) => !prop.replying && prop.mediaPlaying.length === 0) + return Object.entries(this.statusContentProperties).every( + ([, prop]) => !prop.replying && prop.mediaPlaying.length === 0, + ) } if (this.$refs.statusComponent && this.$refs.statusComponent[0]) { - return this.$refs.statusComponent.every(s => s.suspendable) + return this.$refs.statusComponent.every((s) => s.suspendable) } else { return true } }, - hideStatus () { + hideStatus() { return this.virtualHidden && this.suspendable }, - status () { + status() { return this.$store.state.statuses.allStatusesObject[this.statusId] }, - originalStatusId () { + originalStatusId() { if (this.status.retweeted_status) { return this.status.retweeted_status.id } else { return this.statusId } }, - conversationId () { + conversationId() { return this.getConversationId(this.statusId) }, - conversation () { + conversation() { if (!this.status) { return [] } @@ -147,7 +151,9 @@ const conversation = { return [this.status] } - const conversation = clone(this.$store.state.statuses.conversationsObject[this.conversationId]) + const conversation = clone( + this.$store.state.statuses.conversationsObject[this.conversationId], + ) const statusIndex = findIndex(conversation, { id: this.originalStatusId }) if (statusIndex !== -1) { conversation[statusIndex] = this.status @@ -155,144 +161,188 @@ const conversation = { return sortAndFilterConversation(conversation, this.status) }, - statusMap () { + statusMap() { return this.conversation.reduce((res, s) => { res[s.id] = s return res }, {}) }, - threadTree () { - const reverseLookupTable = this.conversation.reduce((table, status, index) => { - table[status.id] = index - return table - }, {}) + threadTree() { + const reverseLookupTable = this.conversation.reduce( + (table, status, index) => { + table[status.id] = index + return table + }, + {}, + ) - const threads = this.conversation.reduce((a, cur) => { - const id = cur.id - a.forest[id] = this.getReplies(id) - .map(s => s.id) + const threads = this.conversation.reduce( + (a, cur) => { + const id = cur.id + a.forest[id] = this.getReplies(id).map((s) => s.id) - return a - }, { - forest: {} - }) + return a + }, + { + forest: {}, + }, + ) - const walk = (forest, topLevel, depth = 0, processed = {}) => topLevel.map(id => { - if (processed[id]) { - return [] - } + const walk = (forest, topLevel, depth = 0, processed = {}) => + topLevel + .map((id) => { + if (processed[id]) { + return [] + } - processed[id] = true - return [{ - status: this.conversation[reverseLookupTable[id]], - id, - depth - }, walk(forest, forest[id], depth + 1, processed)].reduce((a, b) => a.concat(b), []) - }).reduce((a, b) => a.concat(b), []) + processed[id] = true + return [ + { + status: this.conversation[reverseLookupTable[id]], + id, + depth, + }, + walk(forest, forest[id], depth + 1, processed), + ].reduce((a, b) => a.concat(b), []) + }) + .reduce((a, b) => a.concat(b), []) - const linearized = walk(threads.forest, this.topLevel.map(k => k.id)) + const linearized = walk( + threads.forest, + this.topLevel.map((k) => k.id), + ) return linearized }, - replyIds () { - return this.conversation.map(k => k.id) + replyIds() { + return this.conversation + .map((k) => k.id) .reduce((res, id) => { - res[id] = (this.replies[id] || []).map(k => k.id) + res[id] = (this.replies[id] || []).map((k) => k.id) return res }, {}) }, - totalReplyCount () { + totalReplyCount() { const sizes = {} const subTreeSizeFor = (id) => { if (sizes[id]) { return sizes[id] } - sizes[id] = 1 + this.replyIds[id].map(cid => subTreeSizeFor(cid)).reduce((a, b) => a + b, 0) + sizes[id] = + 1 + + this.replyIds[id] + .map((cid) => subTreeSizeFor(cid)) + .reduce((a, b) => a + b, 0) return sizes[id] } - this.conversation.map(k => k.id).map(subTreeSizeFor) + this.conversation.map((k) => k.id).map(subTreeSizeFor) return Object.keys(sizes).reduce((res, id) => { res[id] = sizes[id] - 1 // exclude itself return res }, {}) }, - totalReplyDepth () { + totalReplyDepth() { const depths = {} const subTreeDepthFor = (id) => { if (depths[id]) { return depths[id] } - depths[id] = 1 + this.replyIds[id].map(cid => subTreeDepthFor(cid)).reduce((a, b) => a > b ? a : b, 0) + depths[id] = + 1 + + this.replyIds[id] + .map((cid) => subTreeDepthFor(cid)) + .reduce((a, b) => (a > b ? a : b), 0) return depths[id] } - this.conversation.map(k => k.id).map(subTreeDepthFor) + this.conversation.map((k) => k.id).map(subTreeDepthFor) return Object.keys(depths).reduce((res, id) => { res[id] = depths[id] - 1 // exclude itself return res }, {}) }, - depths () { + depths() { return this.threadTree.reduce((a, k) => { a[k.id] = k.depth return a }, {}) }, - topLevel () { - const topLevel = this.conversation.reduce((tl, cur) => - tl.filter(k => this.getReplies(cur.id).map(v => v.id).indexOf(k.id) === -1), this.conversation) + topLevel() { + const topLevel = this.conversation.reduce( + (tl, cur) => + tl.filter( + (k) => + this.getReplies(cur.id) + .map((v) => v.id) + .indexOf(k.id) === -1, + ), + this.conversation, + ) return topLevel }, - otherTopLevelCount () { + otherTopLevelCount() { return this.topLevel.length - 1 }, - showingTopLevel () { + showingTopLevel() { if (this.canDive && this.diveRoot) { return [this.statusMap[this.diveRoot]] } return this.topLevel }, - diveRoot () { + diveRoot() { const statusId = this.inlineDivePosition || this.statusId const isTopLevel = !this.parentOf(statusId) return isTopLevel ? null : statusId }, - diveDepth () { + diveDepth() { return this.canDive && this.diveRoot ? this.depths[this.diveRoot] : 0 }, - diveMode () { + diveMode() { return this.canDive && !!this.diveRoot }, - shouldShowAllConversationButton () { + shouldShowAllConversationButton() { // The "show all conversation" button tells the user that there exist // other toplevel statuses, so do not show it if there is only a single root - return this.isTreeView && this.isExpanded && this.diveMode && this.topLevel.length > 1 + return ( + this.isTreeView && + this.isExpanded && + this.diveMode && + this.topLevel.length > 1 + ) }, - shouldShowAncestors () { - return this.isTreeView && this.isExpanded && this.ancestorsOf(this.diveRoot).length + shouldShowAncestors() { + return ( + this.isTreeView && + this.isExpanded && + this.ancestorsOf(this.diveRoot).length + ) }, - replies () { + replies() { let i = 1 - return reduce(this.conversation, (result, { id, in_reply_to_status_id: irid }) => { - if (irid) { - result[irid] = result[irid] || [] - result[irid].push({ - name: `#${i}`, - id - }) - } - i++ - return result - }, {}) + return reduce( + this.conversation, + (result, { id, in_reply_to_status_id: irid }) => { + if (irid) { + result[irid] = result[irid] || [] + result[irid].push({ + name: `#${i}`, + id, + }) + } + i++ + return result + }, + {}, + ) }, - isExpanded () { + isExpanded() { return !!(this.expanded || this.isPage) }, - hiddenStyle () { + hiddenStyle() { const height = (this.status && this.status.virtualHeight) || '120px' return this.virtualHidden ? { height } : {} }, - threadDisplayStatus () { + threadDisplayStatus() { return this.conversation.reduce((a, k) => { const id = k.id const depth = this.depths[id] @@ -300,7 +350,7 @@ const conversation = { if (this.threadDisplayStatusObject[id]) { return this.threadDisplayStatusObject[id] } - if ((depth - this.diveDepth) <= this.maxDepthToShowByDefault) { + if (depth - this.diveDepth <= this.maxDepthToShowByDefault) { return 'showing' } else { return 'hidden' @@ -311,7 +361,7 @@ const conversation = { return a }, {}) }, - statusContentProperties () { + statusContentProperties() { return this.conversation.reduce((a, k) => { const id = k.id const props = (() => { @@ -320,13 +370,13 @@ const conversation = { expandingSubject: false, showingLongSubject: false, isReplying: false, - mediaPlaying: [] + mediaPlaying: [], } if (this.statusContentPropertiesObject[id]) { return { ...def, - ...this.statusContentPropertiesObject[id] + ...this.statusContentPropertiesObject[id], } } return def @@ -336,54 +386,58 @@ const conversation = { return a }, {}) }, - canDive () { + canDive() { return this.isTreeView && this.isExpanded }, - maybeHighlight () { + maybeHighlight() { return this.isExpanded ? this.highlight : null }, - ...mapGetters(['mergedConfig']), + ...mapPiniaState(useMergedConfigStore, ['mergedConfig']), ...mapState({ - mastoUserSocketStatus: state => state.api.mastoUserSocketStatus + mastoUserSocketStatus: (state) => state.api.mastoUserSocketStatus, }), ...mapPiniaState(useInterfaceStore, { - mobileLayout: store => store.layoutType === 'mobile' - }) + mobileLayout: (store) => store.layoutType === 'mobile', + }), }, components: { - Status, ThreadTree, QuickFilterSettings, - QuickViewSettings + QuickViewSettings, }, watch: { - statusId (newVal, oldVal) { + statusId(newVal, oldVal) { const newConversationId = this.getConversationId(newVal) const oldConversationId = this.getConversationId(oldVal) - if (newConversationId && oldConversationId && newConversationId === oldConversationId) { + if ( + newConversationId && + oldConversationId && + newConversationId === oldConversationId + ) { this.setHighlight(this.originalStatusId) } else { this.fetchConversation() } }, - expanded (value) { + expanded(value) { if (value) { this.fetchConversation() } else { this.resetDisplayState() } }, - virtualHidden () { - this.$store.dispatch( - 'setVirtualHeight', - { statusId: this.statusId, height: `${this.$el.clientHeight}px` } - ) - } + virtualHidden() { + this.$store.dispatch('setVirtualHeight', { + statusId: this.statusId, + height: `${this.$el.clientHeight}px`, + }) + }, }, methods: { - fetchConversation () { + fetchConversation() { if (this.status) { - this.$store.state.api.backendInteractor.fetchConversation({ id: this.statusId }) + this.$store.state.api.backendInteractor + .fetchConversation({ id: this.statusId }) .then(({ ancestors, descendants }) => { this.$store.dispatch('addNewStatuses', { statuses: ancestors }) this.$store.dispatch('addNewStatuses', { statuses: descendants }) @@ -391,7 +445,8 @@ const conversation = { }) } else { this.loadStatusError = null - this.$store.state.api.backendInteractor.fetchStatus({ id: this.statusId }) + this.$store.state.api.backendInteractor + .fetchStatus({ id: this.statusId }) .then((status) => { this.$store.dispatch('addNewStatuses', { statuses: [status] }) this.fetchConversation() @@ -401,16 +456,16 @@ const conversation = { }) } }, - isFocused (id) { - return (this.isExpanded) && id === this.highlight + isFocused(id) { + return this.isExpanded && id === this.highlight }, - getReplies (id) { + getReplies(id) { return this.replies[id] || [] }, - getHighlight () { + getHighlight() { return this.isExpanded ? this.highlight : null }, - setHighlight (id) { + setHighlight(id) { if (!id) return this.highlight = id @@ -421,44 +476,54 @@ const conversation = { this.$store.dispatch('fetchFavsAndRepeats', id) this.$store.dispatch('fetchEmojiReactionsBy', id) }, - toggleExpanded () { + toggleExpanded() { this.expanded = !this.expanded }, - getConversationId (statusId) { + getConversationId(statusId) { const status = this.$store.state.statuses.allStatusesObject[statusId] - return get(status, 'retweeted_status.statusnet_conversation_id', get(status, 'statusnet_conversation_id')) + return get( + status, + 'retweeted_status.statusnet_conversation_id', + get(status, 'statusnet_conversation_id'), + ) }, - setThreadDisplay (id, nextStatus) { + setThreadDisplay(id, nextStatus) { this.threadDisplayStatusObject = { ...this.threadDisplayStatusObject, - [id]: nextStatus + [id]: nextStatus, } }, - toggleThreadDisplay (id) { + toggleThreadDisplay(id) { const curStatus = this.threadDisplayStatus[id] const nextStatus = curStatus === 'showing' ? 'hidden' : 'showing' this.setThreadDisplay(id, nextStatus) }, - setThreadDisplayRecursively (id, nextStatus) { + setThreadDisplayRecursively(id, nextStatus) { this.setThreadDisplay(id, nextStatus) - this.getReplies(id).map(k => k.id).map(id => this.setThreadDisplayRecursively(id, nextStatus)) + this.getReplies(id) + .map((k) => k.id) + .map((id) => this.setThreadDisplayRecursively(id, nextStatus)) }, - showThreadRecursively (id) { + showThreadRecursively(id) { this.setThreadDisplayRecursively(id, 'showing') }, - setStatusContentProperty (id, name, value) { + setStatusContentProperty(id, name, value) { this.statusContentPropertiesObject = { ...this.statusContentPropertiesObject, [id]: { ...this.statusContentPropertiesObject[id], - [name]: value - } + [name]: value, + }, } }, - toggleStatusContentProperty (id, name) { - this.setStatusContentProperty(id, name, !this.statusContentProperties[id][name]) + toggleStatusContentProperty(id, name) { + this.setStatusContentProperty( + id, + name, + !this.statusContentProperties[id][name], + ) }, - leastVisibleAncestor (id) { + leastVisibleAncestor(id) { let cur = id let parent = this.parentOf(cur) while (cur) { @@ -472,18 +537,20 @@ const conversation = { // nothing found, fall back to toplevel return this.topLevel[0] ? this.topLevel[0].id : undefined }, - diveIntoStatus (id) { + diveIntoStatus(id) { this.tryScrollTo(id) }, - diveToTopLevel () { - this.tryScrollTo(this.topLevelAncestorOrSelfId(this.diveRoot) || this.topLevel[0].id) + diveToTopLevel() { + this.tryScrollTo( + this.topLevelAncestorOrSelfId(this.diveRoot) || this.topLevel[0].id, + ) }, // only used when we are not on a page - undive () { + undive() { this.inlineDivePosition = null this.setHighlight(this.statusId) }, - tryScrollTo (id) { + tryScrollTo(id) { if (!id) { return } @@ -512,13 +579,13 @@ const conversation = { this.setHighlight(id) }) }, - goToCurrent () { + goToCurrent() { this.tryScrollTo(this.diveRoot || this.topLevel[0].id) }, - statusById (id) { + statusById(id) { return this.statusMap[id] }, - parentOf (id) { + parentOf(id) { const status = this.statusById(id) if (!status) { return undefined @@ -529,11 +596,11 @@ const conversation = { } return parentId }, - parentOrSelf (id) { + parentOrSelf(id) { return this.parentOf(id) || id }, // Ancestors of some status, from top to bottom - ancestorsOf (id) { + ancestorsOf(id) { const ancestors = [] let cur = this.parentOf(id) while (cur) { @@ -542,7 +609,7 @@ const conversation = { } return ancestors }, - topLevelAncestorOrSelfId (id) { + topLevelAncestorOrSelfId(id) { let cur = id let parent = this.parentOf(id) while (parent) { @@ -551,11 +618,11 @@ const conversation = { } return cur }, - resetDisplayState () { + resetDisplayState() { this.undive() this.threadDisplayStatusObject = {} - } - } + }, + }, } export default conversation diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 2f3de3a86..8d4734083 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -88,38 +88,34 @@ class="thread-ancestor" :class="{'thread-ancestor-has-other-replies': getReplies(status.id).length > 1, '-faded': shouldFadeAncestors}" > - import('src/components/confirm_modal/confirm_modal.vue'), + ), }, data: () => ({ searchBarHidden: true, - supportsMask: window.CSS && window.CSS.supports && ( - window.CSS.supports('mask-size', 'contain') || + supportsMask: + window.CSS && + window.CSS.supports && + (window.CSS.supports('mask-size', 'contain') || window.CSS.supports('-webkit-mask-size', 'contain') || window.CSS.supports('-moz-mask-size', 'contain') || window.CSS.supports('-ms-mask-size', 'contain') || - window.CSS.supports('-o-mask-size', 'contain') - ), - showingConfirmLogout: false + window.CSS.supports('-o-mask-size', 'contain')), + showingConfirmLogout: false, }), computed: { - enableMask () { return this.supportsMask && this.$store.state.instance.logoMask }, - logoStyle () { + enableMask() { + return this.supportsMask && this.logoMask + }, + logoStyle() { return { - visibility: this.enableMask ? 'hidden' : 'visible' + visibility: this.enableMask ? 'hidden' : 'visible', } }, - logoMaskStyle () { + logoMaskStyle() { return this.enableMask ? { - 'mask-image': `url(${this.$store.state.instance.logo})` + 'mask-image': `url(${this.logo})`, } : { - 'background-color': this.enableMask ? '' : 'transparent' + 'background-color': this.enableMask ? '' : 'transparent', } }, - logoBgStyle () { - return Object.assign({ - margin: `${this.$store.state.instance.logoMargin} 0`, - opacity: this.searchBarHidden ? 1 : 0 - }, this.enableMask - ? {} - : { - 'background-color': this.enableMask ? '' : 'transparent' - }) + logoBgStyle() { + return Object.assign( + { + margin: `${this.logoMargin} 0`, + opacity: this.searchBarHidden ? 1 : 0, + }, + this.enableMask + ? {} + : { + 'background-color': this.enableMask ? '' : 'transparent', + }, + ) + }, + ...mapState(useInstanceStore, ['privateMode']), + ...mapState(useInstanceStore, { + logoMask: (store) => store.instanceIdentity.logoMask, + logo: (store) => store.instanceIdentity.logo, + logoLeft: (store) => store.instanceIdentity.logoLeft, + logoMargin: (store) => store.instanceIdentity.logoMargin, + sitename: (store) => store.instanceIdentity.name, + hideSitename: (store) => store.instanceIdentity.hideSitename, + }), + currentUser() { + return this.$store.state.users.currentUser + }, + shouldConfirmLogout() { + return useMergedConfigStore().mergedConfig.modalOnLogout }, - logo () { return this.$store.state.instance.logo }, - sitename () { return this.$store.state.instance.name }, - hideSitename () { return this.$store.state.instance.hideSitename }, - logoLeft () { return this.$store.state.instance.logoLeft }, - currentUser () { return this.$store.state.users.currentUser }, - privateMode () { return this.$store.state.instance.private }, - shouldConfirmLogout () { - return this.$store.getters.mergedConfig.modalOnLogout - } }, methods: { - scrollToTop () { + scrollToTop() { window.scrollTo(0, 0) }, - showConfirmLogout () { + showConfirmLogout() { this.showingConfirmLogout = true }, - hideConfirmLogout () { + hideConfirmLogout() { this.showingConfirmLogout = false }, - logout () { + logout() { if (!this.shouldConfirmLogout) { this.doLogout() } else { this.showConfirmLogout() } }, - doLogout () { + doLogout() { this.$router.replace('/main/public') this.$store.dispatch('logout') this.hideConfirmLogout() }, - onSearchBarToggled (hidden) { + onSearchBarToggled(hidden) { this.searchBarHidden = hidden }, - openSettingsModal () { - useInterfaceStore().openSettingsModal('user') - }, - openAdminModal () { - useInterfaceStore().openSettingsModal('admin') - } - } + ...mapActions(useInterfaceStore, ['openSettingsModal']), + }, } diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss index 35a57d9fe..9755ac590 100644 --- a/src/components/desktop_nav/desktop_nav.scss +++ b/src/components/desktop_nav/desktop_nav.scss @@ -9,7 +9,7 @@ .inner-nav { display: grid; grid-template-rows: var(--navbar-height); - grid-template-columns: 2fr auto 2fr; + grid-template-columns: minmax(5em, 1fr) auto minmax(5em, 1fr); grid-template-areas: "sitename logo actions"; box-sizing: border-box; padding: 0 1.2em; @@ -31,7 +31,7 @@ } &.-logoLeft .inner-nav { - grid-template-columns: auto 2fr 2fr; + grid-template-columns: auto minmax(5em, 1fr) minmax(5em, 1fr); grid-template-areas: "logo sitename actions"; } @@ -92,23 +92,18 @@ .actions { grid-area: actions; + justify-content: flex-end; + text-align: right; + z-index: 1; } .item { - flex: 1; line-height: var(--navbar-height); height: var(--navbar-height); - overflow: hidden; display: flex; - flex-wrap: wrap; - - &.right { - justify-content: flex-end; - text-align: right; - } } .spacer { - width: 1em; + min-width: 1em; } } diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue index 49382f8ee..477a7634d 100644 --- a/src/components/desktop_nav/desktop_nav.vue +++ b/src/components/desktop_nav/desktop_nav.vue @@ -32,61 +32,64 @@ >
- - - - - +
- {{ $t('login.logout_confirm') }} - + diff --git a/src/components/dialog_modal/dialog_modal.js b/src/components/dialog_modal/dialog_modal.js index b39851fe7..083f7a21d 100644 --- a/src/components/dialog_modal/dialog_modal.js +++ b/src/components/dialog_modal/dialog_modal.js @@ -1,19 +1,23 @@ +import { useMergedConfigStore } from 'src/stores/merged_config.js' + const DialogModal = { props: { darkOverlay: { default: true, - type: Boolean + type: Boolean, }, onCancel: { - default: () => {}, - type: Function - } + default: () => { + /* no-op */ + }, + type: Function, + }, }, computed: { - mobileCenter () { - return this.$store.getters.mergedConfig.modalMobileCenter - } - } + mobileCenter() { + return useMergedConfigStore().mergedConfig.modalMobileCenter + }, + }, } export default DialogModal diff --git a/src/components/dm_timeline/dm_timeline.js b/src/components/dm_timeline/dm_timeline.js index 8b5393a98..d54044ff7 100644 --- a/src/components/dm_timeline/dm_timeline.js +++ b/src/components/dm_timeline/dm_timeline.js @@ -1,14 +1,14 @@ -import Timeline from '../timeline/timeline.vue' +import Timeline from 'src/components/timeline/timeline.vue' const DMs = { computed: { - timeline () { + timeline() { return this.$store.state.statuses.timelines.dms - } + }, }, components: { - Timeline - } + Timeline, + }, } export default DMs diff --git a/src/components/domain_mute_card/domain_mute_card.js b/src/components/domain_mute_card/domain_mute_card.js index f234dcb0f..d83896618 100644 --- a/src/components/domain_mute_card/domain_mute_card.js +++ b/src/components/domain_mute_card/domain_mute_card.js @@ -1,26 +1,26 @@ -import ProgressButton from '../progress_button/progress_button.vue' +import ProgressButton from 'src/components/progress_button/progress_button.vue' const DomainMuteCard = { props: ['domain'], components: { - ProgressButton + ProgressButton, }, computed: { - user () { + user() { return this.$store.state.users.currentUser }, - muted () { + muted() { return this.user.domainMutes.includes(this.domain) - } + }, }, methods: { - unmuteDomain () { + unmuteDomain() { return this.$store.dispatch('unmuteDomain', this.domain) }, - muteDomain () { + muteDomain() { return this.$store.dispatch('muteDomain', this.domain) - } - } + }, + }, } export default DomainMuteCard diff --git a/src/components/draft/draft.js b/src/components/draft/draft.js index 55ee11a15..529d3ddf1 100644 --- a/src/components/draft/draft.js +++ b/src/components/draft/draft.js @@ -1,42 +1,44 @@ -import PostStatusForm from 'src/components/post_status_form/post_status_form.vue' -import EditStatusForm from 'src/components/edit_status_form/edit_status_form.vue' -import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue' -import StatusContent from 'src/components/status_content/status_content.vue' -import Gallery from 'src/components/gallery/gallery.vue' import { cloneDeep } from 'lodash' +import { defineAsyncComponent } from 'vue' + +import Gallery from 'src/components/gallery/gallery.vue' +import PostStatusForm from 'src/components/post_status_form/post_status_form.vue' +import StatusContent from 'src/components/status_content/status_content.vue' + +import { useMergedConfigStore } from 'src/stores/merged_config.js' import { library } from '@fortawesome/fontawesome-svg-core' -import { - faPollH -} from '@fortawesome/free-solid-svg-icons' +import { faPollH } from '@fortawesome/free-solid-svg-icons' -library.add( - faPollH -) +library.add(faPollH) const Draft = { components: { PostStatusForm, - EditStatusForm, - ConfirmModal, + EditStatusForm: defineAsyncComponent( + () => import('src/components/edit_status_form/edit_status_form.vue'), + ), + ConfirmModal: defineAsyncComponent( + () => import('src/components/confirm_modal/confirm_modal.vue'), + ), StatusContent, - Gallery + Gallery, }, props: { draft: { type: Object, - required: true - } + required: true, + }, }, - data () { + data() { return { referenceDraft: cloneDeep(this.draft), editing: false, - showingConfirmDialog: false + showingConfirmDialog: false, } }, computed: { - relAttrs () { + relAttrs() { if (this.draft.type === 'edit') { return { statusId: this.draft.refId } } else if (this.draft.type === 'reply') { @@ -45,24 +47,29 @@ const Draft = { return {} } }, - safeToSave () { - return this.draft.status || + safeToSave() { + return ( + this.draft.status || this.draft.files?.length || - this.draft.hasPoll + this.draft.hasPoll || + this.draft.hasQuote + ) }, - postStatusFormProps () { + postStatusFormProps() { return { draftId: this.draft.id, - ...this.relAttrs + ...this.relAttrs, } }, - refStatus () { - return this.draft.refId ? this.$store.state.statuses.allStatusesObject[this.draft.refId] : undefined + refStatus() { + return this.draft.refId + ? this.$store.state.statuses.allStatusesObject[this.draft.refId] + : undefined }, - localCollapseSubjectDefault () { - return this.$store.getters.mergedConfig.collapseMessageWithSubject + localCollapseSubjectDefault() { + return useMergedConfigStore().mergedConfig.collapseMessageWithSubject }, - nsfwClickthrough () { + nsfwClickthrough() { if (!this.draft.nsfw) { return false } @@ -70,35 +77,34 @@ const Draft = { return false } return true - } + }, }, watch: { - editing (newVal) { + editing(newVal) { if (newVal) return if (this.safeToSave) { this.$store.dispatch('addOrSaveDraft', { draft: this.draft }) } else { this.$store.dispatch('addOrSaveDraft', { draft: this.referenceDraft }) } - } + }, }, methods: { - toggleEditing () { + toggleEditing() { this.editing = !this.editing }, - abandon () { + abandon() { this.showingConfirmDialog = true }, - doAbandon () { - this.$store.dispatch('abandonDraft', { id: this.draft.id }) - .then(() => { - this.hideConfirmDialog() - }) + doAbandon() { + this.$store.dispatch('abandonDraft', { id: this.draft.id }).then(() => { + this.hideConfirmDialog() + }) }, - hideConfirmDialog () { + hideConfirmDialog() { this.showingConfirmDialog = false - } - } + }, + }, } export default Draft diff --git a/src/components/draft/draft.vue b/src/components/draft/draft.vue index 433ebae31..c91675e35 100644 --- a/src/components/draft/draft.vue +++ b/src/components/draft/draft.vue @@ -39,7 +39,7 @@ class="faint" >{{ $t('drafts.empty') }}

- - {{ $t('drafts.abandon_confirm') }} - +
- - - + + + + {{ $t('drafts.abandon_all_confirm') }} + + diff --git a/src/components/edit_status_form/edit_status_form.js b/src/components/edit_status_form/edit_status_form.js index 323763370..f7fd3d04d 100644 --- a/src/components/edit_status_form/edit_status_form.js +++ b/src/components/edit_status_form/edit_status_form.js @@ -1,21 +1,21 @@ -import PostStatusForm from '../post_status_form/post_status_form.vue' +import PostStatusForm from 'src/components/post_status_form/post_status_form.vue' import statusPosterService from '../../services/status_poster/status_poster.service.js' const EditStatusForm = { components: { - PostStatusForm + PostStatusForm, }, props: { params: { type: Object, - required: true - } + required: true, + }, }, methods: { - requestClose () { + requestClose() { this.$refs.postStatusForm.requestClose() }, - doEditStatus ({ status, spoilerText, sensitive, media, contentType, poll }) { + doEditStatus({ status, spoilerText, sensitive, media, contentType, poll }) { const params = { store: this.$store, statusId: this.params.statusId, @@ -24,21 +24,22 @@ const EditStatusForm = { sensitive, poll, media, - contentType + contentType, } - return statusPosterService.editStatus(params) + return statusPosterService + .editStatus(params) .then((data) => { return data }) .catch((err) => { console.error('Error editing status', err) return { - error: err.message + error: err.message, } }) - } - } + }, + }, } export default EditStatusForm diff --git a/src/components/edit_status_form/edit_status_form.vue b/src/components/edit_status_form/edit_status_form.vue index 0a7ec760a..1452be422 100644 --- a/src/components/edit_status_form/edit_status_form.vue +++ b/src/components/edit_status_form/edit_status_form.vue @@ -4,6 +4,7 @@ v-bind="params" :post-handler="doEditStatus" :disable-polls="true" + :disable-quotes="true" :disable-visibility-selector="true" /> diff --git a/src/components/edit_status_modal/edit_status_modal.js b/src/components/edit_status_modal/edit_status_modal.js index 4c10c21a0..c3ba7e4cb 100644 --- a/src/components/edit_status_modal/edit_status_modal.js +++ b/src/components/edit_status_modal/edit_status_modal.js @@ -1,34 +1,38 @@ -import EditStatusForm from '../edit_status_form/edit_status_form.vue' -import Modal from '../modal/modal.vue' -import get from 'lodash/get' -import { useEditStatusStore } from 'src/stores/editStatus' +import { get } from 'lodash' +import { defineAsyncComponent } from 'vue' + +import Modal from 'src/components/modal/modal.vue' + +import { useEditStatusStore } from 'src/stores/editStatus.js' const EditStatusModal = { components: { - EditStatusForm, - Modal + EditStatusForm: defineAsyncComponent( + () => import('src/components/edit_status_form/edit_status_form.vue'), + ), + Modal, }, - data () { + data() { return { - resettingForm: false + resettingForm: false, } }, computed: { - isLoggedIn () { + isLoggedIn() { return !!this.$store.state.users.currentUser }, - modalActivated () { + modalActivated() { return useEditStatusStore().modalActivated }, - isFormVisible () { + isFormVisible() { return this.isLoggedIn && !this.resettingForm && this.modalActivated }, - params () { + params() { return useEditStatusStore().params || {} - } + }, }, watch: { - params (newVal, oldVal) { + params(newVal, oldVal) { if (get(newVal, 'statusId') !== get(oldVal, 'statusId')) { this.resettingForm = true this.$nextTick(() => { @@ -36,20 +40,22 @@ const EditStatusModal = { }) } }, - isFormVisible (val) { + isFormVisible(val) { if (val) { - this.$nextTick(() => this.$el && this.$el.querySelector('textarea').focus()) + this.$nextTick( + () => this.$el && this.$el.querySelector('textarea').focus(), + ) } - } + }, }, methods: { - closeModal () { + closeModal() { this.$refs.editStatusForm.requestClose() }, - doCloseModal () { + doCloseModal() { useEditStatusStore().closeEditStatusModal() - } - } + }, + }, } export default EditStatusModal diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js index f6ba6e245..0cce2494d 100644 --- a/src/components/emoji_input/emoji_input.js +++ b/src/components/emoji_input/emoji_input.js @@ -1,20 +1,20 @@ -import Completion from '../../services/completion/completion.js' -import genRandomSeed from '../../services/random_seed/random_seed.service.js' -import EmojiPicker from '../emoji_picker/emoji_picker.vue' +import { take } from 'lodash' + import Popover from 'src/components/popover/popover.vue' import ScreenReaderNotice from 'src/components/screen_reader_notice/screen_reader_notice.vue' -import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue' -import { take } from 'lodash' -import { findOffset } from '../../services/offset_finder/offset_finder.service.js' import { ensureFinalFallback } from '../../i18n/languages.js' -import { library } from '@fortawesome/fontawesome-svg-core' -import { - faSmileBeam -} from '@fortawesome/free-regular-svg-icons' +import Completion from '../../services/completion/completion.js' +import { findOffset } from '../../services/offset_finder/offset_finder.service.js' +import genRandomSeed from '../../services/random_seed/random_seed.service.js' +import EmojiPicker from '../emoji_picker/emoji_picker.vue' +import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue' -library.add( - faSmileBeam -) +import { useMergedConfigStore } from 'src/stores/merged_config.js' + +import { library } from '@fortawesome/fontawesome-svg-core' +import { faSmileBeam } from '@fortawesome/free-regular-svg-icons' + +library.add(faSmileBeam) /** * EmojiInput - augmented inputs for emoji and autocomplete support in inputs @@ -60,14 +60,14 @@ const EmojiInput = { * For commonly used suggestors (emoji, users, both) use suggestor.js */ required: true, - type: Function + type: Function, }, modelValue: { /** * Used for v-model */ required: true, - type: String + type: String, }, enableEmojiPicker: { /** @@ -75,7 +75,7 @@ const EmojiInput = { */ required: false, type: Boolean, - default: false + default: false, }, hideEmojiButton: { /** @@ -84,7 +84,7 @@ const EmojiInput = { */ required: false, type: Boolean, - default: false + default: false, }, enableStickerPicker: { /** @@ -92,7 +92,7 @@ const EmojiInput = { */ required: false, type: Boolean, - default: false + default: false, }, placement: { /** @@ -101,15 +101,15 @@ const EmojiInput = { */ required: false, type: String, // 'auto', 'top', 'bottom' - default: 'auto' + default: 'auto', }, newlineOnCtrlEnter: { required: false, type: Boolean, - default: false - } + default: false, + }, }, - data () { + data() { return { randomSeed: genRandomSeed(), input: undefined, @@ -122,58 +122,65 @@ const EmojiInput = { disableClickOutside: false, suggestions: [], overlayStyle: {}, - pickerShown: false + pickerShown: false, } }, components: { Popover, EmojiPicker, UnicodeDomainIndicator, - ScreenReaderNotice + ScreenReaderNotice, }, computed: { - padEmoji () { - return this.$store.getters.mergedConfig.padEmoji + padEmoji() { + return useMergedConfigStore().mergedConfig.padEmoji }, - defaultCandidateIndex () { - return this.$store.getters.mergedConfig.autocompleteSelect ? 0 : -1 + defaultCandidateIndex() { + return useMergedConfigStore().mergedConfig.autocompleteSelect ? 0 : -1 }, - preText () { + preText() { return this.modelValue.slice(0, this.caret) }, - postText () { + postText() { return this.modelValue.slice(this.caret) }, - showSuggestions () { - return this.focused && + showSuggestions() { + return ( + this.focused && this.suggestions && this.suggestions.length > 0 && !this.pickerShown && !this.temporarilyHideSuggestions + ) }, - textAtCaret () { + textAtCaret() { return this.wordAtCaret?.word }, - wordAtCaret () { + wordAtCaret() { if (this.modelValue && this.caret) { - const word = Completion.wordAtPosition(this.modelValue, this.caret - 1) || {} + const word = + Completion.wordAtPosition(this.modelValue, this.caret - 1) || {} return word } }, - languages () { - return ensureFinalFallback(this.$store.getters.mergedConfig.interfaceLanguage) + languages() { + return ensureFinalFallback( + useMergedConfigStore().mergedConfig.interfaceLanguage, + ) }, - maybeLocalizedEmojiNamesAndKeywords () { - return emoji => { + maybeLocalizedEmojiNamesAndKeywords() { + return (emoji) => { const names = [emoji.displayText] const keywords = [] if (emoji.displayTextI18n) { - names.push(this.$t(emoji.displayTextI18n.key, emoji.displayTextI18n.args)) + names.push( + this.$t(emoji.displayTextI18n.key, emoji.displayTextI18n.args), + ) } if (emoji.annotations) { - this.languages.forEach(lang => { + this.languages.forEach((lang) => { names.push(emoji.annotations[lang]?.name) keywords.push(...(emoji.annotations[lang]?.keywords || [])) @@ -181,13 +188,13 @@ const EmojiInput = { } return { - names: names.filter(k => k), - keywords: keywords.filter(k => k) + names: names.filter((k) => k), + keywords: keywords.filter((k) => k), } } }, - maybeLocalizedEmojiName () { - return emoji => { + maybeLocalizedEmojiName() { + return (emoji) => { if (!emoji.annotations) { return emoji.displayText } @@ -205,16 +212,18 @@ const EmojiInput = { return emoji.displayText } }, - suggestionListId () { + suggestionListId() { return `suggestions-${this.randomSeed}` }, - suggestionItemId () { + suggestionItemId() { return (index) => `suggestion-item-${index}-${this.randomSeed}` - } + }, }, - mounted () { + mounted() { const { root, hiddenOverlayCaret, suggestorPopover } = this.$refs - const input = root.querySelector('.emoji-input > input') || root.querySelector('.emoji-input > textarea') + const input = + root.querySelector('.emoji-input > input') || + root.querySelector('.emoji-input > textarea') if (!input) return this.input = input this.caretEl = hiddenOverlayCaret @@ -243,7 +252,7 @@ const EmojiInput = { input.addEventListener('input', this.onInput) input.addEventListener('scroll', this.onInputScroll) }, - unmounted () { + unmounted() { const { input } = this if (input) { input.removeEventListener('blur', this.onBlur) @@ -273,36 +282,40 @@ const EmojiInput = { this.suggestions = [] return } - const matchedSuggestions = await this.suggest(newWord, this.maybeLocalizedEmojiNamesAndKeywords) + const matchedSuggestions = await this.suggest( + newWord, + this.maybeLocalizedEmojiNamesAndKeywords, + ) // Async: cancel if textAtCaret has changed during wait if (this.textAtCaret !== newWord || matchedSuggestions.length <= 0) { this.suggestions = [] return } - this.suggestions = take(matchedSuggestions, 5) - .map(({ imageUrl, ...rest }) => ({ + this.suggestions = take(matchedSuggestions, 5).map( + ({ imageUrl, ...rest }) => ({ ...rest, - img: imageUrl || '' - })) + img: imageUrl || '', + }), + ) this.highlighted = this.defaultCandidateIndex this.$refs.screenReaderNotice.announce( this.$t( 'tool_tip.autocomplete_available', { number: this.suggestions.length }, - this.suggestions.length - ) + this.suggestions.length, + ), ) - } + }, }, methods: { - onInputScroll (e) { + onInputScroll(e) { this.$refs.hiddenOverlay.scrollTo({ top: this.input.scrollTop, - left: this.input.scrollLeft + left: this.input.scrollLeft, }) this.setCaret(e) }, - triggerShowPicker () { + triggerShowPicker() { this.$nextTick(() => { this.$refs.picker.showPicker() this.scrollIntoView() @@ -315,22 +328,25 @@ const EmojiInput = { this.disableClickOutside = false }, 0) }, - togglePicker () { + togglePicker() { this.input.focus() if (!this.pickerShown) { this.scrollIntoView() this.$refs.picker.showPicker() - this.$refs.picker.startEmojiLoad() } else { this.$refs.picker.hidePicker() } }, - replace (replacement) { - const newValue = Completion.replaceWord(this.modelValue, this.wordAtCaret, replacement) + replace(replacement) { + const newValue = Completion.replaceWord( + this.modelValue, + this.wordAtCaret, + replacement, + ) this.$emit('update:modelValue', newValue) this.caret = 0 }, - insert ({ insertion, keepOpen, surroundingSpace = true }) { + insert({ insertion, keepOpen, surroundingSpace = true }) { const before = this.modelValue.substring(0, this.caret) || '' const after = this.modelValue.substring(this.caret) || '' @@ -349,18 +365,24 @@ const EmojiInput = { * them, masto seem to be rendering :emoji::emoji: correctly now so why not */ const isSpaceRegex = /\s/ - const spaceBefore = (surroundingSpace && !isSpaceRegex.exec(before.slice(-1)) && before.length && this.padEmoji > 0) ? ' ' : '' - const spaceAfter = (surroundingSpace && !isSpaceRegex.exec(after[0]) && this.padEmoji) ? ' ' : '' + const spaceBefore = + surroundingSpace && + !isSpaceRegex.exec(before.slice(-1)) && + before.length && + this.padEmoji > 0 + ? ' ' + : '' + const spaceAfter = + surroundingSpace && !isSpaceRegex.exec(after[0]) && this.padEmoji + ? ' ' + : '' - const newValue = [ - before, - spaceBefore, - insertion, - spaceAfter, - after - ].join('') + const newValue = [before, spaceBefore, insertion, spaceAfter, after].join( + '', + ) this.$emit('update:modelValue', newValue) - const position = this.caret + (insertion + spaceAfter + spaceBefore).length + const position = + this.caret + (insertion + spaceAfter + spaceBefore).length if (!keepOpen) { this.input.focus() } @@ -372,13 +394,20 @@ const EmojiInput = { this.caret = position }) }, - replaceText (e, suggestion) { + replaceText(e, suggestion) { const len = this.suggestions.length || 0 - if (this.textAtCaret.length === 1) { return } + if (this.textAtCaret.length === 1) { + return + } if (len > 0 || suggestion) { - const chosenSuggestion = suggestion || this.suggestions[this.highlighted] + const chosenSuggestion = + suggestion || this.suggestions[this.highlighted] const replacement = chosenSuggestion.replacement - const newValue = Completion.replaceWord(this.modelValue, this.wordAtCaret, replacement) + const newValue = Completion.replaceWord( + this.modelValue, + this.wordAtCaret, + replacement, + ) this.$emit('update:modelValue', newValue) this.highlighted = 0 const position = this.wordAtCaret.start + replacement.length @@ -393,7 +422,7 @@ const EmojiInput = { e.preventDefault() } }, - cycleBackward (e) { + cycleBackward(e) { const len = this.suggestions.length || 0 this.highlighted -= 1 @@ -406,7 +435,7 @@ const EmojiInput = { e.preventDefault() } }, - cycleForward (e) { + cycleForward(e) { const len = this.suggestions.length || 0 this.highlighted += 1 @@ -418,26 +447,28 @@ const EmojiInput = { e.preventDefault() } }, - scrollIntoView () { + scrollIntoView() { const rootRef = this.$refs.picker.$el /* Scroller is either `window` (replies in TL), sidebar (main post form, * replies in notifs) or mobile post form. Note that getting and setting * scroll is different for `Window` and `Element`s */ - const scrollerRef = this.$el.closest('.sidebar-scroller') || - this.$el.closest('.post-form-modal-view') || - window - const currentScroll = scrollerRef === window - ? scrollerRef.scrollY - : scrollerRef.scrollTop - const scrollerHeight = scrollerRef === window - ? scrollerRef.innerHeight - : scrollerRef.offsetHeight + const scrollerRef = + this.$el.closest('.sidebar-scroller') || + this.$el.closest('.post-form-modal-view') || + window + const currentScroll = + scrollerRef === window ? scrollerRef.scrollY : scrollerRef.scrollTop + const scrollerHeight = + scrollerRef === window + ? scrollerRef.innerHeight + : scrollerRef.offsetHeight const scrollerBottomBorder = currentScroll + scrollerHeight // We check where the bottom border of root element is, this uses findOffset // to find offset relative to scrollable container (scroller) - const rootBottomBorder = rootRef.offsetHeight + findOffset(rootRef, scrollerRef).top + const rootBottomBorder = + rootRef.offsetHeight + findOffset(rootRef, scrollerRef).top const bottomDelta = Math.max(0, rootBottomBorder - scrollerBottomBorder) // could also check top delta but there's no case for it @@ -459,13 +490,13 @@ const EmojiInput = { } }) }, - onPickerShown () { + onPickerShown() { this.pickerShown = true }, - onPickerClosed () { + onPickerClosed() { this.pickerShown = false }, - onBlur (e) { + onBlur(e) { // Clicking on any suggestion removes focus from autocomplete, // preventing click handler ever executing. this.blurTimeout = setTimeout(() => { @@ -473,10 +504,10 @@ const EmojiInput = { this.setCaret(e) }, 200) }, - onClick (e, suggestion) { + onClick(e, suggestion) { this.replaceText(e, suggestion) }, - onFocus (e) { + onFocus(e) { if (this.blurTimeout) { clearTimeout(this.blurTimeout) this.blurTimeout = null @@ -486,7 +517,7 @@ const EmojiInput = { this.setCaret(e) this.temporarilyHideSuggestions = false }, - onKeyUp (e) { + onKeyUp(e) { const { key } = e this.setCaret(e) @@ -498,10 +529,10 @@ const EmojiInput = { this.temporarilyHideSuggestions = false } }, - onPaste (e) { + onPaste(e) { this.setCaret(e) }, - onKeyDown (e) { + onKeyDown(e) { const { ctrlKey, shiftKey, key } = e if (this.newlineOnCtrlEnter && ctrlKey && key === 'Enter') { this.insert({ insertion: '\n', surroundingSpace: false }) @@ -545,30 +576,30 @@ const EmojiInput = { } } }, - onInput (e) { + onInput(e) { this.setCaret(e) this.$emit('update:modelValue', e.target.value) }, - onStickerUploaded (e) { + onStickerUploaded(e) { this.$emit('sticker-uploaded', e) }, - onStickerUploadFailed (e) { + onStickerUploadFailed(e) { this.$emit('sticker-upload-Failed', e) }, - setCaret ({ target: { selectionStart } }) { + setCaret({ target: { selectionStart } }) { this.caret = selectionStart this.$nextTick(() => { - this.$refs.suggestorPopover.updateStyles() + this.$refs.suggestorPopover?.updateStyles() }) }, - autoCompleteItemLabel (suggestion) { + autoCompleteItemLabel(suggestion) { if (suggestion.user) { return suggestion.displayText + ' ' + suggestion.detailText } else { return this.maybeLocalizedEmojiName(suggestion) } - } - } + }, + }, } export default EmojiInput diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue index a1cba33bc..8b69f3d9d 100644 --- a/src/components/emoji_input/emoji_input.vue +++ b/src/components/emoji_input/emoji_input.vue @@ -2,7 +2,7 @@
- + { +export default (data) => { const emojiCurry = suggestEmoji(data.emoji) const usersCurry = data.store && suggestUsers(data.store) return (input, nameKeywordLocalizer) => { @@ -25,22 +27,35 @@ export default data => { } } -export const suggestEmoji = emojis => (input, nameKeywordLocalizer) => { +export const suggestEmoji = (emojis) => (input, nameKeywordLocalizer) => { const noPrefix = input.toLowerCase().substr(1) return emojis - .map(emoji => ({ ...emoji, ...nameKeywordLocalizer(emoji) })) - .filter((emoji) => (emoji.names.concat(emoji.keywords)).filter(kw => kw.toLowerCase().match(noPrefix)).length) - .map(k => { + .map((emoji) => ({ ...emoji, ...nameKeywordLocalizer(emoji) })) + .filter( + (emoji) => + emoji.names + .concat(emoji.keywords) + .filter((kw) => kw.toLowerCase().match(noPrefix)).length, + ) + .map((k) => { let score = 0 // An exact match always wins - score += Math.max(...k.names.map(name => name.toLowerCase() === noPrefix ? 200 : 0), 0) + score += Math.max( + ...k.names.map((name) => (name.toLowerCase() === noPrefix ? 200 : 0)), + 0, + ) // Prioritize custom emoji a lot score += k.imageUrl ? 100 : 0 // Prioritize prefix matches somewhat - score += Math.max(...k.names.map(kw => kw.toLowerCase().startsWith(noPrefix) ? 10 : 0), 0) + score += Math.max( + ...k.names.map((kw) => + kw.toLowerCase().startsWith(noPrefix) ? 10 : 0, + ), + 0, + ) // Sort by length score -= k.displayText.length @@ -78,7 +93,7 @@ export const suggestUsers = ({ dispatch, state }) => { }) } - return async input => { + return async (input) => { const noPrefix = input.toLowerCase().substr(1) if (previousQuery === noPrefix) return suggestions @@ -92,37 +107,43 @@ export const suggestUsers = ({ dispatch, state }) => { await debounceUserSearch(noPrefix) } - const newSuggestions = state.users.users.filter( - user => - user.screen_name && user.name && ( - user.screen_name.toLowerCase().startsWith(noPrefix) || - user.name.toLowerCase().startsWith(noPrefix)) - ).slice(0, 20).sort((a, b) => { - let aScore = 0 - let bScore = 0 + const newSuggestions = state.users.users + .filter( + (user) => + user.screen_name && + user.name && + (user.screen_name.toLowerCase().startsWith(noPrefix) || + user.name.toLowerCase().startsWith(noPrefix)), + ) + .slice(0, 20) + .sort((a, b) => { + let aScore = 0 + let bScore = 0 - // Matches on screen name (i.e. user@instance) makes a priority - aScore += a.screen_name.toLowerCase().startsWith(noPrefix) ? 2 : 0 - bScore += b.screen_name.toLowerCase().startsWith(noPrefix) ? 2 : 0 + // Matches on screen name (i.e. user@instance) makes a priority + aScore += a.screen_name.toLowerCase().startsWith(noPrefix) ? 2 : 0 + bScore += b.screen_name.toLowerCase().startsWith(noPrefix) ? 2 : 0 - // Matches on name takes second priority - aScore += a.name.toLowerCase().startsWith(noPrefix) ? 1 : 0 - bScore += b.name.toLowerCase().startsWith(noPrefix) ? 1 : 0 + // Matches on name takes second priority + aScore += a.name.toLowerCase().startsWith(noPrefix) ? 1 : 0 + bScore += b.name.toLowerCase().startsWith(noPrefix) ? 1 : 0 - const diff = (bScore - aScore) * 10 + const diff = (bScore - aScore) * 10 - // Then sort alphabetically - const nameAlphabetically = a.name > b.name ? 1 : -1 - const screenNameAlphabetically = a.screen_name > b.screen_name ? 1 : -1 + // Then sort alphabetically + const activity = a.last_status_at < b.last_status_at ? 100 : -100 + const nameAlphabetically = a.name > b.name ? 1 : -1 + const screenNameAlphabetically = a.screen_name > b.screen_name ? 1 : -1 - return diff + nameAlphabetically + screenNameAlphabetically - }).map((user) => ({ - user, - displayText: user.screen_name_ui, - detailText: user.name, - imageUrl: user.profile_image_url_original, - replacement: '@' + user.screen_name + ' ' - })) + return diff + nameAlphabetically + screenNameAlphabetically + activity + }) + .map((user) => ({ + user, + displayText: user.screen_name_ui, + detailText: user.name, + imageUrl: user.profile_image_url_original, + replacement: '@' + user.screen_name + ' ', + })) suggestions = newSuggestions || [] return suggestions diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js index 8e572d1d2..bc2bb092b 100644 --- a/src/components/emoji_picker/emoji_picker.js +++ b/src/components/emoji_picker/emoji_picker.js @@ -1,24 +1,29 @@ +import { chunk, debounce, trim } from 'lodash' import { defineAsyncComponent } from 'vue' -import Checkbox from '../checkbox/checkbox.vue' + +import Checkbox from 'src/components/checkbox/checkbox.vue' import Popover from 'src/components/popover/popover.vue' -import StillImage from '../still-image/still-image.vue' import { ensureFinalFallback } from '../../i18n/languages.js' + +import { useEmojiStore } from 'src/stores/emoji.js' +import { useInstanceStore } from 'src/stores/instance.js' +import { useMergedConfigStore } from 'src/stores/merged_config.js' + import { library } from '@fortawesome/fontawesome-svg-core' import { - faBoxOpen, - faStickyNote, - faSmileBeam, - faSmile, - faUser, - faPaw, - faIceCream, - faBus, faBasketballBall, - faLightbulb, + faBoxOpen, + faBus, faCode, - faFlag + faFlag, + faIceCream, + faLightbulb, + faPaw, + faSmile, + faSmileBeam, + faStickyNote, + faUser, } from '@fortawesome/free-solid-svg-icons' -import { debounce, trim, chunk } from 'lodash' library.add( faBoxOpen, @@ -32,7 +37,7 @@ library.add( faBasketballBall, faLightbulb, faCode, - faFlag + faFlag, ) const UNICODE_EMOJI_GROUP_ICON = { @@ -44,16 +49,16 @@ const UNICODE_EMOJI_GROUP_ICON = { activities: 'basketball-ball', objects: 'lightbulb', symbols: 'code', - flags: 'flag' + flags: 'flag', } const maybeLocalizedKeywords = (emoji, languages, nameLocalizer) => { const res = [emoji.displayText, nameLocalizer(emoji)] if (emoji.annotations) { - languages.forEach(lang => { + languages.forEach((lang) => { const keywords = emoji.annotations[lang]?.keywords || [] const name = emoji.annotations[lang]?.name - res.push(...(keywords.concat([name]).filter(k => k))) + res.push(...keywords.concat([name]).filter((k) => k)) }) } return res @@ -66,8 +71,8 @@ const filterByKeyword = (list, keyword = '', languages, nameLocalizer) => { const orderedEmojiList = [] for (const emoji of list) { const indices = maybeLocalizedKeywords(emoji, languages, nameLocalizer) - .map(k => k.toLowerCase().indexOf(keywordLowercase)) - .filter(k => k > -1) + .map((k) => k.toLowerCase().indexOf(keywordLowercase)) + .filter((k) => k > -1) const indexOfKeyword = indices.length ? Math.min(...indices) : -1 @@ -84,11 +89,13 @@ const filterByKeyword = (list, keyword = '', languages, nameLocalizer) => { const getOffset = (elem) => { const style = elem.style.transform const res = /translateY\((\d+)px\)/.exec(style) - if (!res) { return 0 } + if (!res) { + return 0 + } return res[1] } -const toHeaderId = id => { +const toHeaderId = (id) => { return id.replace(/^row-\d+-/, '') } @@ -97,20 +104,20 @@ const EmojiPicker = { enableStickerPicker: { required: false, type: Boolean, - default: true + default: true, }, hideCustomEmoji: { required: false, type: Boolean, - default: false - } + default: false, + }, }, inject: { popoversZLayer: { - default: '' - } + default: '', + }, }, - data () { + data() { return { keyword: '', activeGroup: 'custom', @@ -121,24 +128,27 @@ const EmojiPicker = { hideCustomEmojiInPicker: false, // Lazy-load only after the first time `showing` becomes true. contentLoaded: false, + popoverShown: false, groupRefs: {}, emojiRefs: {}, filteredEmojiGroups: [], emojiSize: 0, - width: 0 + width: 0, } }, components: { - StickerPicker: defineAsyncComponent(() => import('../sticker_picker/sticker_picker.vue')), + StickerPicker: defineAsyncComponent( + () => import('src/components/sticker_picker/sticker_picker.vue'), + ), Checkbox, - StillImage, - Popover + + Popover, }, methods: { - groupScroll (e) { + groupScroll(e) { e.currentTarget.scrollLeft += e.deltaY + e.deltaX }, - updateEmojiSize () { + updateEmojiSize() { const css = window.getComputedStyle(this.$refs.popover.$el) const fontSize = css.getPropertyValue('font-size') || '1rem' const emojiSize = css.getPropertyValue('--emojiSize') || '2.2rem' @@ -163,56 +173,75 @@ const EmojiPicker = { emojiSizeReal = emojiSizeValue } - const fullEmojiSize = emojiSizeReal + (2 * 0.2 * fontSizeMultiplier * 14) + const fullEmojiSize = emojiSizeReal + 2 * 0.2 * fontSizeMultiplier * 14 this.emojiSize = fullEmojiSize }, - showPicker () { + togglePicker() { + if (this.popoverShown) { + this.hidePicker() + } else { + this.showPicker() + } + }, + showPicker() { this.$refs.popover.showPopover() this.$nextTick(() => { this.onShowing() }) }, - hidePicker () { + hidePicker() { this.$refs.popover.hidePopover() }, - setAnchorEl (el) { + setAnchorEl(el) { this.$refs.popover.setAnchorEl(el) }, - setGroupRef (name) { - return el => { this.groupRefs[name] = el } + setGroupRef(name) { + return (el) => { + this.groupRefs[name] = el + } }, - onPopoverShown () { - this.$emit('show') + onPopoverShown() { + this.popoverShown = true }, - onPopoverClosed () { - this.$emit('close') + onPopoverClosed() { + this.popoverShown = false }, - onStickerUploaded (e) { + onStickerUploaded(e) { this.$emit('sticker-uploaded', e) }, - onStickerUploadFailed (e) { + onStickerUploadFailed(e) { this.$emit('sticker-upload-failed', e) }, - onEmoji (emoji) { - const value = emoji.imageUrl ? `:${emoji.displayText}:` : emoji.replacement + onEmoji(emoji) { + const value = emoji.imageUrl + ? `:${emoji.displayText}:` + : emoji.replacement if (!this.keepOpen) { this.$refs.popover.hidePopover() } - this.$emit('emoji', { insertion: value, insertionUrl: emoji.imageUrl, keepOpen: this.keepOpen }) + this.$emit('emoji', { + insertion: value, + insertionUrl: emoji.imageUrl, + keepOpen: this.keepOpen, + }) }, - onScroll (startIndex, endIndex, visibleStartIndex, visibleEndIndex) { + onScroll(startIndex, endIndex, visibleStartIndex, visibleEndIndex) { const target = this.$refs['emoji-groups'].$el this.scrolledGroup(target, visibleStartIndex, visibleEndIndex) }, - scrolledGroup (target, start, end) { + scrolledGroup(target, start, end) { const top = target.scrollTop + 5 this.$nextTick(() => { - this.emojiItems.slice(start, end + 1).forEach(group => { + this.emojiItems.slice(start, end + 1).forEach((group) => { const headerId = toHeaderId(group.id) const ref = this.groupRefs['group-' + group.id] - if (!ref) { return } + if (!ref) { + return + } const elem = ref.$el.parentElement - if (!elem) { return } + if (!elem) { + return + } if (elem && getOffset(elem) <= top) { this.activeGroup = headerId } @@ -220,7 +249,7 @@ const EmojiPicker = { this.scrollHeader() }) }, - scrollHeader () { + scrollHeader() { // Scroll the active tab's header into view const headerRef = this.groupRefs['group-header-' + this.activeGroup] const left = headerRef.offsetLeft @@ -228,7 +257,9 @@ const EmojiPicker = { const headerCont = this.$refs.header const currentScroll = headerCont.scrollLeft const currentScrollRight = currentScroll + headerCont.clientWidth - const setScroll = s => { headerCont.scrollLeft = s } + const setScroll = (s) => { + headerCont.scrollLeft = s + } const margin = 7 // .emoji-tabs-item: padding if (left - margin < currentScroll) { @@ -237,12 +268,12 @@ const EmojiPicker = { setScroll(right + margin - headerCont.clientWidth) } }, - highlight (groupId) { + highlight(groupId) { this.setShowStickers(false) - const indexInList = this.emojiItems.findIndex(k => k.id === groupId) + const indexInList = this.emojiItems.findIndex((k) => k.id === groupId) this.$refs['emoji-groups'].scrollToItem(indexInList) }, - updateScrolledClass (target) { + updateScrolledClass(target) { if (target.scrollTop <= 5) { this.groupsScrolledClass = 'scrolled-top' } else if (target.scrollTop >= target.scrollTopMax - 5) { @@ -251,16 +282,21 @@ const EmojiPicker = { this.groupsScrolledClass = 'scrolled-middle' } }, - toggleStickers () { + toggleStickers() { this.showingStickers = !this.showingStickers }, - setShowStickers (value) { + setShowStickers(value) { this.showingStickers = value }, - filterByKeyword (list, keyword) { - return filterByKeyword(list, keyword, this.languages, this.maybeLocalizedEmojiName) + filterByKeyword(list, keyword) { + return filterByKeyword( + list, + keyword, + this.languages, + this.maybeLocalizedEmojiName, + ) }, - onShowing () { + onShowing() { const oldContentLoaded = this.contentLoaded this.updateEmojiSize() this.recalculateItemPerRow() @@ -277,108 +313,111 @@ const EmojiPicker = { }) } }, - getFilteredEmojiGroups () { + getFilteredEmojiGroups() { return this.allEmojiGroups - .map(group => ({ + .map((group) => ({ ...group, - emojis: this.filterByKeyword(group.emojis, trim(this.keyword)) + emojis: this.filterByKeyword(group.emojis, trim(this.keyword)), })) - .filter(group => group.emojis.length > 0) + .filter((group) => group.emojis.length > 0) }, - recalculateItemPerRow () { + recalculateItemPerRow() { this.$nextTick(() => { if (!this.$refs['emoji-groups']) { return } this.width = this.$refs['emoji-groups'].$el.clientWidth }) - } + }, }, watch: { - keyword () { + keyword() { this.onScroll() this.debouncedHandleKeywordChange() }, - allCustomGroups () { + allCustomGroups() { this.filteredEmojiGroups = this.getFilteredEmojiGroups() - } + }, }, computed: { - minItemSize () { + minItemSize() { return this.emojiSize }, // used to watch it - fontSize () { + fontSize() { this.$nextTick(() => { this.updateEmojiSize() }) - return this.$store.getters.mergedConfig.fontSize + return useMergedConfigStore().mergedConfig.fontSize }, - emojiHeight () { + emojiHeight() { return this.emojiSize }, - itemPerRow () { + itemPerRow() { return this.width ? Math.floor(this.width / this.emojiSize) : 6 }, - activeGroupView () { + activeGroupView() { return this.showingStickers ? '' : this.activeGroup }, - stickersAvailable () { - if (this.$store.state.instance.stickers) { - return this.$store.state.instance.stickers.length > 0 + stickersAvailable() { + if (useEmojiStore().stickers) { + return useEmojiStore().stickers.length > 0 } return 0 }, - allCustomGroups () { + allCustomGroups() { if (this.hideCustomEmoji || this.hideCustomEmojiInPicker) { return {} } - const emojis = this.$store.getters.groupedCustomEmojis + const emojis = useEmojiStore().groupedCustomEmojis if (emojis.unpacked) { emojis.unpacked.text = this.$t('emoji.unpacked') } return emojis }, - defaultGroup () { + defaultGroup() { return Object.keys(this.allCustomGroups)[0] }, - unicodeEmojiGroups () { - return this.$store.getters.standardEmojiGroupList.map(group => ({ + unicodeEmojiGroups() { + return useEmojiStore().standardEmojiGroupList.map((group) => ({ id: `standard-${group.id}`, text: this.$t(`emoji.unicode_groups.${group.id}`), icon: UNICODE_EMOJI_GROUP_ICON[group.id], - emojis: group.emojis + emojis: group.emojis, })) }, - allEmojiGroups () { + allEmojiGroups() { return Object.entries(this.allCustomGroups) .map(([, v]) => v) .concat(this.unicodeEmojiGroups) }, - stickerPickerEnabled () { - return (this.$store.state.instance.stickers || []).length !== 0 + stickerPickerEnabled() { + return (useEmojiStore().stickers || []).length !== 0 }, - debouncedHandleKeywordChange () { + debouncedHandleKeywordChange() { return debounce(() => { this.filteredEmojiGroups = this.getFilteredEmojiGroups() }, 500) }, - emojiItems () { - return this.filteredEmojiGroups.map(group => - chunk(group.emojis, this.itemPerRow) - .map((items, index) => ({ + emojiItems() { + return this.filteredEmojiGroups + .map((group) => + chunk(group.emojis, this.itemPerRow).map((items, index) => ({ ...group, id: index === 0 ? group.id : `row-${index}-${group.id}`, emojis: items, - isFirstRow: index === 0 - }))) + isFirstRow: index === 0, + })), + ) .reduce((a, c) => a.concat(c), []) }, - languages () { - return ensureFinalFallback(this.$store.getters.mergedConfig.interfaceLanguage) + languages() { + return ensureFinalFallback( + useMergedConfigStore().mergedConfig.interfaceLanguage, + ) }, - maybeLocalizedEmojiName () { - return emoji => { + maybeLocalizedEmojiName() { + return (emoji) => { if (!emoji.annotations) { return emoji.displayText } @@ -396,10 +435,10 @@ const EmojiPicker = { return emoji.displayText } }, - isInModal () { + isInModal() { return this.popoversZLayer === 'modals' - } - } + }, + }, } export default EmojiPicker diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue index dae5ff871..06e5976c4 100644 --- a/src/components/emoji_picker/emoji_picker.vue +++ b/src/components/emoji_picker/emoji_picker.vue @@ -4,6 +4,7 @@ trigger="click" popover-class="emoji-picker popover-default" :hide-trigger="true" + placement="bottom" @show="onPopoverShown" @close="onPopoverClosed" > @@ -48,7 +49,7 @@ v-if="group.image" class="emoji-picker-header-image" > - @@ -130,7 +131,7 @@ v-if="!emoji.imageUrl" class="emoji-picker-emoji -unicode" >{{ emoji.replacement }} - ({ - showAll: false + showAll: false, }), computed: { - tooManyReactions () { + tooManyReactions() { return this.status.emoji_reactions.length > EMOJI_REACTION_COUNT_CUTOFF }, - emojiReactions () { + emojiReactions() { return this.showAll ? this.status.emoji_reactions : this.status.emoji_reactions.slice(0, EMOJI_REACTION_COUNT_CUTOFF) }, - showMoreString () { + showMoreString() { return `+${this.status.emoji_reactions.length - EMOJI_REACTION_COUNT_CUTOFF}` }, - accountsForEmoji () { + accountsForEmoji() { return this.status.emoji_reactions.reduce((acc, reaction) => { acc[reaction.name] = reaction.accounts || [] return acc }, {}) }, - loggedIn () { + loggedIn() { return !!this.$store.state.users.currentUser }, - remoteInteractionLink () { - return this.$store.getters.remoteInteractionLink({ statusId: this.status.id }) - } + remoteInteractionLink() { + return useInstanceStore().getRemoteInteractionLink({ + statusId: this.status.id, + }) + }, + allowNonSquareEmoji() { + return useMergedConfigStore().mergedConfig.nonSquareEmoji + }, }, methods: { - toggleShowAll () { + toggleShowAll() { this.showAll = !this.showAll }, - reactedWith (emoji) { - return this.status.emoji_reactions.find(r => r.name === emoji).me + reactedWith(emoji) { + return this.status.emoji_reactions.find((r) => r.name === emoji).me }, - async fetchEmojiReactionsByIfMissing () { - const hasNoAccounts = this.status.emoji_reactions.find(r => !r.accounts) + async fetchEmojiReactionsByIfMissing() { + const hasNoAccounts = this.status.emoji_reactions.find((r) => !r.accounts) if (hasNoAccounts) { - return await this.$store.dispatch('fetchEmojiReactionsBy', this.status.id) + return await this.$store.dispatch( + 'fetchEmojiReactionsBy', + this.status.id, + ) } }, - reactWith (emoji) { + reactWith(emoji) { this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji }) }, - unreact (emoji) { + unreact(emoji) { this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji }) }, - async emojiOnClick (emoji) { + async emojiOnClick(emoji) { if (!this.loggedIn) return await this.fetchEmojiReactionsByIfMissing() @@ -81,19 +83,23 @@ const EmojiReactions = { this.reactWith(emoji) } }, - counterTriggerAttrs (reaction) { + counterTriggerAttrs(reaction) { return { class: [ 'emoji-reaction-count-button', { '-picked-reaction': this.reactedWith(reaction.name), - toggled: this.reactedWith(reaction.name) - } + toggled: this.reactedWith(reaction.name), + }, ], - 'aria-label': this.$t('status.reaction_count_label', { num: reaction.count }, reaction.count) + 'aria-label': this.$t( + 'status.reaction_count_label', + { num: reaction.count }, + reaction.count, + ), } - } - } + }, + }, } export default EmojiReactions diff --git a/src/components/emoji_reactions/emoji_reactions.scss b/src/components/emoji_reactions/emoji_reactions.scss index 8ea45e1b4..88ff1cee6 100644 --- a/src/components/emoji_reactions/emoji_reactions.scss +++ b/src/components/emoji_reactions/emoji_reactions.scss @@ -49,6 +49,12 @@ justify-content: center; align-items: center; + &.-wide { + width: auto; + min-width: var(--emoji-size); + max-width: calc(var(--emoji-size) * 3); + } + --_still_image-label-scale: 0.3; } @@ -62,6 +68,12 @@ font-size: calc(var(--emoji-size) * 0.8); margin: 0; + &.-wide { + width: auto; + min-width: var(--emoji-size); + max-width: calc(var(--emoji-size) * 3); + } + img { object-fit: contain; } diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue index e2361885a..16c69fa40 100644 --- a/src/components/emoji_reactions/emoji_reactions.vue +++ b/src/components/emoji_reactions/emoji_reactions.vue @@ -17,11 +17,13 @@ > { - const fileToDownload = document.createElement('a') - fileToDownload.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(content)) - fileToDownload.setAttribute('download', this.filename) - fileToDownload.style.display = 'none' - document.body.appendChild(fileToDownload) - fileToDownload.click() - document.body.removeChild(fileToDownload) - // Add delay before hiding processing state since browser takes some time to handle file download - setTimeout(() => { this.processing = false }, 2000) - }) - } - } + this.getContent().then((content) => { + const fileToDownload = document.createElement('a') + fileToDownload.setAttribute( + 'href', + 'data:text/plain;charset=utf-8,' + encodeURIComponent(content), + ) + fileToDownload.setAttribute('download', this.filename) + fileToDownload.style.display = 'none' + document.body.appendChild(fileToDownload) + fileToDownload.click() + document.body.removeChild(fileToDownload) + // Add delay before hiding processing state since browser takes some time to handle file download + setTimeout(() => { + this.processing = false + }, 2000) + }) + }, + }, } export default Exporter diff --git a/src/components/exporter/exporter.vue b/src/components/exporter/exporter.vue index 79defdf6f..e36d9dd62 100644 --- a/src/components/exporter/exporter.vue +++ b/src/components/exporter/exporter.vue @@ -23,6 +23,9 @@ diff --git a/src/components/interactions/interactions.js b/src/components/interactions/interactions.js index fc441b908..142a5fc8a 100644 --- a/src/components/interactions/interactions.js +++ b/src/components/interactions/interactions.js @@ -1,4 +1,4 @@ -import Notifications from '../notifications/notifications.vue' +import Notifications from 'src/components/notifications/notifications.vue' import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx' const tabModeDict = { @@ -8,26 +8,29 @@ const tabModeDict = { follows: ['follow'], reactions: ['pleroma:emoji_reaction'], reports: ['pleroma:report'], - moves: ['move'] + moves: ['move'], } const Interactions = { - data () { + data() { return { - allowFollowingMove: this.$store.state.users.currentUser.allow_following_move, + allowFollowingMove: + this.$store.state.users.currentUser.allow_following_move, filterMode: tabModeDict.mentions, - canSeeReports: this.$store.state.users.currentUser.privileges.includes('reports_manage_reports') + canSeeReports: this.$store.state.users.currentUser.privileges.includes( + 'reports_manage_reports', + ), } }, methods: { - onModeSwitch (key) { + onModeSwitch(key) { this.filterMode = tabModeDict[key] - } + }, }, components: { Notifications, - TabSwitcher - } + TabSwitcher, + }, } export default Interactions diff --git a/src/components/interactions/interactions.vue b/src/components/interactions/interactions.vue index 1e2efe402..98fba754d 100644 --- a/src/components/interactions/interactions.vue +++ b/src/components/interactions/interactions.vue @@ -42,7 +42,6 @@ -
- -
    -
  • +
  • +
  • -
  • - -
  • -
-
+
+ +
  • + +
  • + diff --git a/src/components/link-preview/link-preview.js b/src/components/link-preview/link-preview.js index add7c5631..808030fbb 100644 --- a/src/components/link-preview/link-preview.js +++ b/src/components/link-preview/link-preview.js @@ -1,38 +1,34 @@ -import { mapGetters } from 'vuex' +import { mapState } from 'pinia' + +import { useMergedConfigStore } from 'src/stores/merged_config.js' const LinkPreview = { name: 'LinkPreview', - props: [ - 'card', - 'size', - 'nsfw' - ], - data () { + props: ['card', 'size', 'nsfw'], + data() { return { - imageLoaded: false + imageLoaded: false, } }, computed: { - useImage () { + useImage() { // Currently BE shoudn't give cards if tagged NSFW, this is a bit paranoid // as it makes sure to hide the image if somehow NSFW tagged preview can // exist. return this.card.image && !this.censored && this.size !== 'hide' }, - censored () { + censored() { return this.nsfw && this.hideNsfwConfig }, - useDescription () { + useDescription() { return this.card.description && /\S/.test(this.card.description) }, - hideNsfwConfig () { + hideNsfwConfig() { return this.mergedConfig.hideNsfw }, - ...mapGetters([ - 'mergedConfig' - ]) + ...mapState(useMergedConfigStore, ['mergedConfig']), }, - created () { + created() { if (this.useImage) { const newImg = new Image() newImg.onload = () => { @@ -40,7 +36,7 @@ const LinkPreview = { } newImg.src = this.card.image } - } + }, } export default LinkPreview diff --git a/src/components/link-preview/link-preview.vue b/src/components/link-preview/link-preview.vue index 18fc77df4..7ff8433f4 100644 --- a/src/components/link-preview/link-preview.vue +++ b/src/components/link-preview/link-preview.vue @@ -48,6 +48,7 @@ img { width: 100%; height: 100%; + max-height: 10em; object-fit: cover; border-radius: var(--roundness); } diff --git a/src/components/link.style.js b/src/components/link.style.js index d13cef338..141a1f023 100644 --- a/src/components/link.style.js +++ b/src/components/link.style.js @@ -3,22 +3,22 @@ export default { selector: 'a', virtual: true, states: { - faint: '.faint' + faint: '.faint', }, defaultRules: [ { component: 'Link', directives: { - textColor: '--link' - } + textColor: '--link', + }, }, { component: 'Link', state: ['faint'], directives: { textOpacity: 0.5, - textOpacityMode: 'fake' - } - } - ] + textOpacityMode: 'fake', + }, + }, + ], } diff --git a/src/components/list/list.vue b/src/components/list/list.vue index 48686babb..64f6520d3 100644 --- a/src/components/list/list.vue +++ b/src/components/list/list.vue @@ -30,20 +30,20 @@ export default { props: { items: { type: Array, - default: () => [] + default: () => [], }, getKey: { type: Function, - default: item => item.id + default: (item) => item.id, }, getClass: { type: Function, - default: () => '' + default: () => '', }, nonInteractive: { type: Boolean, - default: false - } - } + default: false, + }, + }, } diff --git a/src/components/lists/lists.js b/src/components/lists/lists.js index 8dcb48b52..9dcb7636c 100644 --- a/src/components/lists/lists.js +++ b/src/components/lists/lists.js @@ -1,28 +1,29 @@ -import { useListsStore } from 'src/stores/lists' -import ListsCard from '../lists_card/lists_card.vue' +import ListsCard from 'src/components/lists_card/lists_card.vue' + +import { useListsStore } from 'src/stores/lists.js' const Lists = { - data () { + data() { return { - isNew: false + isNew: false, } }, components: { - ListsCard + ListsCard, }, computed: { - lists () { + lists() { return useListsStore().allLists - } + }, }, methods: { - cancelNewList () { + cancelNewList() { this.isNew = false }, - newList () { + newList() { this.isNew = true - } - } + }, + }, } export default Lists diff --git a/src/components/lists_card/lists_card.js b/src/components/lists_card/lists_card.js index b503caec4..81b811534 100644 --- a/src/components/lists_card/lists_card.js +++ b/src/components/lists_card/lists_card.js @@ -1,16 +1,10 @@ import { library } from '@fortawesome/fontawesome-svg-core' -import { - faEllipsisH -} from '@fortawesome/free-solid-svg-icons' +import { faEllipsisH } from '@fortawesome/free-solid-svg-icons' -library.add( - faEllipsisH -) +library.add(faEllipsisH) const ListsCard = { - props: [ - 'list' - ] + props: ['list'], } export default ListsCard diff --git a/src/components/lists_edit/lists_edit.js b/src/components/lists_edit/lists_edit.js index ca36ab886..d7a8525a8 100644 --- a/src/components/lists_edit/lists_edit.js +++ b/src/components/lists_edit/lists_edit.js @@ -1,22 +1,19 @@ -import { mapState, mapGetters } from 'vuex' import { mapState as mapPiniaState } from 'pinia' -import BasicUserCard from '../basic_user_card/basic_user_card.vue' -import ListsUserSearch from '../lists_user_search/lists_user_search.vue' -import PanelLoading from 'src/components/panel_loading/panel_loading.vue' -import UserAvatar from '../user_avatar/user_avatar.vue' -import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx' -import { library } from '@fortawesome/fontawesome-svg-core' -import { - faSearch, - faChevronLeft -} from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from 'src/stores/interface' -import { useListsStore } from 'src/stores/lists' +import { mapGetters, mapState } from 'vuex' -library.add( - faSearch, - faChevronLeft -) +import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue' +import ListsUserSearch from 'src/components/lists_user_search/lists_user_search.vue' +import PanelLoading from 'src/components/panel_loading/panel_loading.vue' +import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx' +import UserAvatar from 'src/components/user_avatar/user_avatar.vue' + +import { useInterfaceStore } from 'src/stores/interface.js' +import { useListsStore } from 'src/stores/lists.js' + +import { library } from '@fortawesome/fontawesome-svg-core' +import { faChevronLeft, faSearch } from '@fortawesome/free-solid-svg-icons' + +library.add(faSearch, faChevronLeft) const ListsNew = { components: { @@ -24,9 +21,9 @@ const ListsNew = { UserAvatar, ListsUserSearch, TabSwitcher, - PanelLoading + PanelLoading, }, - data () { + data() { return { title: '', titleDraft: '', @@ -35,46 +32,51 @@ const ListsNew = { searchUserIds: [], addedUserIds: new Set([]), // users we added from search, to undo searchLoading: false, - reallyDelete: false + reallyDelete: false, } }, - created () { + created() { if (!this.id) return - useListsStore().fetchList({ listId: this.id }) + useListsStore() + .fetchList({ listId: this.id }) .then(() => { this.title = this.findListTitle(this.id) this.titleDraft = this.title }) - useListsStore().fetchListAccounts({ listId: this.id }) + useListsStore() + .fetchListAccounts({ listId: this.id }) .then(() => { this.membersUserIds = this.findListAccounts(this.id) - this.membersUserIds.forEach(userId => { + this.membersUserIds.forEach((userId) => { this.$store.dispatch('fetchUserIfMissing', userId) }) }) }, computed: { - id () { + id() { return this.$route.params.id }, - membersUsers () { + membersUsers() { return [...this.membersUserIds, ...this.addedUserIds] - .map(userId => this.findUser(userId)).filter(user => user) + .map((userId) => this.findUser(userId)) + .filter((user) => user) }, - searchUsers () { - return this.searchUserIds.map(userId => this.findUser(userId)).filter(user => user) + searchUsers() { + return this.searchUserIds + .map((userId) => this.findUser(userId)) + .filter((user) => user) }, ...mapState({ - currentUser: state => state.users.currentUser + currentUser: (state) => state.users.currentUser, }), ...mapPiniaState(useListsStore, ['findListTitle', 'findListAccounts']), - ...mapGetters(['findUser']) + ...mapGetters(['findUser']), }, methods: { - onInput () { + onInput() { this.search(this.query) }, - toggleRemoveMember (user) { + toggleRemoveMember(user) { if (this.removedUserIds.has(user.id)) { this.id && this.addUser(user) this.removedUserIds.delete(user.id) @@ -83,7 +85,7 @@ const ListsNew = { this.removedUserIds.add(user.id) } }, - toggleAddFromSearch (user) { + toggleAddFromSearch(user) { if (this.addedUserIds.has(user.id)) { this.id && this.removeUser(user.id) this.addedUserIds.delete(user.id) @@ -92,40 +94,41 @@ const ListsNew = { this.addedUserIds.add(user.id) } }, - isRemoved (user) { + isRemoved(user) { return this.removedUserIds.has(user.id) }, - isAdded (user) { + isAdded(user) { return this.addedUserIds.has(user.id) }, - addUser (user) { + addUser(user) { useListsStore().addListAccount({ accountId: user.id, listId: this.id }) }, - removeUser (userId) { + removeUser(userId) { useListsStore().removeListAccount({ accountId: userId, listId: this.id }) }, - onSearchLoading () { + onSearchLoading() { this.searchLoading = true }, - onSearchLoadingDone () { + onSearchLoadingDone() { this.searchLoading = false }, - onSearchResults (results) { + onSearchResults(results) { this.searchLoading = false this.searchUserIds = results }, - updateListTitle () { + updateListTitle() { useListsStore().setList({ listId: this.id, title: this.titleDraft }) - .then(() => { - this.title = this.findListTitle(this.id) - }) + this.title = this.findListTitle(this.id) }, - createList () { - useListsStore().createList({ title: this.titleDraft }) + createList() { + useListsStore() + .createList({ title: this.titleDraft }) .then((list) => { - return useListsStore() - .setListAccounts({ listId: list.id, accountIds: [...this.addedUserIds] }) - .then(() => list.id) + useListsStore().setListAccounts({ + listId: list.id, + accountIds: [...this.addedUserIds], + }) + return list.id }) .then((listId) => { this.$router.push({ name: 'lists-timeline', params: { id: listId } }) @@ -134,15 +137,15 @@ const ListsNew = { useInterfaceStore().pushGlobalNotice({ messageKey: 'lists.error', messageArgs: [e.message], - level: 'error' + level: 'error', }) }) }, - deleteList () { + deleteList() { useListsStore().deleteList({ listId: this.id }) this.$router.push({ name: 'lists' }) - } - } + }, + }, } export default ListsNew diff --git a/src/components/lists_menu/lists_menu_content.js b/src/components/lists_menu/lists_menu_content.js index 726fd5fc4..d96f14599 100644 --- a/src/components/lists_menu/lists_menu_content.js +++ b/src/components/lists_menu/lists_menu_content.js @@ -1,26 +1,25 @@ -import { mapState } from 'vuex' import { mapState as mapPiniaState } from 'pinia' -import NavigationEntry from 'src/components/navigation/navigation_entry.vue' +import { mapState } from 'vuex' + import { getListEntries } from 'src/components/navigation/filter.js' -import { useListsStore } from 'src/stores/lists' +import NavigationEntry from 'src/components/navigation/navigation_entry.vue' + +import { useInstanceStore } from 'src/stores/instance.js' +import { useListsStore } from 'src/stores/lists.js' export const ListsMenuContent = { - props: [ - 'showPin' - ], + props: ['showPin'], components: { - NavigationEntry + NavigationEntry, }, computed: { ...mapPiniaState(useListsStore, { - lists: getListEntries + lists: getListEntries, }), ...mapState({ - currentUser: state => state.users.currentUser, - privateMode: state => state.instance.private, - federating: state => state.instance.federating - }) - } + currentUser: (state) => state.users.currentUser, + }), + }, } export default ListsMenuContent diff --git a/src/components/lists_timeline/lists_timeline.js b/src/components/lists_timeline/lists_timeline.js index eae82a867..a06220a37 100644 --- a/src/components/lists_timeline/lists_timeline.js +++ b/src/components/lists_timeline/lists_timeline.js @@ -1,16 +1,20 @@ -import { useListsStore } from 'src/stores/lists' -import Timeline from '../timeline/timeline.vue' +import Timeline from 'src/components/timeline/timeline.vue' + +import { useListsStore } from 'src/stores/lists.js' + const ListsTimeline = { - data () { + data() { return { - listId: null + listId: null, } }, components: { - Timeline + Timeline, }, computed: { - timeline () { return this.$store.state.statuses.timelines.list } + timeline() { + return this.$store.state.statuses.timelines.list + }, }, watch: { $route: function (route) { @@ -19,19 +23,25 @@ const ListsTimeline = { this.$store.dispatch('stopFetchingTimeline', 'list') this.$store.commit('clearTimeline', { timeline: 'list' }) useListsStore().fetchList({ listId: this.listId }) - this.$store.dispatch('startFetchingTimeline', { timeline: 'list', listId: this.listId }) + this.$store.dispatch('startFetchingTimeline', { + timeline: 'list', + listId: this.listId, + }) } - } + }, }, - created () { + created() { this.listId = this.$route.params.id useListsStore().fetchList({ listId: this.listId }) - this.$store.dispatch('startFetchingTimeline', { timeline: 'list', listId: this.listId }) + this.$store.dispatch('startFetchingTimeline', { + timeline: 'list', + listId: this.listId, + }) }, - unmounted () { + unmounted() { this.$store.dispatch('stopFetchingTimeline', 'list') this.$store.commit('clearTimeline', { timeline: 'list' }) - } + }, } export default ListsTimeline diff --git a/src/components/lists_user_search/lists_user_search.js b/src/components/lists_user_search/lists_user_search.js index c92ec0eee..aed3f1ce7 100644 --- a/src/components/lists_user_search/lists_user_search.js +++ b/src/components/lists_user_search/lists_user_search.js @@ -1,33 +1,29 @@ -import { library } from '@fortawesome/fontawesome-svg-core' -import { - faSearch, - faChevronLeft -} from '@fortawesome/free-solid-svg-icons' import { debounce } from 'lodash' -import Checkbox from '../checkbox/checkbox.vue' -library.add( - faSearch, - faChevronLeft -) +import Checkbox from 'src/components/checkbox/checkbox.vue' + +import { library } from '@fortawesome/fontawesome-svg-core' +import { faChevronLeft, faSearch } from '@fortawesome/free-solid-svg-icons' + +library.add(faSearch, faChevronLeft) const ListsUserSearch = { components: { - Checkbox + Checkbox, }, emits: ['loading', 'loadingDone', 'results'], - data () { + data() { return { loading: false, query: '', - followingOnly: true + followingOnly: true, } }, methods: { onInput: debounce(function () { this.search(this.query) }, 2000), - search (query) { + search(query) { if (!query) { this.loading = false return @@ -36,16 +32,25 @@ const ListsUserSearch = { this.loading = true this.$emit('loading') this.userIds = [] - this.$store.dispatch('search', { q: query, resolve: true, type: 'accounts', following: this.followingOnly }) - .then(data => { - this.$emit('results', data.accounts.map(a => a.id)) + this.$store + .dispatch('search', { + q: query, + resolve: true, + type: 'accounts', + following: this.followingOnly, + }) + .then((data) => { + this.$emit( + 'results', + data.accounts.map((a) => a.id), + ) }) .finally(() => { this.loading = false this.$emit('loadingDone') }) - } - } + }, + }, } export default ListsUserSearch diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js index 9566aa903..b16fb8d2f 100644 --- a/src/components/login_form/login_form.js +++ b/src/components/login_form/login_form.js @@ -1,98 +1,103 @@ +import { mapActions, mapState as mapPiniaState, mapStores } from 'pinia' import { mapState } from 'vuex' -import { mapStores, mapActions, mapState as mapPiniaState } from 'pinia' -import oauthApi from '../../services/new_api/oauth.js' -import { useOAuthStore } from 'src/stores/oauth.js' -import { useAuthFlowStore } from 'src/stores/auth_flow.js' -import { library } from '@fortawesome/fontawesome-svg-core' -import { - faTimes -} from '@fortawesome/free-solid-svg-icons' -library.add( - faTimes -) +import oauthApi from '../../services/new_api/oauth.js' + +import { useAuthFlowStore } from 'src/stores/auth_flow.js' +import { useInstanceStore } from 'src/stores/instance.js' +import { useOAuthStore } from 'src/stores/oauth.js' + +import { library } from '@fortawesome/fontawesome-svg-core' +import { faTimes } from '@fortawesome/free-solid-svg-icons' + +library.add(faTimes) const LoginForm = { data: () => ({ user: {}, - error: false + error: false, }), computed: { - isPasswordAuth () { return this.requiredPassword }, - isTokenAuth () { return this.requiredToken }, - ...mapStores(useOAuthStore), ...mapState({ - registrationOpen: state => state.instance.registrationOpen, - instance: state => state.instance, - loggingIn: state => state.users.loggingIn, + loggingIn: (state) => state.users.loggingIn, + }), + ...mapPiniaState(useOAuthStore, ['clientId', 'clientSecret']), + ...mapPiniaState(useInstanceStore, ['server', 'registrationOpen']), + ...mapPiniaState(useAuthFlowStore, { + isTokenAuth: (store) => store.requiredToken, + isPasswordAuth: (store) => !store.requiredToken, }), - ...mapPiniaState(useAuthFlowStore, ['requiredPassword', 'requiredToken', 'requiredMFA']) }, methods: { ...mapActions(useAuthFlowStore, ['requireMFA', 'login']), - submit () { + ...mapActions(useOAuthStore, ['ensureAppToken']), + submit() { this.isTokenAuth ? this.submitToken() : this.submitPassword() }, - submitToken () { + submitToken() { const data = { - instance: this.instance.server, - commit: this.$store.commit + instance: this.server, + commit: this.$store.commit, } // NOTE: we do not really need the app token, but obtaining a token and // calling verify_credentials is the only way to ensure the app still works. - this.oauthStore.ensureAppToken() - .then(() => { - const app = { - clientId: this.oauthStore.clientId, - clientSecret: this.oauthStore.clientSecret, - } - oauthApi.login({ ...app, ...data }) - }) + this.ensureAppToken().then(() => { + const app = { + clientId: this.clientId, + clientSecret: this.clientSecret, + } + oauthApi.login({ ...app, ...data }) + }) }, - submitPassword () { + submitPassword() { this.error = false // NOTE: we do not really need the app token, but obtaining a token and // calling verify_credentials is the only way to ensure the app still works. - this.oauthStore.ensureAppToken().then(() => { + this.ensureAppToken().then(() => { const app = { - clientId: this.oauthStore.clientId, - clientSecret: this.oauthStore.clientSecret, + clientId: this.clientId, + clientSecret: this.clientSecret, } - oauthApi.getTokenWithCredentials( - { + oauthApi + .getTokenWithCredentials({ ...app, - instance: this.instance.server, + instance: this.server, username: this.user.username, - password: this.user.password - } - ).then((result) => { - if (result.error) { - if (result.error === 'mfa_required') { - this.requireMFA({ settings: result }) - } else if (result.identifier === 'password_reset_required') { - this.$router.push({ name: 'password-reset', params: { passwordResetRequested: true } }) - } else { - this.error = result.error - this.focusOnPasswordInput() - } - return - } - this.login(result).then(() => { - this.$router.push({ name: 'friends' }) + password: this.user.password, + }) + .then((result) => { + if (result.error) { + if (result.error === 'mfa_required') { + this.requireMFA({ settings: result }) + } else if (result.identifier === 'password_reset_required') { + this.$router.push({ + name: 'password-reset', + params: { passwordResetRequested: true }, + }) + } else { + this.error = result.error + this.focusOnPasswordInput() + } + return + } + this.login(result).then(() => { + this.$router.push({ name: 'friends' }) + }) }) - }) }) }, - clearError () { this.error = false }, - focusOnPasswordInput () { + clearError() { + this.error = false + }, + focusOnPasswordInput() { const passwordInput = this.$refs.passwordInput passwordInput.focus() passwordInput.setSelectionRange(0, passwordInput.value.length) - } - } + }, + }, } export default LoginForm diff --git a/src/components/media_modal/media_modal.js b/src/components/media_modal/media_modal.js index 9a57f8250..ad53b6e31 100644 --- a/src/components/media_modal/media_modal.js +++ b/src/components/media_modal/media_modal.js @@ -1,37 +1,36 @@ -import StillImage from '../still-image/still-image.vue' -import VideoAttachment from '../video_attachment/video_attachment.vue' -import Modal from '../modal/modal.vue' -import PinchZoom from '../pinch_zoom/pinch_zoom.vue' -import SwipeClick from '../swipe_click/swipe_click.vue' +import { defineAsyncComponent } from 'vue' + +import Modal from 'src/components/modal/modal.vue' +import StillImage from 'src/components/still-image/still-image.vue' import GestureService from '../../services/gesture_service/gesture_service' -import Flash from 'src/components/flash/flash.vue' -import fileTypeService from '../../services/file_type/file_type.service.js' + +import { useMediaViewerStore } from 'src/stores/media_viewer.js' + import { library } from '@fortawesome/fontawesome-svg-core' import { faChevronLeft, faChevronRight, faCircleNotch, - faTimes + faTimes, } from '@fortawesome/free-solid-svg-icons' -import { useMediaViewerStore } from 'src/stores/media_viewer' -library.add( - faChevronLeft, - faChevronRight, - faCircleNotch, - faTimes -) +library.add(faChevronLeft, faChevronRight, faCircleNotch, faTimes) const MediaModal = { components: { - StillImage, - VideoAttachment, - PinchZoom, - SwipeClick, + VideoAttachment: defineAsyncComponent( + () => import('src/components/video_attachment/video_attachment.vue'), + ), + PinchZoom: defineAsyncComponent( + () => import('src/components/pinch_zoom/pinch_zoom.vue'), + ), + SwipeClick: defineAsyncComponent( + () => import('src/components/swipe_click/swipe_click.vue'), + ), Modal, - Flash + Flash: defineAsyncComponent(() => import('src/components/flash/flash.vue')), }, - data () { + data() { return { loading: false, swipeDirection: GestureService.DIRECTION_LEFT, @@ -40,42 +39,36 @@ const MediaModal = { return window.innerWidth * considerableMoveRatio }, pinchZoomMinScale: 1, - pinchZoomScaleResetLimit: 1.2 + pinchZoomScaleResetLimit: 1.2, } }, computed: { - showing () { + showing() { return useMediaViewerStore().activated }, - media () { + media() { return useMediaViewerStore().media }, - description () { + description() { return this.currentMedia.description }, - currentIndex () { + currentIndex() { return useMediaViewerStore().currentIndex }, - currentMedia () { + currentMedia() { return this.media[this.currentIndex] }, - canNavigate () { + canNavigate() { return this.media.length > 1 }, - type () { - return this.currentMedia ? this.getType(this.currentMedia) : null - }, - swipeDisableClickThreshold () { + swipeDisableClickThreshold() { // If there is only one media, allow more mouse movements to close the modal // because there is less chance that the user wants to switch to another image - return () => this.canNavigate ? 1 : 30 - } + return () => (this.canNavigate ? 1 : 30) + }, }, methods: { - getType (media) { - return fileTypeService.fileType(media.mimetype) - }, - hide () { + hide() { // HACK: Closing immediately via a touch will cause the click // to be processed on the content below the overlay const transitionTime = 100 // ms @@ -83,7 +76,7 @@ const MediaModal = { useMediaViewerStore().closeMediaViewer() }, transitionTime) }, - hideIfNotSwiped (event) { + hideIfNotSwiped(event) { // If we have swiped over SwipeClick, do not trigger hide const comp = this.$refs.swipeClick if (!comp) { @@ -92,33 +85,39 @@ const MediaModal = { comp.$gesture.click(event) } }, - goPrev () { + goPrev() { if (this.canNavigate) { - const prevIndex = this.currentIndex === 0 ? this.media.length - 1 : (this.currentIndex - 1) + const prevIndex = + this.currentIndex === 0 + ? this.media.length - 1 + : this.currentIndex - 1 const newMedia = this.media[prevIndex] - if (this.getType(newMedia) === 'image') { + if (newMedia.type === 'image') { this.loading = true } useMediaViewerStore().setCurrentMedia(newMedia) } }, - goNext () { + goNext() { if (this.canNavigate) { - const nextIndex = this.currentIndex === this.media.length - 1 ? 0 : (this.currentIndex + 1) + const nextIndex = + this.currentIndex === this.media.length - 1 + ? 0 + : this.currentIndex + 1 const newMedia = this.media[nextIndex] - if (this.getType(newMedia) === 'image') { + if (newMedia.type === 'image') { this.loading = true } useMediaViewerStore().setCurrentMedia(newMedia) } }, - onImageLoaded () { + onImageLoaded() { this.loading = false }, - handleSwipePreview (offsets) { + handleSwipePreview(offsets) { this.$refs.pinchZoom.setTransform({ scale: 1, x: offsets[0], y: 0 }) }, - handleSwipeEnd (sign) { + handleSwipeEnd(sign) { this.$refs.pinchZoom.setTransform({ scale: 1, x: 0, y: 0 }) if (sign > 0) { this.goNext() @@ -126,33 +125,36 @@ const MediaModal = { this.goPrev() } }, - handleKeyupEvent (e) { - if (this.showing && e.keyCode === 27) { // escape + handleKeyupEvent(e) { + if (this.showing && e.keyCode === 27) { + // escape this.hide() } }, - handleKeydownEvent (e) { + handleKeydownEvent(e) { if (!this.showing) { return } - if (e.keyCode === 39) { // arrow right + if (e.keyCode === 39) { + // arrow right this.goNext() - } else if (e.keyCode === 37) { // arrow left + } else if (e.keyCode === 37) { + // arrow left this.goPrev() } - } + }, }, - mounted () { + mounted() { window.addEventListener('popstate', this.hide) document.addEventListener('keyup', this.handleKeyupEvent) document.addEventListener('keydown', this.handleKeydownEvent) }, - unmounted () { + unmounted() { window.removeEventListener('popstate', this.hide) document.removeEventListener('keyup', this.handleKeyupEvent) document.removeEventListener('keydown', this.handleKeydownEvent) - } + }, } export default MediaModal diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue index 7f625755c..f2f47a0b6 100644 --- a/src/components/media_modal/media_modal.vue +++ b/src/components/media_modal/media_modal.vue @@ -5,7 +5,7 @@ @backdrop-clicked="hideIfNotSwiped" >
    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 031013559..4969352f6 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 @@ -1,57 +1,56 @@ import { debounce } from 'lodash' + +import { useMergedConfigStore } from 'src/stores/merged_config.js' +import { usePostStatusStore } from 'src/stores/post_status.js' + import { library } from '@fortawesome/fontawesome-svg-core' -import { - faPen -} from '@fortawesome/free-solid-svg-icons' -import { usePostStatusStore } from 'src/stores/post_status' +import { faPen } from '@fortawesome/free-solid-svg-icons' -library.add( - faPen -) +library.add(faPen) -const HIDDEN_FOR_PAGES = new Set([ - 'chats', - 'chat', - 'lists-edit' -]) +const HIDDEN_FOR_PAGES = new Set(['chats', 'chat', 'lists-edit']) const MobilePostStatusButton = { - data () { + data() { return { hidden: false, scrollingDown: false, inputActive: false, oldScrollPos: 0, - amountScrolled: 0 + amountScrolled: 0, } }, - created () { + created() { if (this.autohideFloatingPostButton) { this.activateFloatingPostButtonAutohide() } window.addEventListener('resize', this.handleOSK) }, - unmounted () { + unmounted() { if (this.autohideFloatingPostButton) { this.deactivateFloatingPostButtonAutohide() } window.removeEventListener('resize', this.handleOSK) }, computed: { - isLoggedIn () { + isLoggedIn() { return !!this.$store.state.users.currentUser }, - isHidden () { - if (HIDDEN_FOR_PAGES.has(this.$route.name)) { return true } + isHidden() { + if (HIDDEN_FOR_PAGES.has(this.$route.name)) { + return true + } - return this.autohideFloatingPostButton && (this.hidden || this.inputActive) + return ( + this.autohideFloatingPostButton && (this.hidden || this.inputActive) + ) }, - isPersistent () { - return !!this.$store.getters.mergedConfig.alwaysShowNewPostButton + isPersistent() { + return !!useMergedConfigStore().mergedConfig.alwaysShowNewPostButton + }, + autohideFloatingPostButton() { + return !!useMergedConfigStore().mergedConfig.autohideFloatingPostButton }, - autohideFloatingPostButton () { - return !!this.$store.getters.mergedConfig.autohideFloatingPostButton - } }, watch: { autohideFloatingPostButton: function (isEnabled) { @@ -60,21 +59,21 @@ const MobilePostStatusButton = { } else { this.deactivateFloatingPostButtonAutohide() } - } + }, }, methods: { - activateFloatingPostButtonAutohide () { + activateFloatingPostButtonAutohide() { window.addEventListener('scroll', this.handleScrollStart) window.addEventListener('scroll', this.handleScrollEnd) }, - deactivateFloatingPostButtonAutohide () { + deactivateFloatingPostButtonAutohide() { window.removeEventListener('scroll', this.handleScrollStart) window.removeEventListener('scroll', this.handleScrollEnd) }, - openPostForm () { + openPostForm() { usePostStatusStore().openPostStatusModal() }, - handleOSK () { + handleOSK() { // This is a big hack: we're guessing from changed window sizes if the // on-screen keyboard is active or not. This is only really important // for phones in portrait mode and it's more important to show the button @@ -94,20 +93,28 @@ const MobilePostStatusButton = { this.inputActive = false } }, - handleScrollStart: debounce(function () { - if (window.scrollY > this.oldScrollPos) { - this.hidden = true - } else { - this.hidden = false - } - this.oldScrollPos = window.scrollY - }, 100, { leading: true, trailing: false }), + handleScrollStart: debounce( + function () { + if (window.scrollY > this.oldScrollPos) { + this.hidden = true + } else { + this.hidden = false + } + this.oldScrollPos = window.scrollY + }, + 100, + { leading: true, trailing: false }, + ), - handleScrollEnd: debounce(function () { - this.hidden = false - this.oldScrollPos = window.scrollY - }, 100, { leading: false, trailing: true }) - } + handleScrollEnd: debounce( + function () { + this.hidden = false + this.oldScrollPos = window.scrollY + }, + 100, + { leading: false, trailing: true }, + ), + }, } export default MobilePostStatusButton diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue index 032e7dbeb..a022f7427 100644 --- a/src/components/modal/modal.vue +++ b/src/components/modal/modal.vue @@ -13,27 +13,27 @@ diff --git a/src/components/modal/modals.style.js b/src/components/modal/modals.style.js index 1cb4a34a7..9c8c279f7 100644 --- a/src/components/modal/modals.style.js +++ b/src/components/modal/modals.style.js @@ -3,8 +3,6 @@ export default { selector: ['.modal-view', '#modal', '.shout-panel'], lazy: true, notEditable: true, - validInnerComponents: [ - 'Panel' - ], - defaultRules: [] + validInnerComponents: ['Panel'], + defaultRules: [], } diff --git a/src/components/moderation_tools/moderation_tools.js b/src/components/moderation_tools/moderation_tools.js index bd57a353a..d31002fad 100644 --- a/src/components/moderation_tools/moderation_tools.js +++ b/src/components/moderation_tools/moderation_tools.js @@ -1,9 +1,12 @@ +import DialogModal from 'src/components/dialog_modal/dialog_modal.vue' +import Popover from 'src/components/popover/popover.vue' + +import { useInstanceStore } from 'src/stores/instance.js' +import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' + import { library } from '@fortawesome/fontawesome-svg-core' import { faChevronDown } from '@fortawesome/free-solid-svg-icons' -import DialogModal from '../dialog_modal/dialog_modal.vue' -import Popover from '../popover/popover.vue' - library.add(faChevronDown) const FORCE_NSFW = 'mrf_tag:media-force-nsfw' @@ -15,10 +18,8 @@ const SANDBOX = 'mrf_tag:sandbox' const QUARANTINE = 'mrf_tag:quarantine' const ModerationTools = { - props: [ - 'user' - ], - data () { + props: ['user'], + data() { return { tags: { FORCE_NSFW, @@ -27,92 +28,124 @@ const ModerationTools = { DISABLE_REMOTE_SUBSCRIPTION, DISABLE_ANY_SUBSCRIPTION, SANDBOX, - QUARANTINE + QUARANTINE, }, showDeleteUserDialog: false, - toggled: false + toggled: false, } }, components: { DialogModal, - Popover + Popover, }, computed: { - tagsSet () { + tagsSet() { return new Set(this.user.tags) }, - canGrantRole () { - return this.user.is_local && !this.user.deactivated && this.$store.state.users.currentUser.role === 'admin' + canGrantRole() { + return ( + this.user.is_local && + !this.user.deactivated && + this.$store.state.users.currentUser.role === 'admin' + ) }, - canChangeActivationState () { + canChangeActivationState() { return this.privileged('users_manage_activation_state') }, - canDeleteAccount () { + canDeleteAccount() { return this.privileged('users_delete') }, - canUseTagPolicy () { - return this.$store.state.instance.tagPolicyAvailable && this.privileged('users_manage_tags') - } + canUseTagPolicy() { + return ( + useInstanceCapabilitiesStore().tagPolicyAvailable && + this.privileged('users_manage_tags') + ) + }, }, methods: { - hasTag (tagName) { + hasTag(tagName) { return this.tagsSet.has(tagName) }, - privileged (privilege) { + privileged(privilege) { return this.$store.state.users.currentUser.privileges.includes(privilege) }, - toggleTag (tag) { + toggleTag(tag) { const store = this.$store if (this.tagsSet.has(tag)) { - store.state.api.backendInteractor.untagUser({ user: this.user, tag }).then(response => { - if (!response.ok) { return } - store.commit('untagUser', { user: this.user, tag }) - }) + store.state.api.backendInteractor + .untagUser({ user: this.user, tag }) + .then((response) => { + if (!response.ok) { + return + } + store.commit('untagUser', { user: this.user, tag }) + }) } else { - store.state.api.backendInteractor.tagUser({ user: this.user, tag }).then(response => { - if (!response.ok) { return } - store.commit('tagUser', { user: this.user, tag }) - }) + store.state.api.backendInteractor + .tagUser({ user: this.user, tag }) + .then((response) => { + if (!response.ok) { + return + } + store.commit('tagUser', { user: this.user, tag }) + }) } }, - toggleRight (right) { + toggleRight(right) { const store = this.$store if (this.user.rights[right]) { - store.state.api.backendInteractor.deleteRight({ user: this.user, right }).then(response => { - if (!response.ok) { return } - store.commit('updateRight', { user: this.user, right, value: false }) - }) + store.state.api.backendInteractor + .deleteRight({ user: this.user, right }) + .then((response) => { + if (!response.ok) { + return + } + store.commit('updateRight', { + user: this.user, + right, + value: false, + }) + }) } else { - store.state.api.backendInteractor.addRight({ user: this.user, right }).then(response => { - if (!response.ok) { return } - store.commit('updateRight', { user: this.user, right, value: true }) - }) + store.state.api.backendInteractor + .addRight({ user: this.user, right }) + .then((response) => { + if (!response.ok) { + return + } + store.commit('updateRight', { user: this.user, right, value: true }) + }) } }, - toggleActivationStatus () { + toggleActivationStatus() { this.$store.dispatch('toggleActivationStatus', { user: this.user }) }, - deleteUserDialog (show) { + deleteUserDialog(show) { this.showDeleteUserDialog = show }, - deleteUser () { + deleteUser() { const store = this.$store const user = this.user const { id, name } = user - store.state.api.backendInteractor.deleteUser({ user }) - .then(() => { - this.$store.dispatch('markStatusesAsDeleted', status => user.id === status.user.id) - const isProfile = this.$route.name === 'external-user-profile' || this.$route.name === 'user-profile' - const isTargetUser = this.$route.params.name === name || this.$route.params.id === id - if (isProfile && isTargetUser) { - window.history.back() - } - }) + store.state.api.backendInteractor.deleteUser({ user }).then(() => { + this.$store.dispatch( + 'markStatusesAsDeleted', + (status) => user.id === status.user.id, + ) + const isProfile = + this.$route.name === 'external-user-profile' || + this.$route.name === 'user-profile' + const isTargetUser = + this.$route.params.name === name || this.$route.params.id === id + if (isProfile && isTargetUser) { + window.history.back() + } + }) }, - setToggled (value) { + setToggled(value) { this.toggled = value - } - } + }, + }, } export default ModerationTools diff --git a/src/components/mrf_transparency_panel/mrf_transparency_panel.js b/src/components/mrf_transparency_panel/mrf_transparency_panel.js index 13cfb52ee..b2048984d 100644 --- a/src/components/mrf_transparency_panel/mrf_transparency_panel.js +++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.js @@ -1,5 +1,7 @@ -import { mapState } from 'vuex' import { get } from 'lodash' +import { mapState } from 'pinia' + +import { useInstanceStore } from 'src/stores/instance.js' /** * This is for backwards compatibility. We originally didn't recieve @@ -8,7 +10,7 @@ import { get } from 'lodash' * to add an extra "info" key. */ const toInstanceReasonObject = (instances, info, key) => { - return instances.map(instance => { + return instances.map((instance) => { if (info[key] && info[key][instance] && info[key][instance].reason) { return { instance, reason: info[key][instance].reason } } @@ -18,57 +20,78 @@ const toInstanceReasonObject = (instances, info, key) => { const MRFTransparencyPanel = { computed: { - ...mapState({ - federationPolicy: state => get(state, 'instance.federationPolicy'), - mrfPolicies: state => get(state, 'instance.federationPolicy.mrf_policies', []), - quarantineInstances: state => toInstanceReasonObject( - get(state, 'instance.federationPolicy.quarantined_instances', []), - get(state, 'instance.federationPolicy.quarantined_instances_info', []), - 'quarantined_instances' - ), - acceptInstances: state => toInstanceReasonObject( - get(state, 'instance.federationPolicy.mrf_simple.accept', []), - get(state, 'instance.federationPolicy.mrf_simple_info', []), - 'accept' - ), - rejectInstances: state => toInstanceReasonObject( - get(state, 'instance.federationPolicy.mrf_simple.reject', []), - get(state, 'instance.federationPolicy.mrf_simple_info', []), - 'reject' - ), - ftlRemovalInstances: state => toInstanceReasonObject( - get(state, 'instance.federationPolicy.mrf_simple.federated_timeline_removal', []), - get(state, 'instance.federationPolicy.mrf_simple_info', []), - 'federated_timeline_removal' - ), - mediaNsfwInstances: state => toInstanceReasonObject( - get(state, 'instance.federationPolicy.mrf_simple.media_nsfw', []), - get(state, 'instance.federationPolicy.mrf_simple_info', []), - 'media_nsfw' - ), - mediaRemovalInstances: state => toInstanceReasonObject( - get(state, 'instance.federationPolicy.mrf_simple.media_removal', []), - get(state, 'instance.federationPolicy.mrf_simple_info', []), - 'media_removal' - ), - keywordsFtlRemoval: state => get(state, 'instance.federationPolicy.mrf_keyword.federated_timeline_removal', []), - keywordsReject: state => get(state, 'instance.federationPolicy.mrf_keyword.reject', []), - keywordsReplace: state => get(state, 'instance.federationPolicy.mrf_keyword.replace', []) + ...mapState(useInstanceStore, { + federationPolicy: (state) => state.federationPolicy, + mrfPolicies: (state) => get(state, 'federationPolicy.mrf_policies', []), + quarantineInstances: (state) => + toInstanceReasonObject( + get(state, 'federationPolicy.quarantined_instances', []), + get(state, 'federationPolicy.quarantined_instances_info', []), + 'quarantined_instances', + ), + acceptInstances: (state) => + toInstanceReasonObject( + get(state, 'federationPolicy.mrf_simple.accept', []), + get(state, 'federationPolicy.mrf_simple_info', []), + 'accept', + ), + rejectInstances: (state) => + toInstanceReasonObject( + get(state, 'federationPolicy.mrf_simple.reject', []), + get(state, 'federationPolicy.mrf_simple_info', []), + 'reject', + ), + ftlRemovalInstances: (state) => + toInstanceReasonObject( + get( + state, + 'federationPolicy.mrf_simple.federated_timeline_removal', + [], + ), + get(state, 'federationPolicy.mrf_simple_info', []), + 'federated_timeline_removal', + ), + mediaNsfwInstances: (state) => + toInstanceReasonObject( + get(state, 'federationPolicy.mrf_simple.media_nsfw', []), + get(state, 'federationPolicy.mrf_simple_info', []), + 'media_nsfw', + ), + mediaRemovalInstances: (state) => + toInstanceReasonObject( + get(state, 'federationPolicy.mrf_simple.media_removal', []), + get(state, 'federationPolicy.mrf_simple_info', []), + 'media_removal', + ), + keywordsFtlRemoval: (state) => + get( + state, + 'federationPolicy.mrf_keyword.federated_timeline_removal', + [], + ), + keywordsReject: (state) => + get(state, 'federationPolicy.mrf_keyword.reject', []), + keywordsReplace: (state) => + get(state, 'federationPolicy.mrf_keyword.replace', []), }), - hasInstanceSpecificPolicies () { - return this.quarantineInstances.length || + hasInstanceSpecificPolicies() { + return ( + this.quarantineInstances.length || this.acceptInstances.length || this.rejectInstances.length || this.ftlRemovalInstances.length || this.mediaNsfwInstances.length || this.mediaRemovalInstances.length + ) }, - hasKeywordPolicies () { - return this.keywordsFtlRemoval.length || + hasKeywordPolicies() { + return ( + this.keywordsFtlRemoval.length || this.keywordsReject.length || this.keywordsReplace.length - } - } + ) + }, + }, } export default MRFTransparencyPanel diff --git a/src/components/mute_card/mute_card.js b/src/components/mute_card/mute_card.js index 895586888..0d247930a 100644 --- a/src/components/mute_card/mute_card.js +++ b/src/components/mute_card/mute_card.js @@ -1,39 +1,41 @@ -import BasicUserCard from '../basic_user_card/basic_user_card.vue' +import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue' import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue' const MuteCard = { props: ['userId'], computed: { - user () { + user() { return this.$store.getters.findUser(this.userId) }, - relationship () { + relationship() { return this.$store.getters.relationship(this.userId) }, - muted () { + muted() { return this.relationship.muting }, - muteExpiryAvailable () { - return this.user.mute_expires_at !== undefined + muteExpiryAvailable() { + return Object.hasOwn(this.user, 'mute_expires_at') }, - muteExpiry () { - return this.user.mute_expires_at == null + muteExpiry() { + return this.user.mute_expires_at === false ? this.$t('user_card.mute_expires_forever') - : this.$t('user_card.mute_expires_at', [new Date(this.user.mute_expires_at).toLocaleString()]) - } + : this.$t('user_card.mute_expires_at', [ + new Date(this.user.mute_expires_at).toLocaleString(), + ]) + }, }, components: { BasicUserCard, - UserTimedFilterModal + UserTimedFilterModal, }, methods: { - unmuteUser () { + unmuteUser() { this.$store.dispatch('unmuteUser', this.userId) }, - muteUser () { + muteUser() { this.$refs.timedMuteDialog.optionallyPrompt() - } - } + }, + }, } export default MuteCard diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js index a155abe0c..ae6264217 100644 --- a/src/components/nav_panel/nav_panel.js +++ b/src/components/nav_panel/nav_panel.js @@ -1,32 +1,35 @@ -import BookmarkFoldersMenuContent from 'src/components/bookmark_folders_menu/bookmark_folders_menu_content.vue' -import ListsMenuContent from 'src/components/lists_menu/lists_menu_content.vue' -import { mapState, mapGetters } from 'vuex' import { mapState as mapPiniaState } from 'pinia' -import { TIMELINES, ROOT_ITEMS } from 'src/components/navigation/navigation.js' +import { mapGetters, mapState } from 'vuex' + +import BookmarkFoldersMenuContent from 'src/components/bookmark_folders_menu/bookmark_folders_menu_content.vue' +import Checkbox from 'src/components/checkbox/checkbox.vue' +import ListsMenuContent from 'src/components/lists_menu/lists_menu_content.vue' import { filterNavigation } from 'src/components/navigation/filter.js' +import { ROOT_ITEMS, TIMELINES } from 'src/components/navigation/navigation.js' import NavigationEntry from 'src/components/navigation/navigation_entry.vue' import NavigationPins from 'src/components/navigation/navigation_pins.vue' -import Checkbox from 'src/components/checkbox/checkbox.vue' import { useAnnouncementsStore } from 'src/stores/announcements' -import { useServerSideStorageStore } from 'src/stores/serverSideStorage' +import { useInstanceStore } from 'src/stores/instance.js' +import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import { library } from '@fortawesome/fontawesome-svg-core' import { - faUsers, - faGlobe, - faCity, + faBell, faBookmark, - faEnvelope, + faBullhorn, faChevronDown, faChevronUp, + faCity, faComments, - faBell, + faEnvelope, + faFilePen, + faGlobe, faInfoCircle, - faStream, faList, - faBullhorn, - faFilePen + faStream, + faUsers, } from '@fortawesome/free-solid-svg-icons' library.add( @@ -43,80 +46,94 @@ library.add( faStream, faList, faBullhorn, - faFilePen + faFilePen, ) const NavPanel = { props: ['forceExpand', 'forceEditMode'], - created () { - }, components: { BookmarkFoldersMenuContent, ListsMenuContent, NavigationEntry, NavigationPins, - Checkbox + Checkbox, }, - data () { + data() { return { editMode: false, showTimelines: false, showLists: false, showBookmarkFolders: false, - timelinesList: Object.entries(TIMELINES).map(([k, v]) => ({ ...v, name: k })), - rootList: Object.entries(ROOT_ITEMS).map(([k, v]) => ({ ...v, name: k })) + timelinesList: Object.entries(TIMELINES).map(([k, v]) => ({ + ...v, + name: k, + })), + rootList: Object.entries(ROOT_ITEMS).map(([k, v]) => ({ ...v, name: k })), } }, methods: { - toggleTimelines () { + toggleTimelines() { this.showTimelines = !this.showTimelines }, - toggleLists () { + toggleLists() { this.showLists = !this.showLists }, - toggleBookmarkFolders () { + toggleBookmarkFolders() { this.showBookmarkFolders = !this.showBookmarkFolders }, - toggleEditMode () { + toggleEditMode() { this.editMode = !this.editMode }, - toggleCollapse () { - useServerSideStorageStore().setPreference({ path: 'simple.collapseNav', value: !this.collapsed }) - useServerSideStorageStore().pushServerSideStorage() + toggleCollapse() { + useSyncConfigStore().setSimplePrefAndSave({ + path: 'collapseNav', + value: !this.collapsed, + }) + useSyncConfigStore().pushSyncConfig() }, - isPinned (item) { + isPinned(item) { return this.pinnedItems.has(item) }, - togglePin (item) { + togglePin(item) { if (this.isPinned(item)) { - useServerSideStorageStore().removeCollectionPreference({ path: 'collections.pinnedNavItems', value: item }) + useSyncConfigStore().removeCollectionPreference({ + path: 'collections.pinnedNavItems', + value: item, + }) } else { - useServerSideStorageStore().addCollectionPreference({ path: 'collections.pinnedNavItems', value: item }) + useSyncConfigStore().addCollectionPreference({ + path: 'collections.pinnedNavItems', + value: item, + }) } - useServerSideStorageStore().pushServerSideStorage() - } + useSyncConfigStore().pushSyncConfig() + }, }, computed: { ...mapPiniaState(useAnnouncementsStore, { unreadAnnouncementCount: 'unreadAnnouncementCount', - supportsAnnouncements: store => store.supportsAnnouncements + supportsAnnouncements: (store) => store.supportsAnnouncements, }), - ...mapPiniaState(useServerSideStorageStore, { - collapsed: store => store.prefsStorage.simple.collapseNav, - pinnedItems: store => new Set(store.prefsStorage.collections.pinnedNavItems) + ...mapPiniaState(useInstanceCapabilitiesStore, [ + 'pleromaChatMessagesAvailable', + 'pleromaBookmarkFoldersAvailable', + 'localBubble', + ]), + ...mapPiniaState(useInstanceStore, ['federating']), + ...mapPiniaState(useInstanceStore, { + privateMode: (store) => store.private, + }), + ...mapPiniaState(useSyncConfigStore, { + collapsed: (store) => store.prefsStorage.simple.collapseNav, + pinnedItems: (store) => + new Set(store.prefsStorage.collections.pinnedNavItems), }), ...mapState({ - currentUser: state => state.users.currentUser, - followRequestCount: state => state.api.followRequests.length, - privateMode: state => state.instance.private, - federating: state => state.instance.federating, - pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable, - bookmarkFolders: state => state.instance.pleromaBookmarkFoldersAvailable, - bubbleTimeline: state => state.instance.localBubbleInstances.length > 0 + currentUser: (state) => state.users.currentUser, + followRequestCount: (state) => state.api.followRequests.length, }), - timelinesItems () { + timelinesItems() { return filterNavigation( - Object - .entries({ ...TIMELINES }) + Object.entries({ ...TIMELINES }) // do not show in timeliens list since it's in a better place now .filter(([key]) => key !== 'bookmarks') .map(([k, v]) => ({ ...v, name: k })), @@ -126,29 +143,27 @@ const NavPanel = { isFederating: this.federating, isPrivate: this.privateMode, currentUser: this.currentUser, - supportsBubbleTimeline: this.bubbleTimeline, - supportsBookmarkFolders: this.bookmarkFolders - } + supportsBubbleTimeline: this.localBubble, + supportsBookmarkFolders: this.pleromaBookmarkFoldersAvailable, + }, ) }, - rootItems () { + rootItems() { return filterNavigation( - Object - .entries({ ...ROOT_ITEMS }) - .map(([k, v]) => ({ ...v, name: k })), + Object.entries({ ...ROOT_ITEMS }).map(([k, v]) => ({ ...v, name: k })), { hasChats: this.pleromaChatMessagesAvailable, hasAnnouncements: this.supportsAnnouncements, isFederating: this.federating, isPrivate: this.privateMode, currentUser: this.currentUser, - supportsBubbleTimeline: this.bubbleTimeline, - supportsBookmarkFolders: this.bookmarkFolders - } + supportsBubbleTimeline: this.localBubble, + supportsBookmarkFolders: this.pleromaBookmarkFoldersAvailable, + }, ) }, - ...mapGetters(['unreadChatCount']) - } + ...mapGetters(['unreadChatCount']), + }, } export default NavPanel diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue index 10903bcae..ae5c6eae4 100644 --- a/src/components/nav_panel/nav_panel.vue +++ b/src/components/nav_panel/nav_panel.vue @@ -84,7 +84,7 @@ /> { +export const filterNavigation = ( + list = [], + { + hasChats, + hasAnnouncements, + isFederating, + isPrivate, + currentUser, + supportsBookmarkFolders, + supportsBubbleTimeline, + }, +) => { return list.filter(({ criteria, anon, anonRoute }) => { const set = new Set(criteria || []) if (!isFederating && set.has('federating')) return false if (!currentUser && isPrivate && set.has('!private')) return false if (!currentUser && !(anon || anonRoute)) return false - if ((!currentUser || !currentUser.locked) && set.has('lockedUser')) return false + if ((!currentUser || !currentUser.locked) && set.has('lockedUser')) + return false if (!hasChats && set.has('chats')) return false if (!hasAnnouncements && set.has('announcements')) return false - if (!supportsBubbleTimeline && set.has('supportsBubbleTimeline')) return false - if (!supportsBookmarkFolders && set.has('supportsBookmarkFolders')) return false - if (supportsBookmarkFolders && set.has('!supportsBookmarkFolders')) return false + if (!supportsBubbleTimeline && set.has('supportsBubbleTimeline')) + return false + if (!supportsBookmarkFolders && set.has('supportsBookmarkFolders')) + return false + if (supportsBookmarkFolders && set.has('!supportsBookmarkFolders')) + return false return true }) } -export const getListEntries = store => store.allLists.map(list => ({ - name: 'list-' + list.id, - routeObject: { name: 'lists-timeline', params: { id: list.id } }, - labelRaw: list.title, - iconLetter: list.title[0] -})) +export const getListEntries = (store) => + store.allLists.map((list) => ({ + name: 'list-' + list.id, + routeObject: { name: 'lists-timeline', params: { id: list.id } }, + labelRaw: list.title, + iconLetter: list.title[0], + })) -export const getBookmarkFolderEntries = store => store.allFolders ? store.allFolders.map(folder => ({ - name: 'bookmark-folder-' + folder.id, - routeObject: { name: 'bookmark-folder', params: { id: folder.id } }, - labelRaw: folder.name, - iconEmoji: folder.emoji, - iconEmojiUrl: folder.emoji_url, - iconLetter: folder.name[0] -})) : [] +export const getBookmarkFolderEntries = (store) => + store.allFolders + ? store.allFolders.map((folder) => ({ + name: 'bookmark-folder-' + folder.id, + routeObject: { name: 'bookmark-folder', params: { id: folder.id } }, + labelRaw: folder.name, + iconEmoji: folder.emoji, + iconEmojiUrl: folder.emoji_url, + iconLetter: folder.name[0], + })) + : [] diff --git a/src/components/navigation/navigation.js b/src/components/navigation/navigation.js index d1c2b6763..66fb0d347 100644 --- a/src/components/navigation/navigation.js +++ b/src/components/navigation/navigation.js @@ -4,42 +4,39 @@ export const USERNAME_ROUTES = new Set([ 'interactions', 'notifications', 'chat', - 'chats' + 'chats', ]) // routes that take :name property -export const NAME_ROUTES = new Set([ - 'user-profile', - 'legacy-user-profile' -]) +export const NAME_ROUTES = new Set(['user-profile', 'legacy-user-profile']) export const TIMELINES = { home: { route: 'friends', icon: 'home', label: 'nav.home_timeline', - criteria: ['!private'] + criteria: ['!private'], }, public: { route: 'public-timeline', anon: true, icon: 'users', label: 'nav.public_tl', - criteria: ['!private'] + criteria: ['!private'], }, bubble: { route: 'bubble', anon: true, icon: 'city', label: 'nav.bubble', - criteria: ['!private', 'federating', 'supportsBubbleTimeline'] + criteria: ['!private', 'federating', 'supportsBubbleTimeline'], }, twkn: { route: 'public-external-timeline', anon: true, icon: 'globe', label: 'nav.twkn', - criteria: ['!private', 'federating'] + criteria: ['!private', 'federating'], }, // bookmarks are still technically a timeline so we should show it in the dropdown bookmarks: { @@ -50,13 +47,13 @@ export const TIMELINES = { favorites: { routeObject: { name: 'user-profile', query: { tab: 'favorites' } }, icon: 'star', - label: 'user_card.favorites' + label: 'user_card.favorites', }, dms: { route: 'dms', icon: 'envelope', - label: 'nav.dms' - } + label: 'nav.dms', + }, } export const ROOT_ITEMS = { @@ -67,12 +64,12 @@ export const ROOT_ITEMS = { // shows bookmarks entry in a better suited location // hides it when bookmark folders are supported since // we show custom component instead of it - criteria: ['!supportsBookmarkFolders'] + criteria: ['!supportsBookmarkFolders'], }, interactions: { route: 'interactions', icon: 'bell', - label: 'nav.interactions' + label: 'nav.interactions', }, chats: { route: 'chats', @@ -80,7 +77,7 @@ export const ROOT_ITEMS = { label: 'nav.chats', badgeStyle: 'notification', badgeGetter: 'unreadChatCount', - criteria: ['chats'] + criteria: ['chats'], }, friendRequests: { route: 'friend-requests', @@ -88,13 +85,13 @@ export const ROOT_ITEMS = { label: 'nav.friend_requests', badgeStyle: 'notification', criteria: ['lockedUser'], - badgeGetter: 'followRequestCount' + badgeGetter: 'followRequestCount', }, about: { route: 'about', anon: true, icon: 'info-circle', - label: 'nav.about' + label: 'nav.about', }, announcements: { route: 'announcements', @@ -103,18 +100,18 @@ export const ROOT_ITEMS = { store: 'announcements', badgeStyle: 'notification', badgeGetter: 'unreadAnnouncementCount', - criteria: ['announcements'] + criteria: ['announcements'], }, drafts: { route: 'drafts', icon: 'file-pen', label: 'nav.drafts', badgeStyle: 'neutral', - badgeGetter: 'draftCount' - } + badgeGetter: 'draftCount', + }, } -export function routeTo (item, currentUser) { +export function routeTo(item, currentUser) { if (!item.route && !item.routeObject) return null let route @@ -122,7 +119,7 @@ export function routeTo (item, currentUser) { if (item.routeObject) { route = item.routeObject } else { - route = { name: (item.anon || currentUser) ? item.route : item.anonRoute } + route = { name: item.anon || currentUser ? item.route : item.anonRoute } } if (USERNAME_ROUTES.has(route.name)) { diff --git a/src/components/navigation/navigation_entry.js b/src/components/navigation/navigation_entry.js index 11db1c9e3..7a43000ce 100644 --- a/src/components/navigation/navigation_entry.js +++ b/src/components/navigation/navigation_entry.js @@ -1,48 +1,57 @@ +import { mapState as mapPiniaState, mapStores } from 'pinia' import { mapState } from 'vuex' + import { routeTo } from 'src/components/navigation/navigation.js' import OptionalRouterLink from 'src/components/optional_router_link/optional_router_link.vue' + +import { useAnnouncementsStore } from 'src/stores/announcements.js' +import { useSyncConfigStore } from 'src/stores/sync_config.js' + import { library } from '@fortawesome/fontawesome-svg-core' import { faThumbtack } from '@fortawesome/free-solid-svg-icons' -import { mapStores, mapState as mapPiniaState } from 'pinia' - -import { useAnnouncementsStore } from 'src/stores/announcements' -import { useServerSideStorageStore } from 'src/stores/serverSideStorage' library.add(faThumbtack) const NavigationEntry = { props: ['item', 'showPin'], components: { - OptionalRouterLink + OptionalRouterLink, }, methods: { - isPinned (value) { + isPinned(value) { return this.pinnedItems.has(value) }, - togglePin (value) { + togglePin(value) { if (this.isPinned(value)) { - useServerSideStorageStore().removeCollectionPreference({ path: 'collections.pinnedNavItems', value }) + useSyncConfigStore().removeCollectionPreference({ + path: 'collections.pinnedNavItems', + value, + }) } else { - useServerSideStorageStore().addCollectionPreference({ path: 'collections.pinnedNavItems', value }) + useSyncConfigStore().addCollectionPreference({ + path: 'collections.pinnedNavItems', + value, + }) } - useServerSideStorageStore().pushServerSideStorage() - } + useSyncConfigStore().pushSyncConfig() + }, }, computed: { - routeTo () { + routeTo() { return routeTo(this.item, this.currentUser) }, - getters () { + getters() { return this.$store.getters }, ...mapStores(useAnnouncementsStore), ...mapState({ - currentUser: state => state.users.currentUser + currentUser: (state) => state.users.currentUser, }), - ...mapPiniaState(useServerSideStorageStore, { - pinnedItems: store => new Set(store.prefsStorage.collections.pinnedNavItems) + ...mapPiniaState(useSyncConfigStore, { + pinnedItems: (store) => + new Set(store.prefsStorage.collections.pinnedNavItems), }), - } + }, } export default NavigationEntry diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js index f9a900fc6..c3649e4b3 100644 --- a/src/components/navigation/navigation_pins.js +++ b/src/components/navigation/navigation_pins.js @@ -1,27 +1,37 @@ -import { mapState } from 'vuex' import { mapState as mapPiniaState } from 'pinia' -import { TIMELINES, ROOT_ITEMS, routeTo } from 'src/components/navigation/navigation.js' -import { getBookmarkFolderEntries, getListEntries, filterNavigation } from 'src/components/navigation/filter.js' +import { mapState } from 'vuex' -import StillImage from 'src/components/still-image/still-image.vue' +import { + filterNavigation, + getBookmarkFolderEntries, + getListEntries, +} from 'src/components/navigation/filter.js' +import { + ROOT_ITEMS, + routeTo, + TIMELINES, +} from 'src/components/navigation/navigation.js' + +import { useAnnouncementsStore } from 'src/stores/announcements' +import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders' +import { useInstanceStore } from 'src/stores/instance.js' +import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' +import { useListsStore } from 'src/stores/lists' +import { useSyncConfigStore } from 'src/stores/sync_config.js' import { library } from '@fortawesome/fontawesome-svg-core' import { - faUsers, - faGlobe, - faCity, - faBookmark, - faEnvelope, - faComments, faBell, + faBookmark, + faCity, + faComments, + faEnvelope, + faGlobe, faInfoCircle, + faList, faStream, - faList + faUsers, } from '@fortawesome/free-solid-svg-icons' -import { useListsStore } from 'src/stores/lists' -import { useAnnouncementsStore } from 'src/stores/announcements' -import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders' -import { useServerSideStorageStore } from 'src/stores/serverSideStorage' library.add( faUsers, @@ -33,85 +43,85 @@ library.add( faBell, faInfoCircle, faStream, - faList + faList, ) const NavPanel = { props: ['limit'], methods: { - getRouteTo (item) { + getRouteTo(item) { return routeTo(item, this.currentUser) - } - }, - components: { - StillImage + }, }, + components: {}, computed: { - getters () { + getters() { return this.$store.getters }, ...mapPiniaState(useListsStore, { - lists: getListEntries + lists: getListEntries, }), ...mapPiniaState(useAnnouncementsStore, { - supportsAnnouncements: store => store.supportsAnnouncements + supportsAnnouncements: (store) => store.supportsAnnouncements, }), ...mapPiniaState(useBookmarkFoldersStore, { bookmarks: getBookmarkFolderEntries, }), - ...mapPiniaState(useServerSideStorageStore, { - pinnedItems: store => new Set(store.prefsStorage.collections.pinnedNavItems) + ...mapPiniaState(useSyncConfigStore, { + pinnedItems: (store) => + new Set(store.prefsStorage.collections.pinnedNavItems), }), + ...mapPiniaState(useInstanceStore, ['privateMode', 'federating']), + ...mapPiniaState(useInstanceCapabilitiesStore, [ + 'pleromaChatMessagesAvailable', + 'localBubble', + ]), ...mapState({ - currentUser: state => state.users.currentUser, - followRequestCount: state => state.api.followRequests.length, - privateMode: state => state.instance.private, - federating: state => state.instance.federating, - pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable, - bubbleTimeline: state => state.instance.localBubbleInstances.length > 0 + currentUser: (state) => state.users.currentUser, + followRequestCount: (state) => state.api.followRequests.length, }), - pinnedList () { + pinnedList() { if (!this.currentUser) { - return filterNavigation([ - { ...TIMELINES.public, name: 'public' }, - { ...TIMELINES.twkn, name: 'twkn' }, - { ...ROOT_ITEMS.about, name: 'about' } - ], - { - hasChats: this.pleromaChatMessagesAvailable, - hasAnnouncements: this.supportsAnnouncements, - isFederating: this.federating, - isPrivate: this.privateMode, - currentUser: this.currentUser, - supportsBubbleTimeline: this.bubbleTimeline, - supportsBookmarkFolders: this.bookmarks - }) + return filterNavigation( + [ + { ...TIMELINES.public, name: 'public' }, + { ...TIMELINES.twkn, name: 'twkn' }, + { ...ROOT_ITEMS.about, name: 'about' }, + ], + { + hasChats: this.pleromaChatMessagesAvailable, + hasAnnouncements: this.supportsAnnouncements, + isFederating: this.federating, + isPrivate: this.privateMode, + currentUser: this.currentUser, + supportsBubbleTimeline: this.localBubble, + supportsBookmarkFolders: this.bookmarks, + }, + ) } return filterNavigation( [ - ...Object - .entries({ ...TIMELINES }) + ...Object.entries({ ...TIMELINES }) .filter(([k]) => this.pinnedItems.has(k)) .map(([k, v]) => ({ ...v, name: k })), ...this.lists.filter((k) => this.pinnedItems.has(k.name)), ...this.bookmarks.filter((k) => this.pinnedItems.has(k.name)), - ...Object - .entries({ ...ROOT_ITEMS }) + ...Object.entries({ ...ROOT_ITEMS }) .filter(([k]) => this.pinnedItems.has(k)) - .map(([k, v]) => ({ ...v, name: k })) + .map(([k, v]) => ({ ...v, name: k })), ], { hasChats: this.pleromaChatMessagesAvailable, hasAnnouncements: this.supportsAnnouncements, - supportsBubbleTimeline: this.bubbleTimeline, + supportsBubbleTimeline: this.localBubble, supportsBookmarkFolders: this.bookmarks, isFederating: this.federating, isPrivate: this.privateMode, - currentUser: this.currentUser - } + currentUser: this.currentUser, + }, ).slice(0, this.limit) - } - } + }, + }, } export default NavPanel diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js index 3edf21de7..856850920 100644 --- a/src/components/notification/notification.js +++ b/src/components/notification/notification.js @@ -1,29 +1,36 @@ -import StatusContent from '../status_content/status_content.vue' +import { defineAsyncComponent } from 'vue' import { mapState } from 'vuex' -import Status from '../status/status.vue' -import UserAvatar from '../user_avatar/user_avatar.vue' -import UserCard from '../user_card/user_card.vue' -import Timeago from '../timeago/timeago.vue' -import Report from '../report/report.vue' -import UserLink from '../user_link/user_link.vue' -import RichContent from 'src/components/rich_content/rich_content.jsx' -import UserPopover from '../user_popover/user_popover.vue' -import ConfirmModal from '../confirm_modal/confirm_modal.vue' + +import Report from 'src/components/report/report.vue' +import StatusContent from 'src/components/status_content/status_content.vue' +import Timeago from 'src/components/timeago/timeago.vue' +import UserAvatar from 'src/components/user_avatar/user_avatar.vue' +import UserLink from 'src/components/user_link/user_link.vue' +import UserPopover from 'src/components/user_popover/user_popover.vue' import { isStatusNotification } from '../../services/notification_utils/notification_utils.js' -import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js' +import { + highlightClass, + highlightStyle, +} from '../../services/user_highlighter/user_highlighter.js' + +import { useInstanceStore } from 'src/stores/instance.js' +import { useMergedConfigStore } from 'src/stores/merged_config.js' +import { useUserHighlightStore } from 'src/stores/user_highlight.js' + import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' + import { library } from '@fortawesome/fontawesome-svg-core' import { faCheck, - faTimes, - faStar, - faRetweet, - faUserPlus, - faEyeSlash, - faUser, - faSuitcaseRolling, + faCompressAlt, faExpandAlt, - faCompressAlt + faEyeSlash, + faRetweet, + faStar, + faSuitcaseRolling, + faTimes, + faUser, + faUserPlus, } from '@fortawesome/free-solid-svg-icons' library.add( @@ -36,17 +43,17 @@ library.add( faEyeSlash, faSuitcaseRolling, faExpandAlt, - faCompressAlt + faCompressAlt, ) const Notification = { - data () { + data() { return { selecting: false, statusExpanded: false, unmuted: false, showingApproveConfirmDialog: false, - showingDenyConfirmDialog: false + showingDenyConfirmDialog: false, } }, props: ['notification'], @@ -54,148 +61,166 @@ const Notification = { components: { StatusContent, UserAvatar, - UserCard, Timeago, - Status, + Report, - RichContent, + UserPopover, UserLink, - ConfirmModal + ConfirmModal: defineAsyncComponent( + () => import('src/components/confirm_modal/confirm_modal.vue'), + ), }, - mounted () { + mounted() { document.addEventListener('selectionchange', this.onContentSelect) }, - unmounted () { + unmounted() { document.removeEventListener('selectionchange', this.onContentSelect) }, methods: { - toggleStatusExpanded () { + toggleStatusExpanded() { if (!this.expandable) return this.statusExpanded = !this.statusExpanded }, - onContentSelect () { + onContentSelect() { const { isCollapsed, anchorNode, offsetNode } = document.getSelection() if (isCollapsed) { this.selecting = false return } - const within = this.$refs.root.contains(anchorNode) || this.$refs.root.contains(offsetNode) + const within = + this.$refs.root.contains(anchorNode) || + this.$refs.root.contains(offsetNode) if (within) { this.selecting = true } else { this.selecting = false } }, - onContentClick (e) { - if (!this.selecting && !e.target.closest('a') && !e.target.closest('button')) { + onContentClick(e) { + if ( + !this.selecting && + !e.target.closest('a') && + !e.target.closest('button') + ) { this.toggleStatusExpanded() } }, - generateUserProfileLink (user) { - return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames) + generateUserProfileLink(user) { + return generateProfileLink( + user.id, + user.screen_name, + useInstanceStore().restrictedNicknames, + ) }, - getUser (notification) { + getUser(notification) { return this.$store.state.users.usersObject[notification.from_profile.id] }, - interacted () { + interacted() { this.$emit('interacted') }, - toggleMute () { + toggleMute() { this.unmuted = !this.unmuted }, - showApproveConfirmDialog () { + showApproveConfirmDialog() { this.showingApproveConfirmDialog = true }, - hideApproveConfirmDialog () { + hideApproveConfirmDialog() { this.showingApproveConfirmDialog = false }, - showDenyConfirmDialog () { + showDenyConfirmDialog() { this.showingDenyConfirmDialog = true }, - hideDenyConfirmDialog () { + hideDenyConfirmDialog() { this.showingDenyConfirmDialog = false }, - approveUser () { + approveUser() { if (this.shouldConfirmApprove) { this.showApproveConfirmDialog() } else { this.doApprove() } }, - doApprove () { - this.$emit('interacted') + doApprove() { this.$store.state.api.backendInteractor.approveUser({ id: this.user.id }) this.$store.dispatch('removeFollowRequest', this.user) - this.$store.dispatch('markSingleNotificationAsSeen', { id: this.notification.id }) + this.$store.dispatch('markSingleNotificationAsSeen', { + id: this.notification.id, + }) this.$store.dispatch('updateNotification', { id: this.notification.id, - updater: notification => { + updater: (notification) => { notification.type = 'follow' - } + }, }) this.hideApproveConfirmDialog() }, - denyUser () { + denyUser() { if (this.shouldConfirmDeny) { this.showDenyConfirmDialog() } else { this.doDeny() } }, - doDeny () { - this.$emit('interacted') - this.$store.state.api.backendInteractor.denyUser({ id: this.user.id }) + doDeny() { + this.$store.state.api.backendInteractor + .denyUser({ id: this.user.id }) .then(() => { - this.$store.dispatch('dismissNotificationLocal', { id: this.notification.id }) + this.$store.dispatch('dismissNotificationLocal', { + id: this.notification.id, + }) this.$store.dispatch('removeFollowRequest', this.user) }) this.hideDenyConfirmDialog() - } + }, }, computed: { - userClass () { + userClass() { return highlightClass(this.notification.from_profile) }, - userStyle () { - const highlight = this.$store.getters.mergedConfig.highlight - const user = this.notification.from_profile - return highlightStyle(highlight[user.screen_name]) + userStyle() { + const user = this.notification.from_profile.screen_name + return highlightStyle(useUserHighlightStore().get(user)) }, - expandable () { - return (new Set(['like', 'pleroma:emoji_reaction', 'repeat'])).has(this.notification.type) + expandable() { + return new Set(['like', 'pleroma:emoji_reaction', 'repeat', 'poll']).has( + this.notification.type, + ) }, - user () { + user() { return this.$store.getters.findUser(this.notification.from_profile.id) }, - userProfileLink () { + userProfileLink() { return this.generateUserProfileLink(this.user) }, - targetUser () { + targetUser() { return this.$store.getters.findUser(this.notification.target.id) }, - targetUserProfileLink () { + targetUserProfileLink() { return this.generateUserProfileLink(this.targetUser) }, - needMute () { + needMute() { return this.$store.getters.relationship(this.user.id).muting }, - isStatusNotification () { + isStatusNotification() { return isStatusNotification(this.notification.type) }, - mergedConfig () { - return this.$store.getters.mergedConfig + mergedConfig() { + return useMergedConfigStore().mergedConfig }, - shouldConfirmApprove () { + allowNonSquareEmoji() { + return this.mergedConfig.nonSquareEmoji + }, + shouldConfirmApprove() { return this.mergedConfig.modalOnApproveFollow }, - shouldConfirmDeny () { + shouldConfirmDeny() { return this.mergedConfig.modalOnDenyFollow }, ...mapState({ - currentUser: state => state.users.currentUser - }) - } + currentUser: (state) => state.users.currentUser, + }), + }, } export default Notification diff --git a/src/components/notification/notification.style.js b/src/components/notification/notification.style.js index 05c1f6f23..49e28cf2e 100644 --- a/src/components/notification/notification.style.js +++ b/src/components/notification/notification.style.js @@ -7,7 +7,7 @@ export default { 'Icon', 'Border', 'Avatar', - 'PollGraph' + 'PollGraph', ], - defaultRules: [] + defaultRules: [], } diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index 7165289dc..39bd15426 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -7,7 +7,7 @@ class="Notification" :compact="true" :statusoid="notification.status" - @interacted="interacted" + @click="interacted" />
    @@ -136,6 +137,7 @@ :src="notification.emoji_url" :alt="notification.emoji" :title="notification.emoji" + :class="{ ['-wide']: allowNonSquareEmoji }" > - {{ $t('user_card.approve_confirm', { user: user.screen_name_ui }) }} - - + {{ $t('user_card.deny_confirm', { user: user.screen_name_ui }) }} - +
    diff --git a/src/components/notifications/notification_filters.vue b/src/components/notifications/notification_filters.vue index 0b740ea0a..27e1bb179 100644 --- a/src/components/notifications/notification_filters.vue +++ b/src/components/notifications/notification_filters.vue @@ -106,31 +106,33 @@ diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js index ced97d57f..49349b127 100644 --- a/src/components/notifications/notifications.js +++ b/src/components/notifications/notifications.js @@ -1,28 +1,32 @@ +import { mapState } from 'pinia' import { computed } from 'vue' import { mapGetters } from 'vuex' -import { mapState } from 'pinia' -import Notification from '../notification/notification.vue' -import ExtraNotifications from '../extra_notifications/extra_notifications.vue' -import NotificationFilters from './notification_filters.vue' -import notificationsFetcher from '../../services/notifications_fetcher/notifications_fetcher.service.js' -import { - notificationsFromStore, - filteredNotificationsFromStore, - unseenNotificationsFromStore, - countExtraNotifications, - ACTIONABLE_NOTIFICATION_TYPES -} from '../../services/notification_utils/notification_utils.js' -import FaviconService from '../../services/favicon_service/favicon_service.js' -import { library } from '@fortawesome/fontawesome-svg-core' -import { faCircleNotch, faArrowUp, faMinus } from '@fortawesome/free-solid-svg-icons' -import { useInterfaceStore } from 'src/stores/interface' -import { useAnnouncementsStore } from 'src/stores/announcements' -library.add( - faCircleNotch, +import ExtraNotifications from 'src/components/extra_notifications/extra_notifications.vue' +import Notification from 'src/components/notification/notification.vue' +import FaviconService from '../../services/favicon_service/favicon_service.js' +import { + ACTIONABLE_NOTIFICATION_TYPES, + countExtraNotifications, + filteredNotificationsFromStore, + notificationsFromStore, + unseenNotificationsFromStore, +} from '../../services/notification_utils/notification_utils.js' +import notificationsFetcher from '../../services/notifications_fetcher/notifications_fetcher.service.js' +import NotificationFilters from './notification_filters.vue' + +import { useAnnouncementsStore } from 'src/stores/announcements.js' +import { useInterfaceStore } from 'src/stores/interface.js' +import { useMergedConfigStore } from 'src/stores/merged_config.js' + +import { library } from '@fortawesome/fontawesome-svg-core' +import { faArrowUp, - faMinus -) + faCircleNotch, + faMinus, +} from '@fortawesome/free-solid-svg-icons' + +library.add(faCircleNotch, faArrowUp, faMinus) const DEFAULT_SEEN_TO_DISPLAY_COUNT = 30 @@ -30,7 +34,7 @@ const Notifications = { components: { Notification, NotificationFilters, - ExtraNotifications + ExtraNotifications, }, props: { // Disables panel styles, unread mark, potentially other notification-related actions @@ -41,93 +45,124 @@ const Notifications = { // Do not show extra notifications noExtra: { type: Boolean, - default: false + default: false, }, // Disable teleporting (i.e. for /users/user/notifications) - disableTeleport: Boolean + disableTeleport: Boolean, }, - data () { + data() { return { showScrollTop: false, bottomedOut: false, // How many seen notifications to display in the list. The more there are, // the heavier the page becomes. This count is increased when loading // older notifications, and cut back to default whenever hitting "Read!". - seenToDisplayCount: DEFAULT_SEEN_TO_DISPLAY_COUNT + seenToDisplayCount: DEFAULT_SEEN_TO_DISPLAY_COUNT, } }, - provide () { + provide() { return { - popoversZLayer: computed(() => this.popoversZLayer) + popoversZLayer: computed(() => this.popoversZLayer), } }, computed: { - mainClass () { + mainClass() { return this.minimalMode ? '' : 'panel panel-default' }, - notifications () { + notifications() { return notificationsFromStore(this.$store) }, - error () { + error() { return this.$store.state.notifications.error }, - unseenNotifications () { - return unseenNotificationsFromStore(this.$store) + unseenNotifications() { + return unseenNotificationsFromStore( + this.$store, + useMergedConfigStore().mergedConfig.notificationVisibility, + useMergedConfigStore().mergedConfig.ignoreInactionableSeen, + ) }, - filteredNotifications () { + filteredNotifications() { if (this.unseenAtTop) { return [ - ...filteredNotificationsFromStore(this.$store).filter(n => this.shouldShowUnseen(n)), - ...filteredNotificationsFromStore(this.$store).filter(n => !this.shouldShowUnseen(n)) + ...filteredNotificationsFromStore( + this.$store, + useMergedConfigStore().mergedConfig.notificationVisibility, + ).filter((n) => this.shouldShowUnseen(n)), + ...filteredNotificationsFromStore( + this.$store, + useMergedConfigStore().mergedConfig.notificationVisibility, + ).filter((n) => !this.shouldShowUnseen(n)), ] } else { - return filteredNotificationsFromStore(this.$store, this.filterMode) + return filteredNotificationsFromStore( + this.$store, + useMergedConfigStore().mergedConfig.notificationVisibility, + this.filterMode, + ) } }, - unseenCountBadgeText () { + unseenCountBadgeText() { return `${this.unseenCount ? this.unseenCount : ''}${this.extraNotificationsCount ? '*' : ''}` }, - unseenCount () { + unseenCount() { return this.unseenNotifications.length }, - ignoreInactionableSeen () { return this.$store.getters.mergedConfig.ignoreInactionableSeen }, - extraNotificationsCount () { - return countExtraNotifications(this.$store) + ignoreInactionableSeen() { + return useMergedConfigStore().mergedConfig.ignoreInactionableSeen }, - unseenCountTitle () { - return this.unseenNotifications.length + (this.unreadChatCount) + this.unreadAnnouncementCount + extraNotificationsCount() { + return countExtraNotifications( + this.$store, + useMergedConfigStore().mergedConfig, + useAnnouncementsStore().unreadAnnouncementCount, + ) }, - loading () { + unseenCountTitle() { + return ( + this.unseenNotifications.length + + this.unreadChatCount + + this.unreadAnnouncementCount + ) + }, + loading() { return this.$store.state.notifications.loading }, - noHeading () { + noHeading() { const { layoutType } = useInterfaceStore() return this.minimalMode || layoutType === 'mobile' }, - teleportTarget () { + teleportTarget() { const { layoutType } = useInterfaceStore() const map = { wide: '#notifs-column', - mobile: '#mobile-notifications' + mobile: '#mobile-notifications', } return map[layoutType] || '#notifs-sidebar' }, - popoversZLayer () { + popoversZLayer() { const { layoutType } = useInterfaceStore() return layoutType === 'mobile' ? 'navbar' : null }, - notificationsToDisplay () { - return this.filteredNotifications.slice(0, this.unseenCount + this.seenToDisplayCount) + notificationsToDisplay() { + return this.filteredNotifications.slice( + 0, + this.unseenCount + this.seenToDisplayCount, + ) }, - noSticky () { return this.$store.getters.mergedConfig.disableStickyHeaders }, - unseenAtTop () { return this.$store.getters.mergedConfig.unseenAtTop }, - showExtraNotifications () { + noSticky() { + return useMergedConfigStore().mergedConfig.disableStickyHeaders + }, + unseenAtTop() { + return useMergedConfigStore().mergedConfig.unseenAtTop + }, + showExtraNotifications() { return !this.noExtra }, ...mapState(useAnnouncementsStore, ['unreadAnnouncementCount']), - ...mapGetters(['unreadChatCount']) + ...mapGetters(['unreadChatCount']), }, - mounted () { + mounted() { this.scrollerRef = this.$refs.root.closest('.column.-scrollable') if (!this.scrollerRef) { this.scrollerRef = this.$refs.root.closest('.mobile-notifications') @@ -137,12 +172,12 @@ const Notifications = { } this.scrollerRef.addEventListener('scroll', this.updateScrollPosition) }, - unmounted () { + unmounted() { if (!this.scrollerRef) return this.scrollerRef.removeEventListener('scroll', this.updateScrollPosition) }, watch: { - unseenCountTitle (count) { + unseenCountTitle(count) { if (count > 0) { FaviconService.drawFaviconBadge() useInterfaceStore().setPageTitle(`(${count})`) @@ -151,10 +186,13 @@ const Notifications = { useInterfaceStore().setPageTitle('') } }, - teleportTarget () { + teleportTarget() { // handle scroller change this.$nextTick(() => { - this.scrollerRef.removeEventListener('scroll', this.updateScrollPosition) + this.scrollerRef.removeEventListener( + 'scroll', + this.updateScrollPosition, + ) this.scrollerRef = this.$refs.root.closest('.column.-scrollable') if (!this.scrollerRef) { this.scrollerRef = this.$refs.root.closest('.mobile-notifications') @@ -162,17 +200,18 @@ const Notifications = { this.scrollerRef.addEventListener('scroll', this.updateScrollPosition) this.updateScrollPosition() }) - } + }, }, methods: { - scrollToTop () { + scrollToTop() { const scrollable = this.scrollerRef scrollable.scrollTo({ top: this.$refs.root.offsetTop }) }, - updateScrollPosition () { - this.showScrollTop = this.$refs.root.offsetTop < this.scrollerRef.scrollTop + updateScrollPosition() { + this.showScrollTop = + this.$refs.root.offsetTop < this.scrollerRef.scrollTop }, - shouldShowUnseen (notification) { + shouldShowUnseen(notification) { if (notification.seen) return false const actionable = ACTIONABLE_NOTIFICATION_TYPES.has(notification.type) @@ -182,26 +221,29 @@ const Notifications = { * everything else (likes/repeats/reacts) cannot be acted and therefore we just clear * the "seen" status upon any clicks on them */ - notificationClicked (notification) { + notificationClicked(notification) { const { id } = notification this.$store.dispatch('notificationClicked', { id }) }, - notificationInteracted (notification) { + notificationInteracted(notification) { const { id } = notification this.$store.dispatch('markSingleNotificationAsSeen', { id }) }, - markAsSeen () { + markAsSeen() { this.$store.dispatch('markNotificationsAsSeen') this.seenToDisplayCount = DEFAULT_SEEN_TO_DISPLAY_COUNT }, - fetchOlderNotifications () { + fetchOlderNotifications() { if (this.loading) { return } const seenCount = this.filteredNotifications.length - this.unseenCount if (this.seenToDisplayCount < seenCount) { - this.seenToDisplayCount = Math.min(this.seenToDisplayCount + 20, seenCount) + this.seenToDisplayCount = Math.min( + this.seenToDisplayCount + 20, + seenCount, + ) return } else if (this.seenToDisplayCount > seenCount) { this.seenToDisplayCount = seenCount @@ -210,19 +252,21 @@ const Notifications = { const store = this.$store const credentials = store.state.users.currentUser.credentials store.commit('setNotificationsLoading', { value: true }) - notificationsFetcher.fetchAndUpdate({ - store, - credentials, - older: true - }).then(notifs => { - store.commit('setNotificationsLoading', { value: false }) - if (notifs.length === 0) { - this.bottomedOut = true - } - this.seenToDisplayCount += notifs.length - }) - } - } + notificationsFetcher + .fetchAndUpdate({ + store, + credentials, + older: true, + }) + .then((notifs) => { + store.commit('setNotificationsLoading', { value: false }) + if (notifs.length === 0) { + this.bottomedOut = true + } + this.seenToDisplayCount += notifs.length + }) + }, + }, } export default Notifications diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss index 79ef5b300..32839ebbf 100644 --- a/src/components/notifications/notifications.scss +++ b/src/components/notifications/notifications.scss @@ -119,6 +119,10 @@ max-width: 1.25em; height: 1.25em; width: auto; + + &.-wide { + max-width: 3.75em; + } } .emoji-reaction-emoji-image { diff --git a/src/components/oauth_callback/oauth_callback.js b/src/components/oauth_callback/oauth_callback.js index 02e4c9ffc..4bcb9803e 100644 --- a/src/components/oauth_callback/oauth_callback.js +++ b/src/components/oauth_callback/oauth_callback.js @@ -1,25 +1,29 @@ import oauth from '../../services/new_api/oauth.js' + +import { useInstanceStore } from 'src/stores/instance.js' import { useOAuthStore } from 'src/stores/oauth.js' const oac = { props: ['code'], - mounted () { + mounted() { if (this.code) { const oauthStore = useOAuthStore() const { clientId, clientSecret } = oauthStore - oauth.getToken({ - clientId, - clientSecret, - instance: this.$store.state.instance.server, - code: this.code - }).then((result) => { - oauthStore.setToken(result.access_token) - this.$store.dispatch('loginUser', result.access_token) - this.$router.push({ name: 'friends' }) - }) + oauth + .getToken({ + clientId, + clientSecret, + instance: useInstanceStore().server, + code: this.code, + }) + .then((result) => { + oauthStore.setToken(result.access_token) + this.$store.dispatch('loginUser', result.access_token) + this.$router.push({ name: 'friends' }) + }) } - } + }, } export default oac diff --git a/src/components/opacity_input/opacity_input.vue b/src/components/opacity_input/opacity_input.vue index 041219feb..761aeb216 100644 --- a/src/components/opacity_input/opacity_input.vue +++ b/src/components/opacity_input/opacity_input.vue @@ -8,7 +8,7 @@ class="label" :class="{ faint: !present || disabled }" > - {{ label }} + {{ label || $t('settings.style.themes3.editor.opacity') }} diff --git a/src/components/optional_router_link/optional_router_link.vue b/src/components/optional_router_link/optional_router_link.vue index d56ad268a..b0d553801 100644 --- a/src/components/optional_router_link/optional_router_link.vue +++ b/src/components/optional_router_link/optional_router_link.vue @@ -18,6 +18,6 @@ diff --git a/src/components/page_list/page_list.js b/src/components/page_list/page_list.js index 4e1184844..3030b0a4a 100644 --- a/src/components/page_list/page_list.js +++ b/src/components/page_list/page_list.js @@ -2,7 +2,7 @@ import SelectableList from 'src/components/selectable_list/selectable_list.vue' const PageList = { components: { - SelectableList + SelectableList, }, props: { /** @@ -10,43 +10,43 @@ const PageList = { */ boxOnly: { type: Boolean, - default: false + default: false, }, /** * how many entries to fetch at once */ pageSize: { type: Number, - default: 50 + default: 50, }, /** * the function/callback used to fetch new entries (one page) */ fetchPage: { type: Function, - default: async () => [] + default: async () => [], }, /** * wether or not this is a single page list (so it won't allow fetching more pages) */ singlePage: { type: Boolean, - default: false - } + default: false, + }, }, - data () { + data() { return { pageIndex: 1, items: [], canLoadMore: true, - isLoading: false + isLoading: false, } }, methods: { /** * reset and load first page */ - reset () { + reset() { this.canLoadMore = true this.pageIndex = 1 this.items = [] @@ -56,14 +56,14 @@ const PageList = { /** * load another page */ - loadMore () { + loadMore() { if (!this.isLoading && this.canLoadMore) { this.isLoading = true - console.log("is loading = true") + console.log('is loading = true') this.fetchPage(this.$store, { page: this.pageIndex++, - pageSize: this.pageSize - }).then(items => { + pageSize: this.pageSize, + }).then((items) => { this.items = [...this.items, ...items] this.isLoading = false }) @@ -73,15 +73,15 @@ const PageList = { * get currently selected elements * @returns {Array} */ - getSelected () { + getSelected() { return this.$refs.list.selected - } + }, }, /** * auto-load first page when mounted */ - mounted () { + mounted() { this.loadMore() - } + }, } export default PageList diff --git a/src/components/palette_editor/palette_editor.vue b/src/components/palette_editor/palette_editor.vue index 252928b9e..eec9fe361 100644 --- a/src/components/palette_editor/palette_editor.vue +++ b/src/components/palette_editor/palette_editor.vue @@ -1,60 +1,65 @@ diff --git a/src/components/quote/quote_form.js b/src/components/quote/quote_form.js new file mode 100644 index 000000000..cffae123b --- /dev/null +++ b/src/components/quote/quote_form.js @@ -0,0 +1,120 @@ +import { debounce } from 'lodash' + +import Checkbox from 'src/components/checkbox/checkbox.vue' +import Quote from './quote.vue' + +import { useInstanceStore } from 'src/stores/instance.js' + +export default { + components: { + Quote, + Checkbox, + }, + name: 'QuoteForm', + props: { + visible: { + type: Boolean, + }, + url: { + type: String, + required: false, + default: '', + }, + id: { + type: String, + required: false, + default: '', + }, + }, + data() { + return { + text: this.url, + loading: false, + error: false, + debounceSetQuote: debounce((value) => { + this.fetchStatus(value) + }, 1000), + } + }, + created() { + if (this.url && !this.id) { + this.fetchStatus(this.url) + } else if (this.id) { + this.text = + window.location.protocol + + '//' + + this.instanceHost + + '/notice/' + + this.id + } + }, + computed: { + instanceHost() { + return new URL(useInstanceStore().server).host + }, + noticeRegex() { + return new RegExp( + `^([^/:]*:?//|)(${window.location.host}|${this.instanceHost})/notice/(.*)$`, + ) + }, + quoteVisible() { + return (!!this.id || this.loading) && !this.error + }, + }, + watch: { + text(value) { + this.debounceSetQuote(value) + this.$emit('update:url', value) + }, + visible(value) { + if (value && this.url) { + this.fetchStatus(this.url) + } + }, + }, + methods: { + clear() { + this.text = this.url + this.loading = false + this.error = false + }, + setLoading(value) { + this.loading = value + }, + handleError(error) { + this.id = null + this.error = !!error + }, + fetchStatus(value) { + this.error = false + + const notice = this.noticeRegex.exec(value) + if (notice && notice.length === 4) { + this.$emit('update:id', notice[3]) + } else if (value) { + this.loading = true + this.$store + .dispatch('search', { + q: value, + resolve: true, + offset: 0, + limit: 1, + type: 'statuses', + }) + .then((data) => { + if (data && data.statuses && data.statuses.length === 1) { + this.$emit('update:id', data.statuses[0].id) + } else { + this.handleError(true) + } + }) + .catch(this.handleError) + .finally(() => { + this.loading = false + }) + } else { + this.$emit('update:id', null) + } + }, + }, +} diff --git a/src/components/quote/quote_form.vue b/src/components/quote/quote_form.vue new file mode 100644 index 000000000..2e7200d7f --- /dev/null +++ b/src/components/quote/quote_form.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/src/components/quotes_timeline/quotes_timeline.js b/src/components/quotes_timeline/quotes_timeline.js index a5f42da56..f92f109be 100644 --- a/src/components/quotes_timeline/quotes_timeline.js +++ b/src/components/quotes_timeline/quotes_timeline.js @@ -1,26 +1,36 @@ -import Timeline from '../timeline/timeline.vue' +import Timeline from 'src/components/timeline/timeline.vue' const QuotesTimeline = { - created () { + created() { this.$store.commit('clearTimeline', { timeline: 'quotes' }) - this.$store.dispatch('startFetchingTimeline', { timeline: 'quotes', statusId: this.statusId }) + this.$store.dispatch('startFetchingTimeline', { + timeline: 'quotes', + statusId: this.statusId, + }) }, components: { - Timeline + Timeline, }, computed: { - statusId () { return this.$route.params.id }, - timeline () { return this.$store.state.statuses.timelines.quotes } + statusId() { + return this.$route.params.id + }, + timeline() { + return this.$store.state.statuses.timelines.quotes + }, }, watch: { - statusId () { + statusId() { this.$store.commit('clearTimeline', { timeline: 'quotes' }) - this.$store.dispatch('startFetchingTimeline', { timeline: 'quotes', statusId: this.statusId }) - } + this.$store.dispatch('startFetchingTimeline', { + timeline: 'quotes', + statusId: this.statusId, + }) + }, }, - unmounted () { + unmounted() { this.$store.dispatch('stopFetchingTimeline', 'quotes') - } + }, } export default QuotesTimeline diff --git a/src/components/range_input/range_input.vue b/src/components/range_input/range_input.vue index 2f8645c0b..91d3dcc3b 100644 --- a/src/components/range_input/range_input.vue +++ b/src/components/range_input/range_input.vue @@ -54,13 +54,22 @@ diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js index 53a678680..60f0fd16b 100644 --- a/src/components/registration/registration.js +++ b/src/components/registration/registration.js @@ -1,13 +1,20 @@ import useVuelidate from '@vuelidate/core' import { required, requiredIf, sameAs } from '@vuelidate/validators' +import { mapState as mapPiniaState } from 'pinia' import { mapActions, mapState } from 'vuex' -import InterfaceLanguageSwitcher from '../interface_language_switcher/interface_language_switcher.vue' + +import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue' +import TermsOfServicePanel from 'src/components/terms_of_service_panel/terms_of_service_panel.vue' import localeService from '../../services/locale/locale.service.js' + +import { useInstanceStore } from 'src/stores/instance.js' + import { DAY } from 'src/services/date_utils/date_utils.js' -import TermsOfServicePanel from '../terms_of_service_panel/terms_of_service_panel.vue' const registration = { - setup () { return { v$: useVuelidate() } }, + setup() { + return { v$: useVuelidate() } + }, data: () => ({ user: { email: '', @@ -17,15 +24,15 @@ const registration = { confirm: '', birthday: '', reason: '', - language: [''] + language: [''], }, - captcha: {} + captcha: {}, }), components: { InterfaceLanguageSwitcher, - TermsOfServicePanel + TermsOfServicePanel, }, - validations () { + validations() { return { user: { email: { required: requiredIf(() => this.accountActivationRequired) }, @@ -34,20 +41,23 @@ const registration = { password: { required }, confirm: { required, - sameAs: sameAs(this.user.password) + sameAs: sameAs(this.user.password), }, birthday: { required: requiredIf(() => this.birthdayRequired), - maxValue: value => { - return !this.birthdayRequired || new Date(value).getTime() <= this.birthdayMin.getTime() - } + maxValue: (value) => { + return ( + !this.birthdayRequired || + new Date(value).getTime() <= this.birthdayMin.getTime() + ) + }, }, reason: { required: requiredIf(() => this.accountApprovalRequired) }, - language: {} - } + language: {}, + }, } }, - created () { + created() { if ((!this.registrationOpen && !this.token) || this.signedIn) { this.$router.push({ name: 'root' }) } @@ -55,14 +65,16 @@ const registration = { this.setCaptcha() }, computed: { - token () { return this.$route.params.token }, - bioPlaceholder () { + token() { + return this.$route.params.token + }, + bioPlaceholder() { return this.replaceNewlines(this.$t('registration.bio_placeholder')) }, - reasonPlaceholder () { + reasonPlaceholder() { return this.replaceNewlines(this.$t('registration.reason_placeholder')) }, - birthdayMin () { + birthdayMin() { const minAge = this.birthdayMinAge const today = new Date() today.setUTCMilliseconds(0) @@ -73,31 +85,41 @@ const registration = { minDate.setTime(today.getTime() - minAge * DAY) return minDate }, - birthdayMinAttr () { + birthdayMinAttr() { return this.birthdayMin.toJSON().replace(/T.+$/, '') }, - birthdayMinFormatted () { - const browserLocale = localeService.internalToBrowserLocale(this.$i18n.locale) - return this.user.birthday && new Date(Date.parse(this.birthdayMin)).toLocaleDateString(browserLocale, { timeZone: 'UTC', day: 'numeric', month: 'long', year: 'numeric' }) + birthdayMinFormatted() { + const browserLocale = localeService.internalToBrowserLocale( + this.$i18n.locale, + ) + return ( + this.user.birthday && + new Date(Date.parse(this.birthdayMin)).toLocaleDateString( + browserLocale, + { timeZone: 'UTC', day: 'numeric', month: 'long', year: 'numeric' }, + ) + ) }, + ...mapPiniaState(useInstanceStore, { + registrationOpen: (store) => store.registrationOpen, + embeddedToS: (store) => store.embeddedToS, + termsOfService: (store) => store.tos, + accountActivationRequired: (store) => store.accountActivationRequired, + accountApprovalRequired: (store) => store.accountApprovalRequired, + birthdayRequired: (store) => store.birthdayRequired, + birthdayMinAge: (store) => store.birthdayMinAge, + }), ...mapState({ - registrationOpen: (state) => state.instance.registrationOpen, signedIn: (state) => !!state.users.currentUser, isPending: (state) => state.users.signUpPending, serverValidationErrors: (state) => state.users.signUpErrors, signUpNotice: (state) => state.users.signUpNotice, hasSignUpNotice: (state) => !!state.users.signUpNotice.message, - termsOfService: (state) => state.instance.tos, - embeddedToS: (state) => state.instance.embeddedToS, - accountActivationRequired: (state) => state.instance.accountActivationRequired, - accountApprovalRequired: (state) => state.instance.accountApprovalRequired, - birthdayRequired: (state) => state.instance.birthdayRequired, - birthdayMinAge: (state) => state.instance.birthdayMinAge - }) + }), }, methods: { ...mapActions(['signUp', 'getCaptcha']), - async submit () { + async submit() { this.user.nickname = this.user.username this.user.token = this.token @@ -105,7 +127,9 @@ const registration = { this.user.captcha_token = this.captcha.token this.user.captcha_answer_data = this.captcha.answer_data if (this.user.language) { - this.user.language = localeService.internalToBackendLocaleMulti(this.user.language.filter(k => k)) + this.user.language = localeService.internalToBackendLocaleMulti( + this.user.language.filter((k) => k), + ) } this.v$.$touch() @@ -124,13 +148,15 @@ const registration = { } } }, - setCaptcha () { - this.getCaptcha().then(cpt => { this.captcha = cpt }) + setCaptcha() { + this.getCaptcha().then((cpt) => { + this.captcha = cpt + }) }, - replaceNewlines (str) { + replaceNewlines(str) { return str.replace(/\s*\n\s*/g, ' \n') - } - } + }, + }, } export default registration diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue index f6b056e6b..b969a416e 100644 --- a/src/components/registration/registration.vue +++ b/src/components/registration/registration.vue @@ -395,7 +395,7 @@ } form textarea { - line-height: 16px; + line-height: 1; resize: vertical; } diff --git a/src/components/remote_follow/remote_follow.js b/src/components/remote_follow/remote_follow.js index 951b59419..a583b6f09 100644 --- a/src/components/remote_follow/remote_follow.js +++ b/src/components/remote_follow/remote_follow.js @@ -1,9 +1,9 @@ export default { props: ['user'], computed: { - subscribeUrl () { + subscribeUrl() { const serverUrl = new URL(this.user.statusnet_profile_url) return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus` - } - } + }, + }, } diff --git a/src/components/remote_user_resolver/remote_user_resolver.js b/src/components/remote_user_resolver/remote_user_resolver.js index 9b5e511e0..430f56c84 100644 --- a/src/components/remote_user_resolver/remote_user_resolver.js +++ b/src/components/remote_user_resolver/remote_user_resolver.js @@ -1,14 +1,16 @@ const RemoteUserResolver = { data: () => ({ - error: false + error: false, }), - mounted () { + mounted() { this.redirect() }, methods: { - redirect () { - const acct = this.$route.params.username + '@' + this.$route.params.hostname - this.$store.state.api.backendInteractor.fetchUser({ id: acct }) + redirect() { + const acct = + this.$route.params.username + '@' + this.$route.params.hostname + this.$store.state.api.backendInteractor + .fetchUser({ id: acct }) .then((externalUser) => { if (externalUser.error) { this.error = true @@ -17,15 +19,15 @@ const RemoteUserResolver = { const id = externalUser.id this.$router.replace({ name: 'external-user-profile', - params: { id } + params: { id }, }) } }) .catch(() => { this.error = true }) - } - } + }, + }, } export default RemoteUserResolver diff --git a/src/components/remove_follower_button/remove_follower_button.js b/src/components/remove_follower_button/remove_follower_button.js index 052a519ff..cbe92dce1 100644 --- a/src/components/remove_follower_button/remove_follower_button.js +++ b/src/components/remove_follower_button/remove_follower_button.js @@ -1,48 +1,54 @@ -import ConfirmModal from '../confirm_modal/confirm_modal.vue' +import { defineAsyncComponent } from 'vue' + +import { useMergedConfigStore } from 'src/stores/merged_config.js' export default { props: ['user', 'relationship'], - data () { + data() { return { inProgress: false, - showingConfirmRemoveFollower: false + showingConfirmRemoveFollower: false, } }, components: { - ConfirmModal + ConfirmModal: defineAsyncComponent( + () => import('src/components/confirm_modal/confirm_modal.vue'), + ), }, computed: { - label () { + label() { if (this.inProgress) { return this.$t('user_card.follow_progress') } else { return this.$t('user_card.remove_follower') } }, - shouldConfirmRemoveUserFromFollowers () { - return this.$store.getters.mergedConfig.modalOnRemoveUserFromFollowers - } + shouldConfirmRemoveUserFromFollowers() { + return useMergedConfigStore().mergedConfig.modalOnRemoveUserFromFollowers + }, }, methods: { - showConfirmRemoveUserFromFollowers () { + showConfirmRemoveUserFromFollowers() { this.showingConfirmRemoveFollower = true }, - hideConfirmRemoveUserFromFollowers () { + hideConfirmRemoveUserFromFollowers() { this.showingConfirmRemoveFollower = false }, - onClick () { + onClick() { if (!this.shouldConfirmRemoveUserFromFollowers) { this.doRemoveUserFromFollowers() } else { this.showConfirmRemoveUserFromFollowers() } }, - doRemoveUserFromFollowers () { + doRemoveUserFromFollowers() { this.inProgress = true - this.$store.dispatch('removeUserFromFollowers', this.relationship.id).then(() => { - this.inProgress = false - }) + this.$store + .dispatch('removeUserFromFollowers', this.relationship.id) + .then(() => { + this.inProgress = false + }) this.hideConfirmRemoveUserFromFollowers() - } - } + }, + }, } diff --git a/src/components/remove_follower_button/remove_follower_button.vue b/src/components/remove_follower_button/remove_follower_button.vue index 3054770d9..93eaf66c4 100644 --- a/src/components/remove_follower_button/remove_follower_button.vue +++ b/src/components/remove_follower_button/remove_follower_button.vue @@ -8,7 +8,7 @@ > {{ label }} - - + diff --git a/src/components/report/report.js b/src/components/report/report.js index 6e9f21eea..e9d14c515 100644 --- a/src/components/report/report.js +++ b/src/components/report/report.js @@ -1,37 +1,44 @@ -import { useReportsStore } from 'src/stores/reports' -import Select from '../select/select.vue' -import StatusContent from '../status_content/status_content.vue' -import Timeago from '../timeago/timeago.vue' -import RichContent from 'src/components/rich_content/rich_content.jsx' +import Select from 'src/components/select/select.vue' +import StatusContent from 'src/components/status_content/status_content.vue' +import Timeago from 'src/components/timeago/timeago.vue' + +import { useInstanceStore } from 'src/stores/instance.js' +import { useReportsStore } from 'src/stores/reports.js' + import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' const Report = { - props: [ - 'reportId' - ], + props: ['reportId'], components: { Select, StatusContent, Timeago, - RichContent }, computed: { - report () { + report() { return useReportsStore().reports[this.reportId] || {} }, state: { - get: function () { return this.report.state }, - set: function (val) { this.setReportState(val) } - } + get: function () { + return this.report.state + }, + set: function (val) { + this.setReportState(val) + }, + }, }, methods: { - generateUserProfileLink (user) { - return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames) + generateUserProfileLink(user) { + return generateProfileLink( + user.id, + user.screen_name, + useInstanceStore().restrictedNicknames, + ) }, - setReportState (state) { + setReportState(state) { return useReportsStore().setReportState({ id: this.report.id, state }) - } - } + }, + }, } export default Report diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx index 5adc2443a..fc17a529f 100644 --- a/src/components/rich_content/rich_content.jsx +++ b/src/components/rich_content/rich_content.jsx @@ -1,11 +1,18 @@ -import { unescape, flattenDeep } from 'lodash' -import { getTagName, processTextForEmoji, getAttrs } from 'src/services/html_converter/utility.service.js' -import { convertHtmlToTree } from 'src/services/html_converter/html_tree_converter.service.js' -import { convertHtmlToLines } from 'src/services/html_converter/html_line_converter.service.js' -import StillImageEmojiPopover from 'src/components/still-image/still-image-emoji-popover.vue' -import MentionsLine from 'src/components/mentions_line/mentions_line.vue' -import { MENTIONS_LIMIT } from 'src/components/mentions_line/mentions_line.js' +import { flattenDeep, unescape as ldUnescape } from 'lodash' + import HashtagLink from 'src/components/hashtag_link/hashtag_link.vue' +import { MENTIONS_LIMIT } from 'src/components/mentions_line/mentions_line.js' +import MentionsLine from 'src/components/mentions_line/mentions_line.vue' +import StillImage from 'src/components/still-image/still-image.vue' +import StillImageEmojiPopover from 'src/components/still-image/still-image-emoji-popover.vue' + +import { convertHtmlToLines } from 'src/services/html_converter/html_line_converter.service.js' +import { convertHtmlToTree } from 'src/services/html_converter/html_tree_converter.service.js' +import { + getAttrs, + getTagName, + processTextForEmoji, +} from 'src/services/html_converter/utility.service.js' import './rich_content.scss' @@ -27,7 +34,7 @@ const MAYBE_LINE_BREAKING_ELEMENTS = [ 'h2', 'h3', 'h4', - 'h5' + 'h5', ] /** @@ -52,46 +59,46 @@ export default { name: 'RichContent', components: { MentionsLine, - HashtagLink + HashtagLink, }, props: { // Original html content html: { required: true, - type: String + type: String, }, attentions: { required: false, - default: () => [] + default: () => [], }, // Emoji object, as in status.emojis, note the "s" at the end... emoji: { required: true, - type: Array + type: Array, }, // Whether to handle links or not (posts: yes, everything else: no) handleLinks: { required: false, type: Boolean, - default: false + default: false, }, // Meme arrows greentext: { required: false, type: Boolean, - default: false + default: false, }, // Faint style (for notifs) faint: { required: false, type: Boolean, - default: false + default: false, }, // Collapse newlines collapse: { required: false, type: Boolean, - default: false + default: false, }, /* Content comes from current instance * @@ -103,11 +110,17 @@ export default { isLocal: { required: false, type: Boolean, - default: true - } + default: true, + }, + // Allow wide emoji (max 3:1 ratio) + allowNonSquareEmoji: { + required: false, + type: Boolean, + default: false, + }, }, // NEVER EVER TOUCH DATA INSIDE RENDER - render () { + render() { // Pre-process HTML const { newHtml: html } = preProcessPerLine(this.html, this.greentext) let currentMentions = null // Current chain of mentions, we group all mentions together @@ -124,10 +137,7 @@ export default { let tagsIndex = 0 const renderImage = (tag) => { - return + return } const renderHashtag = (attrs, children, encounteredTextReverse) => { @@ -137,12 +147,14 @@ export default { lastTags.push(linkData) } const { url, tag, content } = linkData - return + return } const renderMention = (attrs, children) => { const linkData = getLinkData(attrs, children, mentionIndex++) - linkData.notifying = this.attentions.some(a => a.statusnet_profile_url === linkData.url) + linkData.notifying = this.attentions.some( + (a) => a.statusnet_profile_url === linkData.url, + ) writtenMentions.push(linkData) if (currentMentions === null) { currentMentions = [] @@ -152,7 +164,7 @@ export default { invisibleMentions.push(linkData) } if (currentMentions.length === 1) { - return + return } else { return '' } @@ -171,26 +183,28 @@ export default { // in MentionsLine lastSpacing = item // Don't remove last space in a container (fixes poast mentions) - return (index !== array.length - 1) && (currentMentions !== null) ? item.trim() : item + return index !== array.length - 1 && currentMentions !== null + ? item.trim() + : item } currentMentions = null if (item.includes(':')) { - item = ['', processTextForEmoji( - item, - this.emoji, - ({ shortcode, url }) => { - return - } - )] + item = [ + '', + processTextForEmoji(item, this.emoji, ({ shortcode, url }) => { + return ( + + ) + }), + ] } return item } @@ -209,18 +223,24 @@ export default { * we have a tag right next to mentions */ const mentionsLinePadding = - // Padding is only needed if we just finished parsing mentions - previouslyMentions && - // Don't add padding if content is string and has padding already - !(children && typeof children[0] === 'string' && children[0].match(/^\s/)) - ? lastSpacing - : '' + // Padding is only needed if we just finished parsing mentions + previouslyMentions && + // Don't add padding if content is string and has padding already + !( + children && + typeof children[0] === 'string' && + children[0].match(/^\s/) + ) + ? lastSpacing + : '' if (MAYBE_LINE_BREAKING_ELEMENTS.includes(Tag)) { // all the elements that can cause a line change currentMentions = null - } else if (Tag === 'img') { // replace images with StillImage + } else if (Tag === 'img') { + // replace images with StillImage return ['', [mentionsLinePadding, renderImage(opener)], ''] - } else if (Tag === 'a' && this.handleLinks) { // replace mentions with MentionLink + } else if (Tag === 'a' && this.handleLinks) { + // replace mentions with MentionLink if (fullAttrs.class && fullAttrs.class.includes('mention')) { // Handling mentions here return renderMention(attrs, children) @@ -228,7 +248,11 @@ export default { currentMentions = null } } else if (Tag === 'span') { - if (this.handleLinks && fullAttrs.class && fullAttrs.class.includes('h-card')) { + if ( + this.handleLinks && + fullAttrs.class && + fullAttrs.class.includes('h-card') + ) { return ['', children.map(processItem), ''] } } @@ -236,11 +260,8 @@ export default { if (children !== undefined) { return [ '', - [ - mentionsLinePadding, - [opener, children.map(processItem), closer] - ], - '' + [mentionsLinePadding, [opener, children.map(processItem), closer]], + '', ] } else { return ['', [mentionsLinePadding, item], ''] @@ -256,29 +277,31 @@ export default { const emptyText = item.trim() === '' if (emptyText) return item if (!encounteredTextReverse) encounteredTextReverse = true - return unescape(item) + return ldUnescape(item) } else if (Array.isArray(item)) { // Handle tag nodes const [opener, children] = item const Tag = opener === '' ? '' : getTagName(opener) switch (Tag) { - case 'a': { // replace mentions with MentionLink + case 'a': { + // replace mentions with MentionLink if (!this.handleLinks) break const fullAttrs = getAttrs(opener, () => true) const attrs = getAttrs(opener, () => true) // should only be this if ( (fullAttrs.class && fullAttrs.class.includes('hashtag')) || // Pleroma style - (fullAttrs.rel === 'tag') // Mastodon style + fullAttrs.rel === 'tag' // Mastodon style ) { return renderHashtag(attrs, children, encounteredTextReverse) } else { attrs.target = '_blank' - const newChildren = [...children].reverse().map(processItemReverse).reverse() + const newChildren = [...children] + .reverse() + .map(processItemReverse) + .reverse() - return
    - { newChildren } - + return {newChildren} } } case '': @@ -290,11 +313,9 @@ export default { const newChildren = Array.isArray(children) ? [...children].reverse().map(processItemReverse).reverse() : children - return - { newChildren } - + return {newChildren} } else { - return + return } } return item @@ -306,30 +327,35 @@ export default { // DO NOT USE SLOTS they cause a re-render feedback loop here. // slots updated -> rerender -> emit -> update up the tree -> rerender -> ... // at least until vue3? - const result = - - { - this.collapse - ? pass2.map(x => { - if (!Array.isArray(x)) return x.replace(/\n/g, ' ') - return x.map(y => y.type === 'br' ? ' ' : y) - }) - : pass2 - } - + const result = ( + + {this.collapse + ? pass2.map((x) => { + if (!Array.isArray(x)) return x.replace(/\n/g, ' ') + return x.map((y) => (y.type === 'br' ? ' ' : y)) + }) + : pass2} + + ) const event = { lastTags, writtenMentions, writtenTags, - invisibleMentions + invisibleMentions, } // DO NOT MOVE TO UPDATE. BAD IDEA. this.$emit('parseReady', event) return result - } + }, } const getLinkData = (attrs, children, index) => { @@ -346,7 +372,7 @@ const getLinkData = (attrs, children, index) => { url: attrs.href, tag: attrs['data-tag'], content: flattenDeep(children).join(''), - textContent + textContent, } } @@ -362,31 +388,36 @@ export const preProcessPerLine = (html, greentext) => { const greentextHandle = new Set(['p', 'div']) const lines = convertHtmlToLines(html) - const newHtml = lines.reverse().map((item, index, array) => { - if (!item.text) return item - const string = item.text + const newHtml = lines + .reverse() + .map((item, index, array) => { + if (!item.text) return item + const string = item.text - // Greentext stuff - if ( - // Only if greentext is engaged - greentext && + // Greentext stuff + if ( + // Only if greentext is engaged + greentext && // Only handle p's and divs. Don't want to affect blockquotes, code etc - item.level.every(l => greentextHandle.has(l)) && + item.level.every((l) => greentextHandle.has(l)) && // Only if line begins with '>' or '<' (string.includes('>') || string.includes('<')) - ) { - const cleanedString = string.replace(/<[^>]+?>/gi, '') // remove all tags - .replace(/@\w+/gi, '') // remove mentions (even failed ones) - .trim() - if (cleanedString.startsWith('>')) { - return `${string}` - } else if (cleanedString.startsWith('<')) { - return `${string}` + ) { + const cleanedString = string + .replace(/<[^>]+?>/gi, '') // remove all tags + .replace(/@\w+/gi, '') // remove mentions (even failed ones) + .trim() + if (cleanedString.startsWith('>')) { + return `${string}` + } else if (cleanedString.startsWith('<')) { + return `${string}` + } } - } - return string - }).reverse().join('') + return string + }) + .reverse() + .join('') return { newHtml } } diff --git a/src/components/rich_content/rich_content.scss b/src/components/rich_content/rich_content.scss index d2ec77dcb..33effc623 100644 --- a/src/components/rich_content/rich_content.scss +++ b/src/components/rich_content/rich_content.scss @@ -77,6 +77,14 @@ height: var(--emoji-size, 32px); } + &.-allow-non-square-emoji { + .emoji { + width: auto; + max-width: calc(var(--emoji-size, 32px) * 3); + min-width: var(--emoji-size, 32px); + } + } + .img, video { max-width: 100%; diff --git a/src/components/root.style.js b/src/components/root.style.js index 5075e33c8..54c4c6095 100644 --- a/src/components/root.style.js +++ b/src/components/root.style.js @@ -27,8 +27,8 @@ export default { // Selection colors '--selectionBackground': 'color | --accent', - '--selectionText': 'color | $textColor(--accent --text no-preserve)' - } - } - ] + '--selectionText': 'color | $textColor(--accent --text no-preserve)', + }, + }, + ], } diff --git a/src/components/roundness_input/roundness_input.vue b/src/components/roundness_input/roundness_input.vue index 1da71ca79..caf21763b 100644 --- a/src/components/roundness_input/roundness_input.vue +++ b/src/components/roundness_input/roundness_input.vue @@ -33,19 +33,17 @@ diff --git a/src/components/scope_selector/scope_selector.js b/src/components/scope_selector/scope_selector.js index 52cda368b..9d3a3a718 100644 --- a/src/components/scope_selector/scope_selector.js +++ b/src/components/scope_selector/scope_selector.js @@ -1,69 +1,92 @@ import { library } from '@fortawesome/fontawesome-svg-core' import { - faEnvelope, - faLock, - faLockOpen, - faGlobe -} from '@fortawesome/free-solid-svg-icons' - -library.add( faEnvelope, faGlobe, faLock, - faLockOpen -) + faLockOpen, +} from '@fortawesome/free-solid-svg-icons' + +library.add(faEnvelope, faGlobe, faLock, faLockOpen) const ScopeSelector = { - props: [ - 'showAll', - 'userDefault', - 'originalScope', - 'initialScope', - 'onScopeChange' - ], - data () { + props: { + showAll: { + required: true, + type: Boolean, + }, + userDefault: { + required: true, + type: String, + }, + originalScope: { + required: false, + type: String, + }, + initialScope: { + required: false, + type: String, + }, + onScopeChange: { + required: true, + type: Function, + }, + unstyled: { + required: false, + type: Boolean, + default: true, + }, + }, + data() { return { - currentScope: this.initialScope + currentScope: this.initialScope, } }, computed: { - showNothing () { - return !this.showPublic && !this.showUnlisted && !this.showPrivate && !this.showDirect + showNothing() { + return ( + !this.showPublic && + !this.showUnlisted && + !this.showPrivate && + !this.showDirect + ) }, - showPublic () { + showPublic() { return this.originalScope !== 'direct' && this.shouldShow('public') }, - showUnlisted () { + showUnlisted() { return this.originalScope !== 'direct' && this.shouldShow('unlisted') }, - showPrivate () { + showPrivate() { return this.originalScope !== 'direct' && this.shouldShow('private') }, - showDirect () { + showDirect() { return this.shouldShow('direct') }, - css () { + css() { + const style = this.unstyled ? 'button-unstyled' : 'button-default' return { - public: { toggled: this.currentScope === 'public' }, - unlisted: { toggled: this.currentScope === 'unlisted' }, - private: { toggled: this.currentScope === 'private' }, - direct: { toggled: this.currentScope === 'direct' } + public: [style, { toggled: this.currentScope === 'public' }], + unlisted: [style, { toggled: this.currentScope === 'unlisted' }], + private: [style, { toggled: this.currentScope === 'private' }], + direct: [style, { toggled: this.currentScope === 'direct' }], } - } + }, }, methods: { - shouldShow (scope) { - return this.showAll || + shouldShow(scope) { + return ( + this.showAll || this.currentScope === scope || this.originalScope === scope || this.userDefault === scope || scope === 'direct' + ) }, - changeVis (scope) { + changeVis(scope) { this.currentScope = scope this.onScopeChange && this.onScopeChange(scope) - } - } + }, + }, } export default ScopeSelector diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue index b90ae0205..cbe51a07f 100644 --- a/src/components/scope_selector/scope_selector.vue +++ b/src/components/scope_selector/scope_selector.vue @@ -1,11 +1,11 @@ @@ -61,18 +59,14 @@ --> + + diff --git a/src/components/settings_modal/admin_tabs/instance_tab.js b/src/components/settings_modal/admin_tabs/instance_tab.js index b07bafe8f..67d04c303 100644 --- a/src/components/settings_modal/admin_tabs/instance_tab.js +++ b/src/components/settings_modal/admin_tabs/instance_tab.js @@ -1,25 +1,22 @@ +import { get } from 'lodash' + +import AttachmentSetting from '../helpers/attachment_setting.vue' import BooleanSetting from '../helpers/boolean_setting.vue' import ChoiceSetting from '../helpers/choice_setting.vue' -import IntegerSetting from '../helpers/integer_setting.vue' -import StringSetting from '../helpers/string_setting.vue' +import ColorSetting from '../helpers/color_setting.vue' import GroupSetting from '../helpers/group_setting.vue' -import AttachmentSetting from '../helpers/attachment_setting.vue' - +import IntegerSetting from '../helpers/integer_setting.vue' +import ListSetting from '../helpers/list_setting.vue' +import MapSetting from '../helpers/map_setting.vue' +import PWAManifestIconsSetting from '../helpers/pwa_manifest_icons_setting.vue' import SharedComputedObject from '../helpers/shared_computed_object.js' -import { library } from '@fortawesome/fontawesome-svg-core' -import { - faGlobe -} from '@fortawesome/free-solid-svg-icons' - -library.add( - faGlobe -) +import StringSetting from '../helpers/string_setting.vue' const InstanceTab = { - provide () { + provide() { return { defaultDraftMode: true, - defaultSource: 'admin' + defaultSource: 'admin', } }, components: { @@ -27,12 +24,45 @@ const InstanceTab = { ChoiceSetting, IntegerSetting, StringSetting, + ColorSetting, AttachmentSetting, - GroupSetting + ListSetting, + PWAManifestIconsSetting, + MapSetting, + GroupSetting, }, computed: { - ...SharedComputedObject() - } + ...SharedComputedObject(), + providersOptions() { + const desc = get(this.$store.state.adminSettings.descriptions, [ + ':pleroma', + 'Pleroma.Web.Metadata', + ':providers', + ]) + return new Set( + desc.suggestions.map((option) => ({ + label: option.replace('Pleroma.Web.Metadata.Providers.', ''), + value: option, + })), + ) + }, + limitLocalContentOptions() { + const desc = get(this.$store.state.adminSettings.descriptions, [ + ':pleroma', + ':instance', + ':limit_to_local_content', + ]) + return new Set( + desc.suggestions.map((option) => ({ + label: + option !== 'false' + ? this.$t('admin_dash.instance.' + option) + : this.$t('general.no'), + value: option, + })), + ) + }, + }, } export default InstanceTab diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue index 32e8df259..144958fa4 100644 --- a/src/components/settings_modal/admin_tabs/instance_tab.vue +++ b/src/components/settings_modal/admin_tabs/instance_tab.vue @@ -1,17 +1,13 @@