Commit Graph

630 Commits

Author SHA1 Message Date
Johann150
278b7a70a7 enhance: read theme color nodeinfo (#8977)
* provide theme color in nodeinfo metadata

* 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-13 21:06:24 +09:00
nvisser
a60b0dd757 Make tensorflow an optinal dependency (#8986) 2022-07-13 21:00:59 +09:00
syuilo
235e55790b feat: support <plain> syntax for mfm 2022-07-12 12:03:38 +09:00
MeiMei
41e4505111 Fix crash at startup if TensorFlow is not supported (#8984)
* Lazy loading tensorflow

* CHANGELOG

* CHANGELOG

* Check CPU flags

* .
2022-07-12 10:38:57 +09:00
syuilo
fa72ec1f08 re: update mfm-js 0.23.0-canary.1 2022-07-11 23:13:23 +09:00
syuilo
e8a58722a2 update mfm-js 0.23.0-canary.1 2022-07-10 21:09:37 +09:00
yzhe819
2d69600539 chore: fix lint errors (#8981) 2022-07-10 19:47:29 +09:00
tamaina
a461625b31 enhance(sw): If receiving a push notification issued more than a day, ignore it. (#8980)
* enhance(sw): ignore old push notification

* ✌️

* 半日

* !==

* 1日
2022-07-10 15:15:21 +09:00
dogcraft
8b106bf548 fix: QueryFailedError when logging user's IPs (#8973)
* fix QueryFailedError when logging user's IPs

* use `orIgnore` to fix
2022-07-10 11:02:46 +09:00
syuilo
fc531766ad update summaly 2022-07-09 18:23:21 +09:00
MeiMei
6125bd981e Fix Attempts to update all notifications (#8974)
* Fix massive update notification parameters

* CHANGELOG

* CHANGELOG
2022-07-09 18:18:39 +09:00
syuilo
638f0eba12 enhance: make active email validation configurable 2022-07-09 15:05:55 +09:00
syuilo
da51152662 enhance(server): tweak identicon generation 2022-07-09 13:22:35 +09:00
Kainoa Kanter
26c012b9c8 v 2022-07-08 12:57:59 -07:00
Kainoa Kanter
7e78110c54 Merge branch 'misskey-dev:develop' into repair-style 2022-07-08 12:57:21 -07:00
syuilo
2012c0937e fix test 2022-07-08 11:21:11 +09:00
syuilo
ed5d81859f feat: auto nsfw detection (#8840)
* feat: auto nsfw detection

* ✌️

* Update ja-JP.yml

* Update ja-JP.yml

* ポルノ判定のしきい値を高めに

* エラーハンドリングちゃんとした

* Update ja-JP.yml

* 感度設定を強化

* refactor

* feat: add video support for auto nsfw detection

* rename: image -> media

* .js

* fix: add missing error handling

* fix: use valid pathname instead of using filename due to invalid usage

* perf(nsfw-detection): decode frames

* disable detection of video for some reasons

* perf(nsfw-detection): streamify detection process for video

* disable disallowUploadWhenPredictedAsPorn option

* fix(nsfw-detection): improve reliability

* fix(nsfw-detection): use Math.ceil instead of Math.round

* perf(nsfw-detection): delete tmp frames after used

* fix(nsfw-detection): FSWatcher does not emit ready event

* perf(nsfw-detection): skip black frames

* refactor: strip exists check

* Update package.json

* めっちゃ変えた

* lint

* Update COPYING

* オプションで動画解析できるように

* Update yarn.lock

* Update CHANGELOG.md

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2022-07-07 21:06:37 +09:00
syuilo
cddfd5df4b Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-07-07 19:08:21 +09:00
syuilo
bbd8f6cd57 chore(server): tweak api for admin 2022-07-07 19:08:18 +09:00
dependabot[bot]
154bbb9d17 chore(deps): bump moment from 2.29.3 to 2.29.4 in /packages/backend (#8958)
Bumps [moment](https://github.com/moment/moment) from 2.29.3 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.3...2.29.4)

---
updated-dependencies:
- dependency-name: moment
  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-07 18:29:42 +09:00
syuilo
7e3404e763 chore(server): tweak api for admin 2022-07-07 18:09:50 +09:00
Kainoa Kanter
a49d19686c enhance: Styled error screen (#8946)
* Styled error screen

* Make details margin auto

* Update boot.css

* Replace fontawesome with tabler svg

* Remove hr

* Add new style to flush screen

* Rename to `error.css`

* Fix

* Update base.pug

* Finally fix!

* Wrap details in `<code>`

* Add style to flush

* Fix

* BIOS -> Repair tool

* Fix

* Typo

* Adjust style

* Adjust text

* Flush -> Clear

* Revert flush changes

* Responsive

* Also hide splash
2022-07-07 17:35:56 +09:00
ThatOneCalculator
814b7fab35 🎨 2022-07-06 23:23:37 -07:00
ThatOneCalculator
dd360f3ead Responsive 2022-07-06 23:16:15 -07:00
ThatOneCalculator
6b2f5dc80a Actually fix :godmode: 2022-07-06 21:50:48 -07:00
ThatOneCalculator
33656d8d3d Typo 2022-07-06 21:47:01 -07:00
ThatOneCalculator
6b7af71fe1 Merge branch 'repair-style' of https://github.com/ThatOneCalculator/misskey into repair-style 2022-07-06 21:46:28 -07:00
ThatOneCalculator
92a5f577a6 Fix flush 2022-07-06 21:46:04 -07:00
Kainoa Kanter
2a0cf2abe7 Merge branch 'develop' into repair-style 2022-07-06 21:40:18 -07:00
ThatOneCalculator
eec414da8b 🎨 2022-07-06 21:39:41 -07:00
ThatOneCalculator
620199b8be Formatting error 2022-07-06 21:36:25 -07:00
ThatOneCalculator
8246c61814 Change script location 2022-07-06 21:34:57 -07:00
ThatOneCalculator
cdcdb76b5b Typo 2022-07-06 21:32:03 -07:00
ThatOneCalculator
9e04347390 Flush style 2022-07-06 21:24:39 -07:00
ThatOneCalculator
bf61e2969b Tweak bios 2022-07-06 21:15:47 -07:00
ThatOneCalculator
8c8896b7c6 Adjust cli 2022-07-06 21:13:32 -07:00
ThatOneCalculator
74029229fa Add bios style 2022-07-06 21:10:31 -07:00
ThatOneCalculator
4d545a1a59 Styled CLI 2022-07-06 21:01:34 -07:00
syuilo
7cb84dc30a revert: feat: styled error screen (#8930) 2022-07-06 06:36:14 +09:00
syuilo
aac0251dd4 perf: allow get for notes/reactions 2022-07-05 19:16:21 +09:00
syuilo
1812c49dbb rename: BIOS -> Repair Tool 2022-07-05 17:46:17 +09:00
Kainoa Kanter
36c502696b feat: styled error screen (#8930)
* Styled error screen

* Make details margin auto

* Update boot.css

* Replace fontawesome with tabler svg

* Remove hr

* Add new style to flush screen

* Rename to `error.css`
2022-07-05 17:44:05 +09:00
tamaina
da6665f5a0 move resolutions 2022-07-05 05:17:37 +00:00
tamaina
247c51b84d Merge branch 'develop' into pr/ThatOneCalculator/8764 2022-07-05 05:16:06 +00:00
CyberRex
bc49a0e9be Add additional drive capacity change support (#8867)
* Add additional drive capacity change support

* Update packages/backend/src/server/api/endpoints/admin/drive-capacity-override.ts

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

* 🎨

* show instance default capacity in placeholder

* fix

* update api/drive

* fix

* remove :

* fix lint

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2022-07-05 00:21:01 +09:00
MeiMei
1831a6a339 fix: streamingテストおそい (#8912) 2022-07-03 20:54:54 +09:00
syuilo
1fe89d6aab fix typo 2022-07-03 19:01:08 +09:00
syuilo
e5ccfa5158 feat: moderation note 2022-07-03 00:15:03 +09:00
syuilo
ddcd10db8e feat(server): add fetch-rss api to reduce dependency of external apis 2022-07-02 21:26:33 +09:00
syuilo
e23e7de453 feat: Log user ips (#8872)
* wip

* store ip and headers

* Update admin-file.vue

* require admin for view ip/headers

* IP (recent) 消した

* admin必須

* opt in

* clean ips periodically

* respect logging setting in drive/files/create
2022-07-02 15:12:11 +09:00
syuilo
cf36949256 enhance(server): アンケートを新しい順にソート 2022-07-02 12:34:22 +09:00
syuilo
c90225ea02 chore(client): tweak ui 2022-07-02 12:22:52 +09:00
MeiMei
62d6d106a6 migrate parse5 to 7.0.0 (#8916)
* migrate parse5 to 7.0.0

* fix
2022-07-01 13:48:03 +09:00
syuilo
23c1109fb0 use parse5 6.0.1
Fix #8914
2022-07-01 11:07:14 +09:00
Johann150
95290ad085 fix typo
Co-authored-by: mei23 <m@m544.net>
2022-06-30 22:03:04 +02:00
syuilo
66c0059868 update deps 2022-07-01 00:21:25 +09:00
syuilo
986b12d4a8 chore(client): tweak ui 2022-06-30 20:15:14 +09:00
syuilo
f571188dd0 fix(server): cannot show users 2022-06-30 15:36:09 +09:00
syuilo
38cdd46063 chore(client): tweak client 2022-06-30 15:32:11 +09:00
ThatOneCalculator
bf6a4b8696 Self host error/info/not-found images 2022-06-28 19:33:32 -07:00
tamaina
fa775220cf Merge branch 'develop' into pr/ThatOneCalculator/8764 2022-06-28 05:08:57 +00:00
syuilo
73113f7631 improve instance doughnut charts 2022-06-28 13:05:20 +09:00
syuilo
31474fc66d fix(api): fix instance schema 2022-06-28 12:16:11 +09:00
syuilo
dcf30c1f4a feat(api): add federation/stats endpoint 2022-06-28 10:41:22 +09:00
syuilo
aa3914d7a2 fix(api): add missing themeColor property of instance 2022-06-28 10:40:49 +09:00
syuilo
4d89a77aef feat: make possible to delete an account by admin
Resolve #8830
2022-06-27 23:49:16 +09:00
Johann150
746f17450f refactor: remove duplicate code (#8895) 2022-06-27 21:48:10 +09:00
MeiMei
9dcd23d74f fix: mocha テストが動かないのを修正 v2 (#8892)
* on push

* Fix mute test

* fix note test

* api

* inc timeout

* uploadUrl

* Revert "on push"

This reverts commit 778a58df61ff9a22421f8ec5dcce96b364eab38d.

* lint

* waitFire

* Wrap connectStream

* return
2022-06-26 19:16:32 +09:00
syuilo
bbad8434c4 fix #8894 2022-06-26 17:38:50 +09:00
tamaina
af100cb1c2 enhance(client): Enhance boot error display (#8879)
* Change boot error message

* fix

* ✌️

* fix
2022-06-26 12:47:43 +09:00
syuilo
107d282b9d Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-25 18:26:34 +09:00
syuilo
e25de6ccc8 feat: allow GET for some endpoints
Resolve #8263
2022-06-25 18:26:31 +09:00
dependabot[bot]
a7cf1b30ec 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-06-25 16:28:36 +09:00
Johann150
a89486af35 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-06-25 14:23:59 +09:00
dependabot[bot]
a752b95e1a 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-06-25 13:50:15 +09:00
dependabot[bot]
41a3917b81 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-06-25 13:50:06 +09:00
syuilo
d7a21948b3 feat: 管理者が特定ユーザーのアップロードしたファイル一覧を見れるように 2022-06-24 21:43:28 +09:00
Johann150
d78b20ba07 fix lints 2022-06-24 12:44:22 +02:00
MeiMei
aef9cb41f3 enhance: Redisをioredisに統一してIPv6サポート (#8869)
* Use ioredis, Supports IPv6 host

https://github.com/misskey-dev/misskey/issues/8862

* Fix import

* order

* a

* i

* fix

* flushdb

* family

* CHANGELOG

* redis_version

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-06-24 19:22:19 +09:00
Johann150
aa22cd03de 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-06-23 21:32:17 +09:00
Johann150
6c244d452e enhance: word mute checks CW (#8873) 2022-06-23 20:26:47 +09:00
syuilo
69c45e4474 tweak client 2022-06-21 17:55:38 +09:00
syuilo
0fddc528ed fix(server): faviconUrl of federated instance is missing 2022-06-21 14:28:43 +09:00
tamaina
566e0d2bea 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-06-20 00:33:46 +09:00
futchitwo
2ee931e0c6 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-06-18 18:27:09 +09:00
MeiMei
ea7c2ec26f enhance: Improve player detection in URL preview (#8849)
* enhance: Improve player detection in URL preview

* CHANGELOG
2022-06-18 16:02:31 +09:00
tamaina
1e908dc895 remove packagemanager 2022-06-16 21:23:11 +09:00
tamaina
0c4b76a832 Merge branch 'develop' into pr/ThatOneCalculator/8764 2022-06-16 21:19:17 +09:00
Johann150
ebd33b9281 fix: render empty note content correctly
Instead of coercing to `null`, coercing to an empty string should simplify handling.
2022-06-16 12:51:44 +02:00
Johann150
efe35ea9e0 fix: correctly render note text
Fix a regression from #8787 that was previously fixed in #8440.
2022-06-16 12:32:09 +02:00
MeiMei
5508bd552c fix: GenerateVideoThumbnail (#8825)
* fix: GenerateVideoThumbnail

* CHANGELOG

* fix cleanup

* Revert "fix cleanup"

This reverts commit d54cf8262ac01a3deb6b8dd7689ec144d4d09ea8.
2022-06-14 23:02:14 +09:00
Johann150
537e3176ea fix: tmpdir cleanup removes contained files (#8826) 2022-06-14 23:00:10 +09:00
syuilo
24a10451c2 enhance(server): モデレーターであってもレートリミットを有効に 2022-06-14 22:59:19 +09:00
tamaina
ef3a582f64 fix: add limit to i/notifications (#8836)
* fix: add limit to i/notifications

* ms

* remove ms
2022-06-14 22:55:58 +09:00
Johann150
41eeb9a184 fix(docs): use correct description property 2022-06-14 11:55:58 +02:00
Johann150
d2d4a17ef7 fix: remove unused parameter 2022-06-14 11:54:55 +02:00
syuilo
ab2d56605e lint fixes 2022-06-14 18:01:23 +09:00
Johann150
ad858dd2e3 fix: missing file name parameter (#8820) 2022-06-13 00:25:06 +09:00
tamaina
9bd3c82e6c fix: some fixes of multiple notification read (#8819)
* fix: limit multiple notification read

* fix

* fix
2022-06-12 19:28:13 +09:00
Johann150
e161c0abe4 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
01011ef9c5 update deps 2022-06-10 15:06:42 +09:00
syuilo
602df78fde Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-10 14:56:07 +09:00
syuilo
7dc86abec3 chore: tweak logo 2022-06-10 14:56:05 +09:00
Johann150
c7a2c42cc2 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
674029f700 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
Johann150
2461d16d12 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
6ba668f934 fix(test): make chart tests working 2022-06-05 20:37:24 +09:00
syuilo
e8fdd35808 Update .mocharc.json 2022-06-05 19:46:52 +09:00
tamaina
0d4b9f07f3 https://github.com/misskey-dev/misskey/pull/8764#discussion_r885749892 2022-06-04 23:34:23 +09:00
tamaina
87b6d5ea39 fix 2022-06-04 08:44:36 +00:00
tamaina
2665322b23 Merge branch 'develop' into pr/ThatOneCalculator/8764 2022-06-04 08:34:56 +00:00
syuilo
3f4101d17b use node 16 2022-06-04 17:26:56 +09:00
tamaina
ac4d6e1ac2 fix http-signature 2022-06-04 08:26:36 +00:00
syuilo
c9cd88a9db update summaly 2022-06-04 17:24:41 +09:00
tamaina
f595c068f9 yarn node => node
依存関係の記載不足の解消がかなり多いため、yarn nodeは使わない
2022-06-04 08:07:27 +00:00
tamaina
13d924b804 wip 2022-06-04 08:01:02 +00:00
syuilo
3661d1bc33 fix bug 2022-06-04 15:15:44 +09:00
syuilo
4bf3ed6c1e fix test 2022-06-04 14:25:30 +09:00
Johann150
102012aa9d 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
86c04c4489 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
336eea9d93 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
186cac05a2 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
e0fb88f9fe Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-03 23:08:18 +09:00
syuilo
dbab6abde4 fix(test): reset redis in e2e test
#7986
2022-06-03 23:08:15 +09:00
tamaina
064c81bcfe npm run => yarn 2022-06-03 22:39:07 +09:00
tamaina
8a92d4139d Merge branch 'develop' into pr/ThatOneCalculator/8764 2022-06-02 10:21:08 +00:00
ThatOneCalculator
3cff4e6144 pnpm = dont change paths 2022-05-31 19:44:04 -07:00
ThatOneCalculator
1aa7bce3ff package.json names 2022-05-31 19:41:15 -07:00
Johann150
7c9d07cd53 fix(mfm): remove duplicate br tag/newline (#8616) 2022-05-31 18:57:55 +09:00
Johann150
8e296b2398 fix: always remove completed tasks (#8771) 2022-05-31 17:54:02 +09:00
MeiMei
f59e364a85 Fix IP address rate limit (#8758)
* Fix IP address rate limit

* CHANGELOG

* Tune getIpHash
2022-05-31 17:44:22 +09:00
ThatOneCalculator
bcb2355bbb 🙏 2022-05-31 00:13:41 -07:00
ThatOneCalculator
071c8958d1 Remove yarnrc for workspaces 2022-05-30 23:56:49 -07:00
ThatOneCalculator
480a8ffa6d :godmode: 2022-05-30 23:55:47 -07:00
ThatOneCalculator
ee9fb2d5d9 :goberserk: 2022-05-30 21:03:11 -07:00
ThatOneCalculator
6e16bed0a8 More yarn workspaces stuff 2022-05-30 17:31:24 -07:00
ThatOneCalculator
10a73439a9 tbh 2022-05-30 15:02:52 -07:00
ThatOneCalculator
caa9905c7d tbh 2022-05-30 15:02:31 -07:00
ThatOneCalculator
f325574ca1 fix the code that depends on node_modules 2022-05-29 22:19:40 -07:00
ThatOneCalculator
e50e8b98a1 Remove packages/*/yarn.lock 2022-05-29 18:19:30 -07:00
ThatOneCalculator
daa6ae548d Yarn berry 2022-05-29 12:40:08 -07:00
Johann150
3b970aae8a fix: add missing import
fix #8756
2022-05-29 14:33:42 +02:00
Johann150
ec47b46423 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
1fe73d31ad 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
86e6126dd7 preload app css (#8752) 2022-05-29 10:57:06 +09:00
Johann150
fef27a1e92 chore: remove unused imports 2022-05-28 21:17:23 +02:00
Johann150
4a8ea6f2d1 fix: validate text is not empty
fix #8747
2022-05-28 17:26:17 +02:00
Johann150
0738a65a78 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 02a43a310f6ad0cc9e9beccc26e51ab5b339e15f.

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

This reverts commit b21b0580058c14532ff3f4033e2a9147643bfca6.

* fix undefined reference

* fix: better error message

* enhance: only handle prefix of IPv6
2022-05-28 12:06:47 +09:00
Johann150
7a65931b28 fix(docs): correct information for drive upload (#8736) 2022-05-27 22:03:25 +09:00
Johann150
8d49573447 use http-signature module that supports hs2019 (#8635) 2022-05-26 09:12:17 +09:00
syuilo
cb330fef64 update deps 2022-05-25 23:28:56 +09:00
syuilo
74d968585a refactor: use === 2022-05-25 23:19:39 +09:00
Johann150
62ab5b4015 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
c2ddc5286c 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
MeiMei
ca95e15345 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
d6046c75aa fix: wrong type for isVisibleForMe 2022-05-24 10:12:42 +02:00
syuilo
d253ee6f78 Update .mocharc.json 2022-05-21 22:24:57 +09:00
syuilo
5ad66d3ddd lint 2022-05-21 22:21:41 +09:00
syuilo
6adc5a33fe refactor 2022-05-21 22:07:11 +09:00
syuilo
56e3ad8b5b Update utils.ts 2022-05-21 22:07:01 +09:00
syuilo
17e07de117 Update utils.ts 2022-05-21 17:40:43 +09:00
Johann150
08c119e088 hotfix: uniform color migration fix 2022-05-19 15:42:55 +02:00
Johann150
848ac5a75d fix(activitypub): add authorization checks (#8534)
* fix spelling

* fix(activitypub): add authorization checks
2022-05-19 20:40:16 +09:00
Johann150
306b825ae2 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
f0cdc636c4 fix: Unable to generate video thumbnails (#8696)
* fix: Unable to generate video thumbnails

* CHANGELOG
2022-05-19 16:19:23 +09:00
syuilo
ea5dd3b1e7 chore(client): tweak loading spinner design 2022-05-19 15:24:35 +09:00
dependabot[bot]
fed2dd5e90 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
3616557dd5 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
Johann150
2556d9209f fix: postgres type error
Fix a bug introduced in #8659. Solution was already tested there.
2022-05-15 11:32:00 +02:00
syuilo
7bd873cc56 CAPTCHA求めるのは2fa認証が無効になっているときだけにした
2faのトークンは期限付きだから、CAPTCHA解いてる間に期限切れになる
2022-05-15 16:47:14 +09:00
syuilo
b688744128 feat: make captcha required when signin to improve security 2022-05-15 12:18:46 +09:00
syuilo
d6e2fb6d15 fix(server): prevent crash when processing certain PNGs
Fix #8605
2022-05-15 01:16:12 +09:00
iwata
fc5c715166 test: Nodeのカスタムローダーを直してテストが動くように (#8625)
* test: Nodeのカスタムローダーを直してテストが動くように

* dev: mochaを呼ぶコマンドにNODE_ENV=testを追加

* Update packages/backend/test/loader.js

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

* chore: change export style in loader.js

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-14 16:10:20 +09:00
iwata
49a6b68b95 test: __dirnameはESModuleでは使えないので置き換えた (#8626) 2022-05-14 16:09:47 +09:00
tamaina
c166655f1f fix: ユーザー検索で、クエリがusernameの条件を満たす場合はusernameもLIKE検索するように (#8644)
* Fix #8643

* 部分一致にする
2022-05-14 15:24:44 +09:00
iwata
ac23bd4667 test: e2eテストがCIで失敗していた問題をいくつか修正 (#8642)
* test: indexeddbをテスト毎に初期化するように

* fix: metaが無いときにfetch-metaを同時に呼ぶと死ぬことがある問題を修正

* test: ログイン後のクライアント側処理を待たずにリロードされてログイン出来ないことがあったのを修正
2022-05-14 15:16:45 +09:00
Johann150
b3ca8d5329 fix: keep file order (#8659) 2022-05-14 15:09:10 +09:00
syuilo
36db202263 enhance: Display TOTP Register URL
Close #7261

Co-Authored-By: tamaina <tamaina@hotmail.co.jp>
2022-05-14 15:00:15 +09:00
syuilo
493dc6836a update deps 2022-05-14 14:57:51 +09:00
Johann150
91100f94b5 perf: fix caching (#8660)
The cache implementation did previously not store the results of the
computation and was thus not a cache at all. This can cause a significant
number of database queries each time someone with a large number of
followers does something that causes an activity to be federated.
2022-05-14 13:28:27 +09:00
Johann150
79072916af chore: synchronize code and database schema (#8577)
* chore: remove default null

null is always the default value if a table column is nullable, and typeorm's
@Column only accepts strings for default.

* chore: synchronize code with database schema

* chore: sync generated migrations with code
2022-05-05 22:45:22 +09:00
tamaina
8ad77a28b4 refactor: use Vite to build instead of webpack (#8575)
* update stream.ts

* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339

* fix lint

* clean up?

* add app

* 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を戻した

* 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

* キャッシュ対策

* Truncate push notification message

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

* components/drive-file-thumbnail.vue

* components/drive-select-dialog.vue

* components/drive-window.vue

* merge

* fix

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

* return createEmptyNotification()

* fix

* i18n.ts

* update

* ✌️

* remove ts-loader

* fix

* fix

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

* pollEnded

* URLをsw.jsに戻す

* clean up

* wip

* wip

* wip

* wip

* wip

* wip

* ✌️

* use import

* fix

* install rollup

* use defineAsyncComponent.

* fix emojilist

* wip use defineAsyncComponent

* popup(import -> popup(defineAsyncComponent(() => import

* draggable?

* fix init import

* clean up

* fix router

* add comment

* ✌️

* ✌️

* ✌️

* remove webpack

* update vite

* fix boot sequence

* Revert "fix boot sequence"

This reverts commit e893dbf37aed83bf9f12e427d98c78a7065b4a39.

* revert boot import

* never make two app div

* ;

* remove console.log

* change clientEntry sequence

* fix

* Revert "fix"

This reverts commit 12741b3d89950a31dbb1bb81477ddb27b0e9951a.

* fix

* add comment https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210

* add log

* add comment

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-05-01 22:51:07 +09:00
Johann150
370b9deac2 fix _misskey_content of quote renotes (#8533) 2022-05-01 19:23:34 +09:00
MeiMei
5610165de4 fix: Add rel attribute to host-meta (#8583)
* Add rel attribute to host-meta

* CHANGELOG
2022-05-01 19:14:14 +09:00
tamaina
1df07ded68 feat: Improve Push Notification (#7667)
* clean up

* ev => data

* refactor

* clean up

* add type

* antenna

* channel

* fix

* add Packed type

* add PackedRef

* fix lint

* add emoji schema

* add reversiGame

* add reversiMatching

* remove signin schema (use Signin entity)

* add schemas refs, fix Packed type

* wip PackedHoge => Packed<'Hoge'>

* add Packed type

* note-reaction

* user

* user-group

* user-list

* note

* app, messaging-message

* notification

* drive-file

* drive-folder

* following

* muting

* blocking

* hashtag

* page

* app (with modifying schema)

* import user?

* channel

* antenna

* clip

* gallery-post

* emoji

* Packed

* reversi-matching

* update stream.ts

* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339

* fix lint

* clean up?

* add app

* 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を戻した

* 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

* キャッシュ対策

* Truncate push notification message

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

* components/drive-file-thumbnail.vue

* components/drive-select-dialog.vue

* components/drive-window.vue

* merge

* fix

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

* return createEmptyNotification()

* fix

* i18n.ts

* update

* ✌️

* remove ts-loader

* fix

* fix

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

* pollEnded

* URLをsw.jsに戻す

* clean up

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-04-30 21:52:07 +09:00
dependabot[bot]
6ed80c910a chore(deps): bump ejs from 3.1.6 to 3.1.7 in /packages/backend (#8560)
Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.7.
- [Release notes](https://github.com/mde/ejs/releases)
- [Changelog](https://github.com/mde/ejs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mde/ejs/compare/v3.1.6...v3.1.7)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-30 00:16:40 +09:00
tamaina
83096440cc enhance: ドライブに画像ファイルをアップロードするときオリジナル画像を破棄してwebpublicのみ保持するオプション (#8216)
* wip

* Update packages/client/src/os.ts

Co-authored-by: tamaina <tamaina@hotmail.co.jp>

* メニューをComposition API化、switchアイテム追加
クライアントサイド画像圧縮の準備

* メニュー型定義を分離 (TypeScriptの型支援が効かないので)

* disabled

* make keepOriginal to follow setting value

* ✌️

* fix

* fix

* ✌️

* WEBP

* aaa

* ✌️

* webp

* lazy load browser-image-resizer

* rename

* rename 2

* Fix

* clean up

* add comment

* clean up

* jpeg, pngにもどす

* fix

* fix name

* webpでなくする ただしサムネやプレビューはwebpのまま (テスト)

* 動画サムネイルはjpegに

* エラーハンドリング

* ✌️

* v2.2.1-misskey-beta.2

* browser-image-resizer#v2.2.1-misskey.1

* ✌️

* fix alert

* update browser-image-resizer to v2.2.1-misskey.2

* lockfile

Co-authored-by: mei23 <m@m544.net>
Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
2022-04-28 11:14:03 +09:00
tamaina
2860b82590 Fix #8535 Excessive stack ... 'SchemaTypeDef<?>' (#8547)
* Fix #8535 Excessive stack ... 'SchemaTypeDef<?>'

Co-authored-by: acid-chicken <root@acid-chicken.com>

* add comment

* clean up

Co-authored-by: acid-chicken <root@acid-chicken.com>
2022-04-27 10:49:00 +09:00
Johann150
0396792209 fix: Promises -> Promise (#8545) 2022-04-25 15:14:13 +09:00
Johann150
aeeaae2d88 enhance: only render public notes in HTML template (#8527)
* only render public notes in HTML template

* fix missing import
2022-04-24 14:17:09 +09:00
tamaina
cce6bce024 fix: Fix schema key type error #8517 (#8538) 2022-04-24 11:43:15 +09:00
syuilo
daa9c02786 bump jsrsasign 2022-04-23 12:48:26 +09:00
Johann150
4c5a1e327f chore(lint): fix type definitions for jsrsasign (#8528)
* fix type definitions for jsrsasign

The @types/jsrsasign is not available in exactly the same version as the jsrsa
package misskey uses, so i used an earlier patch version of the same package.

* update yarn.lock
2022-04-23 12:45:36 +09:00
dependabot[bot]
5ce49356e7 chore(deps): bump moment from 2.24.0 to 2.29.3 in /packages/backend (#8531)
Bumps [moment](https://github.com/moment/moment) from 2.24.0 to 2.29.3.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/2.29.3/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.24.0...2.29.3)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-23 12:39:44 +09:00
syuilo
4bf45e968e refactor: use structuredClone for deep clone 2022-04-23 12:38:02 +09:00
syuilo
555c9b3cd8 update node to 18 2022-04-23 12:37:44 +09:00
syuilo
087e068482 update deps 2022-04-23 12:29:26 +09:00
xianon
c08aef8891 fix: アンテナ、クリップ、リストの表示を速くする (#8518)
* アンテナノートを取得するクエリがタイムアウトしないように速くする

* テーブル名を直接指定しないようにする

* クリップの取得を速くする

* リストの取得を速くする
2022-04-19 22:59:39 +09:00
Johann150
b68ac308ec await promises (#8519) 2022-04-19 18:46:41 +09:00
syuilo
cd7b04e90d fix ogp rendering and refactor 2022-04-17 21:18:18 +09:00