Kisaragi
934f9f80bd
docs: 「Feat: 個別のお知らせにリンクで飛べるように」のcherry-pick元を指定 ( #13891 )
...
* docs: 「Feat: 個別のお知らせにリンクで飛べるように」のcherry-pick元を指定
cc misskey-dev#13885
* Update CHANGELOG.md
Co-authored-by: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
---------
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
2024-05-27 21:25:07 +09:00
github-actions[bot]
4704dfe061
Bump version to 2024.5.0-beta.5
2024-05-27 12:00:25 +00:00
syuilo
d3b969306c
Merge branch 'develop' into release/2024.5.0
2024-05-27 20:55:49 +09:00
anatawa12
4579be0f54
新着ノートをサウンドで通知する機能をdeck UIに追加 ( #13867 )
...
* feat(deck-ui): implement note notification
* chore: remove notify in antenna
* docs(changelog): 新着ノートをサウンドで通知する機能をdeck UIに追加
* fix: type error in test
* lint: key order
* fix: remove notify column
* test: remove test for notify
* chore: make sound selectable
* fix: add license header
* fix: add license header again
* Unnecessary await
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
* ファイルを選択してください -> ファイルが選択されていません
* fix: i18n忘れ
* fix: i18n忘れ
* pleaseSelectFile > fileNotSelected
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
2024-05-27 20:54:53 +09:00
syuilo
d7982e471c
New Crowdin updates ( #13860 )
...
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Romanian)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Dutch)
* New translations ja-jp.yml (Norwegian)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Swedish)
* New translations ja-jp.yml (Turkish)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Uzbek)
* New translations ja-jp.yml (Lao)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Danish)
* New translations ja-jp.yml (Chinese Simplified)
2024-05-27 20:24:15 +09:00
anatawa12
a7a8dc4dbb
もともとセンシティブではないと連合されていたファイルがセンシティブとして連合された場合にセンシティブとしてそのファイルを扱うように ( #13879 )
...
* feat(backend): mark an file as sensitive if the file was newly federated as sensitive
* docs(changelog): もともとセンシティブではないと連合されていたファイルがセンシティブとして連合された場合にセンシティブとしてそのファイルを扱うように
* fix: change way to update federated image
* Update packages/backend/src/core/DriveService.ts
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
* update isSensitive of existing record object
---------
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
2024-05-27 20:12:25 +09:00
zyoshoka
cf2256cf41
fix: CHANGELOG not reflecting correctly ( #13888 )
...
* fix: CHANGELOG not reflecting correctly
* Update .github/workflows/release-edit-with-push.yml
Co-authored-by: anatawa12 <anatawa12@icloud.com>
---------
Co-authored-by: anatawa12 <anatawa12@icloud.com>
2024-05-27 20:11:39 +09:00
かっこかり
28e0e20879
[ci skip] Delete .github/FUNDING.yml
...
use misskey-dev/.github repository
2024-05-27 19:22:46 +09:00
github-actions[bot]
e50107792c
Bump version to 2024.5.0-beta.4
2024-05-27 08:37:07 +00:00
syuilo
579b88adc7
Merge branch 'develop' into release/2024.5.0
2024-05-27 17:28:08 +09:00
github-actions[bot]
140df4b5e0
Bump version to 2024.5.0-beta.3
2024-05-27 08:27:39 +00:00
Sayamame-beans
6af9492ea5
Quick action implement ( #13878 )
...
* enhance(frontend): quick action for file admin-lookup
* docs(changelog): update changelog
* enhance(frontend): quick action for general admin-lookup, remove unimplemented note, instance admin-lookup
* docs(changelog): update changelog
* chore: fix lint
2024-05-27 17:21:05 +09:00
かっこかり
d013e4516d
enhance(frontend): お気に入りチャンネルをキャッシュするように ( #13881 )
2024-05-27 17:19:09 +09:00
かっこかり
805a11aadb
enhance(backend): プロフィールのリンク検証にtry-catchを追加 ( #13882 )
...
* enhance(backend): プロフィールのリンク検証にtry-catchを追加
* ✌️
2024-05-27 17:18:12 +09:00
かっこかり
1b81ca4563
enhance(frontend): 「見たことのあるリノートを省略して表示」の名称を変更 ( #13883 )
...
* enhance(frontend): 「見たことのあるリノートを省略して表示」の名称を変更
* ひとつだけcaptionが入ってるやつが真ん中にいると不格好だったので場所変更
2024-05-27 17:16:47 +09:00
かっこかり
1df8ea824e
fix(backend): `/@` にアクセスするとサーバーエラーが発生する問題を修正 ( #13884 )
2024-05-27 17:15:42 +09:00
かっこかり
3ffbf6296f
feat: 個別のお知らせにリンクで飛べるように ( #13885 )
...
* feat(announcement): 個別のお知らせにリンクで飛べるように (MisskeyIO#639)
(cherry picked from commit f6bf7f992a78e54d86a4701dbd1e4fda7ef4eb27)
* fix
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
* fix
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
* 一覧ページではお知らせpanel全体を押せるように
* お知らせバーは個別ページに飛ばすように
* Update Changelog
* spdx
* attempt to fox test
* remove unnecessary thong
* `announcement` → `announcements/show`
* リンクを押せる場所をタイトルと日付部分のみに変更
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2024-05-27 17:15:11 +09:00
Amelia Yukii
4893efae0f
merge: put back button to delete all files for a user - fixes #535 ( !526 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/526
Closes #535
Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-05-24 20:47:10 +00:00
dakkar
c42d61f69b
put back button to delete all files for a user - fixes #535
2024-05-24 20:47:10 +00:00
dakkar
dbe1c5d055
merge: allow custom oneko image via themes - fixes #472 ( !478 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/478
Closes #472
Approved-by: Luna <her@mint.lgbt>
Approved-by: Leah <kevinlukej@gmail.com>
2024-05-24 09:50:42 +00:00
Amelia Yukii
a9b1affdf0
merge: more timeline filters - #228 ( !455 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/455
Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-05-23 21:56:28 +00:00
dakkar
d27ce442ea
more timeline filters - #228
2024-05-23 21:56:28 +00:00
Amelia Yukii
47963f323b
merge: Ported firefish crop and fade mfm ( !525 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/525
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-05-23 21:40:27 +00:00
Leah
f9a7cd0daa
Ported firefish crop and fade mfm
2024-05-23 21:40:25 +00:00
Amelia Yukii
3d0bf928a7
merge: Ported cutiekeys followmouse mfm ( !524 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/524
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Luna <her@mint.lgbt>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-05-23 18:08:31 +00:00
Leah
4c4b431248
Ported cutiekeys followmouse mfm
2024-05-23 18:08:31 +00:00
かっこかり
e0b47999fa
fix(backend): `read:admin:show-user` と `read:admin:show-users` を統合 ( #13798 )
...
* fix(frontend): 同じdisplayNameの権限があるのを修正
* read:admin:show-user と read:admin:show-users を統合
* Update Changelog
2024-05-23 17:29:59 +09:00
anatawa12
83a9aa4533
feat: suspend instance improvements ( #13861 )
...
* feat(backend): dead instance detection
* feat(backend): suspend type detection
* feat(frontend): show suspend reason on frontend
* feat(backend): resume federation automatically if the server is automatically suspended
* docs(changelog): 配信停止まわりの改善
* lint: fix lint errors
* Update packages/frontend/src/pages/instance-info.vue
* lint: fix lint error
* chore: suspendedState => suspensionState
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-05-23 15:55:47 +09:00
Acid Chicken
611e303bab
feat(backend): add /healthz endpoint ( #13834 )
...
* feat(backend): add /healthz endpoint
* feat(backend): also check meilisearch status if available
* style: header
* chore: no-store
* chore: healthcheck.sh
* style: format
2024-05-23 15:19:52 +09:00
github-actions[bot]
8489d39372
Bump version to 2024.5.0-beta.2
2024-05-23 05:25:01 +00:00
syuilo
4ee4456e87
Merge branch 'develop' into release/2024.5.0
2024-05-23 14:24:10 +09:00
anatawa12
aafa669cf5
feat(frontend): 長いテキストをペーストした際にテキストファイルとして添付するかどうかを選択できるように ( #13862 )
...
* feat(frontend): ask if attach as file if clipboard text is very long
* docs(changelog): 長いテキストをペーストした際にテキストファイルとして添付するかどうかを選択できるように
2024-05-23 13:15:22 +09:00
syuilo
ed432d06d7
New Crowdin updates ( #13850 )
...
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Chinese Simplified)
2024-05-22 06:40:05 +09:00
Sayamame-beans
c69de6b48c
fix(l10n): fix wrong description of server silence ( #13857 )
2024-05-21 20:43:00 +09:00
syuilo
4a3c01d198
Merge branch 'develop' into release/2024.5.0
2024-05-21 17:37:35 +09:00
syuilo
20c0bd9ddb
happy-domにメモリリークがありそう
2024-05-21 17:29:02 +09:00
かっこかり
6a637db36b
enhance(frontend): 通常のノートでも、お気に入りに登録したチャンネルにリノートできるように ( #13855 )
...
* enhance(frontend): チャンネルにリノートできるように
* Update Changelog
2024-05-21 17:23:20 +09:00
かっこかり
126383dca2
deps: AiScript VSCodeのバージョンを上げる ( #13851 )
2024-05-21 15:07:37 +09:00
syuilo
3340631d43
Update about-misskey.vue
2024-05-21 13:35:32 +09:00
syuilo
37f2952af9
Update about-misskey.vue
2024-05-21 13:33:43 +09:00
anatawa12
7bde630820
`/tags` と `/user-tags` が検索エンジンにインデックスされないように ( #13847 )
...
* chore(backend): noindex for tag search pages
* docs(changelog): `/tags` と `/user-tags` が検索エンジンにインデックスされないように
* chore: base.pug内でフラグでコントロールするように
2024-05-21 11:19:33 +09:00
syuilo
3fba7686f8
New Crowdin updates ( #13500 )
...
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Romanian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (Danish)
* New translations ja-jp.yml (Greek)
* New translations ja-jp.yml (Hungarian)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Dutch)
* New translations ja-jp.yml (Norwegian)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Slovak)
* New translations ja-jp.yml (Swedish)
* New translations ja-jp.yml (Turkish)
* New translations ja-jp.yml (Ukrainian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Bengali)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Croatian)
* New translations ja-jp.yml (Uyghur)
* New translations ja-jp.yml (Lojban)
* New translations ja-jp.yml (Sinhala)
* New translations ja-jp.yml (Uzbek)
* New translations ja-jp.yml (Kannada)
* New translations ja-jp.yml (Lao)
* New translations ja-jp.yml (Haitian Creole)
* New translations ja-jp.yml (Kabyle)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Sinhala)
* New translations ja-jp.yml (Sinhala)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Catalan)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Korean (Gyeongsang))
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Arabic)
* New translations ja-jp.yml (Vietnamese)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Russian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Japanese, Kansai)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Indonesian)
* New translations ja-jp.yml (Spanish)
* New translations ja-jp.yml (Italian)
* New translations ja-jp.yml (French)
* New translations ja-jp.yml (Czech)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Polish)
* New translations ja-jp.yml (Portuguese)
* New translations ja-jp.yml (Vietnamese)
2024-05-21 10:14:58 +09:00
Acid Chicken (硫酸鶏)
1d4e6393f3
ci: verify locale data ( #13849 )
...
* ci: verify locale data
* ci: separate workflows
* ci: missing installation
2024-05-21 10:10:59 +09:00
anatawa12
367bf0c8fc
fix: `/share` with unicode characters in the URL ( #13846 )
...
* fix: `/share` with unicode characters in the URL
* docs(changelog): `/share` で日本語等を含むurlがurlエンコードされない問題を修正
2024-05-20 23:21:11 +09:00
Sebastian Di Luzio
eac9f38942
fix(i18n): adjust grammar in about_misskey
2024-05-20 11:10:45 +00:00
anatawa12
5836bd85df
fix: 複数idを指定する`users/show`が関係ないユーザを返すことがある問題を修正 ( #13765 )
...
* fix: 複数idを指定する`users/show`が関係ないユーザを返すことがある問題を修正
* test: fix misskey js test
* chore: user/showがnullを返さないように
* chore: pass lambda instead of pushVisibleUser
2024-05-20 19:25:50 +09:00
anatawa12
ed74f7b4a8
ci: use pnpm version from packageManager field in the package.json. ( #13825 )
2024-05-20 18:55:42 +09:00
anatawa12
f6df94070b
Exclude channel notes from featured polls ( #13838 )
...
* feat(backend): add `channelId` to `MiPoll` as a Denormalized field
* feat(backend): option to exclude polls in channels
* chore: exclude channel notes from featured polls
* docs(changelog): みつけるのアンケート欄にてチャンネルのアンケートが含まれてしまう問題を修正
* fix: missing license header
2024-05-20 18:08:20 +09:00
anatawa12
4d0db37d2e
fix notification limit with exclude/include types ( #13836 )
...
* fix: /i/notificationsがsinceIdのみのときに正しく動かない問題
Fix #10902 again
* chore: use exclusive range to fetch data
* fix: フィルタによって通知が0件だった場合でもリトライするように
* docs(changelog): `/i/notifications`に includeTypes`か`excludeTypes`を指定しているとき、通知が存在するのに空配列を返すことがある問題を修正
2024-05-20 18:05:46 +09:00
anatawa12
acf84a2516
FTTが有効かつsinceIdのみを指定した場合に帰って来るレスポンスが逆順である問題を修正 ( #13837 )
...
* fix: FTTが有効かつsinceIdのみを指定した場合に帰って来るレスポンスが逆順である問題
* docs(changelog): FTTが有効かつsinceIdのみを指定した場合に帰って来るレスポンスが逆順である問題を修正
2024-05-20 08:28:28 +09:00