Merge c8421194b8 into 7d7a12d7d6

fix(deps): broken lockfile (#14556 )
chore(deps): bump body-parser from 1.20.2 to 1.20.3 in /packages/backend (#14550 )
2024-09-15 22:04:24 +09:00 · 2024-09-15 21:57:22 +09:00 · 2024-09-15 20:54:26 +09:00 · 2024-09-15 17:13:53 +09:00 · 2024-08-31 12:59:51 +09:00 · 2024-08-24 19:11:41 +09:00
6 changed files with 171 additions and 154 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -11,6 +11,7 @@
 - Enhance: コントロールパネル内のファイル一覧でセンシティブなファイルを区別しやすく
 - Fix: サーバーメトリクスが2つ以上あるとリロード直後の表示がおかしくなる問題を修正
 - Fix: 月の違う同じ日はセパレータが表示されないのを修正
+- Fix: アカウントがbotになっているときに二段階認証設定ダイアログの上にbotアカウントの注意書きが表示される問題を修正

 ### Server
 - Fix: アンテナの書き込み時にキーワードが与えられなかった場合のエラーをApiErrorとして投げるように
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@ -100,7 +100,7 @@
 		"async-mutex": "0.5.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
-		"body-parser": "1.20.2",
+		"body-parser": "1.20.3",
 		"bullmq": "5.10.4",
 		"cacheable-lookup": "7.0.0",
 		"cbor": "9.0.2",
--- a/packages/frontend/src/components/MkModal.vue
+++ b/packages/frontend/src/components/MkModal.vue
@ -68,7 +68,7 @@ const props = withDefaults(defineProps<{
 	anchor?: { x: string; y: string; };
 	src?: HTMLElement | null;
 	preferType?: ModalTypes | 'auto';
-	zPriority?: 'low' | 'middle' | 'high';
+	zPriority?: os.ZPriority;
 	noOverlap?: boolean;
 	transparentBg?: boolean;
 	hasInteractionWithOtherFocusTrappedEls?: boolean;
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@ -145,7 +145,10 @@ const zIndexes = {
 	middle: 2000000,
 	high: 3000000,
 };
-export function claimZIndex(priority: keyof typeof zIndexes = 'low'): number {
+
+export type ZPriority = keyof typeof zIndexes;
+
+export function claimZIndex(priority: ZPriority = 'low'): number {
 	zIndexes[priority] += 100;
 	return zIndexes[priority];
 }
--- a/packages/frontend/src/ui/_common_/common.vue
+++ b/packages/frontend/src/ui/_common_/common.vue
@ -39,9 +39,13 @@ SPDX-License-Identifier: AGPL-3.0-only

 <div v-if="pendingApiRequestsCount > 0" id="wait"></div>

-<div v-if="dev" id="devTicker"><span>DEV BUILD</span></div>
+<div id="envTicker">
+	<div>
+		<div v-if="$i && $i.isBot">{{ i18n.ts.loggedInAsBot }}</div>
+		<div v-if="dev">DEV BUILD</div>
+	</div>
+</div>

-<div v-if="$i && $i.isBot" id="botWarn"><span>{{ i18n.ts.loggedInAsBot }}</span></div>
 </template>

 <script lang="ts" setup>
@ -241,30 +245,7 @@ if ($i) {
 	}
 }

-#botWarn {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	margin: auto;
-	width: 100%;
-	height: max-content;
-	text-align: center;
-	z-index: 2147483647;
-	color: #ff0;
-	background: rgba(0, 0, 0, 0.5);
-	padding: 4px 7px;
-	font-size: 14px;
-	pointer-events: none;
-	user-select: none;
-
-	> span {
-		animation: dev-ticker-blink 2s infinite;
-	}
-}
-
-#devTicker {
+#envTicker {
 	position: fixed;
 	top: 0;
 	left: 0;
@ -272,11 +253,11 @@ if ($i) {
 	color: #ff0;
 	background: rgba(0, 0, 0, 0.5);
 	padding: 4px 5px;
-	font-size: 14px;
+	border-bottom-right-radius: 6px;
 	pointer-events: none;
 	user-select: none;

-	> span {
+	> div {
 		animation: dev-ticker-blink 2s infinite;
 	}
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -189,8 +189,8 @@ importers:
        specifier: 2.0.5
        version: 2.0.5
      body-parser:
-        specifier: 1.20.2
-        version: 1.20.2
+        specifier: 1.20.3
+        version: 1.20.3
      bullmq:
        specifier: 5.10.4
        version: 5.10.4
@ -1202,7 +1202,7 @@ importers:
        version: 7.17.0(eslint@9.8.0)(typescript@5.5.4)
      '@vitest/coverage-v8':
        specifier: 1.6.0
-        version: 1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.77.8)(terser@5.31.3))
+        version: 1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1(bufferutil@4.0.8)(utf-8-validate@6.0.4))(sass@1.77.8)(terser@5.31.3))
      '@vue/runtime-core':
        specifier: 3.4.37
        version: 3.4.37
@ -6132,6 +6132,10 @@ packages:
    resolution: {integrity: sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==}
    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}

