sync#6
Closed
49372s wants to merge 72 commits intoMSNIC:developfrom
Closed
Conversation
Release: 2025.11.1
Release: 2025.12.0
* fix(sw): implement fetch timeout handling for navigation and offline content * fix(sw): increase fetch timeout * fix(sw): improve fetch timeout handling for i18n content * fix(sw): 結局、fetchを通るかCacheがhitするはずなので、i18nのところはいらない * fix(sw): 400番台のエラーを無条件でオフラインページにしていたのを修正 * 間違えた * i18nもtimeoutが必要 * import sortingを修正 * import sortingを修正 * Fix: Frontend のsharedにはアクセスできないじゃん... * SPDX * Update CHANGELOG.md * Update packages/sw/src/scripts/lang.ts Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> * Update packages/sw/src/sw.ts Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> * Update CHANGELOG.md Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> --------- Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
* enhance: use native glob * remove tiny-glob * remove fast-glob * refactor * fix: use async glob if possible --------- Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
* fix(frontend): 削除されたノートのリノートが正しく表示されない問題を修正 * Update Changelog * 🎨 * fix
* オーナー不在のチャンネルをミュートできないのを修正 * update changelog --------- Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
* fix(frontend): remove unused dependencies * fix(backend): remove unused dependencies
* fix: os.selectの型定義の上で default が文字列である問題を修正 * fix: deckのタイムライン選択画面で今指定されているタイムラインがデフォルトで選択されない問題 * fix lint * fix: type error
* Service Worker Auto Preloadをオプトアウトするように * TypeErrorを修正 * コメントを追記
* fix(frontend): ドライブファイルを日付以外で並び替える場合は月でグループ化して表示しないように * Update Changelog
* fix(frontend/aiscript): nullを返すnote_view_intrruptorが動作しない問題を修正 * Update Changelog
* New translations ja-jp.yml (Spanish) * New translations ja-jp.yml (Chinese Simplified) * New translations ja-jp.yml (English) * New translations ja-jp.yml (German) * New translations ja-jp.yml (German) * New translations ja-jp.yml (Chinese Simplified) * New translations ja-jp.yml (Chinese Simplified) * New translations ja-jp.yml (Chinese Simplified)
Removed empty section under General and retained fixes under Client.
* Initial plan * Update PostgreSQL volume mount paths for PostgreSQL 18 compatibility Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Release: 2025.12.1
…869) * chore(deps): update [github actions] update dependencies * migrate * bump download-artifact to v7 * bump upload-artifact to v6 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
* update deps * update chokidar to v5 * fix type error * rollback serviceworker types to r74 * fix [ci skip]
This reverts commit 5512898. see misskey-dev/misskey#16994
* fix(frontend): ストレージが消去される事がある問題を軽減 * add comment * add catch to continue request permissions * Update Changelog * update changelog * fix 通知権限の許可取得はボタン押下時に移動 * fix * wip * Update main-boot.ts * wip --------- Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
* fix(frontend): 一部のUnicode絵文字がリアクションボタンにならない問題を修正 * Update Changelog * fix
Release: 2025.12.2
…tware/TransFem-org/Sharkey/-/commit/2f2d88dcfc76bac6815d60fa9915b8e797853292#), [@32fc540d](https://activitypub.software/TransFem-org/Sharkey/-/commit/32fc540df4a77076e3365e5471e13ea45a04c508), [@07b72c65](https://activitypub.software/TransFem-org/Sharkey/-/commit/07b72c65b93bff5f13afe28252f4aebf8adac471), [@e1f13f64](https://activitypub.software/TransFem-org/Sharkey/-/commit/e1f13f641e3e0528571e41475cda1718cac4c532), [@288fa114](https://activitypub.software/TransFem-org/Sharkey/-/commit/288fa1143d3a2c8a92a84ee1c4ea7661e0554c4c), [@6e2eabbb](https://activitypub.software/TransFem-org/Sharkey/-/commit/6e2eabbbc9ad02e6e90caa27ce7e1ccb0b8208f6), [@c3f76818](https://activitypub.software/TransFem-org/Sharkey/-/commit/c3f768181ae232a9ac03c69759f5508398b4cd55), [@142f500f](https://activitypub.software/TransFem-org/Sharkey/-/commit/142f500f4bbf3208380b83a4c7764bfe411950ab), [@1d9cb4fa](https://activitypub.software/TransFem-org/Sharkey/-/commit/1d9cb4fad9e825c3389e73f50fa396338b159b5c), [@42530b5a](https://activitypub.software/TransFem-org/Sharkey/-/commit/42530b5a39f0bce386bf408004d1584bf7a36576), [@fea7889e](https://activitypub.software/TransFem-org/Sharkey/-/commit/fea7889e0cd5ed223a4db9cb668be684cead2a52)) - 초대 코드를 공유하지 않고도 가입 사유를 확인해 원하는 유저만 가입을 승인할 수 있습니다. - 가입을 승인하면 해당 유저에게 가입이 승인되었음을 알리는 이메일이 전송됩니다. - 가입 사유는 관리자 및 모더레이터 권한이 있는 유저만 확인할 수 있습니다.
There was a problem hiding this comment.
Pull request overview
This PR is a broad “sync” update that brings the codebase in line with upstream changes (notably around sign-up approvals and proxy/rate-limit handling), refreshes dependencies/tooling, and removes third-party globbing in favor of Node’s built-in fs.glob* APIs.
Changes:
- Add approval-required sign-up flow end-to-end (DB schema, backend APIs, frontend admin UI, SDK typings, and translations).
- Adjust proxy trust / IP rate limiting behavior and improve some operational endpoints/performance.
- Replace external glob libraries with Node 22+
fs.globSync/fs.promises.globacross build/scripts and update various package/workflow dependencies.
Reviewed changes
Copilot reviewed 150 out of 153 changed files in this pull request and generated 9 comments.
Show a summary per file
| File | Description |
|---|---|
| scripts/tarball.mjs | Switch tarball file enumeration from fast-glob to fs.promises.glob. |
| scripts/changelog-checker/package.json | Bump dev tooling dependencies for changelog-checker script. |
| scripts/changelog-checker/package-lock.json | Lockfile updates matching dependency bumps. |
| pnpm-workspace.yaml | Add systeminformation to minimumReleaseAgeExclude temporarily. |
| packages/sw/src/sw.ts | Add navigation fetch timeout + offline fallback improvements; install route opt-out. |
| packages/sw/src/scripts/lang.ts | Add fetch timeout for locale loading and cache update. |
| packages/sw/src/const.ts | Introduce shared SW fetch timeout constant. |
| packages/sw/package.json | Update SW package tooling deps. |
| packages/misskey-reversi/package.json | Update tooling deps; remove glob usage. |
| packages/misskey-reversi/build.js | Replace globSync with fs.globSync. |
| packages/misskey-bubble-game/package.json | Update tooling deps; remove glob usage. |
| packages/misskey-bubble-game/build.js | Replace globSync with fs.globSync. |
| packages/icons-subsetter/src/generator.ts | Replace tiny-glob with fs.promises.glob; switch to node: imports. |
| packages/icons-subsetter/package.json | Remove tiny-glob; bump tooling deps (tsx, biome, etc.). |
| packages/i18n/src/autogen/locale.ts | Add new locale keys (approvals, deck tour, settings persistence, etc.). |
| packages/i18n/package.json | Bump tooling deps and chokidar major update. |
| packages/i18n/build.ts | Replace globSync with fs.globSync. |
| packages/frontend/src/utility/storage.ts | New utility for Storage Persistence UI actions and state. |
| packages/frontend/src/ui/universal.vue | Change widgets-side rendering logic and widget-button visibility condition. |
| packages/frontend/src/ui/friendly/navbar.vue | Add widget button placement + pending-approval indicator API check. |
| packages/frontend/src/ui/friendly.vue | Same widgets-side logic adjustments for friendly UI. |
| packages/frontend/src/ui/deck/tl-column.vue | Ensure deck timeline selector uses a default value. |
| packages/frontend/src/ui/deck/role-timeline-column.vue | Validate default role selection against available roles. |
| packages/frontend/src/ui/deck/list-column.vue | Validate default list selection against available lists. |
| packages/frontend/src/ui/deck/channel-column.vue | Validate default channel selection against available channels. |
| packages/frontend/src/ui/deck/antenna-column.vue | Validate default antenna selection against available antennas. |
| packages/frontend/src/ui/deck.vue | Add deck onboarding tip + “how to use” tour integration. |
| packages/frontend/src/ui/common/navbar.vue | Add widget button placement + pending-approval indicator API check. |
| packages/frontend/src/ui/common/navbar-h.vue | Add pending-approval indicator API check. |
| packages/frontend/src/tips.ts | Add new deck tip key. |
| packages/frontend/src/store.ts | Add device-level flag for storage persistence suggestion. |
| packages/frontend/src/router.definition.ts | Add admin approvals route entry. |
| packages/frontend/src/preferences/manager.ts | Refactor commit path to centralize save + emit behavior. |
| packages/frontend/src/pages/settings/security.vue | Force-disable infinite scroll for sign-in history pagination. |
| packages/frontend/src/pages/settings/profile.vue | Remove beta label from followed-message setting label. |
| packages/frontend/src/pages/settings/privacy.vue | Remove beta label from lockdown setting label. |
| packages/frontend/src/pages/settings/other.vue | Add button to enable Storage Persistence. |
| packages/frontend/src/pages/settings/index.vue | Show Storage Persistence suggestion banner with enable/skip actions. |
| packages/frontend/src/pages/flash/flash.vue | Treat missing Play version as legacy; adjust legacy detection. |
| packages/frontend/src/pages/channel.vue | Show channel header actions even if owner is deleted. |
| packages/frontend/src/pages/admin/performance.vue | Remove beta label in RBT section label. |
| packages/frontend/src/pages/admin/modlog.ModLog.vue | Add approve/decline moderation log handling. |
| packages/frontend/src/pages/admin/moderation.vue | Add admin toggle for approval-required signups. |
| packages/frontend/src/pages/admin/index.vue | Add pending approvals warning + approvals menu item. |
| packages/frontend/src/pages/admin/approvals.vue | New admin page listing pending users for approval/decline. |
| packages/frontend/src/components/index.ts | Adjust global component typing module augmentation target. |
| packages/frontend/src/components/global/MkAvatar.vue | Tighten avatar decoration typing and blink detection. |
| packages/frontend/src/components/MkVisitorDashboard.vue | Warn visitors when approval-required signup is enabled. |
| packages/frontend/src/components/MkSignupDialog.vue | Close dialog on approval-pending result. |
| packages/frontend/src/components/MkSignupDialog.form.vue | Add signup reason field + approval-pending UX. |
| packages/frontend/src/components/MkSignin.password.vue | Prevent tabbing into password-visibility toggle button. |
| packages/frontend/src/components/MkPostFormSimple.vue | Simplify root class handling and adjust textarea sizing CSS. |
| packages/frontend/src/components/MkPostFormDialog.vue | Restore popup class logic and set dialog form sizing constraints. |
| packages/frontend/src/components/MkPostForm.vue | Simplify root class handling and adjust textarea sizing CSS. |
| packages/frontend/src/components/MkPasswordDialog.vue | Prevent tabbing into password-visibility toggle button. |
| packages/frontend/src/components/MkNote.vue | Support note_view_interruptor returning null + handle deleted renote target. |
| packages/frontend/src/components/MkDrive.vue | Don’t group files by date when sorting modes aren’t createdAt-based. |
| packages/frontend/src/components/MkApprovalUser.vue | New component to approve/decline pending sign-ups. |
| packages/frontend/package.json | Dependency and tooling bumps; remove some direct deps. |
| packages/frontend/lib/vite-plugin-create-search-index.ts | Replace glob with fs.globSync for indexing. |
| packages/frontend/.storybook/generate.tsx | Replace fast-glob with fs.globSync. |
| packages/frontend-shared/package.json | Tooling bumps; remove glob usage. |
| packages/frontend-shared/js/emojilist.ts | Fix emoji length handling (codepoints) + add forced colorization path. |
| packages/frontend-shared/build.js | Replace globSync with fs.globSync. |
| packages/frontend-embed/package.json | Dependency/tooling bumps; remove redundant deps. |
| packages/frontend-builder/package.json | Tooling bumps; update vite version. |
| packages/cherrypick-js/src/entities.ts | Add reason to SignupRequest; add moderation log types. |
| packages/cherrypick-js/src/consts.ts | Add permissions and moderation log types for approvals. |
| packages/cherrypick-js/src/autogen/types.ts | Autogen updates for new endpoints/meta fields. |
| packages/cherrypick-js/src/autogen/entities.ts | Autogen entities for approve/decline endpoints. |
| packages/cherrypick-js/src/autogen/endpoint.ts | Register new endpoints in SDK endpoint map. |
| packages/cherrypick-js/src/autogen/apiClientJSDoc.ts | Add SDK JSDoc for approve/decline endpoints. |
| packages/cherrypick-js/package.json | Version bump + based Misskey version bump. |
| packages/cherrypick-js/generator/package.json | Tooling bumps for generator. |
| packages/cherrypick-js/etc/cherrypick-js.api.md | API extractor output updated for new types/endpoints. |
| packages/cherrypick-js/build.js | Replace globSync with fs.globSync. |
| packages/backend/test/unit/chart.ts | Minor test refactor: make redisClient const. |
| packages/backend/test-federation/compose.b.yml | Adjust Postgres volume mount path. |
| packages/backend/test-federation/compose.a.yml | Adjust Postgres volume mount path. |
| packages/backend/src/types.ts | Add moderation log types/payloads for approve/decline. |
| packages/backend/src/server/api/endpoints/server-info.ts | Lazy-load systeminformation. |
| packages/backend/src/server/api/endpoints/admin/update-meta.ts | Add approvalRequiredForSignup param + persistence. |
| packages/backend/src/server/api/endpoints/admin/show-users.ts | Add pending state filtering (unapproved local users). |
| packages/backend/src/server/api/endpoints/admin/show-user.ts | Expose approved + signupReason to admins. |
| packages/backend/src/server/api/endpoints/admin/server-info.ts | Lazy-load systeminformation. |
| packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts | Improve delayed-job aggregation performance using Map. |
| packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts | Improve delayed-job aggregation performance using Map. |
| packages/backend/src/server/api/endpoints/admin/meta.ts | Include approvalRequiredForSignup in admin meta response. |
| packages/backend/src/server/api/endpoints/admin/decline-user.ts | New endpoint: decline pending users (delete account + log). |
| packages/backend/src/server/api/endpoints/admin/approve-user.ts | New endpoint: approve pending users (set approved + log). |
| packages/backend/src/server/api/endpoint-list.ts | Register new admin approve/decline endpoints. |
| packages/backend/src/server/api/SignupApiService.ts | Add approval-required signup path; add optional IP logging + moderator notification. |
| packages/backend/src/server/api/SigninWithPasskeyApiService.ts | Gate IP rate limiting behind config flag + add localhost warning log. |
| packages/backend/src/server/api/SigninApiService.ts | Gate IP rate limiting behind config flag; enforce approval-required sign-in. |
| packages/backend/src/server/api/ApiCallService.ts | Gate anonymous IP rate limiting behind config flag + improve warning logs. |
| packages/backend/src/server/ServerService.ts | Use non-null trustProxy config value directly. |
| packages/backend/src/models/json-schema/meta.ts | Add approvalRequiredForSignup to packed meta schema. |
| packages/backend/src/models/UserPending.ts | Add reason field to pending signup model. |
| packages/backend/src/models/User.ts | Add approved and signupReason fields to user model. |
| packages/backend/src/models/Meta.ts | Add approvalRequiredForSignup flag to instance meta. |
| packages/backend/src/misc/show-machine-info.ts | Replace systeminformation usage with os memory info. |
| packages/backend/src/daemons/ServerStatsService.ts | Lazy-load systeminformation per stat call. |
| packages/backend/src/core/entities/UserEntityService.ts | Include approved and signupReason in packed user entities. |
| packages/backend/src/core/entities/MetaEntityService.ts | Include approvalRequiredForSignup in client meta payload. |
| packages/backend/src/core/SignupService.ts | Support signup reason and default approval based on instance meta. |
| packages/backend/src/core/CustomEmojiService.ts | Minor formatting fix. |
| packages/backend/src/core/AiService.ts | Lazy-load systeminformation for CPU flags. |
| packages/backend/src/config.ts | Provide safer trustProxy defaults; add enableIpRateLimit config flag. |
| packages/backend/package.json | Dependency/tooling bumps and some dependency moves. |
| packages/backend/migration/1768893580518-approvalSignup.js | New migration adding approval-required signup fields. |
| packages/backend/migration/1762797644990-AddInstanceQuarantineLimited.js | Remove trailing whitespace line. |
| package.json | Version bump, pnpm bump, dependency resolution changes. |
| locales/zh-CN.yml | Translation adjustments. |
| locales/ko-KR.yml | Add approval-related strings and assorted translation tweaks. |
| locales/ja-JP.yml | Add approval-related strings and new settings/deck tour strings. |
| locales/es-ES.yml | Minor translation tweak. |
| locales/en-US.yml | Add approval-related strings and follow request confirmation strings. |
| locales/de-DE.yml | Add assorted strings and tweaks. |
| compose_example.yml | Adjust Postgres volume mount path. |
| compose.local-db.yml | Adjust Postgres volume mount path. |
| CHANGELOG_CHERRYPICK.md | Update based Misskey version + add approval feature notes. |
| CHANGELOG.md | Update upstream changelog entries (2025.12.2/2025.12.1). |
| .github/workflows/validate-api-json.yml | Bump GitHub Actions versions. |
| .github/workflows/test-production.yml | Bump GitHub Actions versions. |
| .github/workflows/test-frontend.yml | Bump GitHub Actions versions + artifact uploader versions. |
| .github/workflows/test-federation.yml | Bump GitHub Actions versions. |
| .github/workflows/test-cherrypick-js.yml | Bump GitHub Actions versions. |
| .github/workflows/test-backend.yml | Bump GitHub Actions versions. |
| .github/workflows/storybook.yml | Bump GitHub Actions versions + artifact uploader versions. |
| .github/workflows/request-release-review.yml | Bump github-script action version. |
| .github/workflows/report-backend-memory.yml | Bump github-script + comment action; update inputs. |
| .github/workflows/report-api-diff.yml | Bump github-script + comment action; update inputs. |
| .github/workflows/release-with-dispatch.yml | Bump checkout action; minor formatting tweaks. |
| .github/workflows/release-edit-with-push.yml | Bump checkout action. |
| .github/workflows/on-release-created.yml | Bump checkout/setup-node actions. |
| .github/workflows/locale.yml | Bump checkout/setup-node actions. |
| .github/workflows/lint.yml | Bump checkout/setup-node actions. |
| .github/workflows/labeler.yml | Bump labeler action major version. |
| .github/workflows/get-backend-memory.yml | Bump checkout/setup-node + upload-artifact versions. |
| .github/workflows/get-api-diff.yml | Bump checkout/setup-node + upload-artifact versions. |
| .github/workflows/dockle.yml | Bump checkout action. |
| .github/workflows/docker.yml | Bump checkout + upload/download-artifact versions. |
| .github/workflows/docker-develop.yml | Bump checkout + upload/download-artifact versions. |
| .github/workflows/deploy-test-environment.yml | Bump checkout action. |
| .github/workflows/check_copyright_year.yml | Bump checkout action. |
| .github/workflows/check-spdx-license-id.yml | Bump checkout action. |
| .github/workflows/check-cherrypick-js-version.yml | Bump checkout action. |
| .github/workflows/check-cherrypick-js-autogen.yml | Bump checkout/setup-node + artifact/comment action versions. |
| .github/workflows/changelog-check.yml | Bump checkout/setup-node actions. |
| .github/workflows/api-cherrypick-js.yml | Bump checkout/setup-node actions. |
| .config/example.yml | Expand documentation for trustProxy; add enableIpRateLimit example. |
Files not reviewed (1)
- scripts/changelog-checker/package-lock.json: Language not supported
Comments suppressed due to low confidence (1)
packages/frontend/src/ui/friendly.vue:104
showWidgetsSideis a non-reactive boolean computed once fromwindow.innerWidth. After a resize, the widgets side area and the sidebar widget button won’t update when crossingDESKTOP_THRESHOLD. Make it arefand update it together withisMobileinhandleResize(and remove the resize listener on unmount if this component can be recreated).
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+67
to
71
| const showWidgetsSide = window.innerWidth >= DESKTOP_THRESHOLD; | ||
|
|
||
| const isMobile = ref(deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD); | ||
| const handleResize = () => { | ||
| isMobile.value = deviceKind === 'smartphone' || window.innerWidth <= MOBILE_THRESHOLD; |
Comment on lines
+11
to
+12
| export const storagePersisted = ref(await navigator.storage.persisted()); | ||
|
|
Comment on lines
316
to
+320
| if (res && res.ok) { | ||
| if (res.status === 204 || instance.emailRequiredForSignup) { | ||
| if (instance.approvalRequiredForSignup) { | ||
| os.alert({ | ||
| type: 'success', | ||
| title: i18n.ts._signup.almostThere, |
Comment on lines
+389
to
+393
| this.userIpsRepository.createQueryBuilder().insert().values({ | ||
| createdAt: ipDate ?? new Date(), | ||
| userId, | ||
| ip, | ||
| }).orIgnore(true).execute(); |
| reload: i18n.ts?.reload ?? 'Reload', | ||
| }; | ||
|
|
||
| return `<!DOCTYPE html><html lang="ja"><head><meta charset="UTF-8"><meta content="width=device-width,initial-scale=1"name="viewport"><title>${messages.title}</title><style>body{background-color:rgb(238, 241, 252);color:rgb(87, 112, 150);font-family:Hiragino Maru Gothic Pro,BIZ UDGothic,Roboto,HelveticaNeue,Arial,sans-serif;line-height:1.35;display:flex;flex-direction:column;align-items:center;justify-content:center;min-height:100vh;margin:0;padding:24px;box-sizing:border-box}.icon{max-width:120px;width:100%;height:auto;margin-bottom:20px;}.message{text-align:center;font-size:20px;font-weight:700;margin-bottom:20px}.version{text-align:center;font-size:90%;margin-bottom:20px}button{padding:7px 14px;min-width:100px;font-weight:700;font-family:Hiragino Maru Gothic Pro,BIZ UDGothic,Roboto,HelveticaNeue,Arial,sans-serif;line-height:1.35;border-radius:99rem;background-color:rgb(107, 165, 227);color:rgb(255, 255, 255);border:none;cursor:pointer;-webkit-tap-highlight-color:transparent}button:hover{background-color:rgb(150, 191, 235)}</style></head><body><svg class="icon"fill="none"height="24"stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"stroke-width="2"viewBox="0 0 24 24"width="24"xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z"fill="none"stroke="none"/><path d="M9.58 5.548c.24 -.11 .492 -.207 .752 -.286c1.88 -.572 3.956 -.193 5.444 1c1.488 1.19 2.162 3.007 1.77 4.769h.99c1.913 0 3.464 1.56 3.464 3.486c0 .957 -.383 1.824 -1.003 2.454m-2.997 1.033h-11.343c-2.572 -.004 -4.657 -2.011 -4.657 -4.487c0 -2.475 2.085 -4.482 4.657 -4.482c.13 -.582 .37 -1.128 .7 -1.62"/><path d="M3 3l18 18"/></svg><div class="message">${messages.header}</div><div class="version">v${_VERSION_}<br><span style="font-size: 80%;">${_BASEDMISSKEYVERSION_}</span></div><button onclick="reloadPage()">${messages.reload}</button><script>function reloadPage(){location.reload(!0)}</script></body></html>`; |
| * SPDX-License-Identifier: AGPL-3.0-only | ||
| */ | ||
|
|
||
| import { computed, ref, shallowRef, watch, defineAsyncComponent } from 'vue'; |
Comment on lines
+10
to
+12
| await queryRunner.query(`ALTER TABLE "meta" ADD "approvalRequiredForSignup" boolean DEFAULT false NOT NULL`); | ||
| await queryRunner.query(`ALTER TABLE "user" ADD "approved" boolean DEFAULT false NOT NULL`); | ||
| await queryRunner.query(`ALTER TABLE "user" ADD "signupReason" character varying(1000) NULL`); |
Comment on lines
+168
to
+176
| if (!user.approved && this.meta.approvalRequiredForSignup) { | ||
| reply.code(403); | ||
| return { | ||
| error: { | ||
| message: 'The account has not been approved by an admin yet. Try again later.', | ||
| code: 'NOT_APPROVED', | ||
| id: '22d05606-fbcf-421a-a2db-b32241faft1b', | ||
| }, | ||
| }; |
Comment on lines
+59
to
+62
| }).then(info => { | ||
| reason.value = info?.signupReason; | ||
| email.value = info?.email; | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Why
Additional info (optional)
Checklist