amechama/sharkey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,428 Commits 3 Branches 0 Tags 162 MiB
a12d1c52dd
Commit Graph

780 Commits

Author SHA1 Message Date
tamaina
88e3d3e8cb
enhance(server): 画像圧縮周り（主にサムネイルの仕様）の変更 (#10287) 
* DriveService, is-mime-image

* static, previewをavifに, アニメーション画像でもthumbnailを生成

* fallback

* animated: true

* fix

* avatarはwebp

* revert ?? file.url

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-03-11 14:11:40 +09:00
syuilo
99f3f0917f tweak postgresql entities 
Fix #10266
 2023-03-10 14:53:56 +09:00
syuilo
5de8930058 refactor: rename schema to json-schema 2023-03-10 14:22:37 +09:00
Kagami Sascha Rosylight
e0b7633a7a
enhance(backend): restore OpenAPI endpoints (#10281) 
* enhance(backend): restore OpenAPI endpoints

* Update CHANGELOG.md

* version

* set max-age

* update redoc

* follow redoc documentation

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2023-03-10 02:37:44 +09:00
tamaina
c75afad64a
enhance: アカウント削除時のクライアントの挙動をいい感じにするなど (#10002) 
* refreshAccounts
Resolve #9322

* アカウント管理画面でリストを更新するように

* Update packages/frontend/src/account.ts

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

* ✌️

* クライアント起動時は現在ログインしているアカウントのみリフレッシュする

* clean up

* なんかめっちゃ変えた

* refactor

* refactor

* fix lint

---------

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2023-03-09 14:27:16 +09:00
RyotaK
a4ca127ebd
fix: 登録メール送信時に重複確認を行う (#10231) 
* fix: 登録メール送信時に重複確認を行う

* try-catchを使う必要はない

* Remove spaces
 2023-03-09 12:57:34 +09:00
mmorita
aad70a97db
fix: チャンネルの編集権限をチャンネル所有者とモデレーターに限定する (#10268) 
* チャンネルの編集権限をチャンネルオーナーとモデレーターに限定する

* PR 指摘点対応(共有ボタンを全員に表示、$i の nullable 対応、fix a typo)

* everyOne -> share
 2023-03-09 07:58:53 +09:00
syuilo
dd6569a1bb
feat: Reaction acceptance (#10256) 
* wip

* wip

* デフォルト設定
 2023-03-08 08:56:47 +09:00
syuilo
4c2f7c64cc
feat: Per-user renote mute (#10249) 
* feat: per-user renote muting

From FoundKey/c414f24a2c https://akkoma.dev/FoundKeyGang/FoundKey

* Update ja-JP.yml

* Delete renote-muting.ts

* rename

* fix ids

* lint

* fix

* Update CHANGELOG.md

* リノートをミュートしたユーザー一覧を見れるように

* 🎨

* add test

* fix test

---------

Co-authored-by: Hélène <pleroma-dev@helene.moe>
 2023-03-08 08:56:09 +09:00
syuilo
6fe13f1a63 lint fix 2023-03-07 20:17:19 +09:00
danominium
4f0bb70118
fix(backend): ブロックホストがない場合はINクエリを生成しない。 (#10258) 
空のINクエリはシンタックスエラーとなるため。
 2023-03-07 20:09:20 +09:00
syuilo
2b884ba338 enhance(server): tweak notes/featured api 2023-03-07 08:41:10 +09:00
syuilo
ba2630c615 tweak of 8e5e6f90cb 2023-03-05 10:59:44 +09:00
syuilo
8e5e6f90cb fix(client): PWAでlangがnullになる現象の応急処置 
#10202
 2023-03-05 10:57:54 +09:00
tamaina
c36e7d1a07
enhance(server): メディアプロキシでico,bmpを読めるように (#10186) 
* enhance(server): downloadUrlでContent-Dispositionからファイル名を取得
Resolve #10036
Resolve #4750

* untitled

* オブジェクトストレージのContent-Dispositionのファイル名の拡張子をContent-Typeに添ったものにする

* ✌️

* tiff

* fix filename

* add test

* /files/でもContent-Disposition

* enhance(server): メディアプロキシでico,bmpを読めるように
Fix #10120

* comment

* fix test

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-03-04 19:23:11 +09:00
tamaina
2d551a8598
enhance(server): downloadUrlでContent-Dispositionからファイル名を取得 (#10150) 
* enhance(server): downloadUrlでContent-Dispositionからファイル名を取得
Resolve #10036
Resolve #4750

* untitled

* オブジェクトストレージのContent-Dispositionのファイル名の拡張子をContent-Typeに添ったものにする

* ✌️

* tiff

* fix filename

* add test

* /files/でもContent-Disposition

* comment

* fix test
 2023-03-04 16:51:07 +09:00
Kagami Sascha Rosylight
61215e50ff
test(backend): APIテストの復活 (#10163) 
* Revert 1c5291f818

* APIテストの復活

* apiテストの移行

* moduleNameMapper修正

* simpleGetでthrowしないように

status確認しているので要らない

* longer timeout

* ローカルでは問題ないのになんで

* case sensitive

* Run Nest instance within the current process

* Skip some setIntervals

* wait for 5 seconds

* kill them all!!

* logHeapUsage: true

* detectOpenHandlesがじゃましているらしい

* maxWorkers=1?

* restore drive api tests

* workerIdleMemoryLimit: 500MB

* 1024MiB

* Wait what
 2023-03-03 11:13:12 +09:00
kabo2468
53987fadd7
fix(server): チャンネルでミュートが正しく機能していないのを修正 (#10166) 
* fix(server): チャンネルでミュートが正しく機能していないのを修正

* Update CHANGELOG.md
 2023-03-03 10:30:21 +09:00
syuilo
d0bbeeee52 🎨 2023-03-01 14:22:53 +09:00
syuilo
9e5278d276 fix of #10145 2023-03-01 12:02:37 +09:00
syuilo
1c5291f818
feat: 時限ロール (#10145) 
* feat: 時限ロール

* クライアントから期限を確認できるように

* リファクタとか

* fix test

* fix test

* fix test

* clean up
 2023-03-01 10:20:03 +09:00
tamaina
ffe3386e5b
fix(sw): プッシュ通知でカスタム絵文字リアクションを表示できるように (#10122) 
* fix(sw): プッシュ通知でカスタム絵文字リアクションを表示できるように
Fix #10117
/emoji/*.webpにbadgeモードを

* ?

* ✌️

* fix
 2023-02-28 19:55:31 +09:00
tamaina
12932d2831
fix: 外部メディアプロキシ使用時にアバタークロップができない問題を修正 (#10142) 
* wip

* fix

* Update packages/frontend/src/scripts/media-proxy.ts

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

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-02-28 17:14:23 +09:00
syuilo
746770ac3b fix Serialized type 2023-02-28 16:46:25 +09:00
syuilo
b60c985203 fix(server): メールアドレス更新時にバリデーションが正しく行われていないのを修正 2023-02-28 15:31:48 +09:00
Kagami Sascha Rosylight
647a018362
fix(backend): return HTTP 404 for any unknown api endpoint paths (#10130) 
* fix(backend): return HTTP 400 for any invalid api endpoint paths

* 404
 2023-02-27 18:01:43 +09:00
tamaina
02d7ffd305 fix(server): 単純にrenoteできないのを修正 2023-02-26 11:10:24 +00:00
syuilo
a78a839841 refactor 2023-02-26 18:57:24 +09:00
xianon
67ca7ee4ec
ホームタイムラインの読み込みでクエリタイムアウトになるのを修正する (#10106) 2023-02-26 18:54:52 +09:00
syuilo
cc149e2f46 fix(server): エラーのスタックトレースは返さないように 
Fix #10064
 2023-02-26 17:12:15 +09:00
daima3629
1bdde6bd5c
[Fix] fixed an typo in error message (#10102) 2023-02-26 14:14:57 +09:00
tamaina
18dbcfa0b0
test(server): add validation test of api:notes/create (#10090) 
* fix(server): notes/createのバリデーションが効いていない
Fix #10079

Co-Authored-By: mei23 <m@m544.net>

* anyOf内にバリデーションを書いても最初の一つしかチェックされない

* ✌️

* wip

* wip

* ✌️

* RequiredProp

* Revert "RequiredProp"

This reverts commit 74693900119a590263106fa3adefd008d69ce80c.

* add api:notes/create

* fix lint

* text

* ✌️

* improve readability

---------

Co-authored-by: mei23 <m@m544.net>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-02-26 11:28:05 +09:00
syuilo
ea04778649 feat: in-channel featured note 
Resolve #9938
 2023-02-25 18:26:35 +09:00
tamaina
8b30c0c0cd
fix(client): Android ChromeでPWAとしてインストールできない問題を修正 (#10069) 
* fix(client): Android ChromeでPWAとしてインストールできない問題を修正

* 順番関係ある？
 2023-02-25 05:22:09 +09:00
tamaina
e4336f5b76
fix(server): notes/createで、fileIdsと見つかったファイルの数が異なる場合はエラーにする (#9911) 
* fix(server): notes/createで、fileIdsと見つかったファイルの数が異なる場合はエラーにする

* NO_SUCH_FILE
 2023-02-24 16:32:01 +09:00
tamaina
becc4d2e54
fix: i/notificationsで古い通知タイプを許容するなど、古い通知タイプの清算 (#10042) 
* wip

* fix

* create migration

* oops

* fix front const

* changelog

* fix type

* fix

* wip

* Revert "wip"

This reverts commit 6cdb3600e280be3550b8b6353b2c7930f7b31438.

* enumのこす

* fix

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-02-23 20:46:14 +09:00
Shogo Sensui
2189acdde1
enhance: make pwa icon maskable (#10033) 2023-02-23 15:59:21 +09:00
syuilo
5b3a07ee9e Revert "Allow configuring the listen host (#9924)" 
This reverts commit 3dfe3aa9a4.
 2023-02-22 18:00:35 +09:00
ledlamp
3dfe3aa9a4
Allow configuring the listen host (#9924) 2023-02-22 17:51:40 +09:00
syuilo
84e2ee220b fix(server): tweak admin/show-user api 
Fix #9883
 2023-02-22 17:17:36 +09:00
syuilo
5ec07ede7c fix types 2023-02-22 14:58:41 +09:00
syuilo
72d4ad4c45 fix type 2023-02-22 14:53:36 +09:00
dojineko
a6fb6150a3
chore: add tiny definition for redis-lock (#9971) 
* add tiny definition for redis-lock

* Update packages/backend/src/@types/redis-lock.d.ts

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

* fix type name

* add @typescript-eslint/naming-convention

* define taskToPerform type

* chore: use default settings for `@typescript-eslint/naming-convention`

* set `format:none` to typeParameter (default)

* ignore lines to be treated as exceptions

* chore: fix naming

---------

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-02-22 14:51:34 +09:00
tamaina
b9ee14fe5b
fix: MkUserSelectDialog/search-by-username-and-hostでローカルユーザーを絞って検索できない問題を修正 (#9943) 
* fix: MkUserSelectDialog/search-by-username-and-hostでローカルユーザーを絞って検索できない問題を修正
Fix #9627

* update CHANGELOG.md

* clean up

* search-by-username-and-host大改造
 2023-02-22 14:47:51 +09:00
syuilo
870f7608be enhance: exploreで公開ロール一覧とそのメンバーを閲覧できるように 2023-02-22 14:43:18 +09:00
syuilo
b161f38710 fix(server): improve security of admin/drive/show-file 2023-02-21 14:47:11 +09:00
tamaina
980bf1306e
🎨 2FA設定のデザイン向上 / セキュリティキーの名前を変更できるように (#9985) 
* wip

* fix

* wip

* wip

* ✌️

* rename key

* 🎨

* update CHANGELOG.md

* パスワードレスログインの判断はサーバーで

* 日本語

* 日本語

* 日本語

* 日本語

* ✌️

* fix

* refactor

* トークン→確認コード

* fix password-less / qr click

* use otpauth

* 日本語

* autocomplete

* パスワードレス設定は外に出す

* 🎨

* 🎨

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-02-20 16:40:24 +09:00
noonworks
ea92254b73
refactor: 型エラー修正 / Fix type errors backend (#9983) 
* refactor: fix type errors in backend

* revert some changes

* なるべくJS挙動を変えない方法に修正

* Update packages/backend/src/server/api/ApiCallService.ts

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

* コンフリクトするファイルを削除

---------

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2023-02-20 08:13:37 +09:00
syuilo
7ce0f79f7f chore(server): tweak notes/featured api 2023-02-19 17:50:14 +09:00
syuilo
0f546b47d1 refactor: fix types 2023-02-17 15:39:10 +09:00
syuilo
60df819c60 refactor: fix types 2023-02-17 15:36:36 +09:00
syuilo
0e1b5d6f14 refactor: fix types 2023-02-17 15:15:36 +09:00
tamaina
e8c5307f66
perf(client): ウェルカムページを最適化 (#9960) 
* perf(client): ウェルカムページの最適化

* remove max
 2023-02-17 12:38:30 +09:00
Kagami Sascha Rosylight
8f9ce23e52
style(backend): fix all eslint errors (#9967) 2023-02-17 10:56:59 +09:00
Kagami Sascha Rosylight
63df2c851e
refactor: remove all unused imports (#9951) 
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2023-02-16 23:09:41 +09:00
syuilo
e24b0ceb80 startAt -> startsAt 2023-02-15 14:31:59 +09:00
nenohi
71c42bef9b
広告開始時期の設定 (#9944) 
* 広告開始時期の設定

* 過去のものも表示するように
 2023-02-15 14:29:40 +09:00
syuilo
8caf288ac1
drop group (#9942) 
* drop group

* Update operations.ts
 2023-02-15 13:37:18 +09:00
syuilo
8f2049bcd2
drop messaging (#9919) 
* drop messaging (from backend)

* wip
 2023-02-15 13:06:06 +09:00
tamaina
4e68126c06
enhance(server): URLプレビュー（summaly）はプロキシを通すように (#9905) 
* enhance(server): URLプレビュー（summaly）はプロキシを通すように

* update summaly

* update summaly

* 型エラーバスター

* basic.html

* Delete basic.html

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-02-14 14:17:07 +09:00
Neko7sora
7436a58ea1
改行コードをLFに統一 (#9926) 
* chore: update gitattribute editorconfig

* Normalize all the line endings
 2023-02-14 13:13:34 +09:00
syuilo
1b21bad202 refactor 2023-02-13 15:50:22 +09:00
syuilo
f34f9f6ea5 refactor: fix types 2023-02-13 15:28:07 +09:00
syuilo
451bc0b444 refactor: fix types 2023-02-12 18:47:30 +09:00
syuilo
b55d26387b improve error handling 2023-02-12 10:36:43 +09:00
syuilo
9ddf62d8b7 enhance: レートリミットを0%にできるように 2023-02-12 10:26:27 +09:00
tamaina
ee03ab8d2c
enhance(server): videoThumbnailGenerator config (#9845) 
* enhance(server): videoThumbnailGenerator config

* ✌️

* fix

* 相対url

* サムネイルのproxyRemoteFilesは直接プロキシを指定する

* メディアプロキシ
 2023-02-12 09:13:47 +09:00
momoirodouhu
f28aea9e30
add cors header to ActivityPubServerService.ts (#9888) 
* add cors header to ActivityPubServerService.ts

* Update CHANGELOG.md
 2023-02-12 08:22:42 +09:00
RyotaK
ef860a8f84
CLIページにおいてAPIリクエスト時にContent-Typeヘッダを付与するように変更 (#9887) 2023-02-12 08:21:13 +09:00
tamaina
19035c676c /proxyでemoji, avatarなどの命令がありかつ画像でないなら404を返すように 2023-02-09 12:39:24 +00:00
syuilo
0b269e79fd i/notificationsのレートリミットを緩和 2023-02-09 18:11:11 +09:00
tamaina
6e61a36d05 i/notificationsのレートリミットを緩和 
SubwayTooterのバグ対策でレートリミットを設定していたが、通常の使い方でも引っかかることもあるため緩和
 2023-02-09 08:32:42 +00:00
tamaina
f80bf1fb1c perf: renderBaseでCache-Controlを300秒から30秒に 2023-02-09 08:19:12 +00:00
tamaina
deed25a2ff Fix #9842 2023-02-09 08:00:45 +00:00
tamaina
a486716520 perf: renderBaseでCache-Controlを15秒から300秒に 2023-02-09 07:49:39 +00:00
syuilo
76faec2115 refactor: fix types 2023-02-09 11:46:08 +09:00
syuilo
33c4e57994 refactor: fix types 2023-02-09 11:42:55 +09:00
syuilo
bc23496998 refactor: fix types 2023-02-09 11:31:40 +09:00
syuilo
d35ad95c18 refactor: fix types 2023-02-09 11:03:40 +09:00
syuilo
5facd11592 refactor: fix types 2023-02-09 11:02:37 +09:00
syuilo
e1e885d6b2 refactor: fix types 2023-02-09 10:55:15 +09:00
syuilo
71dd7f89e9 clean up 2023-02-09 10:47:03 +09:00
syuilo
21331e53fe refactor: fix types 2023-02-09 10:46:01 +09:00
syuilo
1139632f95 fix(server): 自分のノートをお気に入りに登録しても実績解除される問題を修正 2023-02-05 14:30:07 +09:00
syuilo
6a3039f7b7 feat: ロールにアイコンを設定してユーザー名の横に表示できるように 
Resolve #9761
 2023-02-05 10:37:03 +09:00
tamaina
faed3b438e fix(server): clean up file in FileServer 2023-02-04 13:46:19 +00:00
syuilo
ee74df6823 fix(server): improve security 2023-02-04 18:21:07 +09:00
syuilo
38f9d1e764 fix(client): validate urls to improve security 2023-02-04 14:20:07 +09:00
tamaina
2dfed75402
perf(server): improvement of external mediaProxy (#9787) 
* perf(server): improvement of external mediaProxy

* add a comment

* ✌️

* /filesでsharpの処理を行わずリダイレクトする

* fix

* thumbnail => static

* Fix #9788

* add avatar mode

* add url

* fix

* static.webp

* remove encodeURIComponent from media proxy path

* remove existance check
 2023-02-04 13:38:51 +09:00
syuilo
0c12e80106 perf(server): cache blocking 2023-02-04 12:40:40 +09:00
syuilo
562b02310f drop twitter/github/discord integrations 
Close #9775
 2023-02-03 15:01:31 +09:00
syuilo
c559a9843f drop hashtag chart 2023-02-03 14:10:14 +09:00
syuilo
d9d98f84bf refactor: fix type 2023-02-01 20:12:42 +09:00
tamaina
7c3143b8e5
enhance(backend): enhance SchemaType handling of anyOf (#9762) 
* enhance(backend): enhance anyOf handling

* clean up
 2023-02-01 20:04:01 +09:00
syuilo
387fcd5c5d refactor: fix type 2023-02-01 17:29:28 +09:00
hayabusa
b21064ffa4
リアクション履歴が公開なら、ログインしていなくても表示できるように (#9728) 2023-01-26 16:10:32 +09:00
tamaina
4735ae6451
refactor: /proxyをFileServerServiceに統合し、/proxyのurlで/filesが指定されていた場合は直接ファイルを解決するようにする (#9709) 
* wip?

* clean up

* Implement? HttpFetchService

* ✌️

* remove node-fetch

* fix

* refactor

* fix

* gateway timeout

* UndiciFetcherクラスを追加 (仮コミット, ビルドもstartもさせていない)

* fix

* add logger and fix url preview

* fix ip check

* enhance logger and error handling

* fix

* fix

* clean up

* Use custom fetcher for ApRequest / ApResolver

* bypassProxyはproxyBypassHostsに判断を委譲するように

* set maxRedirections (default 3, ApRequest/ApResolver: 0)

* fix

* wip????

* wip

* ✌️

* set .node-version

* clean up

* refactor

* clean up

* refactor

* refactor detectRequestType

* rename detectResponseType

* ✌️

* fix

* wip

* clean up

* no got

* remove got

* wip

* ✌️

* fix

* clean up

* remove unnnecessary const

* good cleanup

* no stream

* Revert "no stream"

This reverts commit 636f9192fcd2b17e71bbf6b5b106b490e0f66244.

* fix

* cache-control: max-age=300 to error

* refactor cleanup
 2023-01-26 16:06:29 +09:00
syuilo
d87bb807c3 tweak error screen 2023-01-26 11:39:21 +09:00
tamaina
605b0f27e4 Merge branch 'develop' into emoji-re 2023-01-25 14:22:26 +00:00
syuilo
d4fb201d05 fix(server): node-fetchおよびgotを使う以前の実装に戻す 
see #9710
 2023-01-25 12:00:04 +09:00
syuilo
2a2e8d0cf6 refactor(server): fix type errors 2023-01-25 11:23:57 +09:00
syuilo
b62894ff56 use minified css 2023-01-24 15:02:16 +09:00
tamaina
0cffe60abc 1時間に 2023-01-22 17:14:05 +00:00
tamaina
d347f0a087 wip 2023-01-22 16:07:17 +00:00
tamaina
0b2f945bb6 wip 2023-01-22 15:13:03 +00:00
tamaina
2f6c45e118 wip 2023-01-22 14:53:24 +00:00
tamaina
a8b19f4aa8 Merge branch 'develop' into emoji-re 2023-01-22 12:07:38 +00:00
syuilo
19c93151ce tweak boot.js 2023-01-22 17:18:48 +09:00
syuilo
bd8b624bae tweak bootstrap of client 2023-01-22 17:04:51 +09:00
syuilo
26ae2dfc0f add achievement 2023-01-22 08:00:42 +09:00
syuilo
3e112da486 ローカルのカスタム絵文字については直接オリジナルURLにリクエストするように 2023-01-21 20:40:09 +09:00
syuilo
8631740ca4 fix(server): twitterと連携するときに autwh is not a function になるのを修正 
Fix #9658
 2023-01-21 17:01:02 +09:00
syuilo
0b4a7e8166 enhance(server): set Cache-Control header for some routes 2023-01-21 13:20:09 +09:00
syuilo
65cd605b73
Achievements (#9665) 
* wip

* Update ja-JP.yml

* wip

* wip

* Update MkAchievements.vue

* wip

* 🎨

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip
 2023-01-21 13:14:55 +09:00
syuilo
fe4fbafcf0 存在しないカスタム絵文字をテキストで表示するように 
Resolve #9516
 2023-01-17 15:58:12 +09:00
Kainoa Kanter
84b8ffb7d0
enhance(client): Force error screen (#8947) 2023-01-17 03:26:41 +09:00
tamaina
21e4c3dfe9 wip 2023-01-16 09:39:58 +00:00
syuilo
30fced38c4 refactor: rename instance.caughtAt to instance.firstRetrievedAt 2023-01-16 05:02:38 +09:00
syuilo
81f11d8f86 refactor: rename role.options -> role.policies 2023-01-15 20:52:53 +09:00
syuilo
7fc8d2e6d5 ロールでレートリミットを調整できるように 
Resolve #9584
 2023-01-15 16:52:12 +09:00
syuilo
2047449294 enhance(server): add rate limits for some endpoints 2023-01-14 20:21:03 +09:00
syuilo
6cb9612943 fix import 2023-01-14 17:40:51 +09:00
syuilo
76c049522e enhance: ユーザーリストおよびユーザーリスト内のユーザーの作成可能数を設定可能に 2023-01-14 17:38:16 +09:00
syuilo
c2009acb2d enhance: クリップおよびクリップ内のノートの作成可能数を設定可能に 2023-01-14 16:14:24 +09:00
syuilo
46d2a8726e fix missing import 2023-01-14 16:04:13 +09:00
syuilo
7df3ca7388 enhance(server): add rate limits for some endpoints 2023-01-14 15:59:15 +09:00
syuilo
d52f0617a1 fix(server): ドライブ容量超過時のエラーが適切にレスポンスされない問題を修正 
Fix #9550
 2023-01-14 13:41:53 +09:00
syuilo
c730973294 多分 fix #9551 2023-01-14 13:36:18 +09:00
syuilo
bcb5182e86 Webhookの作成可能数を設定可能に 2023-01-14 10:48:11 +09:00
syuilo
f45059b7b1 fix 2023-01-14 10:46:40 +09:00
syuilo
4151087d3c フォロワー数、フォロー数もConditional roleで利用できるように 2023-01-14 08:27:23 +09:00
syuilo
39c058a4bb Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-01-14 08:04:41 +09:00
syuilo
d1807ee5dc enhance: ハードワードミュートの最大文字数を設定可能に 
Resolve #7574
 2023-01-14 08:04:38 +09:00
こけっち
98469117bf
fix: follow request list api pagination (#9548) 
* fix: follow request list api pagination

* fix: improve alias

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

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-01-14 06:18:58 +09:00
tamaina
303519a1bd
enhance: Judge instance block by endsWith (#9263) 
* TypeScriptでendsWith

* fix

* SQL?

* バ〜カアホ

* Update packages/backend/src/core/UtilityService.ts

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

* add comment

* add description

* Update packages/backend/src/core/UtilityService.ts

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

* Update packages/backend/src/core/chart/charts/federation.ts

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

* remove comment

* fix

* fix?

* add changelog

* ILIKE, ARRAY

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-01-13 18:21:07 +09:00
syuilo
161da24841 fix(server): signup-complete Broken 
Fix #9538
 2023-01-13 17:59:40 +09:00
syuilo
6e40024660 typo 2023-01-13 17:49:05 +09:00
syuilo
2654936c17 fix 2023-01-13 17:42:12 +09:00
syuilo
bc0b8afb1f fix ads/update api 2023-01-13 15:15:31 +09:00
syuilo
b250456814 カスタム絵文字の管理を権限を持つユーザーが行えるように 
Resolve #9542
 2023-01-13 14:58:27 +09:00
syuilo
0a6e237d09 refactor 2023-01-13 14:46:56 +09:00
syuilo
7b7faf1e84 招待コード発行を権限を持つユーザーが行えるように 
Resolve #9541
 2023-01-13 14:22:53 +09:00
syuilo
6458239a7c remoteDriveCapacityMbをロールに統合 2023-01-13 11:14:07 +09:00
syuilo
c5c40a73b7 feat: conditional role 
Resolve #9539
 2023-01-13 11:03:54 +09:00
tamaina
978a9bbb3b
perf(backend): Use undici instead of node-fetch and got (#9459) 
* Implement? HttpFetchService

* ✌️

* remove node-fetch

* fix

* refactor

* fix

* gateway timeout

* UndiciFetcherクラスを追加 (仮コミット, ビルドもstartもさせていない)

* fix

* add logger and fix url preview

* fix ip check

* enhance logger and error handling

* fix

* fix

* clean up

* Use custom fetcher for ApRequest / ApResolver

* bypassProxyはproxyBypassHostsに判断を委譲するように

* set maxRedirections (default 3, ApRequest/ApResolver: 0)

* fix comment

* handle error s3 upload

* add debug message

* no return await

* Revert "no return await"

This reverts commit b5b0dc58a342393d260492e3a6f58304372f53b2.

* reduce maxSockets

* apResolverのUndiciFetcherを廃止しapRequestのものを使う、 add ap logger

* Revert "apResolverのUndiciFetcherを廃止しapRequestのものを使う、 add ap logger"

This reverts commit 997243915c8e1f8472da64f607f88c36cb1d5cb4.

* add logger

* fix

* change logger name

* safe

* デフォルトでUser-Agentを設定
 2023-01-12 21:03:02 +09:00
syuilo
2470afaa2e
Role (#9437) 
* wip

* Update CHANGELOG.md

* wip

* wip

* wip

* Update create.ts

* wip

* wip

* Update CHANGELOG.md

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update CHANGELOG.md

* wip

* wip

* Update delete.ts

* Update delete.ts

* wip

* wip

* wip

* Update account-info.vue

* wip

* wip

* Update settings.vue

* Update user-info.vue

* wip

* Update show-file.ts

* Update show-user.ts

* wip

* wip

* Update delete.ts

* wip

* wip

* Update overview.moderators.vue

* Create 1673500412259-Role.js

* wip

* wip

* Update roles.vue

* 色

* Update roles.vue

* integrate silence

* wip

* wip
 2023-01-12 21:02:26 +09:00
syuilo
c5cfbd99d0 perf(server): improve nodeinfo performance 
Resolve #9505
 2023-01-10 20:08:55 +09:00
syuilo
33b22a323c perf(server): improve stats api performance 2023-01-10 20:06:25 +09:00
syuilo
3bc0cdbfb7 typo 2023-01-09 17:22:21 +09:00
syuilo
462acc9eee カスタム絵文字一覧情報をmetaから分離 2023-01-09 15:50:25 +09:00
syuilo
962373cf06 fix(server): 非公開のクリップのURLでOGPレンダリングされる問題を修正 
Fix #9129
 2023-01-09 13:26:42 +09:00
syuilo
91ced90fb2 fix imports 2023-01-09 08:58:16 +09:00
MeiMei
10e526ba56
fix: Escape SQL LIKE (#9493) 
* SQL LIKE escape

* CHANGELOG
 2023-01-08 20:32:17 +09:00
syuilo
2e2ed1385f delete pollVote notification 2023-01-08 10:54:45 +09:00
syuilo
54e3fccd87 enhance(server): refactor and tweak emoji proxy 2023-01-07 14:19:25 +09:00
tamaina
c336201084 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-01-06 14:01:02 +00:00
tamaina
0f3399753d chore: remove Search from the name of OpenSearch 2023-01-06 14:00:54 +00:00
tamaina
5ec89ea0c3
カスタム絵文字にプロキシを復活 (#9481) 
* wip

* Revert "Update ClientServerService.ts"

This reverts commit 88c64ece78.

* Revert "disable custom emoji proxy temporary"

This reverts commit 495d513efd.

* ✌️
 2023-01-06 22:34:50 +09:00
syuilo
88c64ece78
Update ClientServerService.ts 2023-01-06 14:07:34 +09:00
syuilo
495d513efd disable custom emoji proxy temporary 
https://github.com/misskey-dev/misskey/pull/9431#issuecomment-1373006446
 2023-01-06 13:47:18 +09:00
syuilo
6b2b403d94 Update flash.pug 2023-01-06 10:34:43 +09:00
syuilo
e2ca90b0a1 enhance(server): SSR for flash 2023-01-06 10:20:42 +09:00
CyberRex
bcc3380cfc
fix(backend): Set correct access control of admin/drive/files (#9472) 2023-01-06 08:05:02 +09:00
syuilo
6f9aa94e3a fix instance sort 2023-01-05 16:38:12 +09:00
syuilo
ebe340d510
MisskeyPlay (#9467) 
* wip

* wip

* wip

* wip

* wip

* Update ui.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update CHANGELOG.md

* wip

* wip

* wip

* wip

* 🎨

* wip

* ✌️
 2023-01-05 13:59:48 +09:00
syuilo
d306db4ff8 fix(server): pages/likeのエラーIDが重複しているのを修正 2023-01-04 17:41:39 +09:00
syuilo
1ed078d7f9 fix(server): fix pages/update 2023-01-04 17:41:09 +09:00
syuilo
4cc71d2443 ✌️ 2023-01-03 09:32:36 +09:00
syuilo
c8bd139713 drop lastCommunicatedAt of instance 2023-01-03 09:00:42 +09:00
syuilo
771348e887 PV集計はローカルユーザーのみに 2023-01-03 08:29:25 +09:00
syuilo
969e9df889 feat: add per user pv chart 2023-01-01 17:45:49 +09:00
syuilo
4c4af2ae84 clean up 2023-01-01 17:38:02 +09:00
syuilo
e414737179 feat: make possible to export favorited notes 
#9331
 2023-01-01 16:53:10 +09:00
syuilo
ee6e022b2a enhance(server): productionじゃない限りレートリミットを無効に 2023-01-01 11:58:16 +09:00
syuilo
6f51e7300e ✌️ 2023-01-01 09:35:14 +09:00
syuilo
6140865252 tweak max-age 2022-12-31 09:14:53 +09:00
syuilo
51d8d2abbf cache emoji response 2022-12-31 09:12:42 +09:00
syuilo
b2d6561bc6 enhance(server): clean emoji response 2022-12-31 08:43:13 +09:00
tamaina
1a408db3b1 fix: use || for emoji url fallback instead of ?? 2022-12-30 13:37:58 +00:00
tamaina
8b46edeccf
enhance: Proxy custom emojis to reduce image size and accelerate the frontend (#9431) 
* fix(server): /emoji to accept `@.` host expression

* fix(client): use MkEmoji for custom emoji in MkEmojiPicker

* change convertToWebp

* nanka iroiro

* remove

* fix

* nearLosslessは労多くして益少なしなのでやめる

* do not cleanup tmp for development

* update sharp.js to 0.31.3

* mixed: true

* fix MkAutocomplete of 912791b3ab

* clean up

* https://github.com/misskey-dev/misskey/pull/9431#discussion_r1059215943
 2022-12-30 12:00:50 +09:00
tamaina
329ef760bf fix(server): /emoji to accept @. host expression 2022-12-29 14:54:31 +00:00
syuilo
912791b3ab
refactor: 絵文字URLを引き回すのをやめる (#9423) 2022-12-29 10:14:44 +09:00
Soni L
123e490311
Support OpenSearch (closes #7058) (#9427) 
Co-authored-by: Chaos <chaoticryptidz@owo.monster>
 2022-12-29 07:53:59 +09:00
syuilo
af9e742e71 fix(server): bodyLimit for each endpoints 2022-12-28 09:07:41 +09:00
syuilo
9384f5399d rename: client -> frontend 2022-12-27 14:36:33 +09:00
syuilo
d106fb39ab feat: introduce fluent emoji 2022-12-26 16:04:56 +09:00
syuilo
dd4c411d22 ダッシュボードにモデレーター一覧を表示 2022-12-26 09:22:10 +09:00
syuilo
c801434d11 fix(server): アンテナの作成数上限を追加 2022-12-26 08:50:17 +09:00
syuilo
225dbec8b9 64kb 2022-12-25 14:56:59 +09:00
syuilo
ab1a433400 fix 2022-12-25 14:53:50 +09:00
syuilo
b518c35e00 fix(server): Ap inboxの最大ペイロードサイズを256kbに制限 2022-12-25 14:52:42 +09:00
syuilo
f44a7e2536 refactor 2022-12-25 14:22:23 +09:00
syuilo
3e81913b6a feat: introduce retention-rate aggregation 2022-12-25 09:09:46 +09:00
syuilo
b11f8b0aae chore: fix reporisotry name 2022-12-25 08:30:13 +09:00
syuilo
b648c4bc4d chore: fix reporisotry name 2022-12-25 08:27:06 +09:00
syuilo
4ede367c1e GET非対応APIにGETでリクエストすると接続が開きっぱなしになる 
Fix #9404
 2022-12-24 13:55:50 +09:00
syuilo
024664e2fd fix dummy image path 2022-12-23 16:57:20 +09:00
syuilo
145c15f0d9 fix(server): add missing vary header 
Fix #9393
 2022-12-23 08:50:58 +09:00
rinsuki
aee09f63e1
fix: WebFinger returns 500 (#9390) 2022-12-22 17:46:46 +09:00
tamaina
2fe86fd869
enhance: Vite HMR while yarn dev, and more build tuning (#9361) 
* enhance: Vite HMR while yarn dev, and more build tuning

* use localhost

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-12-20 13:05:36 +09:00
syuilo
917ef465a5
Use tabler icons (#9354) 
* wip

* wip

* wip

* Update style.scss

* wip

* wip

* wip

* wip
 2022-12-19 19:01:30 +09:00
Kagami Sascha Rosylight
c3cb218975
fix(backend): request.body may be undefined (#9356) 2022-12-19 15:57:36 +09:00
syuilo
52cbe07a78 Revert "wip" 
This reverts commit f83bd31fd5.
 2022-12-19 13:54:35 +09:00
syuilo
f83bd31fd5 wip 2022-12-19 13:53:41 +09:00
Effy Elden
5e448deb03
Fix peers API returning suspended instances (#9348) 
* Fix peers API returning suspended instances

* Fix missing comma
 2022-12-19 09:00:13 +09:00
tamaina
ac0a59835e
wip (#9349) 2022-12-19 08:59:17 +09:00
tamaina
4ecc42744c
enhance: Implement the toggle to (or not to) close push notifications when notifications or messages are read (#9219) 
* create file

* wip

* fix

* wip

* tabun dekita

* ✌️

* implement subscribe push notification button to tutorial

* check-exists→show-registration

* add column sendReadMessage

* fix migration file

* sw api

* change PushNotificationService

* wip

* ✌️

* fix tutorial footer flex
 2022-12-18 01:59:59 +09:00
syuilo
96dda253b0 fix(server): GitHubログインしようとするとreply.setCookie is not a function 
fix #9327
 2022-12-17 11:02:49 +09:00
tamaina
9c5dfd2da7 chore(backend): fix duplicated css preload 2022-12-14 08:32:52 +00:00
Kagami Sascha Rosylight
4b98920f02
Fix import related TypeScript errors (#9321) 
* Add missing @types packages

* Fix TS1272 type only imports

* Fix TS2821 import assertion
 2022-12-14 00:01:45 +09:00
syuilo
b4b742ca89 fix #9299 2022-12-10 15:25:39 +09:00
syuilo
6d46e5cf77 enhance: fallback option for media proxy 2022-12-08 17:16:50 +09:00
tamaina
e81c2962a0
enhance: AVIF support (#9281) 
* chore: Make image/avif browsersafe

* server side

* change FileInfoService

* ✌️

* avifはMastodonでは絶望的 see https://github.com/misskey-dev/misskey/issues/9283

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-12-08 14:49:49 +09:00
syuilo
686bea6e2a
Update ServerService.ts 2022-12-08 13:40:42 +09:00
syuilo
8b4ba370f7
Update ServerService.ts 2022-12-08 07:46:11 +09:00
syuilo
9d14476a6a fix(server): cookieが取得されないのを修正 2022-12-06 14:17:53 +09:00
syuilo
3b7c943440 fix(server): cookieが設定されないのを修正 2022-12-06 14:14:41 +09:00
syuilo
9cda400c80 fix(server): GitHub連携ができない問題を修正 2022-12-06 12:41:11 +09:00
syuilo
d8611506cf inboxが処理できない問題を多分修正 2022-12-06 09:21:36 +09:00
syuilo
c0c23b135c bull-board復活 2022-12-04 17:33:51 +09:00
syuilo
bbb49457f9 refactor: introduce bindThis decorator to bind this automaticaly 2022-12-04 15:03:09 +09:00
syuilo
8950114f7d refactor: remove needless const notation 2022-12-04 10:32:12 +09:00
syuilo
22ccb0fa71 refactor 2022-12-04 10:16:03 +09:00
syuilo
3a7182bfb5
Fastify (#9106) 
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* fix

* Update SignupApiService.ts

* wip

* wip

* Update ClientServerService.ts

* wip

* wip

* wip

* Update WellKnownServerService.ts

* wip

* wip

* update des

* wip

* Update ApiServerService.ts

* wip

* update deps

* Update WellKnownServerService.ts

* wip

* update deps

* Update ApiCallService.ts

* Update ApiCallService.ts

* Update ApiServerService.ts
 2022-12-03 19:42:05 +09:00
tamaina
5decad9cf1 fix: add missing , 2022-12-02 14:12:09 +00:00
syuilo
d5aee2ea58 improve performance 2022-11-17 09:31:07 +09:00
syuilo
1751bfea5f update node to v18 2022-11-13 11:23:14 +09:00
squidicuz
2492f4e81e
fix for pinned users. update changelog (#9159) 2022-11-11 11:22:31 +09:00
CyberRex
1309367884
Add Cloudflare Turnstile CAPTCHA support (#9111) 
* Add Cloudflare Turnstile CAPTCHA support

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

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

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2022-10-13 09:19:57 +09:00
syuilo
7670f364e3 type 2022-09-24 17:13:09 +09:00
syuilo
3c4b7d3bd0 fix type 2022-09-24 17:02:19 +09:00
syuilo
89ef21e3b0 fix type 2022-09-24 16:53:53 +09:00
syuilo
349f37bf57 fix 2022-09-24 10:43:23 +09:00
syuilo
0f7cbb5922 fix type 2022-09-24 10:39:17 +09:00
syuilo
f4b981cefe fix type 2022-09-24 10:25:32 +09:00
syuilo
2c45c5b13e fix 2022-09-24 09:03:04 +09:00
syuilo
6eace8894a fixes 2022-09-24 08:41:27 +09:00
syuilo
614b11951b refactor 2022-09-24 07:15:16 +09:00
syuilo
786f1d8be8 remove unused files 2022-09-24 07:13:01 +09:00
syuilo
c8f6bc0dab fixes 2022-09-24 07:12:11 +09:00
syuilo
417f52359d fixes 2022-09-24 06:45:44 +09:00
syuilo
174a8b1b3e fixes 2022-09-23 06:21:31 +09:00
syuilo
31f2f6616c chore: fix type import 2022-09-23 06:07:29 +09:00
こけっち
bcbda6940a
feat: Youtube window player (#9095) 
* wip: feat: Youtube Player Window

* fix: player fill window

* fix: improve design

* fix: disable at mobile and creanup code

* fix: tailing comma

* fix: delete debug output

* fix: eslint

* fix: switch to component

* fix(backend): add missing dependency

Fix #9101

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-09-22 08:20:31 +09:00
Takuya Yoshida
2e0075e79c
Fix ioredis import typo (#9099) 
* Fix import typo

* Fix type
 2022-09-21 10:12:18 +09:00
syuilo
01d4d55e78 fix import type 2022-09-21 05:33:11 +09:00
syuilo
3bc6205150 refactor(backend): ロジックをサービスに切り出す 2022-09-21 02:52:19 +09:00
syuilo
dc43fc68ef enhance(backend): metaのポーリング頻度を減らし、redisで更新を受け取るように 2022-09-21 02:35:49 +09:00
syuilo
567c550120 lint 2022-09-20 05:32:18 +09:00
syuilo
a2eac9fff6 test 2022-09-19 03:11:50 +09:00
syuilo
2fbd09a07e fix 2022-09-18 23:36:00 +09:00
syuilo
dd35f2cce6 refactor(backend): refactor logger 2022-09-18 23:07:41 +09:00
syuilo
b75184ec8e
なんかもうめっちゃ変えた 2022-09-18 03:27:08 +09:00
syuilo
1b014bc3e5 fix(server): 他人の通知を既読にできる可能性があるのを修正 2022-09-06 20:54:49 +09:00
syuilo
773139b737 enhance(client): add html color-schema support 2022-08-27 00:39:59 +09:00
syuilo
f3164c9cf2 fix: use new for throw error 
Co-Authored-By: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2022-08-01 17:44:53 +09:00
syuilo
9f5c8f42e0
tweak rate limit 2022-07-24 17:56:48 +09:00
syuilo
53d24c2ba1 chore: improve error message of boot 2022-07-21 22:30:36 +09:00
syuilo
c1c8c9c37c
fix(server): fix bind of method 
Fix #9006
 2022-07-16 19:03:41 +09:00
syuilo
44f560b453 tweak boot.js 2022-07-14 22:25:57 +09:00
syuilo
f2e91f4d62 tweak boot.js 2022-07-14 22:04:16 +09:00
syuilo
10f4815d34 tweak boot.js 2022-07-14 21:52:58 +09:00
syuilo
d78faf1134 chore: use tab 2022-07-14 21:02:45 +09:00
syuilo
cb00786f1e improve error handling of client boot 2022-07-14 20:41:17 +09:00
syuilo
61e26696aa log error while client boot 2022-07-14 20:29:45 +09:00
tamaina
ae92378689
fix(sw, notification): Don't issue an event if there is no affect (#8979) 
* test

* ]v]
 2022-07-13 21:07:49 +09:00
Johann150
714c80bf3f
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
syuilo
a5648fb07f re: update mfm-js 0.23.0-canary.1 2022-07-11 23:13:23 +09:00
dogcraft
d92200a6d6
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
MeiMei
53e54c22fa
Fix Attempts to update all notifications (#8974) 
* Fix massive update notification parameters

* CHANGELOG

* CHANGELOG
 2022-07-09 18:18:39 +09:00
syuilo
75d516011b enhance: make active email validation configurable 2022-07-09 15:05:55 +09:00
syuilo
e560601815
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
da239b8362 chore(server): tweak api for admin 2022-07-07 19:08:18 +09:00
syuilo
423e7692db chore(server): tweak api for admin 2022-07-07 18:09:50 +09:00
Kainoa Kanter
a23f59b996
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
syuilo
b35c3114c8 revert: feat: styled error screen (#8930) 2022-07-06 06:36:14 +09:00
syuilo
972b03f842 perf: allow get for notes/reactions 2022-07-05 19:16:21 +09:00
syuilo
cb246d3459 rename: BIOS -> Repair Tool 2022-07-05 17:46:17 +09:00
Kainoa Kanter
40656e3ee2
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
CyberRex
cd07eb222e
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
syuilo
26c89e053d fix typo 2022-07-03 19:01:08 +09:00
syuilo
dd426735a0 feat: moderation note 2022-07-03 00:15:03 +09:00
syuilo
949dbb3918 feat(server): add fetch-rss api to reduce dependency of external apis 2022-07-02 21:26:33 +09:00
syuilo
eccc90c843
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
52a1ec9af1 enhance(server): アンケートを新しい順にソート 2022-07-02 12:34:22 +09:00
syuilo
b773d516d3 chore(client): tweak ui 2022-07-02 12:22:52 +09:00
Johann150
66b27bdc97
fix typo 
Co-authored-by: mei23 <m@m544.net>
 2022-06-30 22:03:04 +02:00
syuilo
ed41d542bb chore(client): tweak ui 2022-06-30 20:15:14 +09:00
syuilo
324f5525b5 fix(server): cannot show users 2022-06-30 15:36:09 +09:00
syuilo
6f3e64f13e chore(client): tweak client 2022-06-30 15:32:11 +09:00
syuilo
5c3e782d29 improve instance doughnut charts 2022-06-28 13:05:20 +09:00
syuilo
c04d3d22af feat(api): add federation/stats endpoint 2022-06-28 10:41:22 +09:00
syuilo
329f055a97 feat: make possible to delete an account by admin 
Resolve #8830
 2022-06-27 23:49:16 +09:00
Johann150
bc3ae901cc
refactor: remove duplicate code (#8895) 2022-06-27 21:48:10 +09:00
MeiMei
f834d6a813
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
4634920866 fix #8894 2022-06-26 17:38:50 +09:00
tamaina
2366f568b9
enhance(client): Enhance boot error display (#8879) 
* Change boot error message

* fix

* ✌️

* fix
 2022-06-26 12:47:43 +09:00
syuilo
58e83f8e4f feat: allow GET for some endpoints 
Resolve #8263
 2022-06-25 18:26:31 +09:00
Johann150
5728350267
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
syuilo
696e8add00 feat: 管理者が特定ユーザーのアップロードしたファイル一覧を見れるように 2022-06-24 21:43:28 +09:00
Johann150
a5241379af
fix lints 2022-06-24 12:44:22 +02:00
MeiMei
6f8e3fe366
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
4f4d2b7c53
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
tamaina
b70473ed60
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
5b7595d9d7
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
syuilo
e4dc25dd5c enhance(server): モデレーターであってもレートリミットを有効に 2022-06-14 22:59:19 +09:00
tamaina
f1e6fa8ee2
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
10d979bd65
fix(docs): use correct description property 2022-06-14 11:55:58 +02:00
Johann150
b5390c0922
fix: remove unused parameter 2022-06-14 11:54:55 +02:00
syuilo
963f538728 lint fixes 2022-06-14 18:01:23 +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
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
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
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
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
89419c05b2 use node 16 2022-06-04 17:26:56 +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
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
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
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
21d54f2758
fix: validate text is not empty 
fix #8747
 2022-05-28 17:26:17 +02: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
9c80403072
use http-signature module that supports hs2019 (#8635) 2022-05-26 09:12:17 +09: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
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
syuilo
4fc2058745 chore(client): tweak loading spinner design 2022-05-19 15:24:35 +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
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
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
tamaina
b2a5076d14
fix: ユーザー検索で、クエリがusernameの条件を満たす場合はusernameもLIKE検索するように (#8644) 
* Fix #8643

* 部分一致にする
 2022-05-14 15:24:44 +09:00
Johann150
4b872856c2
fix: keep file order (#8659) 2022-05-14 15:09:10 +09:00
syuilo
98e42ec6ff enhance: Display TOTP Register URL 
Close #7261

Co-Authored-By: tamaina <tamaina@hotmail.co.jp>
 2022-05-14 15:00:15 +09:00
tamaina
a89003b57a
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
MeiMei
60391ff37e
fix: Add rel attribute to host-meta (#8583) 
* Add rel attribute to host-meta

* CHANGELOG
 2022-05-01 19:14:14 +09:00
tamaina
766559c6e9
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
tamaina
12a3c6872f
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
Johann150
7e28c396b9
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
syuilo
fd13173eaf bump jsrsasign 2022-04-23 12:48:26 +09:00
syuilo
84b183a9f6 refactor: use structuredClone for deep clone 2022-04-23 12:38:02 +09:00
xianon
60620bdb25
fix: アンテナ、クリップ、リストの表示を速くする (#8518) 
* アンテナノートを取得するクエリがタイムアウトしないように速くする

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

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

* リストの取得を速くする
 2022-04-19 22:59:39 +09:00
syuilo
d338ea2591 fix ogp rendering and refactor 2022-04-17 21:18:18 +09:00
syuilo
ff8313b48b refactor 2022-04-17 20:51:59 +09:00
syuilo
02bb36cdc4 refactor: fix type 2022-04-17 20:44:21 +09:00
syuilo
6b31ea1992 refactor: fix type 2022-04-17 17:30:27 +09:00
syuilo
31b216f667 refactor: fix type 2022-04-17 14:42:13 +09:00
syuilo
a671f9102d refactor: fix type 2022-04-17 13:31:45 +09:00