+  body-parser@1.20.3:
+    resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==}
+    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
+
  boolbase@1.0.0:
    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}

@ -6258,6 +6262,10 @@ packages:
  call-bind@1.0.2:
    resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}

+  call-bind@1.0.7:
+    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
+    engines: {node: '>= 0.4'}
+
  call-me-maybe@1.0.2:
    resolution: {integrity: sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==}

@ -6847,6 +6855,10 @@ packages:
    resolution: {integrity: sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==}
    engines: {node: '>=10'}

+  define-data-property@1.1.4:
+    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
+    engines: {node: '>= 0.4'}
+
  define-lazy-prop@2.0.0:
    resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
    engines: {node: '>=8'}
@ -7055,6 +7067,14 @@ packages:
    resolution: {integrity: sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==}
    engines: {node: '>= 0.4'}

+  es-define-property@1.0.0:
+    resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
+    engines: {node: '>= 0.4'}
+
+  es-errors@1.3.0:
+    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+    engines: {node: '>= 0.4'}
+
  es-get-iterator@1.1.3:
    resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==}

@ -7615,6 +7635,10 @@ packages:
  get-intrinsic@1.2.1:
    resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==}

+  get-intrinsic@1.2.4:
+    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
+    engines: {node: '>= 0.4'}
+
  get-package-type@0.1.0:
    resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
    engines: {node: '>=8.0.0'}
@ -7813,6 +7837,9 @@ packages:
  has-property-descriptors@1.0.0:
    resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}

+  has-property-descriptors@1.0.2:
+    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
+
  has-proto@1.0.1:
    resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
    engines: {node: '>= 0.4'}
@ -9487,6 +9514,10 @@ packages:
  object-inspect@1.12.3:
    resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}

+  object-inspect@1.13.2:
+    resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==}
+    engines: {node: '>= 0.4'}
+
  object-is@1.1.5:
    resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==}
    engines: {node: '>= 0.4'}
@ -10286,6 +10317,10 @@ packages:
    resolution: {integrity: sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==}
    engines: {node: '>=0.6'}

+  qs@6.13.0:
+    resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
+    engines: {node: '>=0.6'}
+
  qs@6.5.3:
    resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==}
    engines: {node: '>=0.6'}
@ -10692,6 +10727,10 @@ packages:
  set-cookie-parser@2.6.0:
    resolution: {integrity: sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==}

+  set-function-length@1.2.2:
+    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
+    engines: {node: '>= 0.4'}
+
  setimmediate@1.0.5:
    resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}

@ -10735,6 +10774,10 @@ packages:
  side-channel@1.0.4:
    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}

