monkee.ch/monkeeShark
1
0
Fork 0
Code Pull requests Activity
18578 commits 29 branches 918 tags 156 MiB
Commit graph

441 commits

Author SHA1 Message Date
syuilo
874c0eae6a
Better error log of WebFinger 2019-02-04 09:02:23 +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
75558add17
Better logging 2019-02-03 16:45:13 +09:00
syuilo
6071fc7077
Better log 2019-02-03 04:43:43 +09:00
syuilo
15eca04bc4
🎨 2019-02-03 04:20:35 +09:00
syuilo
238c6a428b
[Server] Use logger for logging 2019-02-03 04:18:27 +09:00
syuilo
278e43e9ba
[Server] Use logger for logging 2019-02-03 04:04:57 +09:00
syuilo
d692d531d1
Fix indent 2019-02-02 13:57:26 +09:00
Acid Chicken (硫酸鶏)
40e177fa96 Create type definition for 'http-signature' (#4049) 
* Create type definition for 'http-signature'

* Follow lint
 2019-02-01 19:59:12 +09:00
MeiMei
a6e7bbc306 send/receive user hashtags via AP (#4064) 2019-01-31 20:42:45 +09:00
Acid Chicken (硫酸鶏)
76569bfb08
Create type definition for 'lookup-dns-cache' (#4051) 2019-01-31 17:53:49 +09:00
Acid Chicken (硫酸鶏)
bbcdf1bb8a
Create type definition for 'promise-any' (#4055) 2019-01-31 17:52:27 +09:00
Acid Chicken (硫酸鶏)
6439a6c63f
Create type definition for 'webfinger.js' (#4054) 2019-01-31 17:52:17 +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
Aya Morisawa
28bfb45426
Avoid export default 2019-01-30 16:56:27 +09:00
Aya Morisawa
ca26edbfce
Rename html-to-mfm to fromHtml 2019-01-30 15:00:05 +09:00
Aya Morisawa
3058e8f354
Rename html to toHtml 2019-01-30 14:57:13 +09:00
Acid Chicken (硫酸鶏)
5bbf4187e6 Module 'crypto' as import syntax (#4011) 2019-01-30 11:51:29 +09:00
Acid Chicken (硫酸鶏)
e2f7e82cac 外部サービス認証情報の配信 (#3975) 
* Update person.ts

* Update person.ts

* Update person.ts

* Update person.ts

* Create original model

* Make type formal

* Update person.ts

* Follow @mei23's review

refs: https://github.com/syuilo/misskey/pull/3975#pullrequestreview-195770172
 2019-01-24 17:33:39 +09:00
MeiMei
5b32b900e4 投票未対応インスタンス向けメッセージをわかりやすくする (#3944) 
* Poll message

* fix

* fix

* とりあえず日本語にしちゃう

* TODO

* fix
 2019-01-21 16:34:17 +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
4000da6be8
[Server] Fix bug 2019-01-21 11:15:36 +09:00
MeiMei
22830965e3 AP Undo Like (#3933) 
* AP Undo Like

* rename
 2019-01-20 03:07:12 +09:00
MeiMei
e1cc2394fa Use cached and asynchronous DNS resolver for AP delivery (#3859) 2019-01-09 15:17:54 +09:00
MeiMei
cd4be4116b Fix sharedInbox recovery code (#3840) 2019-01-06 17:45:53 +09:00
syuilo
a3493c4f07
Privateの公開範囲を廃止 2018-12-29 02:55:46 +09:00
syuilo
bfc458e935
Resolve #3758 2018-12-27 07:07:26 +09:00
MeiMei
a53e0d9f73 Fix error in featuredNotes (#3730) 2018-12-23 23:23:56 +09:00
MeiMei
49921f2dcf Fix: can not update remote Misskey user (#3731) 2018-12-23 23:23:17 +09:00
MeiMei
be0cb88b6c Fix sharedInbox location (#3711) 
* Fix sharedInbox location

* Perform update Following

* Fix comment
 2018-12-22 00:12:34 +09:00
Acid Chicken (硫酸鶏)
c81a94ff75 Resolve #3676 (#3677) 2018-12-19 21:20:25 +09:00
MeiMei
acc6f54557 Update remote Emoji (#3680) 2018-12-19 21:19:43 +09:00
MeiMei
5417e40f59 Send original URL for quote (#3668) 2018-12-19 05:07:54 +09:00
MeiMei
7645c212a3
No @ for account name (#3586) 
* No @ for account name

* Use @ for GitHub
 2018-12-12 17:33:08 +09:00
MeiMei
638d81b66e Show user fields (#3590) 2018-12-11 20:18:12 +09:00
MeiMei
1d8fb65959 Fix follow duplicate (#3548) 
* フォローとリクエスト両方存在しても解除する

* 既にフォローしてても承認できるように
 2018-12-08 18:55:00 +09:00
MeiMei
008432e156 lint fix (#3522) 2018-12-06 19:15:09 +09:00
syuilo
3555213155
Resolve #3519 2018-12-06 16:30:28 +09:00
MeiMei
4522568749 Emoji support in profile (#3514) 
* Emoji in profile

* Add emojis to fields
 2018-12-06 10:02:04 +09:00
Acid Chicken (硫酸鶏)
fe891da886 外部サービス連携情報をPersonのfieldsに乗せて配信する (#3499) 
* Update person.ts

* Update person.ts

refs: https://github.com/syuilo/misskey/pull/3499#issuecomment-444484557

* Update person.ts

refs: https://github.com/syuilo/misskey/pull/3499#pullrequestreview-181755475
 2018-12-06 00:37:59 +09:00
Aya Morisawa
03588b3fd6
Merge if-statements (#3478) 2018-12-02 22:32:09 +09:00
nico
2633873fcc Fix syntax error (#3477) 
src/remote/activitypub/models/person.ts(326,4): error TS1005: ',' expected.
 2018-12-02 21:19:28 +09:00
Aya Morisawa
a0d9def98a
Simplify expressions (#3473) 2018-12-02 19:35: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
Acid Chicken (硫酸鶏)
53c559c001 Allow hyphens in the middle of remote usernames (#3440) 
* Allow hyphens in the middle of remote usernames

refs: d797c29db462de4a3d69a5077a1ae4d03195b6f2

* Make options fallback better

* Make options flat
 2018-12-01 07:19:17 +09:00
MeiMei
f2b1cf92e1 AP CW (#3448) 2018-12-01 07:15:10 +09:00
syuilo
95ba7e43b1
Fix bug: リモートユーザーのアイコンとバナーの色が取得されていない問題を修正 2018-11-24 17:29:32 +09:00
syuilo
7e803ff9a9
Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-11-23 08:01:29 +09:00
syuilo
246cead2b1
Improve user operations 
Resolve #2197
Resolve #3367
 2018-11-23 08:01:14 +09:00
MeiMei
336b45b6f7 AP quote (#3384) 2018-11-23 02:10:07 +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
0bf54b3ff6 Renote visibility (#3290) 2018-11-17 03:25:48 +09:00
MeiMei
bceb02d760 local only visibility (#3254) 
* local only visibility

* fix UI
 2018-11-16 05:47:29 +09:00
MeiMei
16136c252a fix self host detection (#3201) 2018-11-11 13:11:16 +09:00
syuilo
5bcce97ff0
Fix bug 2018-11-09 22:19:43 +09:00
Aya Morisawa
3c0d2db3bc
Rename: setDifference -> difference (#3177) 
* Improve setDifference

* Rename: setDifference -> difference
 2018-11-09 14:14:53 +09:00
Aya Morisawa
a9436306ab Fix #3170 (#3173) 2018-11-09 11:01:55 +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
3abe632f06
Clean up 2018-11-05 19:29:50 +09:00
syuilo
65961bc15b
Refactoring & 設定でTwemojiを使うかどうか切り替えられるように 2018-11-05 19:20:35 +09:00
syuilo
54dcc10250
Fix bug for Mastodon(?) 2018-11-04 15:17:52 +09:00
syuilo
aadd5b95b8
Improve admin dashboard 2018-11-03 11:38:00 +09:00
MeiMei
80b5fda292 Remote custom emojis (#3074) 
* Remote custom emojis

* んほおおおおお
 2018-11-02 08:59:40 +09:00
syuilo
5d61c7c691
Refactor and use original image for banner 2018-11-01 09:30:51 +09:00
syuilo
1a51b98700
Refactor 2018-10-31 22:35:02 +09:00
MeiMei
441ab2b5f8 Fix: can't recognize rebirthed instance user (#3046) 
* resync uri from WebFinger

* trigger resync on user page

* allways update on resync

* Revert "trigger resync on user page"

This reverts commit 8ff139fb49ee61ad55e4b42c562f8a2c3f8098ac.

* background resync
 2018-10-31 02:16:13 +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
MeiMei
518646b925 Fix: Unexpected remote user is selected (#3032) 2018-10-28 07:49:58 +09:00
syuilo
a136715111
Implement #2993 2018-10-24 06:17:55 +09:00
syuilo
7c7f32d9a6
Refactoring 2018-10-23 05:36:35 +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
6b0d48423d
Refactor 2018-10-21 15:08:07 +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
46d3293edd
Fix #2920 2018-10-16 22:21:08 +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
syuilo
a7237d157a
Resolve #2600 2018-10-13 17:57:40 +09:00
syuilo
2b0a919fb5
Resolve #2894 2018-10-13 13:13:15 +09:00
MeiMei
f243ce66e7 ActivityPubのHTTPリクエストの強化 (#2820) 
* Fix error handling in AP deliver

* Set timeout to resolver

* Tune looks
 2018-10-05 01:58:41 +09:00
MeiMei
c09a2a37fe リモートのピン留め投稿取得対応 (#2798) 
* Fetch featured

* Handle featured change

* Fix typo
 2018-10-02 16:27:36 +09:00
MeiMei
cba0dd5e17 Fix AP request error message is to long (#2760) 2018-09-24 07:35:39 +09:00
MeiMei
11496d887e Publish pinned notes (#2731) 2018-09-18 13:08:27 +09:00
syuilo
62509edcbe
Refactor 2018-09-17 12:18:59 +09:00
syuilo
f97cdfaa20
Fix #2725 2018-09-17 11:59:24 +09:00
syuilo
b21b33831a
Fix bug 2018-09-17 03:36:58 +09:00
syuilo
6138a74231
Fix #2101 2018-09-17 00:20:00 +09:00
syuilo
ba05f236bd
Resolve #2101 2018-09-10 02:47:34 +09:00
MeiMei
ea4e2da58d Fix AP Announce detection (#2672) 2018-09-09 02:59:14 +09:00
MeiMei
ef62497777 ActivityPub Outboxの修正とactivity idのURLを実装 (#2662) 
* Fix Outbox structure

* Implement activity endpoint

* Use in instead of or

* Use in, addition
 2018-09-08 05:24:55 +09:00
syuilo
a1b82e9723 #2620 2018-09-05 19:32:46 +09:00
MeiMei
5b039a1bee Add User-Agent header (#2602) 2018-09-04 17:44:21 +09:00
mei23
0177023ead Use Tombstone for Delete 2018-09-02 08:02:43 +09:00
Aya Morisawa
291beb45fc
Use string interpolation 2018-09-01 23:12:51 +09:00
mei23
57a63d38aa Send Update activity 2018-09-01 20:23:01 +09:00
mei23
3efffbcf22 Receive Update activity 2018-09-01 20:23:01 +09:00
mei23
15eaebe522 updatePersonで再割り当てを考慮する 2018-09-01 20:23:01 +09:00
mei23
eee98358ac Add missing updatePerson properties 2018-09-01 20:23:01 +09:00
mei23
795fc5e7bc Set Person.updatedAt at first 2018-09-01 20:23:01 +09:00
mei23
dddf7834cc Add host/digest to HTTP signature 2018-08-30 20:52:35 +09:00
mei23
6e3bf26cad Validate host on Person 2018-08-29 16:10:03 +09:00
syuilo
0875460974 ユーザーのアイコンにサムネイルを使うように 
Closes #2365
 2018-08-25 19:44:47 +09:00
mei23
ac474f3884 Send actor in Delete 2018-08-25 14:52:35 +09:00
mei23
a39aaf6eb1 Send actor in Undo Follow 2018-08-25 14:46:47 +09:00
mei23
68a7661f08 Create Note activity にも toとcc 2018-08-25 14:23:51 +09:00
mei23
ffcb2f755c Send actor in CreateNote, Announce 2018-08-25 14:12:44 +09:00
mei23
92828028db Add Activity id if missing 2018-08-25 13:11:54 +09:00
mei23
edb61e52c5 Use resolvable ActivityPub keyId 2018-08-25 12:46:06 +09:00
mei23
1f53d1a149 Send Content-Type in ActivityPub request 2018-08-25 12:32:31 +09:00
mei23
8b51428347 ActivityPub resolve で 添付のNoteを使用しないように 2018-08-25 06:50:35 +09:00
rinsuki
4fb7ee760a
https://misskey.xyz/notes/5b7e20bd248403003019b860 の修正 2018-08-23 11:58:44 +09:00
syuilo
2536bfb5f5 #2378 2018-08-22 09:16:52 +09:00
mei23
be5a0b4794 Fix リモートにNSFWが効かない 2018-08-19 18:08:29 +09:00
syuilo
452514f7fe Fix bug 2018-08-19 05:26:34 +09:00
mei23
a89c206572 Fix Announce Activity 2018-08-17 06:40:50 +09:00
syuilo
d70e27a865 Provide id in announce activity 2018-08-17 02:37:20 +09:00
mei23
0986301788 Implement ActivityPub Followers/Following/Outbox 2018-08-14 20:13:32 +09:00
mei23
f079041827 ActivityPub visibility on send 2018-08-13 03:49:17 +09:00
mei23
c5073b33ef Fix ActivityPub followers/specified detection 2018-08-12 20:37:35 +09:00
mei23
f56ec82f6b Fix ActivityPub attachment url 2018-08-12 04:42:14 +09:00
syuilo
0df093383d Refactoring 2018-08-02 15:35:22 +09:00
syuilo
dddd760efd Fix bug 2018-07-26 17:13:55 +09:00
syuilo
adc3c16ef3 wip 2018-07-24 05:04:43 +09:00
syuilo
297a7f541e #1947 2018-07-21 19:17:15 +09:00
syuilo
ec2b1ec3f0 #1334 2018-07-20 02:40:37 +09:00
syuilo
bfa326af2c WIP: Support sharedInbox 2018-07-19 22:40:44 +09:00
mei23
8ed9e44a78 Fix can't process cancel of follow request from remote 2018-07-08 17:22:18 +09:00
mei23
a796a68e8a Fix can't process follow accept/reject from remote 2018-07-08 17:22:11 +09:00
syuilo
5fb8f5a8c7 Improve error message 2018-07-01 13:44:24 +09:00
syuilo
d63044a15e Fix #1781 2018-06-26 18:34:17 +09:00
syuilo
247f334334 Fix 2018-06-23 19:18:14 +09:00
syuilo
509cdae832 Fix bug 2018-06-23 19:16:50 +09:00
syuilo
79d1bf30a4 リモートユーザーのHTMLで表現されたプロフィールをMFMに変換するように 2018-06-21 01:21:57 +09:00
syuilo
01ff8d171a Fix bug 2018-06-19 08:03:00 +09:00
syuilo
e66d7babc5 yatta 2018-06-18 14:28:43 +09:00
syuilo
80e5645a84 wip 2018-06-18 09:54:53 +09:00
syuilo
5773a5bfa6 Refactor 2018-06-17 17:15:03 +09:00
rinsuki
20549bfdf0 Fix #1729 2018-06-17 16:45:01 +09:00
rinsuki
f0fec654ff fix #1726 2018-06-17 15:58:23 +09:00
syuilo
4d90d554f8
Merge pull request #1721 from rinsuki/activitypub/support-cw 
maybe Support CW in ActivityPub
 2018-06-17 14:12:50 +09:00
rinsuki
e5468713ac maybe Support CW in ActivityPub 2018-06-17 14:11:31 +09:00
syuilo
03f20599ba Add missing semicolon 2018-06-17 07:39:51 +09:00
syuilo
e11f547308 #1715 2018-06-16 10:40:53 +09:00
syuilo
80c52433cc Fix bug 2018-06-13 05:15:26 +09:00
syuilo
1472f0b141 Fix #1712 2018-06-13 05:11:55 +09:00
syuilo
94ce658ab9 ハッシュタグ検索を実装 2018-06-10 12:19:19 +09:00
syuilo
119d38ea08 Fix bug 2018-06-10 08:41:57 +09:00
syuilo
bee77afb7f Fix bug 2018-06-10 08:34:46 +09:00
syuilo
f14571dc42 wip 2018-06-02 00:38:31 +09:00
syuilo
484d17f53f wip 2018-06-02 00:15:17 +09:00
syuilo
35115607bc wip 2018-06-01 00:42:37 +09:00
syuilo
51255bb446 wip 2018-05-31 22:56:02 +09:00
syuilo
bd758a156e wip 2018-05-31 18:34:15 +09:00
syuilo
ceda2ca896 Implement delete note 2018-05-28 14:39:46 +09:00
syuilo
66437f31c0 Save remote user's endpoints 2018-05-16 17:06:12 +09:00
syuilo
f59209aaa3 Fix bug 2018-05-16 16:50:36 +09:00
syuilo
058602352c Fix #1574 2018-05-08 07:03:06 +09:00
syuilo
d305c7e401 Fix 2018-05-07 17:45:21 +09:00
syuilo
8afaca36d9 Better text parsing 2018-05-07 17:19:00 +09:00
syuilo
9950fafff7 oops 2018-05-07 17:15:20 +09:00
syuilo
8c46e5b3d9 投稿のレンダリングを改善 2018-05-07 16:31:33 +09:00
syuilo
4955df3911 oops 2018-05-07 04:26:45 +09:00
syuilo
6785f50a1f 良い感じに 2018-05-07 04:08:39 +09:00
syuilo
1f018d87f2 メンションを処理 2018-05-07 03:19:24 +09:00
syuilo
b77cbeca22 #1427 2018-05-07 02:54:14 +09:00
syuilo
414c600356 ファイルのURLを保存するように 2018-05-04 18:32:03 +09:00
syuilo
671c5e7c12 wip 2018-04-29 04:44:58 +09:00
syuilo
47ce59d555 wip 2018-04-28 17:25:56 +09:00
syuilo
1131ce8a71 sharedInboxを提供 2018-04-23 15:37:27 +09:00
syuilo
02bb99ac02 他のMisskeyインスタンスにリアクション情報を伝えるように 2018-04-23 15:27:01 +09:00
syuilo
20e77196f2 AP: 投票をレンダリング 2018-04-22 10:44:17 +09:00
mei23
0bb59bd73b Fix Misskey同士でフォローできない 2018-04-22 00:41:07 +09:00
syuilo
5d0ded2a69 Better error handling 2018-04-19 18:58:57 +09:00
syuilo
bd207b5012 Implement suspend account 2018-04-19 18:54:34 +09:00
syuilo
02fd46f64f Fix bug 2018-04-19 09:17:42 +09:00
syuilo
0e2bb5bddc Fix #1473 2018-04-18 14:48:40 +09:00
syuilo
233e1eeeb2 Fix bug 2018-04-18 14:09:55 +09:00
syuilo
d892e66072 Fix bug 2018-04-17 22:20:25 +09:00
syuilo
d852cc2789 Fix bug 2018-04-17 16:06:55 +09:00
syuilo
aaa167fd57 Refactor 2018-04-17 16:05:50 +09:00
syuilo
ee754f83cd #1448 2018-04-17 15:30:58 +09:00
syuilo
a9ea405c0c ✌️ 2018-04-15 18:38:40 +09:00
syuilo
d81c20f163 hostLowerは廃止してhostにlowerしたものを入れるように 2018-04-14 14:39:07 +09:00
syuilo
17f4dd69a3 Refactor 2018-04-13 14:39:08 +09:00
syuilo
cb85d7cb14 再帰的にNoteをレンダリングするように 2018-04-10 04:38:02 +09:00
syuilo
805bc4b254 Refactor 2018-04-10 02:12:17 +09:00
syuilo
d90ad34924 Fix bug 2018-04-09 05:44:35 +09:00
syuilo
5093f69b08 oops 2018-04-09 05:39:18 +09:00
syuilo
94e48ba122 ✌️ 2018-04-09 05:37:50 +09:00
syuilo
6b1dc866a8 ✌️ 2018-04-09 05:34:33 +09:00
syuilo
44e5ae110e ✌️ 2018-04-09 05:30:17 +09:00
syuilo
1186b788d6 ✌️ 2018-04-09 05:27:38 +09:00
syuilo
cf5b679117 ✌️ 2018-04-09 05:23:35 +09:00
syuilo
d8a87379ca Fix bug 2018-04-09 05:14:47 +09:00
syuilo
536277122d wip 2018-04-09 05:02:52 +09:00
syuilo
08beb45935 wip 2018-04-09 04:08:56 +09:00
syuilo
ad1a86113b Fix bug 2018-04-08 23:29:27 +09:00
syuilo
a1e6bb6fa3 Provide url property 2018-04-08 18:21:02 +09:00
syuilo
6d49edc0ab ✌️ 2018-04-08 15:25:17 +09:00
syuilo
e63f884bc6 Use id in uri instead of username 2018-04-08 15:15:22 +09:00