limepotato/jormungandr-bite
1
0
Fork 0
mirror of https://iceshrimp.dev/limepotato/jormungandr-bite.git synced 2024-11-16 23:17:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
17145 commits 22 branches 21 tags 1.6 GiB
Commit graph

417 commits

Author SHA1 Message Date
MeiMei
f01e0b5cd4 Accept Article object (#4499) 2019-03-15 00:23:24 +09:00
Acid Chicken (硫酸鶏)
84d7a33067 Follow #3676 2019-03-14 22:18:31 +09:00
Acid Chicken (硫酸鶏)
bcdd4ba366 Follow #3676 2019-03-14 01:20:25 +09:00
MeiMei
1f1d4157db Fix #4486 (#4487) 2019-03-13 11:21:16 +09:00
syuilo
e628128987 Add type annotation to avoid type error 2019-03-12 23:31:18 +09:00
MeiMei
0ec2e92ea6 Ignore 4xx references in AP (#4463) 
* Ignore 4xx references

* remove unnecessary comment
 2019-03-10 22:27:25 +09:00
syuilo
565c1afc20 Fix bug 2019-03-08 19:45:01 +09:00
MeiMei
a5581fda78 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 (硫酸鶏)
7ff7530f2e 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
syuilo
7e7a9e692a Better log 2019-03-04 14:02:42 +09:00
syuilo
a44030bff2 Better logs 2019-03-03 07:47:58 +09:00
syuilo
3d277fe4a0 ログをデータベースに保存して管理画面で見れるように 2019-03-02 18:51:59 +09:00
syuilo
0e5c9df3f5 Use camelCase 2019-02-24 12:53:22 +09:00
syuilo
12d125f44a Fix bug 2019-02-18 01:11:14 +09:00
syuilo
0701d0ceea ハッシュタグでユーザー検索できるように (#4298) 
* ハッシュタグでユーザー検索できるように

* 🎨

* Increase limit

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

* Fix bug

* Fix bug

* Improve performance
 2019-02-17 23:41:47 +09:00
MeiMei
ef73ff91e8 Limit the parallelism of AP object processing (#4193) 2019-02-09 13:01:21 +09:00
syuilo
c54f1928be 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
308bcef08a Refactoring: Move chart dir into services dir 2019-02-08 04:31:33 +09:00
syuilo
dd0871dd59 Implement instance blocking (#4182) 
* Implement instance blocking

* Add missing text

* Delete unnecessary file

* Covert Punycode to Unicode
 2019-02-08 04:26:43 +09:00
syuilo
c59ca22a81 Revert 96bc17aa1014983d5e6bf8b4c05d898156995a0d 2019-02-07 21:02:33 +09:00
syuilo
4c819e29fd Improve instance stats 2019-02-07 15:00:44 +09:00
Aya Morisawa
ff80a2c934 Check config on load (#4170) 
Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
 2019-02-06 22:44:55 +09:00
syuilo
40da658fb1 Better logs 2019-02-06 15:06:23 +09:00
syuilo
e6e3a7dd27 Add logs 2019-02-06 00:01:37 +09:00
syuilo
758d06249b Refactoring 2019-02-05 14:14:23 +09:00
syuilo
3b2734b1cd Better error log of WebFinger 2019-02-04 09:06:13 +09:00
syuilo
7948a3a11b Better error log of WebFinger 2019-02-04 09:02:23 +09:00
syuilo
f38d7b91aa Use internal logger instead of debug/console for logging 
Resolve #4104
Resolve #1966
Resolve #1937
 2019-02-03 18:16:57 +09:00
syuilo
210cf78606 Better logging 2019-02-03 16:45:13 +09:00
syuilo
8c730472b7 Better log 2019-02-03 04:43:43 +09:00
syuilo
559665aec3 🎨 2019-02-03 04:20:35 +09:00
syuilo
c304d813e2 [Server] Use logger for logging 2019-02-03 04:18:27 +09:00
syuilo
9d65660378 [Server] Use logger for logging 2019-02-03 04:04:57 +09:00
syuilo
720612d203 Fix indent 2019-02-02 13:57:26 +09:00
Acid Chicken (硫酸鶏)
d44741e9e2 Create type definition for 'http-signature' (#4049) 
* Create type definition for 'http-signature'

* Follow lint
 2019-02-01 19:59:12 +09:00
MeiMei
163d2df637 send/receive user hashtags via AP (#4064) 2019-01-31 20:42:45 +09:00
Acid Chicken (硫酸鶏)
e203dab232 Create type definition for 'lookup-dns-cache' (#4051) 2019-01-31 17:53:49 +09:00
Acid Chicken (硫酸鶏)
ccf21d4e2e Create type definition for 'promise-any' (#4055) 2019-01-31 17:52:27 +09:00
Acid Chicken (硫酸鶏)
408930e8cc Create type definition for 'webfinger.js' (#4054) 2019-01-31 17:52:17 +09:00
MeiMei
ab7ee7a7ab 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
d034a10d54 Avoid export default 2019-01-30 16:56:27 +09:00
Aya Morisawa
277db03f0d Rename html-to-mfm to fromHtml 2019-01-30 15:00:05 +09:00
Aya Morisawa
047d4c47fe Rename html to toHtml 2019-01-30 14:57:13 +09:00
Acid Chicken (硫酸鶏)
643fc6a16b Module 'crypto' as import syntax (#4011) 2019-01-30 11:51:29 +09:00
Acid Chicken (硫酸鶏)
039e0f443b 外部サービス認証情報の配信 (#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
31d7e15caa 投票未対応インスタンス向けメッセージをわかりやすくする (#3944) 
* Poll message

* fix

* fix

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

* TODO

* fix
 2019-01-21 16:34:17 +09:00
MeiMei
6e36c4a401 リモートで投票を見たりしたりできるように (#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
c057b4b8bb [Server] Fix bug 2019-01-21 11:15:36 +09:00
MeiMei
9440de8fcc AP Undo Like (#3933) 
* AP Undo Like

* rename
 2019-01-20 03:07:12 +09:00
MeiMei
ebc899c47f Use cached and asynchronous DNS resolver for AP delivery (#3859) 2019-01-09 15:17:54 +09:00
MeiMei
2c65dec71e Fix sharedInbox recovery code (#3840) 2019-01-06 17:45:53 +09:00
syuilo
cbf50fee15 Privateの公開範囲を廃止 2018-12-29 02:55:46 +09:00
syuilo
e6c7dff838 Resolve #3758 2018-12-27 07:07:26 +09:00
MeiMei
35a4fbc668 Fix error in featuredNotes (#3730) 2018-12-23 23:23:56 +09:00
MeiMei
26207a451b Fix: can not update remote Misskey user (#3731) 2018-12-23 23:23:17 +09:00
MeiMei
726b13b3ae Fix sharedInbox location (#3711) 
* Fix sharedInbox location

* Perform update Following

* Fix comment
 2018-12-22 00:12:34 +09:00
Acid Chicken (硫酸鶏)
1b04b89199 Resolve #3676 (#3677) 2018-12-19 21:20:25 +09:00
MeiMei
00914ade44 Update remote Emoji (#3680) 2018-12-19 21:19:43 +09:00
MeiMei
8cca6e9902 Send original URL for quote (#3668) 2018-12-19 05:07:54 +09:00
MeiMei
4a22b01ea0 No @ for account name (#3586) 
* No @ for account name

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

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

* Add emojis to fields
 2018-12-06 10:02:04 +09:00
Acid Chicken (硫酸鶏)
9b893b2fe2 外部サービス連携情報を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
cbe691a0c6 Merge if-statements (#3478) 2018-12-02 22:32:09 +09:00
nico
9d55b91ffb 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
840f0bd04c Simplify expressions (#3473) 2018-12-02 19:35:41 +09:00
MeiMei
2b824f7169 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 (硫酸鶏)
f4f19f28d8 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
3d1afb9306 AP CW (#3448) 2018-12-01 07:15:10 +09:00
syuilo
d8e9d03f81 Fix bug: リモートユーザーのアイコンとバナーの色が取得されていない問題を修正 2018-11-24 17:29:32 +09:00
syuilo
38a9438ef5 Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-11-23 08:01:29 +09:00
syuilo
283f792c32 Improve user operations 
Resolve #2197
Resolve #3367
 2018-11-23 08:01:14 +09:00
MeiMei
bb4d0fb6e7 AP quote (#3384) 2018-11-23 02:10:07 +09:00
syuilo
60252911eb 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
950ccf3f55 Renote visibility (#3290) 2018-11-17 03:25:48 +09:00
MeiMei
d94d32dad9 local only visibility (#3254) 
* local only visibility

* fix UI
 2018-11-16 05:47:29 +09:00
MeiMei
be4e80b7f5 fix self host detection (#3201) 2018-11-11 13:11:16 +09:00
syuilo
74c2defc10 Fix bug 2018-11-09 22:19:43 +09:00
Aya Morisawa
0611c8a8b2 Rename: setDifference -> difference (#3177) 
* Improve setDifference

* Rename: setDifference -> difference
 2018-11-09 14:14:53 +09:00
Aya Morisawa
58d1e65e33 Fix #3170 (#3173) 2018-11-09 11:01:55 +09:00
MeiMei
98707f51ec 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
64dbcd6d9d Fix #3149 2018-11-07 19:43:21 +09:00
syuilo
b82cb283cd Clean up 2018-11-05 19:29:50 +09:00
syuilo
ceb2a316cd Refactoring & 設定でTwemojiを使うかどうか切り替えられるように 2018-11-05 19:20:35 +09:00
syuilo
74ab5a34b5 Fix bug for Mastodon(?) 2018-11-04 15:17:52 +09:00
syuilo
41bab2746b Improve admin dashboard 2018-11-03 11:38:00 +09:00
MeiMei
a22f657c0f Remote custom emojis (#3074) 
* Remote custom emojis

* んほおおおおお
 2018-11-02 08:59:40 +09:00
syuilo
1c8c707037 Refactor and use original image for banner 2018-11-01 09:30:51 +09:00
syuilo
6488a17e60 Refactor 2018-10-31 22:35:02 +09:00
MeiMei
9d96058a7f 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
26e7e7d0dc User blocking (Following part) (#3035) 
* block wip

* UndoBlock

* UnBlock

* wip

* follow

* UI

* fix
 2018-10-29 20:32:42 +09:00
MeiMei
4b9bf727fb Fix: Unexpected remote user is selected (#3032) 2018-10-28 07:49:58 +09:00
syuilo
58838381a9 Implement #2993 2018-10-24 06:17:55 +09:00
syuilo
ccb86ea4f9 Refactoring 2018-10-23 05:36:35 +09:00
MeiMei
46af0e12b0 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
781ea39177 Refactor 2018-10-21 15:08:07 +09:00
syuilo
4545439d28 Resolve #2963 2018-10-21 09:20:11 +09:00
syuilo
7fdd4d1cdd Refactoring 2018-10-21 07:10:35 +09:00
syuilo
3763605fc6 Fix #2920 2018-10-16 22:21:08 +09:00
MeiMei
1bc62d3fe4 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
5c4dd783f7 Resolve #2600 2018-10-13 17:57:40 +09:00
syuilo
f93cb02293 Resolve #2894 2018-10-13 13:13:15 +09:00
MeiMei
98447a21ce ActivityPubのHTTPリクエストの強化 (#2820) 
* Fix error handling in AP deliver

* Set timeout to resolver

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

* Handle featured change

* Fix typo
 2018-10-02 16:27:36 +09:00
MeiMei
ceaefa53d6 Fix AP request error message is to long (#2760) 2018-09-24 07:35:39 +09:00
MeiMei
4d37778077 Publish pinned notes (#2731) 2018-09-18 13:08:27 +09:00
syuilo
3729660e69 Refactor 2018-09-17 12:18:59 +09:00
syuilo
91ac4da813 Fix #2725 2018-09-17 11:59:24 +09:00
syuilo
35f7d4e139 Fix bug 2018-09-17 03:36:58 +09:00
syuilo
fdb809d28e Fix #2101 2018-09-17 00:20:00 +09:00
syuilo
4c1ceaaae1 Resolve #2101 2018-09-10 02:47:34 +09:00
MeiMei
fe476d7e8b Fix AP Announce detection (#2672) 2018-09-09 02:59:14 +09:00
MeiMei
756c2caad3 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
cbb3644063 #2620 2018-09-05 19:32:46 +09:00
MeiMei
a2acfef8a3 Add User-Agent header (#2602) 2018-09-04 17:44:21 +09:00
mei23
a90d6044fe Use Tombstone for Delete 2018-09-02 08:02:43 +09:00
Aya Morisawa
36e10e2bbf Use string interpolation 2018-09-01 23:12:51 +09:00
mei23
036e94c368 Send Update activity 2018-09-01 20:23:01 +09:00
mei23
36e85a02d5 Receive Update activity 2018-09-01 20:23:01 +09:00
mei23
22c7d953f4 updatePersonで再割り当てを考慮する 2018-09-01 20:23:01 +09:00
mei23
fd4566b9e7 Add missing updatePerson properties 2018-09-01 20:23:01 +09:00
mei23
3dfdab9aba Set Person.updatedAt at first 2018-09-01 20:23:01 +09:00
mei23
8852c9eebf Add host/digest to HTTP signature 2018-08-30 20:52:35 +09:00
mei23
1029eebc6a Validate host on Person 2018-08-29 16:10:03 +09:00
syuilo
7c463c7c3c ユーザーのアイコンにサムネイルを使うように 
Closes #2365
 2018-08-25 19:44:47 +09:00
mei23
dbd13a2663 Send actor in Delete 2018-08-25 14:52:35 +09:00
mei23
63a2ef73f8 Send actor in Undo Follow 2018-08-25 14:46:47 +09:00
mei23
5d6ea188aa Create Note activity にも toとcc 2018-08-25 14:23:51 +09:00
mei23
f80193c41a Send actor in CreateNote, Announce 2018-08-25 14:12:44 +09:00
mei23
43062ab43a Add Activity id if missing 2018-08-25 13:11:54 +09:00
mei23
5a8f47e995 Use resolvable ActivityPub keyId 2018-08-25 12:46:06 +09:00
mei23
4f90dfb3d4 Send Content-Type in ActivityPub request 2018-08-25 12:32:31 +09:00
mei23
aff4ab9576 ActivityPub resolve で 添付のNoteを使用しないように 2018-08-25 06:50:35 +09:00
rinsuki
ccea661b4f https://misskey.xyz/notes/5b7e20bd248403003019b860 の修正 2018-08-23 11:58:44 +09:00
syuilo
0287ced18e #2378 2018-08-22 09:16:52 +09:00
mei23
a135dad7b5 Fix リモートにNSFWが効かない 2018-08-19 18:08:29 +09:00
syuilo
6a109bd251 Fix bug 2018-08-19 05:26:34 +09:00
mei23
63a6e0a24d Fix Announce Activity 2018-08-17 06:40:50 +09:00
syuilo
258193008f Provide id in announce activity 2018-08-17 02:37:20 +09:00
mei23
fc546f3a2e Implement ActivityPub Followers/Following/Outbox 2018-08-14 20:13:32 +09:00
mei23
dfafbbceb7 ActivityPub visibility on send 2018-08-13 03:49:17 +09:00
mei23
6837574f55 Fix ActivityPub followers/specified detection 2018-08-12 20:37:35 +09:00
mei23
e91174615c Fix ActivityPub attachment url 2018-08-12 04:42:14 +09:00
syuilo
d5e7a062b8 Refactoring 2018-08-02 15:35:22 +09:00
syuilo
f433c61ee4 Fix bug 2018-07-26 17:13:55 +09:00
syuilo
e730860f88 wip 2018-07-24 05:04:43 +09:00
syuilo
792d9233e2 #1947 2018-07-21 19:17:15 +09:00