+  side-channel@1.0.6:
+    resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
+    engines: {node: '>= 0.4'}
+
  siginfo@2.0.0:
    resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}

@ -11337,6 +11380,7 @@ packages:

  ts-case-convert@2.0.2:
    resolution: {integrity: sha512-vdKfx1VAdpvEBOBv5OpVu5ZFqRg9HdTI4sYt6qqMeICBeNyXvitrarCnFWNDAki51IKwCyx+ZssY46Q9jH5otA==}
+    bundledDependencies: []

  ts-dedent@2.2.0:
    resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
@ -12678,7 +12722,7 @@ snapshots:
      '@babel/traverse': 7.23.5
      '@babel/types': 7.24.7
      convert-source-map: 2.0.0
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      gensync: 1.0.0-beta.2
      json5: 2.2.3
      semver: 6.3.1
@ -12698,7 +12742,7 @@ snapshots:
      '@babel/traverse': 7.24.7
      '@babel/types': 7.24.7
      convert-source-map: 2.0.0
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      gensync: 1.0.0-beta.2
      json5: 2.2.3
      semver: 6.3.1
@ -12773,7 +12817,7 @@ snapshots:
      '@babel/core': 7.24.7
      '@babel/helper-compilation-targets': 7.24.7
      '@babel/helper-plugin-utils': 7.24.7
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      lodash.debounce: 4.0.8
      resolve: 1.22.8
    transitivePeerDependencies:
@ -13640,7 +13684,7 @@ snapshots:
      '@babel/helper-split-export-declaration': 7.22.6
      '@babel/parser': 7.24.7
      '@babel/types': 7.24.7
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      globals: 11.12.0
    transitivePeerDependencies:
      - supports-color
@ -13655,7 +13699,7 @@ snapshots:
      '@babel/helper-split-export-declaration': 7.24.7
      '@babel/parser': 7.24.7
      '@babel/types': 7.24.7
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      globals: 11.12.0
    transitivePeerDependencies:
      - supports-color
@ -14115,7 +14159,7 @@ snapshots:
  '@eslint/config-array@0.17.1':
    dependencies:
      '@eslint/object-schema': 2.1.4
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      minimatch: 3.1.2
    transitivePeerDependencies:
      - supports-color
@ -14123,7 +14167,7 @@ snapshots:
  '@eslint/eslintrc@3.1.0':
    dependencies:
      ajv: 6.12.6
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      espree: 10.1.0
      globals: 14.0.0
      ignore: 5.3.1
@ -17289,7 +17333,7 @@ snapshots:
      '@typescript-eslint/types': 7.17.0
      '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.5.4)
      '@typescript-eslint/visitor-keys': 7.17.0
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      eslint: 9.8.0
    optionalDependencies:
      typescript: 5.5.4
@ -17315,7 +17359,7 @@ snapshots:
    dependencies:
      '@typescript-eslint/typescript-estree': 6.11.0(typescript@5.3.3)
      '@typescript-eslint/utils': 6.11.0(eslint@9.8.0)(typescript@5.3.3)
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      eslint: 9.8.0
      ts-api-utils: 1.0.1(typescript@5.3.3)
    optionalDependencies:
@ -17327,7 +17371,7 @@ snapshots:
    dependencies:
      '@typescript-eslint/typescript-estree': 7.1.0(typescript@5.3.3)
      '@typescript-eslint/utils': 7.1.0(eslint@9.8.0)(typescript@5.3.3)
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      eslint: 9.8.0
      ts-api-utils: 1.0.1(typescript@5.3.3)
    optionalDependencies:
@ -17339,7 +17383,7 @@ snapshots:
    dependencies:
      '@typescript-eslint/typescript-estree': 7.17.0(typescript@5.5.4)
      '@typescript-eslint/utils': 7.17.0(eslint@9.8.0)(typescript@5.5.4)
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      eslint: 9.8.0
      ts-api-utils: 1.3.0(typescript@5.5.4)
    optionalDependencies:
@ -17357,7 +17401,7 @@ snapshots:
    dependencies:
      '@typescript-eslint/types': 6.11.0
      '@typescript-eslint/visitor-keys': 6.11.0
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      globby: 11.1.0
      is-glob: 4.0.3
      semver: 7.6.0
@ -17371,7 +17415,7 @@ snapshots:
    dependencies:
      '@typescript-eslint/types': 7.1.0
      '@typescript-eslint/visitor-keys': 7.1.0
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      globby: 11.1.0
      is-glob: 4.0.3
      minimatch: 9.0.3
@ -17386,7 +17430,7 @@ snapshots:
    dependencies:
      '@typescript-eslint/types': 7.17.0
      '@typescript-eslint/visitor-keys': 7.17.0
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      globby: 11.1.0
      is-glob: 4.0.3
      minimatch: 9.0.4
@ -17462,7 +17506,7 @@ snapshots:
    dependencies:
      '@ampproject/remapping': 2.2.1
      '@bcoe/v8-coverage': 0.2.3
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      istanbul-lib-coverage: 3.2.2
      istanbul-lib-report: 3.0.1
      istanbul-lib-source-maps: 5.0.4
@ -17477,25 +17521,6 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  '@vitest/coverage-v8@1.6.0(vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.77.8)(terser@5.31.3))':
-    dependencies:
-      '@ampproject/remapping': 2.2.1
-      '@bcoe/v8-coverage': 0.2.3
-      debug: 4.3.5(supports-color@5.5.0)
-      istanbul-lib-coverage: 3.2.2
-      istanbul-lib-report: 3.0.1
-      istanbul-lib-source-maps: 5.0.4
-      istanbul-reports: 3.1.6
-      magic-string: 0.30.10
-      magicast: 0.3.4
-      picocolors: 1.0.1
-      std-env: 3.7.0
-      strip-literal: 2.1.0
-      test-exclude: 6.0.0
-      vitest: 1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.77.8)(terser@5.31.3)
-    transitivePeerDependencies:
-      - supports-color
-
  '@vitest/expect@1.6.0':
    dependencies:
      '@vitest/spy': 1.6.0
@ -17723,13 +17748,13 @@ snapshots:

  agent-base@6.0.2:
    dependencies:
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
    transitivePeerDependencies:
      - supports-color

  agent-base@7.1.0:
    dependencies:
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
    transitivePeerDependencies:
      - supports-color

@ -17987,7 +18012,7 @@ snapshots:
    dependencies:
      '@fastify/error': 3.4.0
      archy: 1.0.0
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      fastq: 1.17.1
    transitivePeerDependencies:
      - supports-color
@ -18169,6 +18194,23 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

+  body-parser@1.20.3:
+    dependencies:
+      bytes: 3.1.2
+      content-type: 1.0.5
+      debug: 2.6.9
+      depd: 2.0.0
+      destroy: 1.2.0
+      http-errors: 2.0.0
+      iconv-lite: 0.4.24
+      on-finished: 2.4.1
+      qs: 6.13.0
+      raw-body: 2.5.2
+      type-is: 1.6.18
+      unpipe: 1.0.0
+    transitivePeerDependencies:
+      - supports-color
+
  boolbase@1.0.0: {}

  bowser@2.11.0: {}
@ -18334,6 +18376,14 @@ snapshots:
      function-bind: 1.1.2
      get-intrinsic: 1.2.1

+  call-bind@1.0.7:
+    dependencies:
+      es-define-property: 1.0.0
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.4
+      set-function-length: 1.2.2
+
  call-me-maybe@1.0.2: {}

  callsites@3.1.0: {}
@ -19006,6 +19056,12 @@ snapshots:

  defer-to-connect@2.0.1: {}

