johan/FoundKey
1
0
Fork 0
forked from FoundKeyGang/FoundKey
Code Issues Pull requests Packages Projects Releases Wiki Activity
20692 commits 3 branches 2 tags 106 MiB
Commit graph

1167 commits

Author SHA1 Message Date
Johann150 5ca93223c6
fix: remove even more ad stuff 2022-07-14 08:29:30 +02:00
Johann150 563b4a6bd7
remove unused dependency random-seed 
also remove the respective type definitions
it seems this dependency is only used in the backend
 2022-07-14 00:31:58 +02:00
Johann150 cc123266f0
remove unused querystring dependency 2022-07-14 00:21:42 +02:00
Johann150 e9b11231ff detect outdated ID generation configuration 2022-07-13 21:30:21 +00:00
Johann150 f476d149a6 remove alternative ID generation 
Although these are configurable, there seems to be no benefit of being
able to configure these. The expected use of configuration methods other
than "aid" is expected to be low.
 2022-07-13 21:30:21 +00:00
Johann150 29284eca75
remove more ads stuff from client 2022-07-13 23:20:18 +02:00
Johann150 a717fcc70c
remove ads from database 2022-07-13 23:20:18 +02:00
Johann150 402d4e866e
remove ads from API endpoints 2022-07-13 23:20:17 +02:00
Johann150 79ec9641d2
remove ads from client 2022-07-13 23:19:50 +02:00
Johann150 0e3a9d1e0d
refactor: use nullish coalescing / optional chaining 
This seems to be more readable than ternary expressions.
 2022-07-13 19:08:22 +02:00
Johann150 67450815cd
fix(client): wrongly collapsed posts 2022-07-13 19:06:27 +02:00
syuilo facb12164e
chore(client): tweak style 2022-07-13 17:38:11 +02:00
syuilo 8be9d15e81
chore(client): tweak ui 2022-07-13 17:37:57 +02:00
syuilo b003e24af4
chore(client): tweak ui 
cherry-picked from ed41d542bb8894f2eaca42cd7cc08246089e0490
 2022-07-13 17:35:25 +02:00
syuilo 09e0446708
chore(client): tweak ui 2022-07-13 17:29:20 +02:00
syuilo 6a7e016a8e
fix(server): cannot show users 2022-07-13 17:16:51 +02:00
syuilo f95f74f96e
allow non-mods to show instance-info page 2022-07-13 16:16:35 +02:00
syuilo f5d87fbc9e
refactor range input to composition api 2022-07-13 16:03:58 +02:00
syuilo e47af45407
perf(client): improve range control performance 2022-07-13 16:03:30 +02:00
syuilo 896b3d817e
make client component caching configurable 
part of bffe6fb9bfa1fe61eab4f03bd318c010644d7afb
 2022-07-13 15:58:53 +02:00
syuilo 303ce42024
refactor range input component 
part of bffe6fb9bfa1fe61eab4f03bd318c010644d7afb
 2022-07-13 15:58:01 +02:00
syuilo 49a98b1eb0
fix lints 
part of bffe6fb9bfa1fe61eab4f03bd318c010644d7afb
 2022-07-13 15:40:55 +02:00
syuilo 7e1ce04db8
remove FormGroup component 
part of bffe6fb9bfa1fe61eab4f03bd318c010644d7afb
 2022-07-13 15:36:00 +02:00
Johann150 95a8a937e2
fix client router catchall 
fixes #8903
 2022-07-13 13:28:03 +02:00
