graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-25 04:03:08 +02:00
Code Issues Projects Releases Packages Wiki Activity
14554 commits 62 branches 916 tags 154 MiB
Commit graph

615 commits

Author SHA1 Message Date
syuilo
e264a49b08
[Client] Resolve #2596 2018-12-02 20:24:38 +09:00
syuilo
1653977392
Improve input dialog 2018-12-02 20:10:53 +09:00
syuilo
4f5abed70d
Fix 2018-12-02 15:30:48 +09:00
syuilo
c9ac9923df
Refactor: rename alert to dialog 2018-12-02 15:28:52 +09:00
syuilo
bb14895fd8
[Client] Resolve #2225 2018-12-02 15:26:56 +09:00
syuilo
6f92d601ec
🎨 2018-12-02 14:26:30 +09:00
MeiMei
345143b0c1 Suggest in CW (#3467) 2018-12-02 07:33:03 +09:00
syuilo
864b6ad1bd
Resolve #1826 2018-12-02 07:02:08 +09:00
MeiMei
cf4cecd4df Fix media video (#3452) 
* Fix: Always show nsfw

* [Client] Add missing video play icon
 2018-12-01 07:16:28 +09:00
MeiMei
59a1b9adbe Trim notifications text (#3438) 
* Trim notifications

* Remove needless colons

* Use single quote

* 🎨
 2018-11-30 09:34:37 +09:00
MeiMei
55a57db958 Show current selected language (#3429) 2018-11-29 21:56:53 +09:00
Hakaba Hitoyo
afdb23ff57 Feature / Configurable web search engine (#3406) 
* configurable web search engine

* add webSearchEngine config in mobile ui

* add webSearchEngine config in desktop ui

* add webSearchEngine config

* add messages for web search engine config

* correct locale
 2018-11-29 11:05:17 +09:00
Ivan
bb0cb0a866 Fix bad style in deck column options and other things (#3412) 
* Fix wrong text color in empty timeline (#3268)

* Whoops

* Fix wrong text color in deck options (#3268)

* Some padding to make it look less ugly

* Fix wrong text color in user lists menu (#3268)

* Fix wrong text color of footer on welcome screen (mobile) (#3268)

* Fix misalignment of icons and text in menu (mobile) (#3289)

* Fix wrong text color in empty timeline (mobile) (#3268)
 2018-11-29 05:02:35 +09:00
syuilo
5e54751bd4
Refactor 2018-11-25 04:26:07 +09:00
MeiMei
93f13ffc8e Fix: url-preview (#3397) 2018-11-25 01:39:22 +09:00
syuilo
de2b0224d6
Resolve #3158 2018-11-24 07:04:29 +09:00
syuilo
3f8a72eb88
🎨 2018-11-24 07:03:03 +09:00
syuilo
d13999d689
🎨 2018-11-24 06:56:30 +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
syuilo
8d70587814
Refactoring 2018-11-19 02:04:12 +09:00
MeiMei
43c2b00cf8 Show visibility in note-detail (#3308) 
* Show visibility in note-detail

* fix
 2018-11-18 22:47:21 +09:00
MeiMei
35db61f1b4 To able to store local only visibilities (#3298) 2018-11-17 13:21:40 +09:00
Aya Morisawa
57d80932a4 Add an optional setting to remain deleted note (#3271) 
Co-authored-by: Aya Morisawa <AyaMorisawa4869@gmail.com>
Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
 2018-11-16 23:13:37 +09:00
syuilo
27e458f884
Do not use camelCase in html 2018-11-16 22:32:06 +09:00
syuilo
831e8f8583
Refactoring 2018-11-16 22:31:28 +09:00
MeiMei
d2385a0e52 Do not show duplicate url-preview (#3259) 2018-11-16 16:35:13 +09:00
MeiMei
bceb02d760 local only visibility (#3254) 
* local only visibility

* fix UI
 2018-11-16 05:47:29 +09:00
syuilo
4114ce4a04
[Client] Split some components to improve performance 2018-11-15 22:04:12 +09:00
Acid Chicken (硫酸鶏)
9d8f7b081d WIP: Add Discord auth (#3239) 
* Add Discord auth

* Apply review 175263424
 2018-11-15 19:15:04 +09:00
syuilo
56d571c0f0
Moderator system 
Closes #2357
 2018-11-15 04:15:42 +09:00
syuilo
7a2ef04ec3
[Client] Improve UI 2018-11-14 20:36:15 +09:00
syuilo
e76bf5707a
[Client] Fix icons 2018-11-14 18:03:38 +09:00
syuilo
11afa8140c
[Client] Improve alert component 2018-11-14 16:30:58 +09:00
syuilo
5ee75be49e
🎨 2018-11-14 14:47:18 +09:00
syuilo
402efb8c50
[Client] Fix imports 2018-11-14 01:40:29 +09:00
syuilo
cc81d41a05
[Client] Some optimizations 2018-11-13 23:33:30 +09:00
syuilo
a63ec05e41
[Client] Some optimizations 2018-11-13 23:06:31 +09:00
syuilo
0dcb527bf3
[Client] Fix bug 2018-11-13 22:45:28 +09:00
syuilo
54710f17fc
[Client] Some performance optimizations 2018-11-13 22:43:09 +09:00
syuilo
62132570e1
[Client] Split components to reduce bundle size 2018-11-13 20:21:52 +09:00
syuilo
7896242f57
[Client] Fix #3213 2018-11-13 16:19:46 +09:00
MeiMei
81805b01cc sort user timeline by date (#3210) 2018-11-13 01:17:59 +09:00
syuilo
33e79e4bb8
[Client] Split some components to reduce bundle size 2018-11-12 05:35:09 +09:00
syuilo
b1b02d0e32
[Client] Enable code splitting 
And some optimizations
 2018-11-12 04:09:02 +09:00
syuilo
0b40194d31
🎨 2018-11-12 01:20:26 +09:00
syuilo
71d42f64dc
[Client] Implement word mute 
Closes #1739
 2018-11-11 21:17:51 +09:00
MeiMei
036d46c459 show self host in unicode (#3200) 2018-11-11 12:35:30 +09:00
syuilo
27bdb26202
Fix #3187 2018-11-10 00:28:50 +09:00
syuilo
cf0b7e26b5
Remove duplicated option 2018-11-09 21:30:12 +09:00
syuilo
3a1c3f9656
[Client] Fix bug 2018-11-09 21:27:27 +09:00
Aya Morisawa
035bdd0279 Add showVia option (#3182) 
* Resolve #3160

* Fix bug

* Fix bug
 2018-11-09 21:10:21 +09:00
syuilo
0b53ef9bae
[Client] Fix bug 2018-11-09 18:25:21 +09:00
syuilo
3f79c9ae49
Refactor client (#3178) 
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip
 2018-11-09 16:00:29 +09:00
syuilo
ae6293cb6b
[Client] Improve usability 2018-11-09 14:10:23 +09:00
syuilo
c8081ed353
Fix i18n 2018-11-09 13:47:22 +09:00
syuilo
fccbecf159
[Client] Fix bug 2018-11-09 08:26:32 +09:00
syuilo
60ef3e3563
Refactor & Clean up 2018-11-09 08:13:34 +09:00
syuilo
25a69ec1b6
Refactoring of i18n (#3165) 
Refactoring of i18n
 2018-11-09 03:44:35 +09:00
syuilo
3261d54cd3
Resolve #2320 2018-11-08 02:09:15 +09:00
syuilo
06b66f0209
メンテナ情報をDBに保存するように 2018-11-07 01:12:26 +09:00
syuilo
6d67cd07a0
[Client] Use dynamic import to reduce bundle size 2018-11-06 15:37:41 +09:00
syuilo
5e0f2a5b06
[Client] Fix bug 2018-11-06 04:10:30 +09:00
syuilo
9f5dc2c0df
[WIP] Use FontAwesome Component for Vue (#3127) 
* wip

* Rename

* Clean up

* Clean up

* wip

* wip

* Enable tree shaking

* ✌️

* ✌️

* wip

* wip

* Clean up
 2018-11-06 01:40:11 +09:00
syuilo
65961bc15b
Refactoring & 設定でTwemojiを使うかどうか切り替えられるように 2018-11-05 19:20:35 +09:00
Acid Chicken (硫酸鶏)
8646a9c49c Add GitHub auth (#3095) 2018-11-04 22:03:55 +09:00
Acid Chicken (硫酸鶏)
147ad69864 Revert "Add GitHub auth" 
This reverts commit c146006476.
 2018-11-04 19:22:04 +09:00
Acid Chicken (硫酸鶏)
c146006476 Add GitHub auth 2018-11-04 19:17:30 +09:00
syuilo
41e1619f1f
[Client] Fix bug 2018-11-04 18:24:08 +09:00
syuilo
84218abf2b
[Client] Make possible to change password in mobile 
モバイル版からパスワードの変更を行えるように
 2018-11-03 21:53:03 +09:00
syuilo
42a08642a4
Misskeyのバージョンもクライアントの環境変数に突っ込むように 2018-11-03 17:04:33 +09:00
syuilo
e88f7ca7b2
[Client] Fix some charts 2018-11-03 16:44:05 +09:00
MeiMei
80b5fda292 Remote custom emojis (#3074) 
* Remote custom emojis

* んほおおおおお
 2018-11-02 08:59:40 +09:00
syuilo
f7069dcd18
良い感じに 2018-10-31 11:16:13 +09:00
syuilo
7afa541a53
Fix #3040 2018-10-30 14:34:32 +09:00
syuilo
fa17623fa8
モバイル版からブロックできるように 2018-10-29 21:32:38 +09:00
syuilo
bd707cb2a8
🎨 2018-10-26 14:51:57 +09:00
syuilo
e0bf522e7f
Client: Improve API settings 2018-10-26 08:37:30 +09:00
syuilo
7dde3465e2
Improve drive information 2018-10-25 11:30:30 +09:00
syuilo
69b730e91a
Clean up 2018-10-25 06:04:06 +09:00
MeiMei
daa22d68fa Make max allowed text length configurable (#2992) 
* Make max allowed text length configurable

* Fix canPost
 2018-10-24 04:00:04 +09:00
syuilo
8ba87443ca
Use camelCase instead of snake_case 2018-10-23 07:01:43 +09:00
syuilo
f65ac74914
i18n 2018-10-21 00:18:01 +09:00
syuilo
e0d6f7c7c4
RP --> RN 2018-10-20 07:01:09 +09:00
syuilo
e8de29ae79
Resolve #2935 2018-10-19 14:34:51 +09:00
syuilo
fef4f7fce8
#2930 (#2933) 
* wip

* wip

* Clean up

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* 🎨

* wip

* wip
 2018-10-19 06:18:33 +09:00
syuilo
88fbc53e37
Resolve #2314 2018-10-15 18:02:57 +09:00
MeiMei
5dce81c0db 非ASCIIなドメインへのメンションの修正 (#2903) 
* punycodeでされたmentionのラベルをunicodeとして表示する

* post-form mentionはpunycodeにする

* mentionの表示はURLもAPI向けもunicodeにする
 2018-10-14 16:56:19 +09:00
syuilo
c7988fb6f5
🎨 2018-10-14 10:16:02 +09:00
syuilo
0f8847bb74
Resolve #2618 2018-10-14 09:47:38 +09:00
syuilo
65e5cfa68e
Resolve #2853 2018-10-13 20:11:00 +09:00
syuilo
a038738d72
🎨 2018-10-13 13:22:14 +09:00
syuilo
e1109b168c
Clean up 2018-10-13 04:48:09 +09:00
syuilo
0ff27f65b3
Fix bug 2018-10-13 01:33:00 +09:00
syuilo
5149be4b1b
Fix bug 2018-10-12 21:44:04 +09:00
syuilo
9b253ccb3a
Refactor 2018-10-12 14:34:54 +09:00
syuilo
dded76099c
Refactor and usability improvements 2018-10-12 14:28:48 +09:00
syuilo
41a7ec7d3d
Fix bug 2018-10-12 13:53:40 +09:00
MeiMei
1a689f6641 削除された投稿はタイムライン上で表示しないようにする (#2887) 
* Excepts deleted notes on query

* Hide deleted notes

* Use v-show
 2018-10-12 05:10:40 +09:00
syuilo
1fad3cbaae
🎨 2018-10-10 21:23:38 +09:00
syuilo
8a62748e39
🎨 2018-10-10 20:02:56 +09:00
syuilo
17b92c9db2
Fix bug 2018-10-09 22:48:45 +09:00
syuilo
136b13e7ca
Fix bug and refactor 2018-10-09 15:08:31 +09:00
syuilo
32371ed2bd
Fix #2858 2018-10-09 05:11:42 +09:00
syuilo
816ae7eb7e
🎨 2018-10-08 15:43:43 +09:00
syuilo
1c2dbb914e
Improve usability 2018-10-08 15:42:21 +09:00
syuilo
4182a0cf4c
Fix 2018-10-08 01:03:07 +09:00
syuilo
b6a330928d
投稿の削除イベントを受け取るように 2018-10-07 20:08:42 +09:00
syuilo
75cd580c3a
Improve theming 2018-10-07 19:30:24 +09:00
syuilo
d0570d7fe3
V10 (#2826) 
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update CHANGELOG.md

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update CHANGELOG.md

* Update CHANGELOG.md

* wip

* Update CHANGELOG.md

* wip

* wip

* wip

* wip
 2018-10-07 11:06:17 +09:00
syuilo
63a8d556e5
🎨 2018-10-05 12:10:00 +09:00
MeiMei
cd0b9a8e3f 非承認制アカウントのリモートフォローではフォロー許可待ちと表示しない (#2796) 2018-10-01 19:28:24 +09:00
syuilo
25dd19dd8c
🎨 2018-09-29 09:11:06 +09:00
syuilo
8b68c5da37
Merge pull request #2781 from syuilo/theme 
Theme
 2018-09-29 00:48:56 +09:00
syuilo
6a82e94c54
wip 2018-09-29 00:01:11 +09:00
syuilo
8e3dd75c85
wip 2018-09-28 19:59:19 +09:00
syuilo
c627288bde
wip 2018-09-28 14:26:20 +09:00
syuilo
1eef90f6cb
wip 2018-09-28 14:03:55 +09:00
syuilo
29476ea3da
wip 2018-09-28 12:20:22 +09:00
syuilo
7609741680
wip 2018-09-28 12:13:08 +09:00
syuilo
b4a4d784c3
wip 2018-09-28 12:07:28 +09:00
syuilo
d715af0620
wip 2018-09-28 11:49:32 +09:00
syuilo
fe8c384618
wip 2018-09-28 11:45:34 +09:00
syuilo
47d4de75da
wip 2018-09-28 11:44:23 +09:00
syuilo
016c7fd2c4
wip 2018-09-28 11:43:15 +09:00
syuilo
7ca5e33a3a
wip 2018-09-28 11:40:47 +09:00
syuilo
436773837b
wip 2018-09-28 11:23:30 +09:00
syuilo
fccfe19e13
wip 2018-09-28 11:18:56 +09:00
syuilo
d1dce76e28
wip 2018-09-28 01:05:09 +09:00
syuilo
38a6aa26bc
wip 2018-09-27 23:17:33 +09:00
syuilo
32942709bf
wip 2018-09-27 23:09:23 +09:00
syuilo
b032f78769
wip 2018-09-27 21:43:11 +09:00
syuilo
a36d73cb52
wip 2018-09-27 16:49:18 +09:00
syuilo
4fe2f29478
wip 2018-09-27 14:32:48 +09:00
syuilo
0ef64a6d0b
wip 2018-09-27 11:55:17 +09:00
syuilo
1eb6ad58d5
wip 2018-09-27 02:46:53 +09:00
syuilo
3cbdfcb43d
wip 2018-09-27 00:54:37 +09:00
syuilo
b6e33e93de
wip 2018-09-26 20:47:11 +09:00
MeiMei
77b441f14c リプライで元の公開範囲を引き継ぐ (#2775) 
* ホーム/フォロワー限定へのリプライは公開範囲を引き継ぐように

* ダイレクトへのリプライはダイレクトでリプライ先ユーザーを初期設定するように

* 非公開へのリプライでも元の公開範囲を引き継ぐ
 2018-09-26 20:39:59 +09:00
syuilo
297019c22c
example commit 2018-09-26 20:38:16 +09:00
syuilo
f5f2215b47
wip 2018-09-26 20:28:13 +09:00
syuilo
904114740b
wip 2018-09-26 20:19:35 +09:00
syuilo
afdacf14b7
Add excludeNsfw option 2018-09-25 21:09:38 +09:00
syuilo
82d94b5963
Fix #2747 2018-09-22 08:49:14 +09:00
syuilo
d058ecc4ea
Resolve #2698 2018-09-20 17:21:16 +09:00
syuilo
d9f0e158a3
Implement #2736 2018-09-19 14:18:34 +09:00
syuilo
8ba3fb13eb
Fix bug 2018-09-18 13:12:41 +09:00
syuilo
1f2ebce8ed
Resolve #1302 2018-09-18 06:29:47 +09:00
syuilo
ab83e08bc7
メッセージタイムラインを追加 2018-09-18 02:14:12 +09:00
syuilo
109738ccb9
ハッシュタグタイムラインを実装 2018-09-17 09:00:20 +09:00
syuilo
32afe77a26
自分宛ての投稿をタイムラインで見れるように 2018-09-16 22:48:57 +09:00
syuilo
cda3635d97
enable-animations --> reduce-motion 2018-09-16 21:40:48 +09:00
syuilo
a61320ca8c
Improve usability 2018-09-16 04:34:46 +09:00
syuilo
19152c28cb
Fix bug 2018-09-16 04:31:55 +09:00
syuilo
dda2967e2d
Merge pull request #2611 from tamaina/improve-media 
メディアリストにバナータイプのメディアビューを追加
 2018-09-16 04:28:07 +09:00
syuilo
2e3d0d3435
Fix bug 2018-09-16 03:48:16 +09:00
syuilo
7d76887517
アニメーションを無効にするオプションを実装 2018-09-16 03:46:53 +09:00
tamaina
8f8c67ad6d
Merge branch 'develop' into improve-media 2018-09-15 22:15:56 +09:00
syuilo
25b0a93acd
✌️ 2018-09-15 21:53:04 +09:00
syuilo
7b2b7d1456
Resolve #2066 2018-09-15 21:48:10 +09:00
syuilo
f670345d45
ユーザー名のホストを省略しないオプションを実装 2018-09-14 20:33:27 +09:00
syuilo
3220d69a69
常にメディアを閲覧注意として投稿するオプションを実装 2018-09-14 20:11:01 +09:00
syuilo
34a5adf951
常に閲覧注意の画像を表示するオプションを追加 & リファクタリング 2018-09-14 15:14:59 +09:00
syuilo
4b3ece439e
🎨 2018-09-14 12:39:11 +09:00
syuilo
6843019481
メモリリークを承知でいくつかの重要な部分のアニメーションを有効化 2018-09-14 09:15:37 +09:00
syuilo
683d3a70b2
#2562 #2563 2018-09-13 18:23:44 +09:00
syuilo
03e1d3fbc4
Refactor 2018-09-13 18:01:50 +09:00
syuilo
700f8c9bb4
CWが適用されない箇所を修正 2018-09-13 17:44:36 +09:00
Aya Morisawa
0ed197d4d9 Use unique (#2695) 2018-09-12 03:02:14 +09:00
syuilo
046976dffc
Resolve #2691 2018-09-12 02:48:19 +09:00
Acid Chicken (硫酸鶏)
b24f368d3f サロゲートペアを字数にカウントしないようにする (#2661) 
* Update post-form.vue

* Update messaging-message.ts

* Update post-form.vue

* Update note.ts

* Update post-form.vue

refs: https://github.com/syuilo/misskey/pull/2661#issuecomment-419579444

* Update post-form.vue

refs: https://github.com/syuilo/misskey/pull/2661#issuecomment-419579444

* Update messaging-message.ts

refs: https://github.com/syuilo/misskey/pull/2661#issuecomment-419579444

* Update note.ts

refs: https://github.com/syuilo/misskey/pull/2661#issuecomment-419579444

* Update post-form.vue

refs: https://github.com/syuilo/misskey/pull/2661#discussion_r216175581

* Update post-form.vue

* Update post-form.vue

refs: https://github.com/syuilo/misskey/pull/2661#discussion_r216242002

* Update post-form.vue

refs: https://github.com/syuilo/misskey/pull/2661#discussion_r216242105
 2018-09-10 18:02:46 +09:00
syuilo
bc3a5f3512
Fix #2596 2018-09-10 03:02:06 +09:00
syuilo
82ee3a538b
Improve welcome page 2018-09-08 15:28:38 +09:00
syuilo
efaaa76185
Improve note visibility settings 
Closes #2312
Closes #2313
 2018-09-07 21:13:15 +09:00
syuilo
9e3abb9989
Improve welcome page 2018-09-07 20:41:12 +09:00
syuilo
2b50364ab4
ユーザー名にコントラストを付けるデザインのオンオフを切り替えられるように 2018-09-07 05:45:13 +09:00
Aya Morisawa
7959196dc7 Add sum function (#2653) 2018-09-07 04:21:04 +09:00
syuilo
538bb978ed
Merge branch 'develop' of https://github.com/syuilo/misskey into develop 2018-09-07 00:52:21 +09:00
syuilo
10232c5866
Fix bug & some refactor 2018-09-07 00:52:13 +09:00
Aya Morisawa
00d79487cd Add erase function (#2641) 2018-09-07 00:02:55 +09:00
Aya Morisawa
3cace734c7 Add concat function (#2640) 2018-09-06 21:31:15 +09:00
syuilo
91e0fc8c62
Improve welcome page 2018-09-06 04:52:42 +09:00
MeiMei
ebd1c877ad Show host in local user detail (#2634) 2018-09-06 03:21:11 +09:00
Aya Morisawa
1cc183ecdb Resolve #2631 (#2632) 2018-09-06 02:44:01 +09:00
syuilo
a1b82e9723 #2620 2018-09-05 19:32:46 +09:00
syuilo
ff8d300ea8 モバイル版のメニューにお知らせを表示するように 2018-09-05 17:43:31 +09:00
syuilo
6fea2f52f1 nanka iroiro 2018-09-05 13:47:26 +09:00
syuilo
f77eaaa08a Improve usability 2018-09-05 13:06:49 +09:00
tamaina
ebeaef94e2 Improve media list 2018-09-05 01:08:18 +09:00
syuilo
d279f8e9ff 🎨 2018-09-04 19:19:51 +09:00
MeiMei
eaec936fa6 Fix remote follow (#2606) 2018-09-04 18:33:16 +09:00
syuilo
f42665d4bc 🎨 2018-09-04 11:34:36 +09:00
syuilo
d15ebe5732 Improve usability 2018-09-02 18:27:43 +09:00
syuilo
ef630195fa モバイルのドライブダイアログがおかしいのを修正 & ダークモード対応 2018-09-02 18:23:47 +09:00
Aya Morisawa
291beb45fc
Use string interpolation 2018-09-01 23:12:51 +09:00
syuilo
5209a584a2 Better post form 2018-09-01 20:47:49 +09:00
syuilo
7559b8da6c ✌️ 2018-09-01 16:23:23 +09:00
syuilo
f1d65a66b4 Fix bug 2018-09-01 15:38:03 +09:00
syuilo
63e2dbbb0d Fix bug 2018-09-01 15:22:28 +09:00
syuilo
4d6b9f62e5 モバイルのドライブをダークモード対応した 2018-09-01 12:05:25 +09:00
syuilo
6819eb3b4d Improve usability 2018-09-01 09:16:25 +09:00