+  define-data-property@1.1.4:
+    dependencies:
+      es-define-property: 1.0.0
+      es-errors: 1.3.0
+      gopd: 1.0.1
+
  define-lazy-prop@2.0.0: {}

  define-properties@1.2.0:
@ -19041,7 +19097,7 @@ snapshots:
  detect-port@1.5.1:
    dependencies:
      address: 1.2.2
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
    transitivePeerDependencies:
      - supports-color

@ -19212,6 +19268,12 @@ snapshots:
      unbox-primitive: 1.0.2
      which-typed-array: 1.1.11

+  es-define-property@1.0.0:
+    dependencies:
+      get-intrinsic: 1.2.4
+
+  es-errors@1.3.0: {}
+
  es-get-iterator@1.1.3:
    dependencies:
      call-bind: 1.0.2
@ -19254,7 +19316,7 @@ snapshots:

  esbuild-register@3.5.0(esbuild@0.19.11):
    dependencies:
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      esbuild: 0.19.11
    transitivePeerDependencies:
      - supports-color
@ -19484,7 +19546,7 @@ snapshots:
      ajv: 6.12.6
      chalk: 4.1.2
      cross-spawn: 7.0.3
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      escape-string-regexp: 4.0.0
      eslint-scope: 8.0.2
      eslint-visitor-keys: 4.0.0
@ -19937,7 +19999,7 @@ snapshots:

  follow-redirects@1.15.2(debug@4.3.5):
    optionalDependencies:
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)

  for-each@0.3.3:
    dependencies:
@ -20056,6 +20118,14 @@ snapshots:
      has-proto: 1.0.1
      has-symbols: 1.0.3

+  get-intrinsic@1.2.4:
+    dependencies:
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      has-proto: 1.0.1
+      has-symbols: 1.0.3
+      hasown: 2.0.0
+
  get-package-type@0.1.0: {}

  get-pixels-frame-info-update@3.3.2:
@ -20221,7 +20291,7 @@ snapshots:

  gopd@1.0.1:
    dependencies:
-      get-intrinsic: 1.2.1
+      get-intrinsic: 1.2.4

  got@11.8.5:
    dependencies:
@ -20318,6 +20388,10 @@ snapshots:
    dependencies:
      get-intrinsic: 1.2.1

+  has-property-descriptors@1.0.2:
+    dependencies:
+      es-define-property: 1.0.0
+
  has-proto@1.0.1: {}

  has-symbols@1.0.3: {}
@ -20403,7 +20477,7 @@ snapshots:
  http-proxy-agent@7.0.2:
    dependencies:
      agent-base: 7.1.0
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
    transitivePeerDependencies:
      - supports-color

@ -20442,28 +20516,28 @@ snapshots:
  https-proxy-agent@5.0.1:
    dependencies:
      agent-base: 6.0.2
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
    transitivePeerDependencies:
      - supports-color

  https-proxy-agent@7.0.2:
    dependencies:
      agent-base: 7.1.0
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
    transitivePeerDependencies:
      - supports-color

  https-proxy-agent@7.0.4:
    dependencies:
      agent-base: 7.1.0
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
    transitivePeerDependencies:
      - supports-color

  https-proxy-agent@7.0.5:
    dependencies:
      agent-base: 7.1.0
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
    transitivePeerDependencies:
      - supports-color

@ -20811,7 +20885,7 @@ snapshots:

  istanbul-lib-source-maps@4.0.1:
    dependencies:
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      istanbul-lib-coverage: 3.2.2
      source-map: 0.6.1
    transitivePeerDependencies:
@ -20820,7 +20894,7 @@ snapshots:
  istanbul-lib-source-maps@5.0.4:
    dependencies:
      '@jridgewell/trace-mapping': 0.3.25
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      istanbul-lib-coverage: 3.2.2
    transitivePeerDependencies:
      - supports-color