Johann150 29ef7c85d0
fix 'assignment to const' error 2022-07-13 13:28:02 +02:00
syuilo 5e0f9699ab
Update .eslintrc.js 2022-07-13 13:26:48 +02:00
Johann150 40eb861aff
Prevent access to user pages when not logged in [v2] (#8904) 
* do not throw error when navigating

* enhance: add loginRequired to router

This allows client pages to require logging in before displaying the
page, useful for example for user settings pages.

* add login requirements

Co-authored-by: Andreas Nedbal <git@pixelde.su>
 2022-07-13 13:24:42 +02:00
syuilo b361069610
chore(client): fix type def 2022-07-13 13:24:42 +02:00
syuilo 761d5347d2
perf(client): remove needless reactivity 2022-07-13 13:24:42 +02:00
syuilo 03ea6763e1
enhance(client): improve router 
Fix #8902
 2022-07-13 13:24:41 +02:00
syuilo 9ec98e66f9
chore(client): tweak client 2022-07-13 13:24:40 +02:00
syuilo 9d8a9f22c1
chore(client): tweak style 2022-07-13 13:22:28 +02:00
syuilo a0a64eb0ff
enhance(client): add users tab to instance-info 2022-07-13 13:21:56 +02:00
syuilo bb7d080a60
refactor(client): remove invalid computed 2022-07-13 12:59:07 +02:00
syuilo 6513e72a3e
fix(client): 非モデレーターがインスタンス情報ページを表示できない問題を修正 2022-07-13 12:59:06 +02:00
syuilo 435e45351c
chore(client): tweak style 2022-07-13 12:59:06 +02:00
syuilo cc835a0f81
chore(client): tweak style 2022-07-13 12:58:17 +02:00
syuilo e4fefa42c5
chore(client): tweak style 2022-07-13 12:58:16 +02:00
syuilo 9ec020015d
chore(client): fix #8858 2022-07-13 12:58:16 +02:00
syuilo b2d9b059b6
chore(client): tweak style 2022-07-13 12:58:16 +02:00
syuilo b454142083
chore(client): refactor and style tweaks 2022-07-13 12:58:15 +02:00
syuilo df3ff4d06e
refactor(client): use setup syntax 2022-07-13 12:56:22 +02:00
syuilo 095a99f3f7
chore(client): fix type def 2022-07-13 12:56:08 +02:00
syuilo a7cc45fa98
fix(api): fix instance schema 2022-07-13 12:55:43 +02:00
syuilo 681a650b01
fix(client): fix chart tooltip rendering 2022-07-13 12:55:23 +02:00
syuilo 3579ebf03d
feat(api): add federation/stats endpoint 2022-07-13 12:55:09 +02:00
syuilo 591a0bf1b3
fix(api): add missing themeColor property of instance 2022-07-13 12:54:56 +02:00
syuilo cfb7b70cde
lint fix 2022-07-13 12:54:44 +02:00
syuilo fbe210a39d
feat: make possible to delete an account by admin 
Resolve #8830
 2022-07-13 12:52:45 +02:00
Johann150 9b008b9684
refactor: remove duplicate code (#8895) 2022-07-13 12:52:45 +02:00
syuilo 5e7b7d4d12
chore(client): tweak client 2022-07-13 12:52:43 +02:00
MeiMei 5ac94cc268
fix broken mocha tests v2 
see also https://github.com/misskey-dev/misskey/pull/8892
 2022-07-13 12:49:58 +02:00
syuilo 45b36e8059
fix #8894 2022-07-13 12:45:24 +02:00
syuilo 570c08b976
chore(client): tweak ui 🎨 2022-07-13 12:45:24 +02:00
syuilo 78ddaed2a1
chore(client): tweak ui 🎨 2022-07-13 12:45:23 +02:00
syuilo d6146d9102
chore(client): fix type 2022-07-13 12:43:26 +02:00
syuilo c64b1ceb83
chore(client): tweak client 2022-07-13 12:43:15 +02:00
syuilo 3978e3a4d3
chore(client): tweak client 2022-07-13 12:42:16 +02:00
tamaina f109de9ebb
enhance(client): Enhance boot error display (#8879) 
* Change boot error message

* fix

* ✌️

* fix
 2022-07-13 12:37:34 +02:00
syuilo 707754fece
refactor(client): extract interval logic to a composable function 
Also, I fixed the `onUnmounted` call in `onMounted` and so on.
 2022-07-13 12:34:33 +02:00
Johann150 17c752811f
refactor: notification setting window composition API (#8860) 
* refactor: notification setting window composition API

* fix lint vue/require-valid-default-prop

* fix type

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2022-07-13 11:23:16 +02:00
dependabot[bot] b269ab709b
chore(deps): bump jsrsasign from 10.5.24 to 10.5.25 in /packages/backend (#8889) 
Bumps [jsrsasign](https://github.com/kjur/jsrsasign) from 10.5.24 to 10.5.25.
- [Release notes](https://github.com/kjur/jsrsasign/releases)
- [Changelog](https://github.com/kjur/jsrsasign/blob/master/ChangeLog.txt)
- [Commits](https://github.com/kjur/jsrsasign/compare/10.5.24...10.5.25)

---
updated-dependencies:
- dependency-name: jsrsasign
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-07-13 11:23:15 +02:00
syuilo 4d8d9936f1
feat: allow GET for some endpoints 
Resolve #8263
 2022-07-13 11:23:15 +02:00
syuilo 4dee440bbf
refactor(client): extract tooltip logic of chart 2022-07-13 11:23:15 +02:00
Andy 631c3bac58
fix(client): only enable hotkeys for logged in users (#8793) 
* fix(client): only enable hotkeys for logged in users

* fix(client): keep theme and search hotkeys for logged out users
 2022-07-13 11:23:15 +02:00
Johann150 e45624855f
fix: always respect instance mutes (#8854) 
* fix: muted user query also checks instances

This way it can be ensured that the instance mute is used everywhere it
is required without checking the whole codebase again. Muted users and
muted instances should be used together anyways.

* fix lint
 2022-07-13 11:23:14 +02:00
dependabot[bot] 30aa91bb94
chore(deps): bump jpeg-js from 0.4.1 to 0.4.4 in /packages/backend (#8843) 
Bumps [jpeg-js](https://github.com/eugeneware/jpeg-js) from 0.4.1 to 0.4.4.
- [Release notes](https://github.com/eugeneware/jpeg-js/releases)
- [Commits](https://github.com/eugeneware/jpeg-js/compare/v0.4.1...v0.4.4)

---
updated-dependencies:
- dependency-name: jpeg-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-07-13 11:23:14 +02:00
dependabot[bot] 893ed309bf
chore(deps): bump undici from 5.4.0 to 5.5.1 in /packages/backend (#8842) 
Bumps [undici](https://github.com/nodejs/undici) from 5.4.0 to 5.5.1.
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v5.4.0...v5.5.1)

---
updated-dependencies:
- dependency-name: undici
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-07-13 11:23:14 +02:00
syuilo b03071e019
refactor MkKeyValue to composition API 2022-07-13 11:23:13 +02:00
syuilo 9914db3722
open fewer links with "window" behavior 2022-07-13 11:23:13 +02:00
syuilo 2f54fdbcd0
fix admin per user file list 2022-07-13 11:23:13 +02:00
syuilo 6b1a5baf17
refactor: remove unused import 2022-07-13 11:23:04 +02:00
syuilo f30214b006
feat(admin): show list of files of a user 2022-07-13 10:44:48 +02:00
syuilo 147a798a88
fix lints in signup component 2022-07-13 10:44:04 +02:00
syuilo 57f9f787d1
fix(client): logout functionality 2022-07-13 10:42:48 +02:00
Johann150 912c19222e
fix lints 2022-07-13 10:42:16 +02:00
syuilo c5218e5bc0
chore(client): tweak mini-chart rendering 2022-07-13 10:42:07 +02:00
MeiMei d4ac71593b
enhance: use ioredis everywhere, fix IPv6 support for redis 
fixes https://github.com/misskey-dev/misskey/pull/8869
see also https://github.com/misskey-dev/misskey/pull/8869

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-07-13 10:40:39 +02:00
Johann150 b4a00d72b6
fix(client): ask to log in for poll vote (#8883) 2022-07-13 10:26:06 +02:00
syuilo 56bad9a6c0
client: use foldable groups in settings 2022-07-13 10:25:22 +02:00
syuilo f1ab034379
refactor mention component to use composition api 2022-07-13 10:20:13 +02:00
tamaina 3ab54fd534
fix(nirax): Normalize path (#8877) 2022-07-13 10:19:56 +02:00
syuilo 252ab3d852
fix onBeforeRouteLeave 
fixes https://github.com/misskey-dev/misskey/issues/8861
 2022-07-13 10:18:12 +02:00
syuilo c781dd445f
chore(client): tweak ui 2022-07-13 10:17:10 +02:00
syuilo 272b81f6e8
lint fixes 2022-07-13 10:16:57 +02:00
Johann150 0cd330afe4
refactor: simplify ap/show with DbResolver (#8838) 
Using the existing code in DbResolver we can avoid separate code for
parsing the URIs in this endpoint.

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-07-13 10:16:38 +02:00
Johann150 00fe1d341b
enhance: word mute checks CW (#8873) 2022-07-13 10:16:38 +02:00
syuilo d01c38c8ff
chore(client): tweak client design 2022-07-13 10:16:37 +02:00
Johann150 d5d3935cfd
enable more lints 
cherry-picked from 2a2020b79786b25668bfcfed19366a26c840e508
 2022-07-13 10:15:24 +02:00
syuilo 31da7bc88a
enhance(client): tweak ui 2022-07-13 10:14:17 +02:00
syuilo 63cf2756d8
refactor(client): use composition api 2022-07-13 10:03:09 +02:00
syuilo 57df232b07
refactor(client): refactor header tab handling 2022-07-13 10:03:08 +02:00
syuilo badc53ed38
tweak client 2022-07-13 09:59:47 +02:00
syuilo 1f1cbc3fa6
tweak client: modify instance information panel 2022-07-13 09:59:08 +02:00
yzhe819 9111d238c1
chore: fix lint errors (#8981) 2022-07-13 00:45:57 +02:00
Johann150 749477c199
use predefined noteVisibilities constant 2022-07-12 14:45:36 +02:00
Johann150 568f14070d
remove unused logger 2022-07-12 14:44:19 +02:00
Johann150 ba0236700d
chore: remove unused imports 2022-07-12 14:41:10 +02:00
Johann150 3317e21b39
chore: remove unused imports 2022-07-11 15:45:12 +02:00
Johann150 dc6884898d
chore: remove unused imports 2022-07-11 15:31:09 +02:00
Johann150 03aa41664f
chore: remove unused columns 
The columns "mascotImageUrl" and "errorImageUrl" are unused in the
web client. It is unlikely that they are being used elsewhere.
 2022-07-11 12:49:39 +02:00
Johann150 c38cce9c45
remove 'search with google' localisation 2022-07-11 12:37:32 +02:00
Johann150 d0b5981a0b
Revert "Revert option to collapse long notes (Misskey PR 8561)" 
This reverts commit 71150f21cd and reinstates
the option to collapse long notes again after they were expanded.

It is unclear why this commit was reverted in the first place, syuilo
claimed there to be issues with URL previews and attached images. These
problems could not be reproduced when testing.
 2022-07-10 10:42:27 +02:00
Johann150 10970f2d52
read theme color from nodeinfo 
Prefer to read the theme color from the nodeinfo since it is more
performant than performing selector search on a DOM.
 2022-07-09 22:52:42 +02:00
Johann150 f873f4f0b9
provide theme color in nodeinfo metadata 2022-07-09 22:52:37 +02:00
syuilo dcf70ebbec fix(client): moderators cannot view instance-info page 2022-07-09 06:11:04 -04:00
syuilo 3539a9537e enhance(client): show warning in control panel when there is an unresolved abuse report 2022-07-09 06:09:14 -04:00
syuilo 82f506e62f refactor(client): use composition api 2022-07-09 06:02:01 -04:00
syuilo a1e3eada2e fix(server): faviconUrl of federated instance is missing 2022-07-09 06:01:35 -04:00
syuilo 61c770d634 chore: add comments 2022-07-09 06:00:30 -04:00
syuilo 2050708902 tweak client 
Fix #8856
 2022-07-09 06:00:12 -04:00
Johann150 7f1ae87587 fix: block button in federation panel (#8855) 2022-07-09 05:57:17 -04:00
syuilo 64a0a680e1 tweak client 2022-07-09 05:57:00 -04:00
syuilo 19cb1991b0 fix client 2022-07-09 05:56:50 -04:00
syuilo cb87d03fe9 refactor(client): Refine routing (#8846) 2022-07-09 05:56:36 -04:00
tamaina 18fea6a36d refactor: チャットルームをComposition API化 (#8850) 
* pick form

* pick message

* pick room

* fix lint

* fix scroll?

* fix scroll.ts

* fix directives/sticky-container

* update global/sticky-container.vue

* fix, 🎨

* test.1
 2022-07-09 05:53:45 -04:00
tamaina 37581ea831 feat: Add Badge Image to Push Notification (#8012) 
* fix

* nanka iroiro

* wip

* wip

* fix lint

* fix loginId

* fix

* refactor

* refactor

* remove follow action

* clean up

* Revert "remove follow action"

This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a.

* Revert "clean up"

This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.

* remove fetch specification

* renoteの条件追加

* apiFetch => cli

* bypass fetch?

* fix

* refactor: use path alias

* temp: add submodule

* remove submodule

* enhane: unison-reloadに指定したパスに移動できるように

* null

* null

* feat: ログインするアカウントのIDをクエリ文字列で指定する機能

* null

* await?

* rename

* rename

* Update read.ts

* merge

* get-note-summary

* fix

* swパッケージに

* add missing packages

* fix getNoteSummary

* add webpack-cli

* ✌️

* remove plugins

* sw-inject分離したがテストしてない

* fix notification.vue

* remove a blank line

* disconnect intersection observer

* disconnect2

* fix notification.vue

* remove a blank line

* disconnect intersection observer

* disconnect2

* fix

* ✌️

* clean up config

* typesを戻した

* backend/src/web/index.ts

* notification-badges

* add scripts

* change create-notification.ts

* Update packages/client/src/components/notification.vue

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* disconnect

* oops

* Failed to load the script unexpectedly回避
sw.jsとlib.tsを分離してみた

* truncate notification

* Update packages/client/src/ui/_common_/common.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* clean up

* clean up

* refactor

* キャッシュ対策

* Truncate push notification message

* fix

* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正

* components/drive-file-thumbnail.vue

* components/drive-select-dialog.vue

* components/drive-window.vue

* merge

* fix

* Service Workerのビルドにesbuildを使うようにする

* return createEmptyNotification()

* fix

* fix

* i18n.ts

* update

* ✌️

* remove ts-loader

* fix

* fix

* enhance: Service Workerを常に登録するように

* pollEnded

* pollEnded

* URLをsw.jsに戻す

* clean up

* fix lint

* changelog

* alpha-test

* also with twemoji

* add isMimeImage function

* catch

* Colour => Color

* char2file => char2filePath

* Update autocomplete.vue

* remove clone?

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-07-09 05:52:01 -04:00
Andy 231cd63ce2 Refactor page-editor elements to use Composition API (#8721) 
* refactor(client): refactor page-editor elements to use Composition API

* Apply review suggestions from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-07-09 05:44:40 -04:00
syuilo a0deecfdee fix typo 2022-07-09 05:44:03 -04:00
futchitwo 42e3ddae91 Improve: unclip (#8823) 
* Refactor clip page to use Composition API

* Refactor clip page

* Refactor clip page

* Refactor clip page

* Improve: unclip

* Fix unclip

* Fix unclip

* chore: better type and name

* Fix

* Fix clipPage vue provider

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-07-09 05:43:48 -04:00
futchitwo 72c3d16c29 Refactor clip page to Composition API (#8822) 
* Refactor clip page to use Composition API

* Refactor clip page

* Refactor clip page

* Refactor clip page
 2022-07-09 05:43:11 -04:00
MeiMei a8f7514d0d enhance: Improve player detection in URL preview (#8849) 
* enhance: Improve player detection in URL preview

* CHANGELOG
 2022-07-09 05:42:36 -04:00
syuilo 75e8b2bf25 enhance(client): improve file moderation ui 2022-07-09 05:41:38 -04:00
syuilo 22ded9e3f8 chore(client): tweak range control design 2022-07-09 05:39:07 -04:00
Johann150 9a1e6bf10f fix: render empty note content correctly 
Instead of coercing to `null`, coercing to an empty string should simplify handling.
 2022-07-09 05:38:38 -04:00
Johann150 bc9c79b9ef fix: correctly render note text 
Fix a regression from #8787 that was previously fixed in #8440.
 2022-07-09 05:35:27 -04:00
syuilo 9d2622da99 enhance(client): improve files page of control panel 2022-07-09 05:35:08 -04:00
MeiMei 8f2aaba944 fix: GenerateVideoThumbnail (#8825) 
* fix: GenerateVideoThumbnail

* CHANGELOG

* fix cleanup

* Revert "fix cleanup"

This reverts commit d54cf8262ac01a3deb6b8dd7689ec144d4d09ea8.
 2022-07-09 05:32:02 -04:00
Johann150 95d59b3947 fix: tmpdir cleanup removes contained files (#8826) 2022-07-09 05:30:04 -04:00
tamaina 4edb67667a fix: add limit to i/notifications (#8836) 
* fix: add limit to i/notifications

* ms

* remove ms
 2022-07-09 05:29:13 -04:00
Johann150 22420245a5 fix(docs): use correct description property 2022-07-09 05:27:31 -04:00
Johann150 052b45d2b4 fix: remove unused parameter 2022-07-09 05:24:50 -04:00
syuilo 9fcc0e460c lint fixes 2022-07-09 05:23:42 -04:00
Johann150 963758d8ec
fix: missing file name parameter (#8820) 2022-06-13 00:25:06 +09:00
futchitwo b15dbb818f
Fix(client): fix wrong gallery page component (#8815) 2022-06-12 19:53:21 +09:00
syuilo 4e89d41f04 lint 2022-06-12 19:50:47 +09:00
syuilo a8e7b1a303 fix(client): デッキでウィジェットの情報が保存されない問題を修正 
Fix #8818
 2022-06-12 19:50:43 +09:00
tamaina 11a6bd890c
fix: some fixes of multiple notification read (#8819) 
* fix: limit multiple notification read

* fix

* fix
 2022-06-12 19:28:13 +09:00
syuilo ca9753f2e7 Update cropper-dialog.vue 2022-06-11 18:48:59 +09:00
syuilo 7894804eed Update cropper-dialog.vue 2022-06-11 18:47:58 +09:00
syuilo 99eb971c3d Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-11 16:46:23 +09:00
syuilo 410210cf6f fix(client): オブジェクトストレージを使用していると画像のクロップができない 2022-06-11 16:46:21 +09:00
Johann150 7db09103e7
chore: synchronize visibility checks (#8687) 
* reuse single meId parameter

* unify code style

Use template string to avoid having to use escaped quote marks.

* fix: follower only notes are visible to mentioned users

This synchronizes the visibility rules with the Notes.isVisibleForMe
method from packages/backend/src/models/repositories/note.ts

* add comment
 2022-06-11 16:14:44 +09:00
syuilo ecb3c43520
feat: image cropping (#8808) 
* wip

* wip

* wip
 2022-06-11 15:45:44 +09:00
syuilo ec6b418a23 update deps 2022-06-10 15:06:42 +09:00
syuilo b9c64053e8 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-10 14:56:07 +09:00
syuilo f5ba73e7c8 chore: tweak logo 2022-06-10 14:56:05 +09:00
Johann150 5e29528ad4
chore: fix some lints automatically (#8788) 
* chore: fix some lints automatically

Fixed lints that were automatically fixable with `eslint --fix`.

* fix type

* workaround for empty interface lint
 2022-06-10 14:36:55 +09:00
Johann150 a683a7092d
enhance(federation): use ActivityPub defined property in favour of proprietary property. (#8787) 
* add activitypub `source` property

* parse MFM from new `source` attribute
 2022-06-10 14:31:58 +09:00
Johann150 42f48ffea2
refactor: follow button (#8789) 
* fix: display cancelling follow request

* remove unnecessary branch

The executed code is the same as in the else branch so this special
condition is unnecessary.

* remove code duplication

Use the same callback as later for updating these variables.

* use $ref sugar

* remove unused import

Co-authored-by: blackskye-sx <saul.newman@gmail.com>
 2022-06-10 14:29:46 +09:00
Johann150 78df3dc484
enhance: improve documentation for /users/ endpoints (#8790) 
* docs: category & description for reset password

* docs: category & description for testing

* docs: descriptions for groups endpoints

* docs: descriptions for drive file endpoints

* docs: descriptions for sw endpoints

* docs: descriptions for user list endpoints

* docs: descriptions & result type for gallery posts

* docs: descriptions & result type for user endpoints

* docs: add return type for stats
 2022-06-10 14:25:20 +09:00
Andy 7dde0b1362
fix(client): render quote renote CWs as MFM (#8792) 
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-06-09 23:45:16 +09:00
Johann150 b66e73aed5
fix: use autocomplete=new-password (#8797) 2022-06-09 23:42:00 +09:00
Johann150 eec7a0a1f6
properly display alt text for videos (#8802) 
The alt text is already properly federated and given by the API,
it is just not displayed properly by the client.
 2022-06-09 23:35:58 +09:00
Johann150 4800dd06e5
fix: try to prevent autocomplete for emoji search (#8798) 2022-06-08 20:20:37 +09:00
Johann150 0fa2a52fac
refactor: use awaitAll to reduce duplication (#8791) 
* refactor: use awaitAll to reduce duplication

* fix lint

* fix typo
 2022-06-08 17:59:48 +09:00
syuilo d17298d3b5 fix(test): make chart tests working 2022-06-05 20:37:24 +09:00
syuilo 09b749eb97 Update .mocharc.json 2022-06-05 19:46:52 +09:00
syuilo 5fb3f8a116 chore: lint fixes 2022-06-05 12:26:36 +09:00
syuilo adf3190859 chore(client): fix menu item style 2022-06-05 12:23:57 +09:00
syuilo 89419c05b2 use node 16 2022-06-04 17:26:56 +09:00
syuilo abcd5bc951 update summaly 2022-06-04 17:24:41 +09:00
syuilo 71150f21cd Revert "feat: option to collapse long notes (#8561)" 
This reverts commit e675ffcf38.
 2022-06-04 15:23:53 +09:00
syuilo 11afdf7e24 fix bug 2022-06-04 15:15:44 +09:00
syuilo 702edfd3d3 fix test 2022-06-04 14:25:30 +09:00
Balazs Nadasdi e675ffcf38
feat: option to collapse long notes (#8561) 
* feat: option to collapse long notes

Closes #8559

* do not collapse if cw exists

* use '閉じる' to close / show less.

* make it sticky

* Change style of the Show less button
 2022-06-04 13:57:09 +09:00
Johann150 32dff28460
fix: add id for activitypub follows (#8689) 
* add id for activitypub follows

* fix lint

* fix: follower must be local, followee must be remote

Misskey will only use ActivityPub follow requests for users that are local
and are requesting to follow a remote user. This check is to ensure that
this endpoint can not be used by other services or instances.

* fix: missing import

* render block with id

* fix comment
 2022-06-04 13:52:42 +09:00
Johann150 9954c054a7
fix: ensure resolver does not fetch local resources via HTTP(S) (#8733) 
* refactor: parseUri types and checks

The type has been refined to better represent what it actually is. Uses of
parseUri are now also checking the parsed object type before resolving.

* cannot resolve URLs with fragments

* also take remaining part of URL into account

Needed for parsing the follows URIs.

* Resolver uses DbResolver for local

* remove unnecessary use of DbResolver

Using DbResolver would mean that the URL is parsed and handled again.
This duplicated processing can be avoided by querying the database directly.

* fix missing property name
 2022-06-04 11:29:20 +09:00
Johann150 81109b14b5
fix: correctly render empty note text (#8746) 
Ensure that the _misskey_content attribute will always exist. Because
the API endpoint does not require the existence of the `text` field,
that field may be `undefined`. By using `?? null` it can be ensured
that the value is at least `null`.

Furthermore, the rendered HTML of a note with empty text will also be
the empty string. From git blame it seems that this behaviour was added
because of a Mastodon bug that might have previously existed. Hoever,
this seems to be no longer the case as I can find mastodon posts that
have empty content.

The code could be made a bit more succinct by using the null coercion
operator.
 2022-06-03 23:18:44 +09:00
PikaDude 6061937996
User moderation details (#8762) 
* add more user details for admins to see

* fix some issues

* small style fix

as suggested by Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

* fix

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-06-03 23:14:50 +09:00
syuilo 71c230b7b7 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-03 23:08:18 +09:00
syuilo a3fed7d0fb fix(test): reset redis in e2e test 
#7986
 2022-06-03 23:08:15 +09:00
sn0w df3bbfb416
fix(client): correctly handle MiAuth URLs with query string (#8772) 2022-06-03 21:22:03 +09:00
Johann150 118f354661
fix: server metrics widget 2022-06-01 08:51:00 +02:00
Johann150 121a1784a2
fix(lint): indentation 2022-05-31 16:22:00 +02:00
Johann150 025bf4a5e7
fix(mfm): remove duplicate br tag/newline (#8616) 2022-05-31 18:57:55 +09:00
Johann150 c56e45ecef
fix: always remove completed tasks (#8771) 2022-05-31 17:54:02 +09:00
MeiMei c05723ca6a
Fix IP address rate limit (#8758) 
* Fix IP address rate limit

* CHANGELOG

* Tune getIpHash
 2022-05-31 17:44:22 +09:00
tamaina 857055a9dd chore: fix import tinycolor 2022-05-30 12:09:22 +00:00
tamaina 465531d56c Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-05-30 05:53:40 +00:00
tamaina 9759ca7d24 chore: remove packages/sw/webpack.config.js 2022-05-30 05:53:36 +00:00
Andy 3905185463
fix(client): import shared ESLint config in client package (#8761) 2022-05-30 11:37:34 +09:00
Johann150 ebc2566130
fix: add missing import 
fix #8756
 2022-05-29 14:33:42 +02:00
futchitwo d2784030ec
fix(client): fix popout url (#8494) 2022-05-29 12:21:36 +02:00
Johann150 804fa33535
refactor: improve code quality (#8751) 
* remove unnecessary if

`Array.prototype.some` already returns a boolean so an if to return
true or false is completely unnecessary in this case.

* perf: use count instead of find

When using `count` instead of `findOneBy`, the data is not
unnecessarily loaded.

* remove duplicate null check

The variable is checked for null in the lines above and the function
returns if so. Therefore, it can not be null at this point.

* simplify `getJsonSchema`

Because the assigned value is `null` and the used keys are only
shallow, use of `nestedProperty.set` seems inappropriate. Because the
value is not read, the initial for loop can be replaced by a `for..in`
loop.

Since all keys will be assigned `null`, the condition of the ternary
expression in the nested function will always be true. Therefore the
recursion case will never happen. With this the nested function can be
eliminated.

* remove duplicate condition

The code above already checks `dragging` and returns if it is truthy.
Checking it again later is therefore unnecessary.

To make this more obvious the `return` is removed in favour of using
an if...else construct.

* remove impossible "unknown" time

The `ago` variable will always be a number and all non-negative numbers
are already covered by other cases, the negative case is handled with
`future` so there is no case when `unkown` could be achieved.
 2022-05-29 15:15:52 +09:00
tamaina f1d2398eac
fix(client): Vite related boot mechanism revision (#8753) 
* preload app css

* remove salt

* APP_FETCH_FAILED error

* set max-age to 15s
 2022-05-29 10:58:54 +09:00
tamaina 4917961736
preload app css (#8752) 2022-05-29 10:57:06 +09:00
Johann150 e54aa56ee1
chore: remove unused imports 2022-05-28 21:17:23 +02:00
Johann150 21d54f2758
fix: validate text is not empty 
fix #8747
 2022-05-28 17:26:17 +02:00
tamaina abc8998b48
refactor: use css module at components/global/loading.vue (#8750) 
* refactor: use css module at components/global/loading.vue

* rename class name to "root"
 2022-05-29 00:15:32 +09:00
tamaina 4a50c49211
Fix theme import (#8749) 2022-05-28 21:59:23 +09:00
Andy 708fba989a
feat(tests): add e2e tests for widgets (#8735) 
* test(e2e): add baseline for widget tests

* chore(repo): enable test running in branch

* fix(e2e): set viewport for widget tests

* fix(client): add widget identifier classes to widgets

* test(e2e): add memo widget test

* fix(tests): force select value

* fix(tests): force button press for widget addition

* fix(tests): invoke select value differently

* fix(tests): adjust widget submit

* fix(tests): don't explicitly navigate for widget test

* fix(tests): click label to hide select popup

* fix(tests): just click modal background

* fix(tests): adjust modal background selector

* fix(tests): click all modal backgrounds

* feat(e2e): add test for adding timeline widget

* fix(client): add more widget identifier classes

* feat(tests): add method abstraction for test cases

* fix(tests): force-click overlays

* fix(tests): force widget button press

* fix(tests): remove timeout from final widget check

* feat(tests): add widget removal test case

* fix(client): use mk instead of msky as class prefix

* fix(tests): check widgets for existence rather than visibility

* chore(meta): don't run tests for specific feature branch
 2022-05-28 14:28:12 +09:00
Johann150 161659de5c
enhance: replace signin CAPTCHA with rate limit (#8740) 
* enhance: rate limit works without signed in user

* fix: make limit key required for limiter

As before the fallback limiter key will be set from the endpoint name.

* enhance: use limiter for signin

* Revert "CAPTCHA求めるのは2fa認証が無効になっているときだけにした"

This reverts commit 02a43a310f.

* Revert "feat: make captcha required when signin to improve security"

This reverts commit b21b058005.

* fix undefined reference

* fix: better error message

* enhance: only handle prefix of IPv6
 2022-05-28 12:06:47 +09:00
Johann150 63a814c70e
fix(docs): correct information for drive upload (#8736) 2022-05-27 22:03:25 +09:00
Johann150 3dae18b93c
fix lints (#8737) 
* fix: emits use ev instead of e

* fix: errors use err instead of e

* fix: replace use of data where possible

* fix: events use evt instead of e

* fix: use strict equals

* fix: use emoji instead of e

* fix: vue lints
 2022-05-26 22:53:09 +09:00
Johann150 9c80403072
use http-signature module that supports hs2019 (#8635) 2022-05-26 09:12:17 +09:00
syuilo b3ad04fcb0 update deps 2022-05-25 23:28:56 +09:00
syuilo 3c3140a100 refactor: use === 2022-05-25 23:19:39 +09:00
Johann150 8d5c9e96e4
fix: assume remote users are following each other (#8734) 
Misskey does not know if two remote users are following each other.
Because ActivityPub actions would otherwise fail on followers only
notes, we have to assume that two remote users are following each other
when an interaction about a remote note occurs.
 2022-05-25 23:17:00 +09:00
Johann150 429f1ad061
fix: activity widget used wrong variable name 2022-05-25 10:44:04 +02:00
Johann150 a7be9be43d
fix: server metrics widget 2022-05-25 10:13:46 +02:00
Johann150 e27c6abaea
refactor: temporary files (#8713) 
* simplify temporary files for thumbnails

Because only a single file will be written to the directory, creating a
separate directory seems unnecessary. If only a temporary file is created,
the code from `createTemp` can be reused here as well.

* refactor: deduplicate code for temporary files/directories

To follow the DRY principle, the same code should not be duplicated
across different files. Instead an already existing function is used.

Because temporary directories are also create in multiple locations,
a function for this is also newly added to reduce duplication.

* fix: clean up identicon temp files

The temporary files for identicons are not reused and can be deleted
after they are fully read. This condition is met when the stream is closed
and so the file can be cleaned up using the events API of the stream.

* fix: ensure cleanup is called when download fails

* fix: ensure cleanup is called in error conditions

This covers import/export queue jobs and is mostly just wrapping all
code in a try...finally statement where the finally runs the cleanup.

* fix: use correct type instead of `any`
 2022-05-25 16:50:22 +09:00
Andy b049633db7
Refactor widgets and fix lint issues (#8719) 
* fix(client): refactor widgets and fix lint issues

* Apply review suggestions from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-25 16:43:12 +09:00
Andy 81fccb5656
refactor(client): refactor admin/other-settings to use Composition API (#8667) 2022-05-25 16:38:18 +09:00
Andy 67f3515dc1
Refactor admin/overview to use Composition API (#8674) 
* refactor(client): refactor admin/overview to use Composition API

* fix(client): apply review suggestions
 2022-05-25 16:37:35 +09:00
Andy 83b831d975
Refactor my-antennas/edit to use Composition API (#8680) 
* refactor(client): refactor my-antennas/edit to use Composition API

* fix(client): apply review suggestions
 2022-05-25 16:37:15 +09:00
MeiMei 6b44fe165b
Supports Unicode Emoji 14.0 (#8699) 
* Unicode 14.0 Emoji

* mfm-js@0.22.0

* CHANGELOG

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-05-25 16:35:30 +09:00
Johann150 6b109c7b0f
fix: wrong type for isVisibleForMe 2022-05-24 10:12:42 +02:00
Johann150 f90c947036
fix(client): wrong scoping breaks 2FA 2022-05-23 22:43:13 +02:00
Andy 563cb36a8f
fix(client): fix undefined data value on 2FA settings (#8725) 2022-05-23 21:55:06 +02:00
syuilo 53fc1235d7 Update .mocharc.json 2022-05-21 22:24:57 +09:00
syuilo b8544814ec lint 2022-05-21 22:21:41 +09:00
syuilo 05c4d6b11e refactor 2022-05-21 22:07:11 +09:00
syuilo 425084b596 Update utils.ts 2022-05-21 22:07:01 +09:00
syuilo 2205c61edf Update utils.ts 2022-05-21 17:40:43 +09:00
Andy 4bb04a2c24
chore(meta): add pixeldesu to patron list (#8714) 2022-05-21 09:48:40 +09:00
syuilo b811de53b6 fix(client): make emoji stand out more on reaction button 
Fix #8520
Close #8521

Co-Authored-By: Johann150 <20990607+Johann150@users.noreply.github.com>
 2022-05-19 23:23:12 +09:00
Johann150 68f9341e95
hotfix: uniform color migration fix 2022-05-19 15:42:55 +02:00
Johann150 be1d02a7f8
enhance: page image component with alt text (#8634) 
* refactor to composition API

* use existing image component

This improves user experience because alt text is displayed correctly.

* fix: correct image src

* fix: defineProps

* fix
 2022-05-19 20:41:47 +09:00
Johann150 edfded7fb7
fix(activitypub): add authorization checks (#8534) 
* fix spelling

* fix(activitypub): add authorization checks
 2022-05-19 20:40:16 +09:00
Johann150 60fd793bc3
enhance(MFM): limit large MFM (#8540) 
* add CSS classes for zoom MFM

* limit nesting of x2, x3, x4 MFM

* simplify CSS calculation

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2022-05-19 20:38:14 +09:00
xianon 0f33864df1
fix: ノート詳細ページの新しいノートを表示する機能の動作が正しくなるように修正する (#8607) 
* ノート詳細で新しいノートの表示が正しくないのを修正する

* ノート詳細から別のノート詳細を表示した時に前後の表示をリセットする
 2022-05-19 20:32:55 +09:00
Andy 3abb0d589d
refactor(client): refactor admin/settings to use Composition API (#8678) 2022-05-19 20:30:23 +09:00
Andy 1d9a4f68f4
Refactor pleaseLogin to show a sign-in dialog (#8630) 
* refactor(client): refactor pleaseLogin to show a sign-in dialog

* Apply review suggestions from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-05-19 20:28:08 +09:00
Andy a273940348
fix(client): fix lint issues in Deck UI components (#8681) 2022-05-19 17:35:43 +09:00
dependabot[bot] 3d46da64a8
chore(deps): bump async from 3.2.1 to 3.2.3 in /packages/client (#8707) 
Bumps [async](https://github.com/caolan/async) from 3.2.1 to 3.2.3.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v3.2.1...v3.2.3)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-19 17:35:11 +09:00
syuilo 4702f99c83 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-05-19 17:21:11 +09:00
syuilo 65b048bb70 chore(client): tweak loading spinner design 2022-05-19 17:21:08 +09:00
Johann150 aaf5bb62ab
enhance: uniform theme color (#8702) 
* enhance: make theme color format uniform

All newly fetched instance theme colors will be uniformely formatted
as hashtag followed by 6 hexadecimal digits.

Colors are checked for validity and invalid colors are not handled.

* better input validation for own theme color

* migration to unify theme color formats

Fixes theme colors of other instances as well as the local instance.

* add changelog entry

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-05-19 09:54:45 +02:00
MeiMei 55a578a8df
fix: Unable to generate video thumbnails (#8696) 
* fix: Unable to generate video thumbnails

* CHANGELOG
 2022-05-19 16:19:23 +09:00
xianon 02f9e5d6f0
fix: ノートのインスタンス情報の文字に縁を付けて見やすくする (#8697) 
* ノートのインスタンス情報の背景色が反映されないことがあるのを修正する

* ノートのインスタンス情報の文字に縁を付けて見やすくする

* Revert "ノートのインスタンス情報の背景色が反映されないことがあるのを修正する"

This reverts commit de920dfc537d1f2c68804d0d6930520f2b3cbce7.

* ノートのインスタンス情報の文字の影の数を増やしてさらに見やすくする
 2022-05-19 16:17:00 +09:00
syuilo 4fc2058745 chore(client): tweak loading spinner design 2022-05-19 15:24:35 +09:00
dependabot[bot] 13b275773b
chore(deps): bump async from 3.2.0 to 3.2.3 in /packages/backend (#8706) 
Bumps [async](https://github.com/caolan/async) from 3.2.0 to 3.2.3.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v3.2.0...v3.2.3)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-05-19 11:49:59 +09:00
MeiMei b6794b614b
enhance: Perform port diagnosis at startup only when Listen fails (#8698) 
* Change port check

* Comment: disableClustering

* CHANGELOG

* Smart message
 2022-05-19 11:49:07 +09:00
あずき⪥™ e3f2d469c0
remove unneeded attrs (#8673) 2022-05-18 01:34:30 +09:00
Andy a86e1221a0
Refactor file-dialog to use Composition API (#8661) 
* refactor(client): refactor file-dialog to use Composition API

* Apply review suggestion from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-18 01:33:21 +09:00
Andy f03390f0b8
Refactor admin/index to use Composition API (#8662) 
* refactor(client): refactor admin/index to use Composition API

* fix(client): fix navigation to initial admin pages

* Apply review suggestions from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

* fix(client): re-add abuses page to admin/index

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-18 01:32:21 +09:00
Andy bf6cc34961
refactor(client): refactor admin/instance-block to use Composition API (#8663) 2022-05-18 01:31:59 +09:00
Andy 18307c822c
Refactor admin/integrations to use Composition API (#8664) 
* refactor(client): refactor admin/integrations to use Composition API

* Apply review suggestions from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-18 01:31:48 +09:00
Andy 83ac6742f6
refactor(client): refactor admin/object-storage to use Composition API (#8666) 2022-05-18 01:31:32 +09:00
Andy 13999d953b
refactor(client): refactor admin/proxy-account to use Composition API (#8675) 2022-05-18 01:31:16 +09:00
Andy 7c5c27cbe3
Refactor admin/queue to use Composition API (#8676) 
* refactor(client): refactor admin/queue to use Composition API

* Apply review suggestion from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-18 01:31:04 +09:00
Andy dfeafaf499
Refactor admin/relays to use Composition API (#8677) 
* refactor(client): refactor admin/relays to use Composition API

* Apply review suggestion from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-18 01:30:49 +09:00
Andy 7d08b936c6
refactor(client): refactor my-antennas/index to use Composition API (#8679) 2022-05-18 01:30:35 +09:00
Andy d62a55b46f
Refactor emoji-edit-dialog to use Composition API (#8657) 
* refactor(client): refactor emoji-edit-dialog to use Composition API

* fix(client): fix editing emoji not updating emoji list

* Apply review suggestions from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

* fix(client): use cached category info instead of making a request

* fix(client): use updateItem in emoji pagination when editing

* fix(client): reimplement removeItem in MkPagination

* Apply review suggestion from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-15 22:20:01 +09:00
Johann150 037ca92275
fix: postgres type error 
Fix a bug introduced in #8659. Solution was already tested there.
 2022-05-15 11:32:00 +02:00
syuilo 504cf74b90 ビルド関係の依存関係をdevDependenciesに入れるのをやめた 
本番環境でビルドできないため
 2022-05-15 17:26:14 +09:00
syuilo 02a43a310f CAPTCHA求めるのは2fa認証が無効になっているときだけにした 
2faのトークンは期限付きだから、CAPTCHA解いてる間に期限切れになる
 2022-05-15 16:47:14 +09:00
syuilo b21b058005 feat: make captcha required when signin to improve security 2022-05-15 12:18:46 +09:00
syuilo 6de40cf789 fix(server): prevent crash when processing certain PNGs 
Fix #8605
 2022-05-15 01:16:12 +09:00