Commit graph

775 commits

Author SHA1 Message Date
syuilo
f83bd31fd5 wip 2022-12-19 13:53:41 +09:00
syuilo
9e9142a110 update depsd 2022-12-19 13:20:47 +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
867e31c9ff
enhance: Push notification of Antenna note (#9338)
* wip

* wip

* wip

* fix

* fix

* 🎨
2022-12-18 19:50:02 +09:00
Kagami Sascha Rosylight
af9034355c
Remove redundant ts-node things (#9335) 2022-12-18 07:51:31 +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
e8a49c9c9e
Fix MetaService unit tests (#9319) 2022-12-14 14:26:25 +09: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
Kagami Sascha Rosylight
f30d54fe88
Call tsc --noEmit also for backend/client (#9316) 2022-12-13 00:40:30 +09:00
syuilo
c5213dddbf update deps 2022-12-10 16:38:41 +09:00
syuilo
2067180328 improve nest logger 2022-12-10 15:45:30 +09:00
syuilo
b4b742ca89 fix #9299 2022-12-10 15:25:39 +09:00
xtexChooser
020cd5cc02
fix: typo (#9300) 2022-12-10 08:55:07 +09:00
syuilo
847f59369b tweak blurhash 2022-12-09 16:03:10 +09:00
syuilo
d73cc8f9b8 refactor(server): rename AppModule to RootModule 2022-12-08 17:22:27 +09:00
syuilo
6bb194de54 refactor(server): move RepositoryModule into models directory 2022-12-08 17:19:37 +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
f1855020ad update dep 2022-12-06 12:31:50 +09:00
syuilo
b4be9d270c perf(server): improve syslog performance 2022-12-06 09:38:55 +09:00
syuilo
d8611506cf inboxが処理できない問題を多分修正 2022-12-06 09:21:36 +09:00
syuilo
3e493effaf chore: add missing decoration of PushNotificationService 2022-12-06 09:17:37 +09:00
syuilo
c0c23b135c bull-board復活 2022-12-04 17:33:51 +09:00
syuilo
9ce13d487b chore: fix import position 2022-12-04 17:05:32 +09:00
syuilo
bbb49457f9 refactor: introduce bindThis decorator to bind this automaticaly 2022-12-04 15:03:09 +09:00
syuilo
496639f5b0 fix typo 2022-12-04 13:16:25 +09:00
syuilo
b29a50eca6 fix import paths 2022-12-04 13:14:35 +09:00
syuilo
2b1a673e32 chore: remove needless experimental-json-modules flag 2022-12-04 10:52:53 +09:00
syuilo
69016735be update deps 2022-12-04 10:39:11 +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
tamaina
14221e78b7 Fix forkbomb 2
also in extractApMentions and parseAudience

Co-authored-by: mei23 <m@m544.net>
2022-12-03 16:59:28 +00: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
Derek
66513b9893
fix(server): "forkbomb" DOS mitigation (#9247)
* Add recursion limit to resolver

* Use shared resolver in featured and question

* Changelog

* Changelog fix

* Update CHANGELOG.md

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

* Add host to recursion limit error message

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

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2022-12-03 06:13:36 +09:00
tamaina
5decad9cf1 fix: add missing , 2022-12-02 14:12:09 +00:00
syuilo
594c329dbd update deps 2022-11-29 13:14:57 +09:00
Kainoa Kanter
bdbc448d13
refactor: migrate to Yarn Berry (v3.2.1) (#8764)
* Yarn berry

* Add `.yarn` to dockerignore

* Mention in CHANGELOG

* Update Dockerfile

* Proper upgrade to yarn

* use `"packageManager"`

* Replace `install-packages.js` with workspaces

* Replace `install-packages.js` with workspaces

* Typo

* `corepack enable` for linting

* Remove `packages/*/yarn.lock`

* Improve lint workflow

* Update .github/workflows/lint.yml

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

* Update .github/workflows/lint.yml

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

* Add `eslint`

* Regenerate yarn.lock

* 🙏‍

* Update lint.yml

🤔

* Fix workflow!

* yarn lint my beloved

* corepack enable for mocha/e2e

* Update CHANGELOG.md

* fix the code that depends on node_modules

* tbh

* tbh

* More yarn workspaces stuff

* 🍀

* Change `browser-image-resizer`

* :finnadie:

* :goberserk:

* :godmode:

* Remove yarnrc for workspaces

* 🙏

* Add proper packages for eslint

* Skip extra install

* New steps for test.yml too

* uhh

* Update .dockerignore

* Update lint.yml

* Update test.yml

* Make client/backend lints seperate workflows

* package.json names

* pnpm = dont change paths

* Fix changelog

* :bowtie:

* I don't know why github workflows hates me...

* test

* ?????

* continue-on-error: true

* Fix yarn.lock

Co-authored-by: ishowta <ishowta@gmail.com>

* add @rollup/pluginutils

* add packageExtensions for chartjs_date-fns

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

* npm run => yarn

* wip

* yarn node => node

依存関係の記載不足の解消がかなり多いため、yarn nodeは使わない

* fix

* fix http-signature

* fix

* fix

* add packageExtensions

* ✌️

* remove `yarn set version berry`

* yarn install --immutable

Co-authored-by: ishowta <ishowta@gmail.com>

* https://github.com/misskey-dev/misskey/pull/8764#discussion_r885749892

* enable actions/setup-node's global cache

* Update .gitignore

Co-authored-by: iwata <ishowta@gmail.com>

* revival gulp build
66ab7591bf (r885899944)

* fix lockfile

* Update packages/backend/package.json

Co-authored-by: iwata <ishowta@gmail.com>

* remove packagemanager

* `yarn run gulp` in `build` instead of just `gulp`

* Update CHANGELOG.md

* update lockfile

* Add .yarn/cache to gitignore for packages

* ?

* move resolutions

* ✌️

* update lockfie

* update-lockfile

* update yarn.lock

* fix build

* fix

* fix

* fix: add @tensorflow/tfjs

* ダメ

* modify lockfile

* use yarnrc

* update yarnlock

* add jest-mock

* update-lockfile

* update lockfile

* update lockfile

* move jest-mock, update lockfile

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: ishowta <ishowta@gmail.com>
2022-11-24 15:39:00 +09:00
syuilo
aa8693e8df update deps 2022-11-19 10:25:16 +09:00
syuilo
521f97d03e Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-11-17 09:38:41 +09:00
kabo2468
456705a3d5
fix: 引用内の文章をnyaizeをしないように (#9141)
* fix nyaize in quote

* Update CHANGELOG.md

* for ofのほうが早いらしい

* Update NoteEntityService.ts

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-11-17 09:34:23 +09:00
syuilo
d5aee2ea58 improve performance 2022-11-17 09:31:07 +09:00
heka
746fac0dfe
fix typo on CleanRemoteFilesProcessorService (#9171) 2022-11-14 06:53:50 +09:00
syuilo
1751bfea5f update node to v18 2022-11-13 11:23:14 +09:00
syuilo
49daa56a64 update deps 2022-11-13 11:14:07 +09:00
syuilo
8935eaec3b Update QueueProcessorService.ts 2022-11-11 16:55:16 +09:00
squidicuz
2492f4e81e
fix for pinned users. update changelog (#9159) 2022-11-11 11:22:31 +09:00
syuilo
5e21fd2caf update deps 2022-10-28 16:08:27 +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
df0a90f69f fix type 2022-09-25 07:44:42 +09:00
syuilo
7670f364e3 type 2022-09-24 17:13:09 +09:00
syuilo
fd5976f378 fix type 2022-09-24 17:07:56 +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
da88e3a3b1 test: 後で戻す 2022-09-24 15:22:15 +09:00
syuilo
dabe5bf7e9 fix type errors 2022-09-24 14:45:44 +09:00
syuilo
aa3ca438a2 fix type 2022-09-24 10:46:52 +09:00
syuilo
cd6a6738c2 fix 2022-09-24 10:45:42 +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
b1abf47ce7 fix type 2022-09-24 07:17:45 +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
syuilo
92bfcb9b60
Update package.json 2022-09-23 04:19:13 +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
syuilo
e6077b03c3 refactor(backend): refactor dependency 2022-09-22 05:11:26 +09:00
syuilo
db2d391b3a update test 2022-09-22 04:59:58 +09:00
syuilo
8e6f1508ed use swc for jest 2022-09-22 04:51:16 +09:00
Takuya Yoshida
2e0075e79c
Fix ioredis import typo (#9099)
* Fix import typo

* Fix type
2022-09-21 10:12:18 +09:00
syuilo
8583b96402 fix wrong impot 2022-09-21 07:59:18 +09:00
syuilo
01d4d55e78 fix import type 2022-09-21 05:33:11 +09:00
syuilo
18fe773923 add test for metaService 2022-09-21 04:58:32 +09:00
syuilo
62bce14709 test 2022-09-21 04:54:21 +09:00
syuilo
e7cdc53c7b test 2022-09-21 04:50:16 +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
55f8a641a6 fix(backend): add missing noteEntityService dep 2022-09-21 02:19:49 +09:00
syuilo
320ee29e2a revert blurhash
https://github.com/woltapp/blurhash/issues/202
2022-09-20 07:52:23 +09:00
syuilo
88a6c312e2 update deps 2022-09-20 07:33:27 +09:00
syuilo
4a7bec4e57 lint 2022-09-20 05:36:51 +09:00
syuilo
567c550120 lint 2022-09-20 05:32:18 +09:00
syuilo
3010dc207a refactor(backend): refactor ChartManagementService 2022-09-20 05:19:37 +09:00
syuilo
0ea15f1c8a Create .madgerc 2022-09-20 01:04:08 +09:00
syuilo
89174904bc fix(test): fix chart test 2022-09-19 08:25:44 +09:00
syuilo
a2eac9fff6 test 2022-09-19 03:11:50 +09:00
syuilo
92c78218bc revert 2022-09-19 03:08:54 +09:00
syuilo
0163cb7bc1 test 2022-09-19 03:03:11 +09:00
syuilo
6c5a42e745 fix queue bug 2022-09-19 03:00:25 +09:00
syuilo
2fbd09a07e fix 2022-09-18 23:36:00 +09:00
syuilo
91d2c954fc typo 2022-09-18 23:30:08 +09:00
syuilo
a66111ac1f refactor(backend): simplify boot 2022-09-18 23:17:32 +09:00
syuilo
dd35f2cce6 refactor(backend): refactor logger 2022-09-18 23:07:41 +09:00
syuilo
1cb85c5c76 fix(backend): サービスが二重にインスタンス化されるのを修正 2022-09-18 06:24:30 +09:00
syuilo
6b639f186d Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-09-18 06:10:13 +09:00
syuilo
b69bd0ee7c refactor 2022-09-18 06:10:10 +09:00
dependabot[bot]
131c05f18c
chore(deps): bump undici from 5.8.0 to 5.10.0 in /packages/backend (#9073)
Bumps [undici](https://github.com/nodejs/undici) from 5.8.0 to 5.10.0.
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v5.8.0...v5.10.0)

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-18 05:48:29 +09:00
syuilo
b75184ec8e
なんかもうめっちゃ変えた 2022-09-18 03:27:08 +09:00
syuilo
7c89a27e61 update deps 2022-09-10 19:14:07 +09:00
syuilo
1b014bc3e5 fix(server): 他人の通知を既読にできる可能性があるのを修正 2022-09-06 20:54:49 +09:00
Takuya Yoshida
057d1642c8
Update typeorm to 0.3.9 (#9083) 2022-09-06 14:57:46 +09:00
syuilo
47b2e56967 update deps 2022-08-27 16:34:14 +09:00
syuilo
773139b737 enhance(client): add html color-schema support 2022-08-27 00:39:59 +09:00
syuilo
dddc076d01 update deps 2022-08-13 18:45:29 +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
78f061b9db update deps 2022-07-31 22:01:01 +09:00
syuilo
b5bf4e75a6 use es2021 for node 2022-07-31 14:20:10 +09:00
syuilo
f835421d70 update deps 2022-07-25 21:10:06 +09:00
syuilo
9f5c8f42e0
tweak rate limit 2022-07-24 17:56:48 +09:00
dependabot[bot]
d93ad43c49
chore(deps): bump undici from 5.5.1 to 5.8.0 in /packages/backend (#9028)
Bumps [undici](https://github.com/nodejs/undici) from 5.5.1 to 5.8.0.
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v5.5.1...v5.8.0)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-23 14:41:01 +09:00
dependabot[bot]
ab9fcc863f
chore(deps): bump file-type from 17.1.2 to 17.1.3 in /packages/backend (#9030)
Bumps [file-type](https://github.com/sindresorhus/file-type) from 17.1.2 to 17.1.3.
- [Release notes](https://github.com/sindresorhus/file-type/releases)
- [Commits](https://github.com/sindresorhus/file-type/compare/v17.1.2...v17.1.3)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-23 14:40:54 +09:00
syuilo
3acfeb1680 update tfjs 2022-07-23 14:31:15 +09:00
xianon
b6556c7ff1
リモートユーザーを正しくブロックできるように修正する (#9027) 2022-07-22 15:41:31 +09:00
syuilo
53d24c2ba1 chore: improve error message of boot 2022-07-21 22:30:36 +09:00
Acid Chicken (硫酸鶏)
a3c2dbbfb5
fix(server): make sure getFileInfo doesn't fail if detectSensitivity ever fails (#9020) 2022-07-19 17:09:21 +09:00
syuilo
bec2d9e3fa Update 1651224615271-foreign-key.js
#8852
2022-07-17 05:12:59 +09:00
syuilo
e4453e9ca8 Update 1651224615271-foreign-key.js
#8852
2022-07-16 23:51:32 +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
syuilo
e30a03b5c4 update deps 2022-07-13 21:37:48 +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
nvisser
947f079735
Make tensorflow an optinal dependency (#8986) 2022-07-13 21:00:59 +09:00
syuilo
4550a4459b feat: support <plain> syntax for mfm 2022-07-12 12:03:38 +09:00
MeiMei
660781afd9
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
a5648fb07f re: update mfm-js 0.23.0-canary.1 2022-07-11 23:13:23 +09:00
syuilo
18206e3cf6 update mfm-js 0.23.0-canary.1 2022-07-10 21:09:37 +09:00
yzhe819
9107de63b4
chore: fix lint errors (#8981) 2022-07-10 19:47:29 +09:00
tamaina
83ebe79a3f
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
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
syuilo
49012f8352 update summaly 2022-07-09 18:23:21 +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
522ddba3d7 enhance(server): tweak identicon generation 2022-07-09 13:22:35 +09:00
syuilo
207d7e0478 fix test 2022-07-08 11:21:11 +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
15a9a4b119 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-07-07 19:08:21 +09:00
syuilo
da239b8362 chore(server): tweak api for admin 2022-07-07 19:08:18 +09:00
dependabot[bot]
10f7e976ee
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
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
MeiMei
034c5d792b
fix: streamingテストおそい (#8912) 2022-07-03 20:54:54 +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
MeiMei
2f65d91ea8
migrate parse5 to 7.0.0 (#8916)
* migrate parse5 to 7.0.0

* fix
2022-07-01 13:48:03 +09:00
syuilo
b846ebeb97 use parse5 6.0.1
Fix #8914
2022-07-01 11:07:14 +09:00
Johann150
66b27bdc97
fix typo
Co-authored-by: mei23 <m@m544.net>
2022-06-30 22:03:04 +02:00
syuilo
e3bf53ea84 update deps 2022-07-01 00:21:25 +09: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
7d8a70f99e fix(api): fix instance schema 2022-06-28 12:16:11 +09:00
syuilo
c04d3d22af feat(api): add federation/stats endpoint 2022-06-28 10:41:22 +09:00
syuilo
164d4a9825 fix(api): add missing themeColor property of instance 2022-06-28 10:40:49 +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
929dc076ec Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-25 18:26:34 +09:00
syuilo
58e83f8e4f feat: allow GET for some endpoints
Resolve #8263
2022-06-25 18:26:31 +09:00
dependabot[bot]
126011c1a7
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
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
dependabot[bot]
e3461f1b58
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]
ca5200d1f1
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
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
Johann150
ecdaeea94f
enhance: word mute checks CW (#8873) 2022-06-23 20:26:47 +09:00
syuilo
f880d0631c tweak client 2022-06-21 17:55:38 +09:00
syuilo
4efee455b1 fix(server): faviconUrl of federated instance is missing 2022-06-21 14:28:43 +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
MeiMei
6422cde5f2
enhance: Improve player detection in URL preview (#8849)
* enhance: Improve player detection in URL preview

* CHANGELOG
2022-06-18 16:02:31 +09:00
Johann150
6078c986d3
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
b54f906605
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
1d8ec102f1
fix: GenerateVideoThumbnail (#8825)
* fix: GenerateVideoThumbnail

* CHANGELOG

* fix cleanup

* Revert "fix cleanup"

This reverts commit d54cf8262ac01a3deb6b8dd7689ec144d4d09ea8.
2022-06-14 23:02:14 +09:00
Johann150
3a42fe50c6
fix: tmpdir cleanup removes contained files (#8826) 2022-06-14 23:00:10 +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
Johann150
963758d8ec
fix: missing file name parameter (#8820) 2022-06-13 00:25:06 +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
ec6b418a23 update deps 2022-06-10 15:06:42 +09:00
syuilo
b9c64053e8 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-10 14:56:07 +09:00
syuilo
f5ba73e7c8 chore: tweak logo 2022-06-10 14:56:05 +09:00
Johann150
a683a7092d
enhance(federation): use ActivityPub defined property in favour of proprietary property. (#8787)
* add activitypub `source` property

* parse MFM from new `source` attribute
2022-06-10 14:31:58 +09:00
Johann150
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
d17298d3b5 fix(test): make chart tests working 2022-06-05 20:37:24 +09:00
syuilo
09b749eb97 Update .mocharc.json 2022-06-05 19:46:52 +09:00
syuilo
89419c05b2 use node 16 2022-06-04 17:26:56 +09:00
syuilo
abcd5bc951 update summaly 2022-06-04 17:24:41 +09:00
syuilo
11afdf7e24 fix bug 2022-06-04 15:15:44 +09:00
syuilo
702edfd3d3 fix test 2022-06-04 14:25:30 +09:00
Johann150
32dff28460
fix: add id for activitypub follows (#8689)
* add id for activitypub follows

* fix lint

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

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

* fix: missing import

* render block with id

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

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

* cannot resolve URLs with fragments

* also take remaining part of URL into account

Needed for parsing the follows URIs.

* Resolver uses DbResolver for local

* remove unnecessary use of DbResolver

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

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

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

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

* fix some issues

* small style fix

as suggested by Johann150

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

* fix

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

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-06-03 23:14:50 +09:00
syuilo
71c230b7b7 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-03 23:08:18 +09:00
syuilo
a3fed7d0fb fix(test): reset redis in e2e test
#7986
2022-06-03 23:08:15 +09:00
Johann150
025bf4a5e7
fix(mfm): remove duplicate br tag/newline (#8616) 2022-05-31 18:57:55 +09:00
Johann150
c56e45ecef
fix: always remove completed tasks (#8771) 2022-05-31 17:54:02 +09:00
MeiMei
c05723ca6a
Fix IP address rate limit (#8758)
* Fix IP address rate limit

* CHANGELOG

* Tune getIpHash
2022-05-31 17:44:22 +09:00
Johann150
ebc2566130
fix: add missing import
fix #8756
2022-05-29 14:33:42 +02:00
Johann150
804fa33535
refactor: improve code quality (#8751)
* remove unnecessary if

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

* perf: use count instead of find

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

* remove duplicate null check

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

* simplify `getJsonSchema`

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

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

* remove duplicate condition

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

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

* remove impossible "unknown" time

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

* remove salt

* APP_FETCH_FAILED error

* set max-age to 15s
2022-05-29 10:58:54 +09:00
tamaina
4917961736
preload app css (#8752) 2022-05-29 10:57:06 +09:00
Johann150
e54aa56ee1
chore: remove unused imports 2022-05-28 21:17:23 +02:00
Johann150
21d54f2758
fix: validate text is not empty
fix #8747
2022-05-28 17:26:17 +02:00
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
syuilo
b3ad04fcb0 update deps 2022-05-25 23:28:56 +09:00
syuilo
3c3140a100 refactor: use === 2022-05-25 23:19:39 +09:00
Johann150
8d5c9e96e4
fix: assume remote users are following each other (#8734)
Misskey does not know if two remote users are following each other.
Because ActivityPub actions would otherwise fail on followers only
notes, we have to assume that two remote users are following each other
when an interaction about a remote note occurs.
2022-05-25 23:17:00 +09:00
Johann150
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
MeiMei
6b44fe165b
Supports Unicode Emoji 14.0 (#8699)
* Unicode 14.0 Emoji

* mfm-js@0.22.0

* CHANGELOG

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-05-25 16:35:30 +09:00