Commit graph

547 commits

Author SHA1 Message Date
Johann150
ef9fdb93d2
fix: pagination uses API correctly (#8925) 2022-07-05 17:42:54 +09:00
syuilo
0de176a2ba enhance(client): improve marquee 2022-07-05 16:16:13 +09:00
Kainoa Kanter
1eb504a640
chore: fix client lint errors (#8934)
* Fix client lint

* Hide no-v-html

* Ignore banned type

* Update page-editor.vue
2022-07-05 11:21:59 +09:00
Johann150
a228d1ddaa
fix lint @typescript-eslint/ban-types 2022-07-04 16:46:48 +02:00
Johann150
d748ba2c51
fix lint no-prototype-builtins 2022-07-04 16:39:04 +02:00
Johann150
a5c3fcea6e
fix lint no-undef 2022-07-04 16:33:55 +02:00
Johann150
366fae41ff
fix lint vue/require-valid-default-prop 2022-07-04 16:06:46 +02:00
Johann150
0b9c961707
fix lint no-fallthrough 2022-07-04 16:05:41 +02:00
Johann150
f14d5886f2
fix lint padded-blocks 2022-07-04 15:59:24 +02:00
Johann150
ea9e32096b
fix(lint): semicolong spacing 2022-07-04 15:56:16 +02:00
Johann150
121fa40621
fix: replace use of window 2022-07-04 15:27:21 +02:00
Johann150
e0e42a6425
fix: spellcheck is boolean not string 2022-07-04 10:35:27 +02:00
syuilo
66ffb253a2 chore(client): tweak style 2022-07-03 16:46:00 +09:00
syuilo
4774bc1f47 chore(client): tweak style 2022-07-03 16:36:13 +09:00
syuilo
e393ab6044 fix(client): style tweak for ios 2022-07-03 16:17:31 +09:00
syuilo
44c85aff86 feat(client): status bar (experimental) 2022-07-03 14:40:02 +09:00
syuilo
9c6a220810 chore(client): tweak ui 2022-07-02 22:07:04 +09:00
syuilo
ec41aefeea fix(client): fix typo 2022-07-02 22:06:53 +09:00
syuilo
66231c1669 fix(client): use unique class names for root to prevent conflicts of style 2022-07-02 21:29:48 +09:00
syuilo
f9ba35d928 enhance(client): better sticky-container component 2022-07-02 21:28:55 +09:00
syuilo
ef83670716 enhance(client): better marquee component 2022-07-02 21:28:04 +09:00
syuilo
ded0f6f0df refactor(client): refactoring 2022-07-02 14:00:37 +09:00
syuilo
6bcd5cb310 enhance(client): cache pages in page-window 2022-07-02 12:12:10 +09:00
syuilo
add6e9b14b chore(client): tweak ui 2022-07-01 18:55:45 +09:00
syuilo
80a033c1cf chore(client): tweak style 2022-07-01 17:08:45 +09:00
syuilo
c67c3b0360 chore(client): tweak style 2022-07-01 16:43:38 +09:00
syuilo
7c7ce072c7 chore(client): tweak ui 2022-06-30 23:51:18 +09:00
syuilo
bbdc52a7ea chore(client): tweak style 2022-06-30 23:07:45 +09:00
syuilo
cb697cf582 chore(client): tweak ui 2022-06-30 22:02:08 +09:00
syuilo
4c2cd3c8d5 chore(client): tweak ui 2022-06-30 21:38:34 +09:00
syuilo
ed41d542bb chore(client): tweak ui 2022-06-30 20:15:14 +09:00
syuilo
eac31eb323 chore(client): tweak ui 2022-06-30 19:19:54 +09:00
syuilo
47dcb1b41f refactor(client): use setup syntax 2022-06-30 12:48:42 +09:00
syuilo
fa6eb0e0f2 perf(client): improve range control performance 2022-06-30 12:42:35 +09:00
syuilo
bffe6fb9bf tweak client 2022-06-30 10:53:40 +09:00
syuilo
9ac526b6b6 tweak client 2022-06-30 10:13:27 +09:00
syuilo
c9b3ab80ca feat(client): add tag cloud component 2022-06-29 21:22:15 +09:00
syuilo
f997b7dff2 chore(client): fix type def 2022-06-29 16:07:38 +09:00
syuilo
a107dff4d6 perf(client): remove needless reactivity 2022-06-29 16:06:13 +09:00
syuilo
4fd386c3dc chore(client): tweak client 2022-06-29 15:41:06 +09:00
syuilo
8648308823 chore(client): tweak style 2022-06-29 14:19:40 +09:00
ThatOneCalculator
9ac1a527dc Self host error/info/not-found images 2022-06-28 19:33:32 -07:00
syuilo
0f1c0a42a2 enhance(client): メニュー整理
Resolve #6389
Fix #8035
2022-06-29 11:13:32 +09:00
syuilo
1a698111a4 refactor(client): remove invalid computed 2022-06-29 00:36:06 +09:00
syuilo
9a4198293a chore(client): tweak style 2022-06-28 22:32:01 +09:00
syuilo
ac162f9996 chore(client): tweak style 2022-06-28 18:41:37 +09:00
syuilo
d7e7152bd3 chore(client): tweak style 2022-06-28 18:09:42 +09:00
syuilo
270e1212ac chore(client): refactor and style tweaks 2022-06-28 15:59:49 +09:00
syuilo
57bb6e611f refactor(client): use setup syntax 2022-06-28 14:34:44 +09:00
syuilo
31d73f4659 chore(client): fix type def 2022-06-28 13:06:31 +09:00
syuilo
d7c6e2e61c fix(client): fix chart tooltip rendering 2022-06-28 10:41:38 +09:00
syuilo
40cd5c5a49 chore(client): tweak style 2022-06-28 00:20:51 +09:00
syuilo
0ec266abf7 chore(client): tweak client 2022-06-26 19:41:21 +09:00
syuilo
bd3c6f4157 chore(client): tweak ui 🎨 2022-06-26 16:38:27 +09:00
syuilo
4329d9e76d chore(client): fix type 2022-06-26 15:55:51 +09:00
syuilo
311478e725 chore(client): tweak client 2022-06-26 15:54:07 +09:00
syuilo
0cae0a49e2 chore(client): tweak ui 2022-06-26 13:28:47 +09:00
syuilo
5e95a1f7af refactor(client): extract interval logic to a composable function
あと`onUnmounted`を`onMounted`内で呼んでいたりしたのを修正したりとか
2022-06-26 03:12:58 +09:00
syuilo
0248a2a989 enhance(client): improve control panel 2022-06-25 23:01:40 +09:00
tamaina
c67c0df762 fix notification-setting-window.vue 2022-06-25 09:29:42 +00:00
syuilo
929dc076ec Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-25 18:26:34 +09:00
syuilo
58e83f8e4f feat: allow GET for some endpoints
Resolve #8263
2022-06-25 18:26:31 +09:00
syuilo
7be4b2145b refactor(client): extract tooltip logic of chart 2022-06-25 18:05:35 +09:00
Johann150
d5ef68336a
refactor: notification setting window composition API (#8860)
* refactor: notification setting window composition API

* fix lint vue/require-valid-default-prop

* fix type
2022-06-25 17:14:13 +09:00
syuilo
16fda89738 chore(client): tweak MkKeyValue component 2022-06-25 11:50:19 +09:00
syuilo
734fe9fd9d chore(client): tweak ui 2022-06-25 00:03:59 +09:00
syuilo
03973654b5 chore(client): improve usability 2022-06-24 23:49:47 +09:00
syuilo
1b2bd89383 fix bug 2022-06-24 21:48:54 +09:00
syuilo
1e8d84dbfa refactor: remove unused import 2022-06-24 21:46:49 +09:00
syuilo
696e8add00 feat: 管理者が特定ユーザーのアップロードしたファイル一覧を見れるように 2022-06-24 21:43:28 +09:00
syuilo
905d8625f8 fix(client): アカウント作成フォームでエラーが出る問題を修正 2022-06-24 21:19:38 +09:00
syuilo
a1449455a2 chore(client): tweak mini-chart rendering 2022-06-24 19:47:38 +09:00
Johann150
1c2e2c4b06
fix(client): ask to log in for poll vote (#8883) 2022-06-24 19:03:41 +09:00
syuilo
55c22eec8b chore(client): tweak ui 2022-06-24 10:52:34 +09:00
syuilo
4a5d5fe20c refactor(client): use composition api 2022-06-24 10:52:28 +09:00
syuilo
3e1248ff35 lint fixes 2022-06-23 21:46:15 +09:00
syuilo
d1e151172b chore(client): tweak client design 2022-06-23 13:39:28 +09:00
syuilo
43b9a9e618 enhance(client): tweak ui 2022-06-22 23:40:53 +09:00
syuilo
d3f25fa290 tweak client 2022-06-22 20:47:53 +09:00
syuilo
be383aa5b2 refactor(client): use composition api 2022-06-22 16:30:55 +09:00
syuilo
85365da69e refactor(client): refactor header tab handling 2022-06-22 16:30:45 +09:00
syuilo
f880d0631c tweak client 2022-06-21 17:55:38 +09:00
syuilo
a6fff86099 refactor(client): use composition api 2022-06-21 14:39:23 +09:00
syuilo
ce6cc21bcd tweak client
Fix #8856
2022-06-21 14:12:39 +09:00
syuilo
699f24f3dc
refactor(client): Refine routing (#8846) 2022-06-20 17:38:49 +09:00
tamaina
30a39a296d
refactor: チャットルームをComposition API化 (#8850)
* pick form

* pick message

* pick room

* fix lint

* fix scroll?

* fix scroll.ts

* fix directives/sticky-container

* update global/sticky-container.vue

* fix, 🎨

* test.1
2022-06-20 13:20:28 +09:00
tamaina
b70473ed60
feat: Add Badge Image to Push Notification (#8012)
* fix

* nanka iroiro

* wip

* wip

* fix lint

* fix loginId

* fix

* refactor

* refactor

* remove follow action

* clean up

* Revert "remove follow action"

This reverts commit defbb41648.

* Revert "clean up"

This reverts commit f94919cb9c.

* remove fetch specification

* renoteの条件追加

* apiFetch => cli

* bypass fetch?

* fix

* refactor: use path alias

* temp: add submodule

* remove submodule

* enhane: unison-reloadに指定したパスに移動できるように

* null

* null

* feat: ログインするアカウントのIDをクエリ文字列で指定する機能

* null

* await?

* rename

* rename

* Update read.ts

* merge

* get-note-summary

* fix

* swパッケージに

* add missing packages

* fix getNoteSummary

* add webpack-cli

* ✌️

* remove plugins

* sw-inject分離したがテストしてない

* fix notification.vue

* remove a blank line

* disconnect intersection observer

* disconnect2

* fix notification.vue

* remove a blank line

* disconnect intersection observer

* disconnect2

* fix

* ✌️

* clean up config

* typesを戻した

* backend/src/web/index.ts

* notification-badges

* add scripts

* change create-notification.ts

* Update packages/client/src/components/notification.vue

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* disconnect

* oops

* Failed to load the script unexpectedly回避
sw.jsとlib.tsを分離してみた

* truncate notification

* Update packages/client/src/ui/_common_/common.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* clean up

* clean up

* refactor

* キャッシュ対策

* Truncate push notification message

* fix

* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正

* components/drive-file-thumbnail.vue

* components/drive-select-dialog.vue

* components/drive-window.vue

* merge

* fix

* Service Workerのビルドにesbuildを使うようにする

* return createEmptyNotification()

* fix

* fix

* i18n.ts

* update

* ✌️

* remove ts-loader

* fix

* fix

* enhance: Service Workerを常に登録するように

* pollEnded

* pollEnded

* URLをsw.jsに戻す

* clean up

* fix lint

* changelog

* alpha-test

* also with twemoji

* add isMimeImage function

* catch

* Colour => Color

* char2file => char2filePath

* Update autocomplete.vue

* remove clone?

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-06-20 00:33:46 +09:00
syuilo
802a35d4b6 fix typo 2022-06-18 18:27:47 +09:00
futchitwo
5b7595d9d7
Improve: unclip (#8823)
* Refactor clip page to use Composition API

* Refactor clip page

* Refactor clip page

* Refactor clip page

* Improve: unclip

* Fix unclip

* Fix unclip

* chore: better type and name

* Fix

* Fix clipPage vue provider

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-06-18 18:27:09 +09:00
syuilo
7faa75d483 chore(client): tweak range control design 2022-06-17 13:20:33 +09:00
syuilo
4a55425fdb enhance(client): improve files page of control panel 2022-06-16 16:05:43 +09:00
syuilo
ca9753f2e7 Update cropper-dialog.vue 2022-06-11 18:48:59 +09:00
syuilo
7894804eed Update cropper-dialog.vue 2022-06-11 18:47:58 +09:00
syuilo
410210cf6f fix(client): オブジェクトストレージを使用していると画像のクロップができない 2022-06-11 16:46:21 +09:00
syuilo
ecb3c43520
feat: image cropping (#8808)
* wip

* wip

* wip
2022-06-11 15:45:44 +09:00
Johann150
5e29528ad4
chore: fix some lints automatically (#8788)
* chore: fix some lints automatically

Fixed lints that were automatically fixable with `eslint --fix`.

* fix type

* workaround for empty interface lint
2022-06-10 14:36:55 +09:00
Johann150
42f48ffea2
refactor: follow button (#8789)
* fix: display cancelling follow request

* remove unnecessary branch

The executed code is the same as in the else branch so this special
condition is unnecessary.

* remove code duplication

Use the same callback as later for updating these variables.

* use $ref sugar

* remove unused import

Co-authored-by: blackskye-sx <saul.newman@gmail.com>
2022-06-10 14:29:46 +09:00
Andreas Nedbal
7dde0b1362
fix(client): render quote renote CWs as MFM (#8792)
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-06-09 23:45:16 +09:00
Johann150
b66e73aed5
fix: use autocomplete=new-password (#8797) 2022-06-09 23:42:00 +09:00
Johann150
eec7a0a1f6
properly display alt text for videos (#8802)
The alt text is already properly federated and given by the API,
it is just not displayed properly by the client.
2022-06-09 23:35:58 +09:00
Johann150
4800dd06e5
fix: try to prevent autocomplete for emoji search (#8798) 2022-06-08 20:20:37 +09:00
syuilo
5fb3f8a116 chore: lint fixes 2022-06-05 12:26:36 +09:00
syuilo
adf3190859 chore(client): fix menu item style 2022-06-05 12:23:57 +09:00
syuilo
71150f21cd Revert "feat: option to collapse long notes (#8561)"
This reverts commit e675ffcf38.
2022-06-04 15:23:53 +09:00
Balazs Nadasdi
e675ffcf38
feat: option to collapse long notes (#8561)
* feat: option to collapse long notes

Closes #8559

* do not collapse if cw exists

* use '閉じる' to close / show less.

* make it sticky

* Change style of the Show less button
2022-06-04 13:57:09 +09:00
Johann150
804fa33535
refactor: improve code quality (#8751)
* remove unnecessary if

`Array.prototype.some` already returns a boolean so an if to return
true or false is completely unnecessary in this case.

* perf: use count instead of find

When using `count` instead of `findOneBy`, the data is not
unnecessarily loaded.

* remove duplicate null check

The variable is checked for null in the lines above and the function
returns if so. Therefore, it can not be null at this point.

* simplify `getJsonSchema`

Because the assigned value is `null` and the used keys are only
shallow, use of `nestedProperty.set` seems inappropriate. Because the
value is not read, the initial for loop can be replaced by a `for..in`
loop.

Since all keys will be assigned `null`, the condition of the ternary
expression in the nested function will always be true. Therefore the
recursion case will never happen. With this the nested function can be
eliminated.

* remove duplicate condition

The code above already checks `dragging` and returns if it is truthy.
Checking it again later is therefore unnecessary.

To make this more obvious the `return` is removed in favour of using
an if...else construct.

* remove impossible "unknown" time

The `ago` variable will always be a number and all non-negative numbers
are already covered by other cases, the negative case is handled with
`future` so there is no case when `unkown` could be achieved.
2022-05-29 15:15:52 +09:00
tamaina
abc8998b48
refactor: use css module at components/global/loading.vue (#8750)
* refactor: use css module at components/global/loading.vue

* rename class name to "root"
2022-05-29 00:15:32 +09:00
Andreas Nedbal
708fba989a
feat(tests): add e2e tests for widgets (#8735)
* test(e2e): add baseline for widget tests

* chore(repo): enable test running in branch

* fix(e2e): set viewport for widget tests

* fix(client): add widget identifier classes to widgets

* test(e2e): add memo widget test

* fix(tests): force select value

* fix(tests): force button press for widget addition

* fix(tests): invoke select value differently

* fix(tests): adjust widget submit

* fix(tests): don't explicitly navigate for widget test

* fix(tests): click label to hide select popup

* fix(tests): just click modal background

* fix(tests): adjust modal background selector

* fix(tests): click all modal backgrounds

* feat(e2e): add test for adding timeline widget

* fix(client): add more widget identifier classes

* feat(tests): add method abstraction for test cases

* fix(tests): force-click overlays

* fix(tests): force widget button press

* fix(tests): remove timeout from final widget check

* feat(tests): add widget removal test case

* fix(client): use mk instead of msky as class prefix

* fix(tests): check widgets for existence rather than visibility

* chore(meta): don't run tests for specific feature branch
2022-05-28 14:28:12 +09:00
Johann150
161659de5c
enhance: replace signin CAPTCHA with rate limit (#8740)
* enhance: rate limit works without signed in user

* fix: make limit key required for limiter

As before the fallback limiter key will be set from the endpoint name.

* enhance: use limiter for signin

* Revert "CAPTCHA求めるのは2fa認証が無効になっているときだけにした"

This reverts commit 02a43a310f.

* Revert "feat: make captcha required when signin to improve security"

This reverts commit b21b058005.

* fix undefined reference

* fix: better error message

* enhance: only handle prefix of IPv6
2022-05-28 12:06:47 +09:00
Johann150
3dae18b93c
fix lints (#8737)
* fix: emits use ev instead of e

* fix: errors use err instead of e

* fix: replace use of data where possible

* fix: events use evt instead of e

* fix: use strict equals

* fix: use emoji instead of e

* fix: vue lints
2022-05-26 22:53:09 +09:00
Johann150
f90c947036
fix(client): wrong scoping breaks 2FA 2022-05-23 22:43:13 +02:00
syuilo
b811de53b6 fix(client): make emoji stand out more on reaction button
Fix #8520
Close #8521

Co-Authored-By: Johann150 <20990607+Johann150@users.noreply.github.com>
2022-05-19 23:23:12 +09:00
Johann150
be1d02a7f8
enhance: page image component with alt text (#8634)
* refactor to composition API

* use existing image component

This improves user experience because alt text is displayed correctly.

* fix: correct image src

* fix: defineProps

* fix
2022-05-19 20:41:47 +09:00
Johann150
60fd793bc3
enhance(MFM): limit large MFM (#8540)
* add CSS classes for zoom MFM

* limit nesting of x2, x3, x4 MFM

* simplify CSS calculation

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2022-05-19 20:38:14 +09:00
xianon
0f33864df1
fix: ノート詳細ページの新しいノートを表示する機能の動作が正しくなるように修正する (#8607)
* ノート詳細で新しいノートの表示が正しくないのを修正する

* ノート詳細から別のノート詳細を表示した時に前後の表示をリセットする
2022-05-19 20:32:55 +09:00
Andreas Nedbal
1d9a4f68f4
Refactor pleaseLogin to show a sign-in dialog (#8630)
* refactor(client): refactor pleaseLogin to show a sign-in dialog

* Apply review suggestions from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-05-19 20:28:08 +09:00
syuilo
4702f99c83 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-05-19 17:21:11 +09:00
syuilo
65b048bb70 chore(client): tweak loading spinner design 2022-05-19 17:21:08 +09:00
xianon
02f9e5d6f0
fix: ノートのインスタンス情報の文字に縁を付けて見やすくする (#8697)
* ノートのインスタンス情報の背景色が反映されないことがあるのを修正する

* ノートのインスタンス情報の文字に縁を付けて見やすくする

* Revert "ノートのインスタンス情報の背景色が反映されないことがあるのを修正する"

This reverts commit de920dfc53.

* ノートのインスタンス情報の文字の影の数を増やしてさらに見やすくする
2022-05-19 16:17:00 +09:00
syuilo
4fc2058745 chore(client): tweak loading spinner design 2022-05-19 15:24:35 +09:00
Andreas Nedbal
d62a55b46f
Refactor emoji-edit-dialog to use Composition API (#8657)
* refactor(client): refactor emoji-edit-dialog to use Composition API

* fix(client): fix editing emoji not updating emoji list

* Apply review suggestions from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

* fix(client): use cached category info instead of making a request

* fix(client): use updateItem in emoji pagination when editing

* fix(client): reimplement removeItem in MkPagination

* Apply review suggestion from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-15 22:20:01 +09:00
syuilo
02a43a310f CAPTCHA求めるのは2fa認証が無効になっているときだけにした
2faのトークンは期限付きだから、CAPTCHA解いてる間に期限切れになる
2022-05-15 16:47:14 +09:00
syuilo
b21b058005 feat: make captcha required when signin to improve security 2022-05-15 12:18:46 +09:00
Andreas Nedbal
88307327e6
Refactor Chart component (#8622)
* refactor(client): refactor Chart component

* Apply review suggestions from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

* fix(client): don't expose values from Chart

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-14 21:20:41 +09:00
Andreas Nedbal
a29ff7b1fa
Fix lint issues in post form component (#8619)
* fix(client): fix lint issues in post form

* Apply review suggestions from @Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-07 17:01:01 +09:00
Andreas Nedbal
7bd45e5729
Fix lint issues in emoji picker components (#8620)
* fix(client): fix lint issues in emoji picker components

* fix(client): switch argument naming for emoji picker section event
2022-05-07 17:00:05 +09:00
futchitwo
3ea351d8a2
Enhance(MFM): Allow speed changes in all animated MFMs (#8551)
* MFM: Allow speed changes in all animated MFMs

* Feature(MFM): Add speed property to cheat sheet

* Use template literal

Oops!

* Remove unnecessary template string

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-05-05 22:52:33 +09:00
tamaina
1168e25721
fix (client): fix mention icon height (#8615) 2022-05-05 20:46:46 +09:00
Andreas Nedbal
7362c2da76
Fix lint issues in Drive components (#8613)
* fix(client): Fix lint issues in Drive components

* fix(client): only use !=/== for null comparisons

* Update drive.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-05-05 20:45:50 +09:00
tamaina
a89003b57a
refactor: use Vite to build instead of webpack (#8575)
* update stream.ts

* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339

* fix lint

* clean up?

* add app

* fix

* nanka iroiro

* wip

* wip

* fix lint

* fix loginId

* fix

* refactor

* refactor

* remove follow action

* clean up

* Revert "remove follow action"

This reverts commit defbb41648.

* Revert "clean up"

This reverts commit f94919cb9c.

* remove fetch specification

* renoteの条件追加

* apiFetch => cli

* bypass fetch?

* fix

* refactor: use path alias

* temp: add submodule

* remove submodule

* enhane: unison-reloadに指定したパスに移動できるように

* null

* null

* feat: ログインするアカウントのIDをクエリ文字列で指定する機能

* null

* await?

* rename

* rename

* Update read.ts

* merge

* get-note-summary

* fix

* swパッケージに

* add missing packages

* fix getNoteSummary

* add webpack-cli

* ✌️

* remove plugins

* sw-inject分離したがテストしてない

* fix notification.vue

* remove a blank line

* disconnect intersection observer

* disconnect2

* fix notification.vue

* remove a blank line

* disconnect intersection observer

* disconnect2

* fix

* ✌️

* clean up config

* typesを戻した

* Update packages/client/src/components/notification.vue

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* disconnect

* oops

* Failed to load the script unexpectedly回避
sw.jsとlib.tsを分離してみた

* truncate notification

* Update packages/client/src/ui/_common_/common.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* clean up

* clean up

* キャッシュ対策

* Truncate push notification message

* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正

* components/drive-file-thumbnail.vue

* components/drive-select-dialog.vue

* components/drive-window.vue

* merge

* fix

* Service Workerのビルドにesbuildを使うようにする

* return createEmptyNotification()

* fix

* i18n.ts

* update

* ✌️

* remove ts-loader

* fix

* fix

* enhance: Service Workerを常に登録するように

* pollEnded

* URLをsw.jsに戻す

* clean up

* wip

* wip

* wip

* wip

* wip

* wip

* ✌️

* use import

* fix

* install rollup

* use defineAsyncComponent.

* fix emojilist

* wip use defineAsyncComponent

* popup(import -> popup(defineAsyncComponent(() => import

* draggable?

* fix init import

* clean up

* fix router

* add comment

* ✌️

* ✌️

* ✌️

* remove webpack

* update vite

* fix boot sequence

* Revert "fix boot sequence"

This reverts commit e893dbf37a.

* revert boot import

* never make two app div

* ;

* remove console.log

* change clientEntry sequence

* fix

* Revert "fix"

This reverts commit 12741b3d89.

* fix

* add comment https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210

* add log

* add comment

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-05-01 22:51:07 +09:00
tamaina
766559c6e9
feat: Improve Push Notification (#7667)
* clean up

* ev => data

* refactor

* clean up

* add type

* antenna

* channel

* fix

* add Packed type

* add PackedRef

* fix lint

* add emoji schema

* add reversiGame

* add reversiMatching

* remove signin schema (use Signin entity)

* add schemas refs, fix Packed type

* wip PackedHoge => Packed<'Hoge'>

* add Packed type

* note-reaction

* user

* user-group

* user-list

* note

* app, messaging-message

* notification

* drive-file

* drive-folder

* following

* muting

* blocking

* hashtag

* page

* app (with modifying schema)

* import user?

* channel

* antenna

* clip

* gallery-post

* emoji

* Packed

* reversi-matching

* update stream.ts

* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339

* fix lint

* clean up?

* add app

* fix

* nanka iroiro

* wip

* wip

* fix lint

* fix loginId

* fix

* refactor

* refactor

* remove follow action

* clean up

* Revert "remove follow action"

This reverts commit defbb41648.

* Revert "clean up"

This reverts commit f94919cb9c.

* remove fetch specification

* renoteの条件追加

* apiFetch => cli

* bypass fetch?

* fix

* refactor: use path alias

* temp: add submodule

* remove submodule

* enhane: unison-reloadに指定したパスに移動できるように

* null

* null

* feat: ログインするアカウントのIDをクエリ文字列で指定する機能

* null

* await?

* rename

* rename

* Update read.ts

* merge

* get-note-summary

* fix

* swパッケージに

* add missing packages

* fix getNoteSummary

* add webpack-cli

* ✌️

* remove plugins

* sw-inject分離したがテストしてない

* fix notification.vue

* remove a blank line

* disconnect intersection observer

* disconnect2

* fix notification.vue

* remove a blank line

* disconnect intersection observer

* disconnect2

* fix

* ✌️

* clean up config

* typesを戻した

* Update packages/client/src/components/notification.vue

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* disconnect

* oops

* Failed to load the script unexpectedly回避
sw.jsとlib.tsを分離してみた

* truncate notification

* Update packages/client/src/ui/_common_/common.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* clean up

* clean up

* キャッシュ対策

* Truncate push notification message

* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正

* components/drive-file-thumbnail.vue

* components/drive-select-dialog.vue

* components/drive-window.vue

* merge

* fix

* Service Workerのビルドにesbuildを使うようにする

* return createEmptyNotification()

* fix

* i18n.ts

* update

* ✌️

* remove ts-loader

* fix

* fix

* enhance: Service Workerを常に登録するように

* pollEnded

* URLをsw.jsに戻す

* clean up

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-04-30 21:52:07 +09:00
tamaina
12a3c6872f
enhance: ドライブに画像ファイルをアップロードするときオリジナル画像を破棄してwebpublicのみ保持するオプション (#8216)
* wip

* Update packages/client/src/os.ts

Co-authored-by: tamaina <tamaina@hotmail.co.jp>

* メニューをComposition API化、switchアイテム追加
クライアントサイド画像圧縮の準備

* メニュー型定義を分離 (TypeScriptの型支援が効かないので)

* disabled

* make keepOriginal to follow setting value

* ✌️

* fix

* fix

* ✌️

* WEBP

* aaa

* ✌️

* webp

* lazy load browser-image-resizer

* rename

* rename 2

* Fix

* clean up

* add comment

* clean up

* jpeg, pngにもどす

* fix

* fix name

* webpでなくする ただしサムネやプレビューはwebpのまま (テスト)

* 動画サムネイルはjpegに

* エラーハンドリング

* ✌️

* v2.2.1-misskey-beta.2

* browser-image-resizer#v2.2.1-misskey.1

* ✌️

* fix alert

* update browser-image-resizer to v2.2.1-misskey.2

* lockfile

Co-authored-by: mei23 <m@m544.net>
Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
2022-04-28 11:14:03 +09:00
Andreas Nedbal
d0443f9de1
fix(client): fix lint issues in autocomplete (#8548) 2022-04-28 10:56:18 +09:00
Johann150
f68a2c0881
add perspective 2022-04-27 17:25:27 +02:00
Johann150
92d53f7441
add x,y parameters to rotate MFM 2022-04-26 22:26:22 +02:00
tamaina
eac71ae1d7
fix: Fix settings page (#8508)
* Fix settings page

* nanka iroiro

* clean up

* clean up

* インデックスに戻ってもタイトルが残ってしまうのを修正
2022-04-23 19:17:15 +09:00
syuilo
f02508c259 Revert "make emoji stand out more on reaction button"
This reverts commit e0c5401241.
2022-04-20 09:30:29 +09:00
Johann150
e0c5401241
make emoji stand out more on reaction button
a slight shadow makes them easier to see
2022-04-19 22:03:15 +02:00
syuilo
8e5f2690f2
feat: Webhook (#8457)
* feat: introduce webhook

* wip

* wip

* wip

* Update CHANGELOG.md
2022-04-02 15:28:49 +09:00
syuilo
11ccb98c93 update deps 2022-04-01 19:13:40 +09:00
syuilo
525b4b6cf4 tweak client 2022-03-27 16:28:25 +09:00
syuilo
c7969ef418 refactor 2022-03-27 02:22:31 +09:00
tamaina
a3cdb4cca1
fix: Handle decodeURIComponent error (#8411) 2022-03-27 02:21:56 +09:00
tamaina
78736c70f7
デッキまわりをCompositon API / Setup Sugarに (#8410)
* universal.widgets.vue

* column.vue, antenna-column.vue

* direct-column.vue, list-column.vue

* main-column.vue

* wip

* ✌️

* fix

* ✌️

* ✌️
2022-03-21 03:11:14 +09:00
syuilo
c928941d29 fix(client): fix popup menu direction calclation 2022-03-19 22:03:53 +09:00
syuilo
fb355abbcf 🎨 2022-03-12 14:54:08 +09:00
syuilo
5490d82e3b tweal c;iemy 2022-03-11 18:55:47 +09:00
nullobsi
9c36cc8b01
fix scroll (#8382) 2022-03-09 22:33:07 +09:00
syuilo
b929bffea5 fix federation chart 2022-03-08 22:56:46 +09:00
syuilo
ec64b5ea0b feat: add active to federation chart 2022-03-07 15:10:16 +09:00
syuilo
0f736e7e9d tweak client 2022-03-06 23:21:19 +09:00
syuilo
2442592ef1 feat: アンケート終了通知
Resolve #4664
2022-03-06 16:06:27 +09:00
tamaina
446e4ce0c3
fix: iPhone X以降(?)でページの内容が全て表示しきれないのを修正 (#8375)
* add safe-area-inset-bottom to spacer

* fix

* ✌️

* fix
2022-03-05 02:00:45 +09:00
syuilo
5431b51249 fix 2022-03-05 01:23:34 +09:00
syuilo
476dfb0f35 fix(client): register_note_view_interruptor()が動かないのを修正
Fix #8318
2022-03-05 01:22:57 +09:00
syuilo
5448ed643e tweak client 2022-03-04 16:26:21 +09:00
syuilo
072799f674 fix(client): ユーザー名オートコンプリートが正しく動作しない問題を修正 2022-03-02 18:52:49 +09:00
syuilo
b80ec1fa3f refactor 2022-03-01 21:36:20 +09:00
syuilo
c1c71c2e79 🎨 2022-02-25 18:32:37 +09:00
syuilo
9202ce6d7c client: 検索構文でGoogle明示 & deprecated 2022-02-25 14:40:11 +09:00
syuilo
c0fd7697b9 enhance(client): improve launch pad usability 2022-02-23 23:40:31 +09:00
syuilo
a28daf7f44 feat: add pub & sub item for federation chart 2022-02-23 16:17:16 +09:00
xianon
ec632e6694
タッチ操作でウィジェットの編集や削除ができるようにする (#8328) 2022-02-20 16:07:29 +09:00
syuilo
9d7352a9e4 fix(client): リアクションピッカーの高さが低くなったまま戻らないことがあるのを修正
Fix #8071
2022-02-13 16:35:53 +09:00
syuilo
642a51a558 fix(client): nextTickの中でonUnmounted呼び出しても効かない可能性がある 2022-02-12 17:29:15 +09:00
syuilo
c1f0fa5bd6 enhance(client): tweak padding 2022-02-11 22:16:20 +09:00
syuilo
b01a0325ba fix(client): ノート詳細が開けないのを直したり
Fix #8305
2022-02-11 22:14:14 +09:00
syuilo
b3decdc4e5 fix(client): ノートの参照を断ち切るように
Fix #8201
Close #8237
2022-02-11 21:35:28 +09:00
syuilo
88e09ef380 chore(client): tweak chart 2022-02-11 15:14:08 +09:00
syuilo
bf4cdd71ce enhance(client): リアクションピッカーの幅、高さ制限を緩和 2022-02-11 13:53:02 +09:00
syuilo
cc019a217f feat(client): make size of reaction picker configuable 2022-02-11 13:38:47 +09:00
syuilo
2dad6ee50d 🎨 2022-02-11 12:46:03 +09:00
syuilo
9f417bd50b 🎨 2022-02-10 22:16:59 +09:00
syuilo
108ec412c3 enhance(client): tweak chart 2022-02-10 19:02:52 +09:00
syuilo
0afebcfd9e enhance: improve federation chart 2022-02-10 17:45:12 +09:00
syuilo
f512b29443 chore(client): check textarea exists 2022-02-09 21:27:42 +09:00
syuilo
ff59984ff4 chore: tweak chart labels 2022-02-09 13:25:08 +09:00
syuilo
7fcd9435f3 feat: introduce intersection calculation of charts 2022-02-09 03:46:58 +09:00
syuilo
eb894c330f fix(client): 環境に依っては返信する際のカーソル位置が正しくない問題を修正 2022-02-08 23:53:01 +09:00
syuilo
f4e28983a1 feat: improve federation chart 2022-02-08 23:43:51 +09:00
syuilo
f7ff39e7ff chore: better label 2022-02-08 23:25:48 +09:00
syuilo
f50dd5d677 🎨 2022-02-08 23:15:43 +09:00
syuilo
adf3493af8 feat: notes/instance/perUserNotesチャートに添付ファイル付きノートの数を追加 2022-02-08 23:12:37 +09:00
syuilo
e9190599ca 🎨 2022-02-08 22:36:07 +09:00
syuilo
aa7ab1c1e0 🎨 2022-02-08 19:20:09 +09:00
syuilo
60b6601d3e Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-02-08 18:46:45 +09:00
syuilo
190b47aad2 feat(client): デバイスの種類を手動指定できるように 2022-02-08 18:46:39 +09:00
Johann150
e902178153
fix: instance ticker (#8260)
* add type and default values

* remove unnecessary string operation
2022-02-08 16:38:52 +09:00
syuilo
5792eea1b1 enhance(client): improve tooltip position calclation 2022-02-08 15:37:31 +09:00
syuilo
e5d6d1dcf0 🎨 2022-02-07 14:56:49 +09:00
syuilo
cc7a1808ec imprpve active users chart 2022-02-06 06:24:06 +09:00
syuilo
80fa92fb97 improve chart 2022-02-06 00:43:22 +09:00
syuilo
0b462feff6 enhance(client): improve chart rendering 2022-02-04 16:39:09 +09:00
syuilo
5e198381d3 🎨 2022-02-03 02:08:54 +09:00
syuilo
9b7b8bb9a1 fix(client): ツールチップの表示位置が正しくない問題を修正 2022-02-02 01:32:26 +09:00
tamaina
ae3abc2126
fix: Fix Sideview (#8235)
* Fix #7890

* a-

* 3度目の正直

* fix

* ✌️

* update CHANGELOG

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-02-01 23:48:19 +09:00
nullobsi
bfc95ccf73
fix: ensure that specified users does not get duplicates (#8233)
* ensure that specified users does not get duplicates

* Update packages/client/src/components/post-form.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-02-01 21:49:34 +09:00
syuilo
8560e107bc enhance(client): Chartjsのツールチップを自前に 2022-01-31 21:07:33 +09:00
tamaina
55b3ae22ee
enhance: メニュー関連をComposition API化、switchアイテム追加 (#8215)
* メニューをComposition API化、switchアイテム追加
クライアントサイド画像圧縮の準備

* メニュー型定義を分離 (TypeScriptの型支援が効かないので)

* disabled

* make keepOriginal to follow setting value

* fix

* fix

* Fix

* clean up
2022-01-30 14:11:52 +09:00
syuilo
149edaecab refactor(client): use setup sugar 2022-01-29 03:03:23 +09:00
syuilo
f0e720931b fix(client): 投稿フォームのハッシュタグ保持フィールドが動作しない問題を修正
Fix #8212
2022-01-29 02:54:56 +09:00
Johann150
29b33b37ee
round relative time (#8199) 2022-01-28 15:29:24 +09:00
syuilo
9ffab33037 fix(client): リアクション設定で絵文字ピッカーが開かないのを修正 2022-01-28 12:30:47 +09:00
syuilo
bb6b912aef fix 2022-01-28 12:21:35 +09:00
syuilo
974269b8f1 refactor 2022-01-28 12:20:42 +09:00
syuilo
bfc9873fb9 refactor(client): use setup sugar 2022-01-28 12:14:21 +09:00
syuilo
b946d89ec1 refactor(client): better semantics 2022-01-28 11:53:12 +09:00
syuilo
57ec04d9ec refactor(client): i18n.locale -> i18n.ts 2022-01-28 11:39:49 +09:00
syuilo
6ebab5f577 chore(client): improve chart rendering 2022-01-28 11:19:18 +09:00
syuilo
a9960ac63a refactor(client): use composition api 2022-01-28 00:52:05 +09:00
syuilo
2a4f2fba09 refactor(client): use composition api 2022-01-28 00:46:49 +09:00
syuilo
779bd244a6 chore: fix instant form handling 2022-01-27 17:38:02 +09:00
tamaina
2f67ec2f84
enhance: MediaListでは、サーバーで許可された形式しか表示しないように (#8113)
* wip

* fix
2022-01-27 00:08:48 +09:00
syuilo
ad2a3eed9b 🎨 2022-01-26 03:31:10 +09:00
syuilo
f7a90e041c Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-01-26 03:26:40 +09:00
syuilo
0b4a076f66 refactor 2022-01-26 03:26:34 +09:00
Derek
4e1974c6e6
enhance: Improve poll-editor UI + composition port (#8186)
* Poll editor UI changes

Use a horizontal layout when possible, wrap to vertical when constrained

* Port poll-editor to composition API

* Fix poll-editor `get` time calcs

* fix

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-01-26 03:26:12 +09:00
Johann150
e51f59e1b7
disable animations on more transitions (#8112) 2022-01-25 23:18:21 +09:00
syuilo
901453ba7d chore(client): add tooltip 2022-01-21 20:51:07 +09:00
syuilo
10609eebfa 投稿したらアカウントを元に戻すように 2022-01-21 20:19:56 +09:00
syuilo
331afcb96a feat(client): make possible to switch account instantly in post form 2022-01-21 20:17:31 +09:00
syuilo
43baafbebb Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-01-21 18:27:37 +09:00
syuilo
e3a5584d0a feat: increase files limit for note
#8062
2022-01-21 18:27:33 +09:00
nullobsi
76db7ba781
update local copy of file when describing (#8131) 2022-01-21 17:43:51 +09:00
Acid Chicken (硫酸鶏)
9a4267f01f
fix(#8133): hCaptcha の reCAPTCHA 互換挙動を無効化する (#8135)
* fix(#8133): hCaptcha の reCAPTCHA 互換挙動を無効化する

* Update packages/client/src/components/captcha.vue

* fix: hCaptcha host

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2022-01-21 17:43:14 +09:00
tamaina
e1d69e236f
enhance: e2eテストをできるだけ改良してみた (#8159)
* update docker image?

* 続

* serial run delete from "${table}" cascade

* use cypress official github action

* refuse install by cypress action

* clean up

* use wait?

* use more wait?

* Revert "use more wait?"

This reverts commit 18d0fcae9c.

* Revert "use wait?"

This reverts commit 5aa8feec9c.

* fix

* test

* test

* log?

* 握りつぶしてみる

* clean up

* env?

* clean up?

* disable video

* add comment

* remove test

* 成功?

* test browser

* nodeインストール無効化

* node16.13.0-chrome95-ff94

* node.js復活

* ?

* ちょっと戻してみる

* chrome?

* cross browser test2

* --shm-size=2g

* artifact?

* misskey.local?

* firefoxはあきらめる

* not headless?

* oops

* fix

* ??

* test1

* if?

* fail-fast: false

* headless: false

* easy error ignoreing describe

* エラーの解消
とちょっとリファクター

* add browser name to artifact

* Install mplayer for FireFox

* no wait?

* タイムアウトを甘くしてみる

* firefoxをあきらめる(n回目)

* remove timeout setting

* wait復活

* Update basic.js

* Update index.js

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-01-21 16:43:56 +09:00
Johann150
cbb7e95d82
enhance: Forward report (#8001)
* implement sending AP Flag object

Optionally allow a user to select to forward a report about a remote
user to the other instance. This is added in a backwards-compatible way.

* add locale string

* forward report only for moderators

* add switch to moderator UI to forward report

* fix report note url

* return forwarded status from API

apparently forgot to carry this over from my testing environment

* object in Flag activity has to be an array

For correct interoperability with Pleroma the "object" property of the Flag
activity has to be an array.

This array will in the future also hold the link to respective notes, so it
makes sense to correct this on our side.

* Update get-note-menu.ts

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-01-21 03:06:38 +09:00
tamaina
1bd7c55c88
post-form.vue (#8164) 2022-01-20 23:15:08 +09:00
syuilo
2a1d9a7428 refactor 2022-01-20 01:27:41 +09:00
syuilo
b5ccac3cb5 refactor 2022-01-19 23:51:37 +09:00
syuilo
d7d533f9de fix #8158 2022-01-19 23:51:28 +09:00
tamaina
7be09a4af9
refactor: Composition APIへ移行 (#8138)
* components/drive-file-thumbnail.vue

* components/drive-select-dialog.vue

* components/drive-window.vue

* wip

* wip drive.file.vue, drive.vue

* fix prop

* wip(

* components/drive.folder.vue

* maybe ok

* ✌️

* fix variable

* FIX FOLDER VARIABLE

* components/emoji-picker-dialog.vue

* Hate `$emit`

* hate global property

* components/emoji-picker-window.vue

* components/emoji-picker.section.vue

* fix

* fixx

* wip components/emoji-picker.vue

* fix

* defineExpose

* ユニコード絵文字の型をもっといい感じに

* components/featured-photos.vue

* components/follow-button.vue

* forgot-password.vue

* forgot-password.vue

* 🎨

* fix
2022-01-18 23:06:16 +09:00
syuilo
a8fad1b61c refactor 2022-01-18 21:35:57 +09:00
tamaina
9869f01e7c
Fix #8151 (#8152) 2022-01-18 21:32:17 +09:00
syuilo
9885c6ba6c wip: refactor(client): migrate components to composition api 2022-01-16 21:31:09 +09:00
syuilo
df61e173c1 wip: refactor(client): migrate components to composition api 2022-01-16 11:02:27 +09:00
syuilo
8322c90834 refactor(client): specify global scope 2022-01-16 10:14:14 +09:00
syuilo
689e75e10a wip: refactor(client): migrate components to composition api 2022-01-16 08:49:27 +09:00
syuilo
133b5c6391 wip: refactor(client): migrate components to composition api 2022-01-16 08:38:55 +09:00
syuilo
ed5c918d70 wip: refactor(client): migrate components to composition api 2022-01-16 08:24:53 +09:00
syuilo
7cbeef21e1 wip: refactor(client): migrate components to composition api 2022-01-16 07:47:28 +09:00
syuilo
9693dfb09d wip: refactor(client): migrate components to composition api 2022-01-16 06:59:35 +09:00
syuilo
c17e8fa8a4 wip: refactor(client): migrate components to composition api 2022-01-16 01:46:25 +09:00
syuilo
21c9705a0f wip: refactor(client): migrate components to composition api 2022-01-15 20:42:30 +09:00
syuilo
45462e4a5e wip: refactor(client): migrate paging components to composition api 2022-01-14 12:02:10 +09:00
syuilo
c8a90ec7d1 wip: refactor(client): migrate paging components to composition api 2022-01-14 10:35:32 +09:00
syuilo
41ece00789 wip: refactor(client): migrate paging components to composition api 2022-01-14 10:29:18 +09:00
syuilo
28193f12ca wip: refactor(client): migrate paging components to composition api 2022-01-14 10:25:51 +09:00
syuilo
ef4d78dda2 wip: refactor(client): migrate paging components to composition api 2022-01-13 02:55:19 +09:00
syuilo
2f128bcd3c Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-01-11 00:05:33 +09:00