@ -21244,35 +21318,6 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  jsdom@24.1.1:
-    dependencies:
-      cssstyle: 4.0.1
-      data-urls: 5.0.0
-      decimal.js: 10.4.3
-      form-data: 4.0.0
-      html-encoding-sniffer: 4.0.0
-      http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.5
-      is-potential-custom-element-name: 1.0.1
-      nwsapi: 2.2.12
-      parse5: 7.1.2
-      rrweb-cssom: 0.7.1
-      saxes: 6.0.0
-      symbol-tree: 3.2.4
-      tough-cookie: 4.1.4
-      w3c-xmlserializer: 5.0.0
-      webidl-conversions: 7.0.0
-      whatwg-encoding: 3.1.1
-      whatwg-mimetype: 4.0.0
-      whatwg-url: 14.0.0
-      ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
-      xml-name-validator: 5.0.0
-    transitivePeerDependencies:
-      - bufferutil
-      - supports-color
-      - utf-8-validate
-    optional: true
-
  jsdom@24.1.1(bufferutil@4.0.7)(utf-8-validate@6.0.3):
    dependencies:
      cssstyle: 4.0.1
@ -21958,7 +22003,7 @@ snapshots:
  micromark@4.0.0:
    dependencies:
      '@types/debug': 4.1.12
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      decode-named-character-reference: 1.0.2
      devlop: 1.1.0
      micromark-core-commonmark: 2.0.0
@ -22433,6 +22478,8 @@ snapshots:

  object-inspect@1.12.3: {}

+  object-inspect@1.13.2: {}
+
  object-is@1.1.5:
    dependencies:
      call-bind: 1.0.2
@ -23219,6 +23266,10 @@ snapshots:
    dependencies:
      side-channel: 1.0.4

+  qs@6.13.0:
+    dependencies:
+      side-channel: 1.0.6
+
  qs@6.5.3: {}

  querystringify@2.2.0: {}
@ -23515,7 +23566,7 @@ snapshots:

  require-in-the-middle@7.3.0:
    dependencies:
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      module-details-from-path: 1.0.3
      resolve: 1.22.8
    transitivePeerDependencies:
@ -23722,6 +23773,15 @@ snapshots:

  set-cookie-parser@2.6.0: {}

+  set-function-length@1.2.2:
+    dependencies:
+      define-data-property: 1.1.4
+      es-errors: 1.3.0
+      function-bind: 1.1.2
+      get-intrinsic: 1.2.4
+      gopd: 1.0.1
+      has-property-descriptors: 1.0.2
+
  setimmediate@1.0.5: {}

  setprototypeof@1.2.0: {}
@ -23786,6 +23846,13 @@ snapshots:
      get-intrinsic: 1.2.1
      object-inspect: 1.12.3

+  side-channel@1.0.6:
+    dependencies:
+      call-bind: 1.0.7
+      es-errors: 1.3.0
+      get-intrinsic: 1.2.4
+      object-inspect: 1.13.2
+
  siginfo@2.0.0: {}

  signal-exit@3.0.7: {}
@ -23796,7 +23863,7 @@ snapshots:
    dependencies:
      '@hapi/hoek': 11.0.4
      '@hapi/wreck': 18.0.1
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      joi: 17.11.0
    transitivePeerDependencies:
      - supports-color
@ -23896,7 +23963,7 @@ snapshots:
  socks-proxy-agent@8.0.2:
    dependencies:
      agent-base: 7.1.0
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      socks: 2.7.1
    transitivePeerDependencies:
      - supports-color
@ -23991,7 +24058,7 @@ snapshots:
      arg: 5.0.2
      bluebird: 3.7.2
      check-more-types: 2.24.0
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      execa: 5.1.1
      lazy-ass: 1.6.0
      ps-tree: 1.2.0
@ -24732,7 +24799,7 @@ snapshots:
  vite-node@1.6.0(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3):
    dependencies:
      cac: 6.7.14
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      pathe: 1.1.2
      picocolors: 1.0.1
      vite: 5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
