Commit graph

443 commits

Author SHA1 Message Date
MeiMei
7bebea087c Fix #4546 (#4548)
* Refactor download

* emoji type
2019-03-21 04:50:44 +09:00
MeiMei
1c79e30436 Fix NoteReaction (#4547) 2019-03-20 21:39:02 +09:00
syuilo
da3447765b
Revert "Remove deepcopy dependency"
This reverts commit cbf5663179.
2019-03-19 18:47:14 +09:00
syuilo
cbf5663179
Remove deepcopy dependency 2019-03-19 17:59:44 +09:00
MeiMei
c2eec272e6 Content-Disposition in ObjectStrage (#4524)
* Content-Disposition in ObjectStrage

* encode filename
2019-03-18 15:23:45 +09:00
MeiMei
2684541693 Custom reaction (#4517)
* Custom reaction

* increase limit of reactions/delete

* リアクションの場合は OS標準の絵文字を使用 を迂回する

* カスタムリアクションを無効にする設定

* fix

* disableCustomReaction --> enableEmojiReaction

* Avoid MFM rendering

* 🎨

* 🎨

* Auto accept

* custom emoji reaction

* Improve usability

* Extract emojiRegex

* Fix

* Clean up

* 🎨

* 🎨

* toDbReaction で reaction は必須に

あとフォールバックは like に

* Clean up

* Make required

* 3eb08748fe (r266241728)

* Refactor

* Allow null
2019-03-18 00:03:57 +09:00
MeiMei
56eb896a03 Accept Article object (#4499) 2019-03-15 00:23:24 +09:00
Acid Chicken (硫酸鶏)
4068d220e5
Follow #3676 2019-03-14 22:17:26 +09:00
MeiMei
1179920790 unFollowAll on suspend (#4490)
* unFollowAll on suspend

* use services

* silent
2019-03-14 15:16:07 +09:00
syuilo
e47c354916
Refactor 2019-03-11 19:57:50 +09:00
MeiMei
c6cdfa2f5a Ignore 4xx references in AP (#4463)
* Ignore 4xx references

* remove unnecessary comment
2019-03-10 22:27:25 +09:00
syuilo
d1aea7596c
Fix import 2019-03-07 23:14:01 +09:00
MeiMei
7325d66c52 Implement Update Question (#4435)
* Update remote votes count

* save updatedAt

* deliver Update

* use renderNote

* use id

* fix typeof
2019-03-07 21:19:32 +09:00
Acid Chicken (硫酸鶏)
725600da8f Enhance poll (#4409)
* Start working

* WIP: Enhance poll

* Fix bug

* Use `name` in voting note
refs: https://github.com/syuilo/misskey/issues/4407#issuecomment-469057296

* Fix style

* Refactor
Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>

* WIP: Update poll editor

* Fix bug

* Fix bug
refs: https://github.com/syuilo/misskey/pull/4409#discussion_r

* Fix typo

* Better design

* Beautify poll editor

* Fix UI

* Fix bug
refs: https://github.com/syuilo/misskey/pull/4409#discussion_r262217524

* Add debug logging

* Fix bug

* Log deliver

* fix vote

* Update ap/show
refs: https://github.com/syuilo/misskey/pull/4409#issuecomment-469652386

* Update poll view

* Maybe done

* Add tests

* Fix path

* Fix test

* Fix test

* Fix test

* Fix expired check on AP

* Update note.ts

* Squashed commit of the following:

commit d9a4beabf851893b8992a0f4568265eb9d4f0b8e
Author: mei23 <m@m544.net>
Date:   Wed Mar 6 05:16:14 2019 +0900

    tune

commit 83ff421a6e978243f80ba9ec820189bc897e6e3b
Author: mei23 <m@m544.net>
Date:   Wed Mar 6 05:01:14 2019 +0900

    fallback

commit 0b566af973b115ade9e75ea4b8094ee2b329dabc
Author: mei23 <m@m544.net>
Date:   Wed Mar 6 04:40:12 2019 +0900

    Note

commit cc0296dd6127580ac584c40398db3f762a311f8b
Author: mei23 <m@m544.net>
Date:   Wed Mar 6 04:33:58 2019 +0900

    createで送る

* Squashed commit of the following:

commit ae696b1ed12568b27c27367ac5a77035c97c9a1f
Author: mei23 <m@m544.net>
Date:   Wed Mar 6 06:11:17 2019 +0900

    fix

commit b735e354e7a9e64534c4f17d04ecbc65fb735c21
Author: mei23 <m@m544.net>
Date:   Wed Mar 6 06:08:33 2019 +0900

    messge

commit d9a4beabf851893b8992a0f4568265eb9d4f0b8e
Author: mei23 <m@m544.net>
Date:   Wed Mar 6 05:16:14 2019 +0900

    tune

commit 83ff421a6e978243f80ba9ec820189bc897e6e3b
Author: mei23 <m@m544.net>
Date:   Wed Mar 6 05:01:14 2019 +0900

    fallback

commit 0b566af973b115ade9e75ea4b8094ee2b329dabc
Author: mei23 <m@m544.net>
Date:   Wed Mar 6 04:40:12 2019 +0900

    Note

commit cc0296dd6127580ac584c40398db3f762a311f8b
Author: mei23 <m@m544.net>
Date:   Wed Mar 6 04:33:58 2019 +0900

    createで送る

* Fix typo

* Update vote.ts

* Update vote.ts

* Update poll-editor.vue

* Update tslint.json

* Fix layout

* Add note

* Fix bug

* Rename text key

* 投票するときに投稿として扱わないように (#4425)

* wip

* 形式をMastodonと合わせた

* Bye something

* Use - instead of ~

* Redundancy

* Yes!

* Refactor

* Use moment instead of Date

* Fix indent

* Refactor

if (votes.length)
は必要なさそう

* Clean up

* Bye Date

* Clean

* Fix timer is not displayed

* Fix リモートから無期限pollにvoteできない

* Fix vote actor
2019-03-06 22:55:47 +09:00
MeiMei
94f2c20d35 Fix #4413 (#4417) 2019-03-05 07:56:23 +09:00
MeiMei
d4ff19f013 Fix SVG detection (#4401)
* Fix SVG detection

* remove unnecessary import
2019-03-03 08:48:02 +09:00
syuilo
60c30ece10
Better logs 2019-03-03 08:00:39 +09:00
syuilo
d50624f0a0
Better logs 2019-03-03 07:47:58 +09:00
syuilo
977af0a24d
ログをデータベースに保存して管理画面で見れるように 2019-03-02 18:51:59 +09:00
syuilo
47d4dcfdf5
Improve doc 2019-02-25 04:02:18 +09:00
syuilo
563d604812
Refactor 2019-02-24 17:28:51 +09:00
syuilo
9b79a411e0
Use camelCase 2019-02-24 12:53:22 +09:00
syuilo
5db7b2e193
Improve doc 2019-02-24 12:23:31 +09:00
syuilo
ac0390fec3
Improve doc 2019-02-24 10:08:09 +09:00
syuilo
97b99867f2
Improve doc 2019-02-24 10:04:27 +09:00
syuilo
a55d5516a6
Improve doc 2019-02-24 10:00:24 +09:00
syuilo
b679163d01
Improve type definitions 2019-02-24 09:45:27 +09:00
syuilo
68a6758302
投稿を削除したときにお気に入りからも削除するように 2019-02-22 14:54:52 +09:00
syuilo
2756f553c6
Improve error handling of API (#4345)
* wip

* wip

* wip

* Update attached_notes.ts

* wip

* Refactor

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update call.ts

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* ✌️

* Fix
2019-02-22 11:46:58 +09:00
syuilo
3409a51cca
Resolve #2017 2019-02-21 01:30:21 +09:00
syuilo
d51cafca74
Fix #4326 2019-02-20 06:44:40 +09:00
syuilo
0e046faf4a
みつけるの人気のタグを第2ソートで連合含めたユーザー数にしたりユーザーのタグ以外は除外するように 2019-02-18 11:47:25 +09:00
syuilo
e8db63e788
Fix bug 2019-02-18 01:11:14 +09:00
syuilo
1d5a54ff6f
ハッシュタグでユーザー検索できるように (#4298)
* ハッシュタグでユーザー検索できるように

* 🎨

* Increase limit

* リモートユーザーも表示

* Fix bug

* Fix bug

* Improve performance
2019-02-17 23:41:47 +09:00
syuilo
43864f0da4
既にフォローされている場合はフォローリクエストを生成しないように (#4266) 2019-02-15 05:56:28 +09:00
syuilo
faba21d003
Remove unused import 2019-02-11 23:39:05 +09:00
syuilo
d82c5dff71
Fix bug 2019-02-11 23:37:15 +09:00
syuilo
acb82fe7b6
フォロー処理のリファクタリング (#4196)
* Fix #4185

* Fix bug
2019-02-09 12:04:03 +09:00
syuilo
56275bcfcb
Introduce per-instance chart (#4183)
* Introduce per-instance chart

* Implement chart view in client

* Handle note deleting

* More chart srcs

* Add drive stats

* Improve drive stats

* Fix bug

* Add icon
2019-02-08 16:58:57 +09:00
syuilo
aba85b977d
Refactoring: Move chart dir into services dir 2019-02-08 04:31:33 +09:00
syuilo
5448c22031
Revert 96bc17aa10 2019-02-07 21:02:33 +09:00
syuilo
336912e442
Improve instance stats 2019-02-07 15:00:44 +09:00
Aya Morisawa
96bc17aa10 Check config on load (#4170)
Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
2019-02-06 22:44:55 +09:00
syuilo
8129d4dc23
Refactoring 2019-02-05 14:14:23 +09:00
MeiMei
f014b7ae0e アニメーションを自動再生しないオプション (#4131)
* Refactor

* settings

* Media Proxy

* Replace API response
2019-02-05 03:01:36 +09:00
Acid Chicken (硫酸鶏)
68ee9a008e Resolve #4121 (#4122)
* Resolve #4121

* Update tslint.json
2019-02-04 18:27:45 +09:00
syuilo
0868c3517f
Use internal logger instead of debug/console for logging
Resolve #4104
Resolve #1966
Resolve #1937
2019-02-03 18:16:57 +09:00
syuilo
efe2a6be14
Better logging 2019-02-03 17:09:16 +09:00
syuilo
75558add17
Better logging 2019-02-03 16:45:13 +09:00
syuilo
238c6a428b
[Server] Use logger for logging 2019-02-03 04:18:27 +09:00
MeiMei
84931003ea Fix video thumbnails (#4095)
* Fix video thumbnails

* Fix import
2019-02-02 23:30:34 +09:00
MeiMei
3040700005 Generate video thumbnails (#4084)
* Generate video thumbnails

* import order
2019-02-02 13:22:09 +09:00
syuilo
734277d9f6
[Server] Resolve #4062 2019-01-31 17:37:57 +09:00
MeiMei
b8a7468c4a Do not import as pack from AP renderer (#4048)
* Do not import as pack from AP renderer

* rename
2019-01-31 02:29:35 +09:00
syuilo
00b134ce1e
Introduce silence (#4043)
* Introduce silence

* Fix icon
2019-01-30 17:25:56 +09:00
Aya Morisawa
28bfb45426
Avoid export default 2019-01-30 16:56:27 +09:00
Aya Morisawa
250933fff3
Add missing semicolon 2019-01-28 17:49:20 +09:00
syuilo
a0f8c7e94e
Resolve #2253 2019-01-26 17:47:56 +09:00
syuilo
da7d1938c9
[Server] Fix #3991 2019-01-26 17:11:02 +09:00
MeiMei
fa124abbe2 Supports Twemoji / CustomEmoji in poll (#3960)
* Supports Twemoji / CustomEmoji in poll

* extract emojis in polls
2019-01-23 04:49:16 +09:00
syuilo
e0874069bd
[Server] リプライをタイムラインに流す以前の仕様に差し戻し
Resolve #3941
2019-01-21 14:44:49 +09:00
syuilo
90c8568a3f
Remove unused import 2019-01-21 13:45:58 +09:00
MeiMei
4a57482216 リモートで投票を見たりしたりできるように (#3940)
* fix type

* expose Question

* Note refs Question

* rename

* wip

* リモート投票の場合リプライ送信

* voteの実装をservicesに移動

* 投票受信

* debug

* つくる

* Revert "つくる"

This reverts commit 0c9245886680b7d3b93a0278642f4cf6a43b5cb2.

* APIの実装はもどし

* Send Update

* AP type

* Recv Update

* Revert "Recv Update"

This reverts commit ffda39c0936d8e023f64603edabeb8e0eb9fc370.

* Revert "AP type"

This reverts commit 63d8bbe29dd6f326773214346350607cc4381996.

* Revert "Send Update"

This reverts commit 171b046de549f1478e928dee3177eeefab341fcf.

* リモートで投票を見る

* 投票はDM

* Provides choices as text for AP

* 絵文字

* fix error

* revert

* APからには不要な処理を削除

* Revert "APからには不要な処理を削除"

This reverts commit 8b5d8af9b0cc4d4ad0cf21de59827ff21df99560.

* てぬき

* めんどい

* ちっ

* remove unused code
2019-01-21 13:27:19 +09:00
syuilo
6bbccedb2d
[Server] Fix #3528 2019-01-21 12:19:20 +09:00
syuilo
875d793512
常にメディアを閲覧注意として投稿するオプションが機能してなかった問題を修正 2019-01-20 18:20:25 +09:00
syuilo
b39d12f01a
関係のない返信がタイムラインに流れる問題を修正
Resolve #1910
2019-01-20 13:14:31 +09:00
syuilo
6909add1ec
Drop stalk feature
Resolve #3935
Closes #2226
Closes #1946
2019-01-20 12:25:00 +09:00
MeiMei
22830965e3 AP Undo Like (#3933)
* AP Undo Like

* rename
2019-01-20 03:07:12 +09:00
syuilo
8d42e94e57
Implement active users chart
Resolve #3904
2019-01-17 17:16:08 +09:00
Acid Chicken (硫酸鶏)
018837db0b Support SVG (#3883)
* Update add-file.ts

* Update package.json

* Revert "Update add-file.ts"

This reverts commit ba0fe83b54a44493447208dfb3cc304a60df6fdd.

* Update add-file.ts

* Update package.json

* Update add-file.ts

* Update add-file.ts

* Create image.svg

* Update api.ts
2019-01-13 18:21:10 +09:00
MeiMei
12cf598e6b Fix bug (for return) (#3878) 2019-01-11 17:53:53 +09:00
MeiMei
273bc6507a ダイレクトを非公開のように使えるようにする (#3869) 2019-01-11 08:06:05 +09:00
syuilo
a3493c4f07
Privateの公開範囲を廃止 2018-12-29 02:55:46 +09:00
MeiMei
8823a6c1a1 フォローしているユーザーからのフォローを自動承認するオプション (#3780) 2018-12-28 21:36:58 +09:00
MeiMei
98acf919f1 ダイレクト投稿でユーザーが指定されていなかったらrejectする (#3724) 2018-12-23 04:17:42 +09:00
MeiMei
c9c2853150 ダイレクトでメンションでもユーザーを指定できるように (#3722) 2018-12-23 03:44:18 +09:00
Aya Morisawa
e9f8897fe2
Refactor MFM
Co-authored-by: syuilo syuilotan@yahoo.co.jp
2018-12-20 19:42:10 +09:00
MeiMei
4fc377584f Fix tag length limit from AP (#3688) 2018-12-20 02:20:56 +09:00
syuilo
00f979f0e6
Fix bug 2018-12-19 11:16:29 +09:00
MeiMei
9ee9cf8d81 Fix URL after deleting remote file (#3597)
* Fix URL after deleting remote file

* expired only

* delete space
2018-12-12 11:46:35 +09:00
Aya Morisawa
125849673a
Use for-of instead of forEach (#3583)
Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2018-12-11 20:36:55 +09:00
MeiMei
1d8fb65959 Fix follow duplicate (#3548)
* フォローとリクエスト両方存在しても解除する

* 既にフォローしてても承認できるように
2018-12-08 18:55:00 +09:00
syuilo
b2dedf7f98
Add comment 2018-12-08 10:20:43 +09:00
MeiMei
702875a78e Apply tag length limit from AP (#3536) 2018-12-07 21:01:43 +09:00
MeiMei
4522568749 Emoji support in profile (#3514)
* Emoji in profile

* Add emojis to fields
2018-12-06 10:02:04 +09:00
MeiMei
c1d59716d1 Remove unnecessary Renote check code (#3489) 2018-12-04 03:22:41 +09:00
MeiMei
3a2dc95850 No MFM parsing when remote note (#3470)
* Use tag for hashtag detection of remote note

* No MFM parsing when remote note
2018-12-02 18:05:33 +09:00
syuilo
864b6ad1bd
Resolve #1826 2018-12-02 07:02:08 +09:00
Aya Morisawa
3db414add4
Use for-of instead of map
return values are not being used
2018-11-30 23:30:28 +09:00
MeiMei
bcb04924ff Image for web publish (#3402)
* Image for Web

* Add comment

* Make main to original
2018-11-26 04:25:48 +09:00
MeiMei
f2f7bdc5a9 Do not use _replyIds (#3392) 2018-11-23 23:12:28 +09:00
syuilo
246cead2b1
Improve user operations
Resolve #2197
Resolve #3367
2018-11-23 08:01:14 +09:00
syuilo
79ffbf95db
Improve MFM parser (#3337)
* wip

* wip

* Refactor

* Refactor

* wip

* wip

* wip

* wip

* Refactor

* Refactor

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Clean up

* Update misskey-flavored-markdown.ts

* wip

* wip

* wip

* wip

* Update parser.ts

* wip

* Add new test

* wip

* Add new test

* Add new test

* wip

* Refactor

* Update parse.ts

* Refactor

* Update parser.ts

* wip
2018-11-21 05:11:00 +09:00
MeiMei
644bc985e7 Fix some image processing (#3313)
* Improve thunmbnail generation

* Respect orientation in Firefox
2018-11-19 09:17:16 +09:00
MeiMei
bceb02d760 local only visibility (#3254)
* local only visibility

* fix UI
2018-11-16 05:47:29 +09:00
MeiMei
9f0b8ba2f8 Fix: notes/create hangs when rejected (#3221) 2018-11-13 19:34:09 +09:00
MeiMei
5b684c6deb On remote notes, not use content for detecting mentions (#3170)
* On remote note, detect mentioned users from to/cc

* fix
2018-11-09 08:44:19 +09:00
syuilo
a8d05cba5a
Fix #3149 2018-11-07 19:43:21 +09:00
syuilo
665fa7f2aa
[API] Improve drive/files/upload_from_url 2018-11-07 12:12:43 +09:00
syuilo
37999f4af7
[API] Implement notes/watching/ 2018-11-06 14:58:20 +09:00
MeiMei
5f59b980a7 Fix: download file (#3138)
* Fix: url download

* not explicitly close on end

* resolve on stream finish

* remove unnecessary code

* reject on file error
2018-11-06 07:53:03 +09:00
syuilo
2a5c19cd01
リモートのファイルをキャッシュするかどうかの設定をDBに保存するように 2018-11-06 07:52:13 +09:00
syuilo
8f714b5b12
ドライブ容量の設定をDBに保存するようにしたりリファクタリングしたり 2018-11-06 07:14:43 +09:00
syuilo
65961bc15b
Refactoring & 設定でTwemojiを使うかどうか切り替えられるように 2018-11-05 19:20:35 +09:00
syuilo
84db15694d
Do not send needless emojis in note
投稿作成時に含まれている絵文字を保存しておくように

SEE: https://github.com/syuilo/misskey/pull/3085#issuecomment-435608434
2018-11-04 03:32:20 +09:00
syuilo
120474ec6a
Fix bug 2018-10-30 21:55:16 +09:00
syuilo
7afa541a53
Fix #3040 2018-10-30 14:34:32 +09:00
syuilo
0d86eef3d7
Format 2018-10-29 21:38:09 +09:00
MeiMei
d64dc45899 User blocking (Following part) (#3035)
* block wip

* UndoBlock

* UnBlock

* wip

* follow

* UI

* fix
2018-10-29 20:32:42 +09:00
syuilo
0206a4ac83
Clean up 2018-10-25 08:42:07 +09:00
syuilo
380f5a972c
Implement featured note API 2018-10-25 07:04:15 +09:00
syuilo
a136715111
Implement #2993 2018-10-24 06:17:55 +09:00
syuilo
11c5d257f2
ハッシュタグチャートでローカルとリモートを分離するように 2018-10-23 09:59:43 +09:00
syuilo
19af2d7a7b
Implement #2983 2018-10-23 07:04:00 +09:00
syuilo
8ba87443ca
Use camelCase instead of snake_case 2018-10-23 07:01:43 +09:00
syuilo
7c7f32d9a6
Refactoring 2018-10-23 05:36:35 +09:00
MeiMei
2f8cc36d4b Complement file extension from MIME (#2979) 2018-10-23 04:37:37 +09:00
syuilo
3bebf82501
Implement #2980 2018-10-22 17:36:36 +09:00
syuilo
e9a8090d7e
Refactor 2018-10-22 17:13:06 +09:00
syuilo
99aa588ae7
Implement per user drive stats 2018-10-22 04:44:10 +09:00
syuilo
0085e1f3ab
Fix bug 2018-10-22 04:36:57 +09:00
syuilo
53a9eb13f8
Fix bug 2018-10-22 04:31:45 +09:00
syuilo
b8c56c4dda
Implemet per user notes stats 2018-10-22 04:30:27 +09:00
syuilo
59266b3190
Fix bug 2018-10-22 03:41:50 +09:00
syuilo
0dc94547f5
Fix bug 2018-10-22 03:34:56 +09:00
syuilo
29fc6de330
Refactor 2018-10-22 03:30:45 +09:00
syuilo
77b15a3535
Update stats.ts 2018-10-21 18:43:45 +09:00
MeiMei
72754ede4e Fix several file processings (#2968)
* Ignore image error in person

* Fix hang while processing empty file
2018-10-21 18:35:36 +09:00
syuilo
b8ed8336e0
Improve readability 2018-10-21 17:58:02 +09:00
syuilo
13f82856f9
Implement following stats 2018-10-21 17:51:35 +09:00
syuilo
a62013f54d
Refactor 2018-10-21 17:28:27 +09:00
syuilo
4c180869c6
Imprement hashtag stats 2018-10-21 16:54:07 +09:00
syuilo
6b0d48423d
Refactor 2018-10-21 15:08:07 +09:00
syuilo
a617b8dbed
Refactor 2018-10-21 14:53:04 +09:00
syuilo
c57f472caf
Improve readability 2018-10-21 14:47:44 +09:00
syuilo
e1ba19fd7e
Improve readability 2018-10-21 14:44:37 +09:00
syuilo
1bf8cbeb29
Clean up 2018-10-21 14:15:02 +09:00
syuilo
f13faf2243
Refactoring & Better stats aggregation 2018-10-21 14:08:05 +09:00
syuilo
6cccd9d288
Implement unique incremebt 2018-10-21 12:37:00 +09:00
syuilo
be2cde106b Update stats.ts 2018-10-21 10:35:37 +09:00
syuilo
17263fb459
✌️ 2018-10-21 10:24:56 +09:00
syuilo
fed04ef5ae
Reduce network traffic of API response 2018-10-21 10:05:15 +09:00
syuilo
969b6dbcad
Resolve #2963 2018-10-21 09:20:11 +09:00
syuilo
ba0e57396d
Refactoring 2018-10-21 07:10:35 +09:00
syuilo
00290fbf75
Fix bug 2018-10-19 06:29:25 +09:00
syuilo
704e217dbb
オブジェクトストレージのURLに拡張子を含めるように 2018-10-16 20:59:36 +09:00
syuilo
cfbb6e8092
オブジェクトストレージのURLにファイル名を含めるのを廃止 2018-10-16 20:14:06 +09:00
syuilo
9427a756c9
Update mongodb 2018-10-16 11:38:09 +09:00
syuilo
4d6335ce9a
Add some tests and fix 2018-10-16 09:45:36 +09:00
MeiMei
49dbd7f9d2 Fix following from Preroma does not complete (#2905)
* In Follow Accept/Reject, send previous received id

* In Follow Accept/Reject, send Activity.actor
2018-10-15 16:51:22 +09:00