Mar0xy
38e35e1472
merge: upstream
2023-10-03 15:20:49 +02:00
syuilo
ac19b055c7
update deps
2023-09-29 15:11:08 +09:00
syuilo
7ce86a6196
.js
2023-09-29 08:04:53 +09:00
Mar0xy
8595a325ce
merge: upstream
2023-09-26 02:26:30 +02:00
Mar0xy
2375d043d1
add: Megalodon, initial mastodon api
2023-09-23 18:49:47 +02:00
syuilo
5a4cf059ee
update deps
2023-09-23 12:46:19 +09:00
syuilo
e3f151e230
feat: 指定したユーザーの投稿通知
...
Resolve #11499
2023-09-21 18:48:15 +09:00
syuilo
b9c6992aac
update deps ( #11849 )
...
* update deps
* wip
* wip
2023-09-20 16:43:45 +09:00
syuilo
b0f6c44f36
refactor(frontend): use ESM
2023-09-19 16:37:43 +09:00
syuilo
6cf466e5d1
update deps ( #11820 )
...
* update deps
* fix
* wip
* wip
* wip
* Update docker-compose.yml.example
* Delete reviewer-lottery.yml
* Update RepositoryModule.ts
* wip
* wip
* clean up
* update deps
* wip
* wip
2023-09-15 14:28:29 +09:00
syuilo
59ab4af7ca
update deps
2023-09-05 17:43:43 +09:00
syuilo
1f7a81aae7
update deps ( #11764 )
...
* update deps
* node16
* wip
* wip
* wip
* Update test-utils.ts
* wip
* Update tsconfig.json
* wip
* Update package.json
* wip
* Update following.vue
* Update followers.vue
* Update index.vue
* Update share.vue
* Update MkUserPopup.vue
* Update MkPostForm.vue
* wip
* Update MkTokenGenerateWindow.vue
* Update MkPagination.vue
* refactor
* update deps
* update deps
* Update sw.ts
* wip
* wip
* wip
* Update FetchInstanceMetadataService.ts
* Update FetchInstanceMetadataService.ts
* update node
* update deps
* 🎨
2023-09-04 13:33:38 +09:00
syuilo
2b4c8c9e0f
update deps ( #11409 )
...
* update deps
* Update .eslintrc.js
* Update .eslintrc.js
* lint
* lint
* Update update.ts
* update deps
* Update .eslintrc.js
2023-07-31 19:14:20 +09:00
Shun Sakai
c2370a1be6
chore: 著作権とライセンスについての情報を各ファイルに追加する ( #11348 )
...
* chore: Add the SPDX information to each file
Add copyright and licensing information as defined in version 3.0 of
the REUSE Specification.
* tweak format
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-07-27 14:31:52 +09:00
syuilo
9a5bc78eb4
update deps
2023-07-15 16:07:30 +09:00
yukineko
52b440357f
fix(sw): アンケート終了時のプッシュ通知が正しく表示されない問題を修正 ( #11278 )
...
* fix(sw): アンケート終了時のプッシュ通知が正しく表示されない問題を修正
* update: CHANGELOG.md
2023-07-15 10:00:38 +09:00
anatawa12
9845ccec5b
オフライン時の画面にリロードボタンを追加 ( #11242 )
...
* feat: オフライン時の画面にリロードボタンを追加
リロードのためのボタンがないとPWAでインターネットが復帰しても何もできなくなるため。
* docs(changelog): add オフライン時の画面にリロードボタンを追加
2023-07-11 18:24:10 +09:00
Kagami Sascha Rosylight
59046d583d
refactor(locales, sw): use es module ( #11204 )
...
* refactor(locales): use es module
* fix sw build
* fix gulp
* try fixing storybook
* Revert "try fixing storybook"
This reverts commit 5f2a4eee016776381a7d80407e28d129c252228f.
* try fixing storybook 2
* Update main.ts
* Update build.js
* Update main.ts
* Update changes.ts
* fix sw lint
* Update build.js
2023-07-09 17:19:07 +09:00
syuilo
644023316e
refactor: use esm
2023-07-08 13:03:31 +09:00
syuilo
d5c4e77c44
update deps
2023-07-07 10:53:06 +09:00
syuilo
8099bc24e1
refactor(backend): use node16 for moduleResolution ( #10938 )
...
* refactor(backend): use node16 for moduleResolution
* update deps
* Update tsconfig.json
* ✌️
* revive KEYWORD
* restore strict-event-emitter-types dependency
* restore ms dependency
* cancel redundant import reorder
* fix
* Delete ms.ts
* remove rndstr
---------
Co-authored-by: Kagami Sascha Rosylight <saschanaz@outlook.com>
2023-06-25 21:13:15 +09:00
syuilo
60cc7f62e6
update deps
2023-06-24 13:11:53 +09:00
syuilo
5be6438bbc
update deps
2023-05-12 12:10:56 +09:00
syuilo
bcd123371b
update deps
2023-05-02 20:52:36 +09:00
syuilo
8c9cb9ee15
update deps
2023-04-19 12:52:14 +09:00
tamaina
471b836a44
fix(sw): 通知全削除時にread_notification通知が消えないように
...
通知欄に現れたり消えたりするとうざい
2023-04-18 06:01:18 +00:00
okayurisotto
5002effd65
Refactor sw ( #10579 )
...
* refactor(sw): remove dead code
* refactor(sw): remove dead code
* refactor(sw): remove dead code
* refactor(sw): remove dead code
* refactor(sw): remove dead code
* refactor(sw): remove dead code
* refactor(sw): 冗長な部分を変更
* refactor(sw): 使われていない煩雑な機能を削除
* refactor(sw): remove dead code
* refactor(sw): URL文字列の作成に`URL`を使うように
* refactor(sw): 型アサーションの削除とそれに伴い露呈したエラーへの対処
* refactor(sw): `append` -> `set` in `URLSearchParams`
* refactor(sw): `any`の削除とそれに伴い露呈したエラーへの対処
* refactor(sw): 型アサーションの削除とそれに伴い露呈したエラーへの対処
対処と言っても`throw`するだけ。いままでもこの状況ではエラーが投げられていたはずなので、この対処により新たな問題が起きることはないはず。
* refactor(sw): i18n loading
* refactor(sw): 型推論がうまくできる書き方に変更
`codes`が`(string | undefined)[]`から`string[]`になった
* refactor(sw): クエリ文字列の作成に`URLSearchParams`を使うように
* refactor(sw): `findClient`
* refactor(sw): `openClient`における`any`や`as`の書き換え
* refactor(sw): `openPost`における`any`の書き換え
* refactor(sw): `let` -> `const`
* refactor(sw): `any` -> `unknown`
* cleanup(sw): import
* cleanup(sw)
* cleanup(sw): `?.`
* cleanup(sw/.eslintrc.js)
* refactor(sw): `@typescript-eslint/explicit-function-return-type`
* refactor(sw): `@typescript-eslint/no-unused-vars`
* refactor(sw): どうしようもないところに`eslint-disable-next-line`を
* refactor(sw): `import/no-default-export`
* update operations.ts
* throw new Error
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2023-04-12 01:07:24 +09:00
tamaina
3a90bcc03c
sw: なんかもうめっちゃ変えた ( #10570 )
...
* sw: なんかいろいろ
* remove debug code
* never renotify
* update changelog.md
2023-04-11 14:11:39 +09:00
tamaina
da64273b43
chore(sw): use PascalCase
2023-04-10 12:10:06 +00:00
okayurisotto
6a23ffcce5
swのesbuildの更新とビルドスクリプトの更新 ( #10549 )
...
* cleanup(sw/build.js)
* fix(sw/build.js): `define`に真偽値を渡していた問題を修正
`define`では文字列を渡さなければならないので、`JSON.stringify`をするようにした。
* fix(sw/build.js): `string`が期待される`define`において`undefined`になる場合がある問題を修正
* update(sw): esbuild 0.17.15
* fixup! update(sw): esbuild 0.17.15
* fixup! fix(sw/build.js): `string`が期待される`define`において`undefined`になる場合がある問題を修正
コメントの文言を調整
2023-04-10 19:43:15 +09:00
okayurisotto
69828e8dac
fix(sw): プッシュ通知の操作でZen UIなクライアントが開かれてしまう場合がある問題を修正 ( #10497 ) ( #10498 )
2023-04-07 15:48:49 +09:00
syuilo
88f22da052
update deps
2023-04-06 20:22:26 +09:00
syuilo
30d6992684
perf(backend): 通知をRedisに保存するように
...
Resolve #10168
2023-04-04 14:06:57 +09:00
tamaina
26068a3a8f
use workspace:*, use pnpm@8.1.0
2023-03-30 13:01:00 +00:00
syuilo
bb2b33f2c9
update deps
2023-03-30 12:03:04 +09:00
Kagami Sascha Rosylight
cee1d5e2d0
chore: integrate misskey-js as a workspace item (git subtree) ( #10409 )
...
* Additional changes for the merge
* api-misskey-js
2023-03-30 09:33:19 +09:00
Kagami Sascha Rosylight
abdb43c440
Revert "Additional changes for the merge"
...
This reverts commit efb5e1d1cc
2023-03-25 08:20:34 +01:00
Kagami Sascha Rosylight
efb5e1d1cc
Additional changes for the merge
2023-03-25 08:13:30 +01:00
tamaina
ffe3386e5b
fix(sw): プッシュ通知でカスタム絵文字リアクションを表示できるように ( #10122 )
...
* fix(sw): プッシュ通知でカスタム絵文字リアクションを表示できるように
Fix #10117
/emoji/*.webpにbadgeモードを
* ?
* ✌️
* fix
2023-02-28 19:55:31 +09:00
syuilo
0fb9c372dd
lint
2023-02-22 15:28:17 +09:00
syuilo
716ffcace6
update deps
2023-02-20 17:04:57 +09:00
tamaina
cd5615d354
fix lint
2023-02-18 14:11:45 +00:00
tamaina
8c883653c9
fix/enhance(sw): プッシュ通知 (バックグラウンドで開いている場合も通知, リアクション通知はノートにつき1つに) ( #9977 )
...
* fix(sw): クライアントがあってもpush notificationを無視しない
「プッシュ通知を更新しました」の原因になるため
* enhance(sw): リアクション通知は1つのノートにつき1つしか表示しない
Safari対応で、通知tagは能動的に閉じるように
* revert closeNotificationsByTags
2023-02-18 17:48:20 +09:00
tamaina
36170a11f5
refactor(sw): self => globalThis
2023-02-18 05:16:34 +00:00
Kagami Sascha Rosylight
dd52be3a01
ci: run typecheck and eslint separately ( #9966 )
...
* ci: run typecheck and eslint separately
* fix syntax
2023-02-17 10:57: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
8d4c5deb8d
perf(sw): skipWaitingしない
2023-02-12 15:48:56 +00:00
Kagami Sascha Rosylight
9f0e0dc8ce
refactor(sw): Fix type errors in packages/sw ( #9909 )
...
* Fix type errors in packages/sw
* mouhitotsu
* @typesは越境しない
* Update packages/sw/src/scripts/create-notification.ts
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2023-02-13 00:31:37 +09:00
syuilo
1ff14d81c1
update deps
2023-02-09 09:25:31 +09:00
syuilo
65ed702d87
update deps
2023-02-03 14:44:09 +09:00
syuilo
c7b5c8b19e
swがビルドできないのを修正
2023-01-27 12:33:15 +09:00
syuilo
d8f33bc0af
update deps
2023-01-27 11:40:18 +09:00
tamaina
b442c38f41
enhance: Push Notification badges to Tabler Icons ( #9406 )
...
* enhance: Push Notification badges to Tabler Icons
* add receiveFollowRequest icon
2023-01-08 16:47:57 +09:00
syuilo
2e2ed1385f
delete pollVote notification
2023-01-08 10:54:45 +09: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 912791b3abhttps://github.com/misskey-dev/misskey/pull/9431#discussion_r1059215943
2022-12-30 12:00:50 +09:00
syuilo
9b595b93f8
update es version
2022-12-28 09:17:33 +09:00
tamaina
af649b0480
encodeURIComponent for static image proxy filename ( #9410 )
2022-12-25 18:05:53 +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
cfd7cf0f1e
refactor(sw): Typecheck the service worker ( #9314 )
...
* Typecheck the service worker
Currently the service worker build never typechecks, since esbuild and typescript-eslint don't do such job.
esbuild: https://esbuild.github.io/content-types/#typescript
>However, esbuild does not do any type checking so you will still need to run tsc -noEmit in parallel with esbuild to check types. This is not something esbuild does itself.
typescript-eslint: https://typescript-eslint.io/linting/troubleshooting#why-dont-i-see-typescript-errors-in-my-eslint-output
>TypeScript's compiler (or whatever your build chain may be) is specifically designed and built to validate the correctness of your codebase. Our tooling does not reproduce the errors that TypeScript provides, because doing so would slow down the lint run [1], and duplicate the errors that TypeScript already outputs for you.
Adding this step adds tons of TS errors 😱
* Override lib-webworker with service worker
2022-12-12 22:20:35 +09:00
Kagami Sascha Rosylight
8211893210
Fix lint errors (except @typescript-eslint/prefer-nullish-coalescing) ( #9311 )
...
* `yarn workspace client run lint --fix`
* `eslint-disable-next-line no-var` for service worker self
* A few more manual sw fixes
* word change
2022-12-12 19:27:47 +09:00
tamaina
83e1d53928
fix: lintが動かないのを修正, swもlint
2022-12-05 13:21:44 +00: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)✌️
* 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
b75184ec8e
なんかもうめっちゃ変えた
2022-09-18 03:27:08 +09:00
rinsuki
e60a6cc621
chore(sw): only proxies HTML requests ( #9070 )
...
* chore(sw): only proxies HTML requests
もはやHTMLじゃなさそうなリクエストにはSWで関与しないようにする
こうするといろいろな面倒事が解決するはず…たぶん
Resolve #9037
Resolve #9038
* align code style
* Update packages/sw/src/sw.ts
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2022-09-10 19:25:32 +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
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
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
tamaina
9759ca7d24
chore: remove packages/sw/webpack.config.js
2022-05-30 05:53:36 +00: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