@ -24801,41 +24868,6 @@ snapshots:
      - supports-color
      - terser

-  vitest@1.6.0(@types/node@20.14.12)(happy-dom@10.0.3)(jsdom@24.1.1)(sass@1.77.8)(terser@5.31.3):
-    dependencies:
-      '@vitest/expect': 1.6.0
-      '@vitest/runner': 1.6.0
-      '@vitest/snapshot': 1.6.0
-      '@vitest/spy': 1.6.0
-      '@vitest/utils': 1.6.0
-      acorn-walk: 8.3.2
-      chai: 4.3.10
-      debug: 4.3.4(supports-color@5.5.0)
-      execa: 8.0.1
-      local-pkg: 0.5.0
-      magic-string: 0.30.10
-      pathe: 1.1.2
-      picocolors: 1.0.0
-      std-env: 3.7.0
-      strip-literal: 2.1.0
-      tinybench: 2.6.0
-      tinypool: 0.8.4
-      vite: 5.3.5(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
-      vite-node: 1.6.0(@types/node@20.14.12)(sass@1.77.8)(terser@5.31.3)
-      why-is-node-running: 2.2.2
-    optionalDependencies:
-      '@types/node': 20.14.12
-      happy-dom: 10.0.3
-      jsdom: 24.1.1
-    transitivePeerDependencies:
-      - less
-      - lightningcss
-      - sass
-      - stylus
-      - sugarss
-      - supports-color
-      - terser
-
  void-elements@3.1.0: {}

  vscode-jsonrpc@8.2.0: {}
@ -24899,7 +24931,7 @@ snapshots:

  vue-eslint-parser@9.4.3(eslint@9.8.0):
    dependencies:
-      debug: 4.3.5(supports-color@5.5.0)
+      debug: 4.3.5(supports-color@8.1.1)
      eslint: 9.8.0
      eslint-scope: 7.2.2
      eslint-visitor-keys: 3.4.3
Author	SHA1	Message	Date
かっこかり	379c7947a1	Merge `c8421194b8` into `7d7a12d7d6`	2024-09-15 22:04:24 +09:00
かっこかり	7d7a12d7d6	fix(deps): broken lockfile (#14556 )	2024-09-15 21:57:22 +09:00
dependabot[bot]	887c709647	chore(deps): bump body-parser from 1.20.2 to 1.20.3 in /packages/backend (#14550 ) Bumps [body-parser](https://github.com/expressjs/body-parser) from 1.20.2 to 1.20.3. - [Release notes](https://github.com/expressjs/body-parser/releases) - [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md) - [Commits](https://github.com/expressjs/body-parser/compare/1.20.2...1.20.3) --- updated-dependencies: - dependency-name: body-parser dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-09-15 20:54:26 +09:00
かっこかり	c8421194b8	Merge branch 'develop' into fix-14452	2024-09-15 17:13:53 +09:00
かっこかり	1d54c97781	Merge branch 'develop' into fix-14452	2024-08-31 12:59:51 +09:00
かっこかり	9db8a64665	Merge branch 'develop' into fix-14452	2024-08-24 19:11:41 +09:00
kakkokari-gtyih	d9150053f4	🎨	2024-08-22 13:48:10 +09:00
kakkokari-gtyih	e4788ac014	🎨	2024-08-22 13:47:51 +09:00
kakkokari-gtyih	50693b8be7	rename	2024-08-22 13:45:10 +09:00
kakkokari-gtyih	f9945d1abf	botアカウントのメッセージを左上に	2024-08-22 13:44:13 +09:00
kakkokari-gtyih	faefe39a4b	Update Changelog	2024-08-22 13:36:37 +09:00
kakkokari-gtyih	74ecc4ec42	fix(frontend): 二段階認証の設定ダイアログはbotWarnよりも上に表示するように	2024-08-22 13:35:19 +09:00