Madeorsk/rudeshark.net
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,500 Commits 2 Branches 0 Tags 376 MiB
dda8655ca3
Commit Graph

1047 Commits

Author SHA1 Message Date
ThatOneCalculator
03b7f7d7f3 Remove from watch 2022-07-08 16:09:18 -07:00
ThatOneCalculator
fe95244f49 Make optional 2022-07-08 15:45:19 -07:00
Johann150
a1b8587ab2
enhance: show recipients of notes with specified visibility (#8949) 
* enhance: reusable visibility component

* rename renote tooltip component

The tooltip that is used for renotes can be used in other cases as well.

* add tooltip for specified recipients

* add changelog entry

* Update visibility.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-07-07 21:17:47 +09:00
syuilo
e560601815
feat: auto nsfw detection (#8840) 
* feat: auto nsfw detection

* ✌️

* Update ja-JP.yml

* Update ja-JP.yml

* ポルノ判定のしきい値を高めに

* エラーハンドリングちゃんとした

* Update ja-JP.yml

* 感度設定を強化

* refactor

* feat: add video support for auto nsfw detection

* rename: image -> media

* .js

* fix: add missing error handling

* fix: use valid pathname instead of using filename due to invalid usage

* perf(nsfw-detection): decode frames

* disable detection of video for some reasons

* perf(nsfw-detection): streamify detection process for video

* disable disallowUploadWhenPredictedAsPorn option

* fix(nsfw-detection): improve reliability

* fix(nsfw-detection): use Math.ceil instead of Math.round

* perf(nsfw-detection): delete tmp frames after used

* fix(nsfw-detection): FSWatcher does not emit ready event

* perf(nsfw-detection): skip black frames

* refactor: strip exists check

* Update package.json

* めっちゃ変えた

* lint

* Update COPYING

* オプションで動画解析できるように

* Update yarn.lock

* Update CHANGELOG.md

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2022-07-07 21:06:37 +09:00
syuilo
a785f1f933 chore(client): tweak ui 2022-07-07 21:00:42 +09:00
syuilo
c0eba65527 chore(client): tweak ui 2022-07-07 20:19:50 +09:00
syuilo
a279d50212 chore(client): tweak ui 2022-07-07 18:06:34 +09:00
syuilo
9426f37c3e chore(client): tweak ui 2022-07-07 17:55:47 +09:00
syuilo
f4fcb912e3 enhance(client): make widgets available on tablet again 2022-07-07 17:29:30 +09:00
syuilo
1c5f339d09 chore(client): tweak style 2022-07-07 17:28:21 +09:00
syuilo
7cf3218068 chore(client): tweak ui 2022-07-07 17:28:13 +09:00
ThatOneCalculator
81d8c223ad prevent default for good enter 2022-07-06 18:39:32 -07:00
ThatOneCalculator
e37dd8b93e Disable enter for touchscreens 2022-07-06 18:35:45 -07:00
ThatOneCalculator
033462653c Fix client lint 2022-07-06 18:14:05 -07:00
ThatOneCalculator
1dc28da65a Autocomplete in messaging 2022-07-06 18:09:26 -07:00
ThatOneCalculator
49c4d345f2 Don't need for shift key 2022-07-06 17:59:21 -07:00
ThatOneCalculator
50a7d10f27 Enter sends message, ctrl/meta/shift + enter makes newline 2022-07-06 17:54:04 -07:00
Johann150
7775eb9641
refactor: use overflow-y to determine scroll container 
By using `overflow-y` instead of `overflow` using `endsWith` can be
avoided and represents the data we are actually interested in here
more accurately.
 2022-07-06 19:02:39 +02:00
Johann150
ac6b8f3480
refactor: use autofocus parameter 
Using the `ref` seems to be broken but using the autofocus parameter
seems to fix it.
 2022-07-06 18:23:05 +02:00
syuilo
41bef75d1a chore(client): tweak style 2022-07-06 18:20:32 +09:00
syuilo
7db4af5578 perf(client): trying improve perf of emoji-picker 2022-07-06 07:54:04 +09:00
syuilo
f7747af690 Revert "revert emoji picker changes" 
This reverts commit 38d5303ccd.
 2022-07-06 07:30:56 +09:00
Johann150
4940894324
fix prismjs import 
fixes #8944
 2022-07-06 00:29:51 +02:00
syuilo
38d5303ccd revert emoji picker changes 2022-07-06 07:26:58 +09:00
syuilo
efafc31c9b fix(client): テーマを作成するとクライアントが起動しなくなる 2022-07-06 07:08:45 +09:00
syuilo
bf186de56c chore(client): rendering performance tweak a bit 2022-07-05 23:13:28 +09:00
syuilo
bc73ad2e56 chore(client): rendering performance tweak a bit 2022-07-05 23:01:23 +09:00
syuilo
f882e0b6b6 chore(client): remove unused class 2022-07-05 22:40:53 +09:00
syuilo
bc012784ef chore(client): tweak ui 2022-07-05 22:40:15 +09:00
syuilo
f66235f066 chore(client): rendering performance tweak a bit 2022-07-05 22:35:57 +09:00
syuilo
60710805d5 chore(client): fix type 2022-07-05 22:25:34 +09:00
syuilo
62f8af4891 enhance(client): improve usability 2022-07-05 22:25:27 +09:00
syuilo
7dd9f93efb feat(client): メニューからページをリロードできるように 2022-07-05 19:29:44 +09:00
syuilo
972b03f842 perf: allow get for notes/reactions 2022-07-05 19:16:21 +09:00
syuilo
a1cbffd14f chore(client): tweak ui 2022-07-05 17:55:47 +09:00
Johann150
ef9fdb93d2
fix: pagination uses API correctly (#8925) 2022-07-05 17:42:54 +09:00
syuilo
02fafd5114 fix(client): user search of explore not working 2022-07-05 17:20:34 +09:00
syuilo
58b00e2f4c chore(client): tweak style 2022-07-05 16:19:52 +09:00
syuilo
0de176a2ba enhance(client): improve marquee 2022-07-05 16:16:13 +09:00
syuilo
1778269ea8 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-07-05 16:07:55 +09:00
syuilo
ccea04f391 chore(client): tweak deck 2022-07-05 16:07:53 +09:00
syuilo
135dfa8026 chore(client): tweak deck 2022-07-05 15:55:55 +09:00
Kainoa Kanter
25b7d02540
Update store.ts (#8937) 2022-07-05 15:21:46 +09:00
syuilo
4f0878e267 chore(client): tweak ui 2022-07-05 12:09:49 +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
CyberRex
cd07eb222e
Add additional drive capacity change support (#8867) 
* Add additional drive capacity change support

* Update packages/backend/src/server/api/endpoints/admin/drive-capacity-override.ts

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

* 🎨

* show instance default capacity in placeholder

* fix

* update api/drive

* fix

* remove :

* fix lint

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2022-07-05 00:21:01 +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
2bd4323b17
fix lint: use let instead of const for $ref 
Fixes lint no-const-assign.
 2022-07-04 16:22:21 +02:00
Johann150
935fce338a
refactor: remove unnecessary computed 
Fixes lint no-const-assign.
 2022-07-04 16:17:07 +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
syuilo
f9444aa3d3 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-07-04 21:29:10 +09:00
syuilo
65c12903e4 enhance(client): deckのウイジェットカラムが未設定の時に説明を表示するように 2022-07-04 21:28:59 +09:00
Johann150
e0e42a6425
fix: spellcheck is boolean not string 2022-07-04 10:35:27 +02:00
syuilo
4ab2f16ed3 enhance(client): tweak statusbar 2022-07-04 01:37:47 +09:00
syuilo
dc1a35c13c chore(client): tweak style 2022-07-04 01:12:36 +09:00
syuilo
1cb847aa80 enhance(client): tweak deck 2022-07-03 23:13:41 +09:00
syuilo
1163c85db6 enhance(client): refine deck 
Fix #7720
 2022-07-03 20:30:58 +09:00
futchitwo
1f51b2aba7
hide timeline link if timeline is disabled 2022-07-03 20:03:57 +09:00
futchitwo
e9c6d312a4
better variable name 2022-07-03 19:32:34 +09:00
syuilo
af6dd4194f fix(client): contextmenu of deck not working 2022-07-03 19:11:10 +09:00
syuilo
57c6db6952 chore(client): rename marquee -> ticker 2022-07-03 16:50:51 +09:00
syuilo
66ffb253a2 chore(client): tweak style 2022-07-03 16:46:00 +09:00
syuilo
ab5cd1cb15 fix(client): fix wrong import 2022-07-03 16:36:23 +09:00
syuilo
4774bc1f47 chore(client): tweak style 2022-07-03 16:36:13 +09:00
syuilo
1cc8fd54c0 fix(client): fix wrong import 2022-07-03 16:19:47 +09:00
syuilo
e393ab6044 fix(client): style tweak for ios 2022-07-03 16:17:31 +09:00
syuilo
b2af1948a4 fix(client): フォロワー一覧がフォローににゃっているんだにゃあ 2022-07-03 14:44:18 +09:00
syuilo
0eb473198c chore(client): tweak style 2022-07-03 14:43:28 +09:00
syuilo
44c85aff86 feat(client): status bar (experimental) 2022-07-03 14:40:02 +09:00
syuilo
dd426735a0 feat: moderation note 2022-07-03 00:15:03 +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
949dbb3918 feat(server): add fetch-rss api to reduce dependency of external apis 2022-07-02 21:26:33 +09:00
futchitwo
c11cef09fc
導線を追加 2022-07-02 20:55:20 +09:00
futchitwo
49beee532b
feature(client): Timeline page for non-login users 2022-07-02 20:08:31 +09:00
syuilo
eccc90c843
feat: Log user ips (#8872) 
* wip

* store ip and headers

* Update admin-file.vue

* require admin for view ip/headers

* IP (recent) 消した

* admin必須

* opt in

* clean ips periodically

* respect logging setting in drive/files/create
 2022-07-02 15:12:11 +09:00
syuilo
ded0f6f0df refactor(client): refactoring 2022-07-02 14:00:37 +09:00
syuilo
b773d516d3 chore(client): tweak ui 2022-07-02 12:22:52 +09:00
syuilo
6bcd5cb310 enhance(client): cache pages in page-window 2022-07-02 12:12:10 +09:00
syuilo
01d5a97a4f feat(client): poll highlights in explore page 2022-07-01 23:42:03 +09:00
syuilo
afe0d9a266 enhance(client): ハイライトをみつけるに統合 2022-07-01 23:33:47 +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
f635d5b864 chore(client): tweak style 2022-07-01 15:23:49 +09:00
syuilo
65b0a002c7 chore(client): tweak ui 2022-07-01 15:06:17 +09:00
syuilo
649bb672df chore(client): fix pie rendering 2022-07-01 00:38:20 +09:00
syuilo
30aa1dcdcd chore(client): tweak rss-marquee 2022-06-30 23:53:58 +09:00
syuilo
7c7ce072c7 chore(client): tweak ui 2022-06-30 23:51:18 +09:00
syuilo
6ba888f476 feat(client): add rss-marquee widget 2022-06-30 23:45:11 +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
6f3e64f13e chore(client): tweak client 2022-06-30 15:32:11 +09:00
syuilo
6f2d2a71f9 enhance(client): show confirm dialog when logout 2022-06-30 15:09:10 +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
Johann150
ca6afd40ad
fix client router catchall 
fixes #8903
 2022-06-29 22:09:44 +02:00
Johann150
8b7dcf4dba
fix 'assignment to const' error 2022-06-29 17:44:03 +02:00
syuilo
99dcd7bb27 feat(client): add instance-cloud widget 2022-06-29 23:28:52 +09:00
syuilo
3f6e04697a Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-29 21:22:18 +09:00
syuilo
c9b3ab80ca feat(client): add tag cloud component 2022-06-29 21:22:15 +09:00
Johann150
7f111f4474
Prevent access to user pages when not logged in [v2] (#8904) 
* do not throw error when navigating

* enhance: add loginRequired to router

This allows client pages to require logging in before displaying the
page, useful for example for user settings pages.

* add login requirements

Co-authored-by: Andreas Nedbal <git@pixelde.su>
 2022-06-29 18:26:06 +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
bb68cfaa81 enhance(client): improve router 
Fix #8902
 2022-06-29 16:00:00 +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
syuilo
2b1e03cc64 enhance(client): add users tab to instance-info 2022-06-29 14:14:27 +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
9f7c9b122f fix(client): 非モデレーターがインスタンス情報ページを表示できない問題を修正 2022-06-28 22:56:18 +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
a50b1d69a1 chore(client): fix #8858 2022-06-28 17:59:23 +09:00
syuilo
ea3d391df9 chore(client): tweak style 2022-06-28 16:02:39 +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
5c3e782d29 improve instance doughnut charts 2022-06-28 13:05:20 +09:00
syuilo
553d644781 chore(client): tweak style 2022-06-28 12:16:20 +09:00
syuilo
0657995b42 chore(client): tweak style 2022-06-28 10:42:54 +09:00
syuilo
fe460c022c feat(client): add instances doughnuts charts for dashboard 2022-06-28 10:42:26 +09:00
syuilo
d7c6e2e61c fix(client): fix chart tooltip rendering 2022-06-28 10:41:38 +09:00
syuilo
596a61ce18 lint fix 2022-06-28 00:27:24 +09:00
syuilo
40cd5c5a49 chore(client): tweak style 2022-06-28 00:20:51 +09:00
syuilo
329f055a97 feat: make possible to delete an account by admin 
Resolve #8830
 2022-06-27 23:49:16 +09:00
syuilo
0ec266abf7 chore(client): tweak client 2022-06-26 19:41:21 +09:00
syuilo
744db4b5ed chore(client): tweak ui 🎨 2022-06-26 16:57:12 +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
c27d9e11b4 chore(client): tweak client 2022-06-26 14:17:55 +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
6a4574b612 enhance(client): tweak control panel dashboard 2022-06-26 01:45:33 +09:00
syuilo
f071ea4902 fix(client): remove needless requestLog call 2022-06-25 23:16:02 +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
Andreas Nedbal
36f09b6cdc
fix(client): only enable hotkeys for logged in users (#8793) 
* fix(client): only enable hotkeys for logged in users

* fix(client): keep theme and search hotkeys for logged out users
 2022-06-25 14:25:22 +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
bf4726f91d fix(client): ログアウトできない問題を修正 2022-06-24 21:16:05 +09:00
syuilo
274352beab Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-24 19:47:48 +09:00
syuilo
a1449455a2 chore(client): tweak mini-chart rendering 2022-06-24 19:47:38 +09:00
Johann150
a5241379af
fix lints 2022-06-24 12:44:22 +02: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
tamaina
12374bd6a3
fix(nirax): Normalize path (#8877) 2022-06-24 01:26:15 +09:00
syuilo
c9e9129373 fix #8861 2022-06-24 00:47:55 +09:00
syuilo
5ee53c222b chore(client): tweak ui 2022-06-23 23:45:22 +09:00
syuilo
3e1248ff35 lint fixes 2022-06-23 21:46:15 +09:00
Johann150
ecdaeea94f
enhance: word mute checks CW (#8873) 2022-06-23 20:26:47 +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
e44cb42de4 🎨 2022-06-22 00:48:16 +09:00
syuilo
ad123b3cce tweak client 2022-06-22 00:10:34 +09:00
syuilo
c9d4c00708 fix(client): moderators cannot view instance-info page 2022-06-21 23:22:18 +09:00
syuilo
2d181ba5af enhance(client): show warning in control panel when there is an unresolved abuse report 2022-06-21 19:48:28 +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
14cc341cc9 chore: add comments 2022-06-21 14:18:06 +09:00
syuilo
ce6cc21bcd tweak client 
Fix #8856
 2022-06-21 14:12:39 +09:00
Johann150
3796a3edea
fix: block button in federation panel (#8855) 2022-06-20 23:48:38 +09:00
syuilo
f995172c5d tweak client 2022-06-20 21:05:18 +09:00
syuilo
8e20e27ff9 fix client 2022-06-20 19:49:51 +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 defbb416480905af2150d1c92f10d8e1d1288c0a.

* Revert "clean up"

This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.

* 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
Andreas Nedbal
54465d36a7
Refactor page-editor elements to use Composition API (#8721) 
* refactor(client): refactor page-editor elements to use Composition API

* Apply review suggestions from @Johann150

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

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-06-18 18:39:04 +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
futchitwo
d7bab7cf0b
Refactor clip page to Composition API (#8822) 
* Refactor clip page to use Composition API

* Refactor clip page

* Refactor clip page

* Refactor clip page
 2022-06-18 18:23:54 +09:00
syuilo
8df2f19b5b enhance(client): improve file moderation ui 2022-06-17 15:03:02 +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
futchitwo
b15dbb818f
Fix(client): fix wrong gallery page component (#8815) 2022-06-12 19:53:21 +09:00
syuilo
4e89d41f04 lint 2022-06-12 19:50:47 +09:00
syuilo
a8e7b1a303 fix(client): デッキでウィジェットの情報が保存されない問題を修正 
Fix #8818
 2022-06-12 19:50: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
PikaDude
6061937996
User moderation details (#8762) 
* add more user details for admins to see

* fix some issues

* small style fix

as suggested by Johann150

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

* fix

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

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-06-03 23:14:50 +09:00
sn0w
df3bbfb416
fix(client): correctly handle MiAuth URLs with query string (#8772) 2022-06-03 21:22:03 +09:00
Johann150
118f354661
fix: server metrics widget 2022-06-01 08:51:00 +02:00
Johann150
121a1784a2
fix(lint): indentation 2022-05-31 16:22:00 +02:00
tamaina
857055a9dd chore: fix import tinycolor 2022-05-30 12:09:22 +00:00
futchitwo
d2784030ec
fix(client): fix popout url (#8494) 2022-05-29 12:21:36 +02: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
tamaina
4a50c49211
Fix theme import (#8749) 2022-05-28 21:59:23 +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
429f1ad061
fix: activity widget used wrong variable name 2022-05-25 10:44:04 +02:00
Johann150
a7be9be43d
fix: server metrics widget 2022-05-25 10:13:46 +02:00
Andreas Nedbal
b049633db7
Refactor widgets and fix lint issues (#8719) 
* fix(client): refactor widgets and fix lint issues

* Apply review suggestions from @Johann150

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

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-25 16:43:12 +09:00
Andreas Nedbal
81fccb5656
refactor(client): refactor admin/other-settings to use Composition API (#8667) 2022-05-25 16:38:18 +09:00
Andreas Nedbal
67f3515dc1
Refactor admin/overview to use Composition API (#8674) 
* refactor(client): refactor admin/overview to use Composition API

* fix(client): apply review suggestions
 2022-05-25 16:37:35 +09:00
Andreas Nedbal
83b831d975
Refactor my-antennas/edit to use Composition API (#8680) 
* refactor(client): refactor my-antennas/edit to use Composition API

* fix(client): apply review suggestions
 2022-05-25 16:37:15 +09:00
MeiMei
6b44fe165b
Supports Unicode Emoji 14.0 (#8699) 
* Unicode 14.0 Emoji

* mfm-js@0.22.0

* CHANGELOG

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-05-25 16:35:30 +09:00
Johann150
f90c947036
fix(client): wrong scoping breaks 2FA 2022-05-23 22:43:13 +02:00
Andreas Nedbal
563cb36a8f
fix(client): fix undefined data value on 2FA settings (#8725) 2022-05-23 21:55:06 +02:00
Andreas Nedbal
4bb04a2c24
chore(meta): add pixeldesu to patron list (#8714) 2022-05-21 09:48:40 +09: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
3abb0d589d
refactor(client): refactor admin/settings to use Composition API (#8678) 2022-05-19 20:30:23 +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
Andreas Nedbal
a273940348
fix(client): fix lint issues in Deck UI components (#8681) 2022-05-19 17:35:43 +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 de920dfc537d1f2c68804d0d6930520f2b3cbce7.

* ノートのインスタンス情報の文字の影の数を増やしてさらに見やすくする
 2022-05-19 16:17:00 +09:00
syuilo
4fc2058745 chore(client): tweak loading spinner design 2022-05-19 15:24:35 +09:00
あずき⪥™
e3f2d469c0
remove unneeded attrs (#8673) 2022-05-18 01:34:30 +09:00
Andreas Nedbal
a86e1221a0
Refactor file-dialog to use Composition API (#8661) 
* refactor(client): refactor file-dialog to use Composition API

* Apply review suggestion from @Johann150

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

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-18 01:33:21 +09:00
Andreas Nedbal
f03390f0b8
Refactor admin/index to use Composition API (#8662) 
* refactor(client): refactor admin/index to use Composition API

* fix(client): fix navigation to initial admin pages

* Apply review suggestions from @Johann150

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

* fix(client): re-add abuses page to admin/index

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-18 01:32:21 +09:00
Andreas Nedbal
bf6cc34961
refactor(client): refactor admin/instance-block to use Composition API (#8663) 2022-05-18 01:31:59 +09:00
Andreas Nedbal
18307c822c
Refactor admin/integrations to use Composition API (#8664) 
* refactor(client): refactor admin/integrations to use Composition API

* Apply review suggestions from @Johann150

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

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-18 01:31:48 +09:00
Andreas Nedbal
83ac6742f6
refactor(client): refactor admin/object-storage to use Composition API (#8666) 2022-05-18 01:31:32 +09:00
Andreas Nedbal
13999d953b
refactor(client): refactor admin/proxy-account to use Composition API (#8675) 2022-05-18 01:31:16 +09:00
Andreas Nedbal
7c5c27cbe3
Refactor admin/queue to use Composition API (#8676) 
* refactor(client): refactor admin/queue to use Composition API

* Apply review suggestion from @Johann150

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

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-18 01:31:04 +09:00
Andreas Nedbal
dfeafaf499
Refactor admin/relays to use Composition API (#8677) 
* refactor(client): refactor admin/relays to use Composition API

* Apply review suggestion from @Johann150

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

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-18 01:30:49 +09:00
Andreas Nedbal
7d08b936c6
refactor(client): refactor my-antennas/index to use Composition API (#8679) 2022-05-18 01:30: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
657dc15995
fix(client): remove unexpected token (#8672) 2022-05-14 23:24:45 +09:00
Andreas Nedbal
0db2051480 fix(client): additional background for acrylic popups if unsupported 2022-05-14 15:00:30 +02:00
Andreas Nedbal
3f9b7e8b1d
Refactor admin/email-settings to use Composition API (#8656) 
* refactor(client): refactor admin/email-settings to use Composition API

* Update packages/client/src/pages/admin/email-settings.vue

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

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-14 21:36:12 +09:00
Andreas Nedbal
577f63c4f4
Refactor admin/database to use Composition API (#8654) 
* refactor(client): refactor admin/database to use Composition API

* Apply review suggestion from @Johann150

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

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-14 21:35:08 +09:00
Andreas Nedbal
5de77405ea
Refactor admin/security to use Composition API (#8652) 
* refactor(client): refactor admin/security to use Composition API

* Apply review suggestions from @Johann150

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

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-14 21:34:50 +09:00
Andreas Nedbal
9f07bd8f46
refactor(client): refactor admin/announcements to use Composition API (#8650) 2022-05-14 21:34:07 +09:00
Andreas Nedbal
cafd29888d
refactor(client): refactor admin/ads to use Composition API (#8649) 2022-05-14 21:33:41 +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
syuilo
98e42ec6ff enhance: Display TOTP Register URL 
Close #7261

Co-Authored-By: tamaina <tamaina@hotmail.co.jp>
 2022-05-14 15:00:15 +09:00
Andreas Nedbal
9fc5e8688f
fix(client): add setup attribute to notification page (#8648) 2022-05-12 19:31:26 +02: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
Andreas Nedbal
a975a0971c
fix(client): fix lint issues in scripts (#8621) 2022-05-07 14:19:15 +09:00
Andreas Nedbal
ad860905c6
refactor(client): refactor settings/theme/manage to use Composition API (#8596) 2022-05-05 22:53:08 +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
Andreas Nedbal
f3628946af
refactor(client): refactor settings/word-mute to use Composition API (#8597) 2022-05-05 22:51:58 +09:00
Andreas Nedbal
e5a8773bfe
refactor(client): refactor settings/deck to use Composition API (#8598) 2022-05-05 22:51:29 +09:00
Andreas Nedbal
a6c138600f
Refactor settings/sounds to use Composition API (#8594) 
* refactor(client): refactor settings/sounds to use Composition API

* Apply review suggestion from @Johann150

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

* chore(client): remove old sound reference

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-05 22:51:05 +09:00
Andreas Nedbal
bd620a8c77
refactor(client): refactor 2FA settings to Composition API (#8599) 2022-05-05 22:41:10 +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
Andreas Nedbal
d075ead80a
fix(client): fix duplicate token request dialog in plugin install (#8612) 2022-05-05 18:21:38 +09:00
Andreas Nedbal
9230334a31
Refactor settings/notifications to use Composition API (#8587) 
* refactor(client): refactor settings/notifications to use Composition API

* fix(client): use async/await for API methods
 2022-05-04 12:25:19 +09:00
Andreas Nedbal
7154ad5a73
Refactor account-info to use Composition API (#8568) 
* refactor(client): refactor account-info  to use Composition API

* fix(client): use mounted hook for initial data

* fix(client): switch to non-null assertion for account check
 2022-05-04 10:16:14 +09:00
Andreas Nedbal
c72f5e2773
refactor(client): refactor settings/api to use Composition API (#8569) 2022-05-04 10:15:43 +09:00
Andreas Nedbal
6226e8d902
refactor(client): refactor settings/apps to use Composition API (#8570) 2022-05-04 10:15:24 +09:00
Andreas Nedbal
80355fb08e
Refactor delete-account to use Composition API (#8572) 
* refactor(client): refactor delete-account to use Composition API

* Apply review suggestion from @Johann150

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

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-04 10:15:06 +09:00
Andreas Nedbal
fc02f8fc93
refactor(client): refactor settings/drive to use Composition API (#8573) 2022-05-04 10:14:48 +09:00
Andreas Nedbal
7a51f0ac94
Refactor settings/email to use Composition API (#8576) 
* refactor(client): refactor settings/email to use Composition API

* fix(client): switch to non-null assertion for settings values
 2022-05-04 10:14:26 +09:00
Andreas Nedbal
247a9deb02
Refactor settings/general to use Composition API (#8578) 
* refactor(client): refactor settings/general to use Composition API

* fix(client): turn watcher callback asynchronous
 2022-05-04 10:13:51 +09:00
Andreas Nedbal
60010bdb0f
Refactor settings/menu to use Composition API (#8586) 
* refactor(client): refactor settings/menu to use Composition API

* Apply review suggestion from @Johann150

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

* Apply review suggestion from @Johann150

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

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-04 10:12:40 +09:00
Andreas Nedbal
8489afa3d7
Refactor settings/other to use Composition API (#8589) 
* refactor(client): refactor settings/other to use Composition API

* fix(client): fix 'show featured notes' checkbox
 2022-05-04 10:12:08 +09:00
Andreas Nedbal
81e5ff7dce
refactor(client): refactor settings/plugin to use Composition API (#8590) 2022-05-04 10:11:35 +09:00
Andreas Nedbal
4e1b5038fb
refactor(client): refactor settings/plugin/install to use Composition API (#8591) 2022-05-04 10:10:52 +09:00
Andreas Nedbal
f8c66be130
refactor(client): refactor settings/security to use Composition API (#8592) 2022-05-04 10:10:34 +09:00
Andreas Nedbal
1f222e6cd1
refactor(client): refactor settings/theme to use Composition API (#8595) 2022-05-03 20:34:48 +09:00
Andreas Nedbal
0e26fae3bb
refactor(client): refactor settings/accounts to use Composition API (#8604) 2022-05-03 20:33:40 +09:00
Andreas Nedbal
49b63154df
fix(client): fix missing import of defineAsyncComponent in os.ts 2022-05-01 17:55:17 +02: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 defbb416480905af2150d1c92f10d8e1d1288c0a.

* Revert "clean up"

This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.

* 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 e893dbf37aed83bf9f12e427d98c78a7065b4a39.

* revert boot import

* never make two app div

* ;

* remove console.log

* change clientEntry sequence

* fix

* Revert "fix"

This reverts commit 12741b3d89950a31dbb1bb81477ddb27b0e9951a.

* 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
Andreas Nedbal
a00a1fd6b5
Refactor custom-css to use Composition API (#8571) 
* refactor(client): refactor custom-css to use Composition API

* Apply review suggestion from @Johann150

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

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-01 15:50:09 +09:00
Andreas Nedbal
274ca6f7e6
refactor(client): refactor import-export to use Composition API (#8579) 2022-05-01 11:55:15 +09:00
Andreas Nedbal
475b7556d8
Refactor instance-mute to use Composition API (#8580) 
* refactor(client): refactor instance-mute to use Composition API

* Apply review suggestion from @Johann150

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

* Apply review suggestion from @Johann150

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

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 2022-05-01 11:52:19 +09:00
Andreas Nedbal
3dc027bcd5
Refactor integration to use Composition API (#8581) 
* refactor(client): refactor integration to use Composition API

* fix(client): drop superfluous enable* constants

* refactor(client): deduplicate window opening for services
 2022-05-01 11:23:12 +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 defbb416480905af2150d1c92f10d8e1d1288c0a.

* Revert "clean up"

This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.

* 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
Andreas Nedbal
5ad42d1d85
refactor(client): refactor scratchpad to use Composition API (#8565) 2022-04-29 12:26:24 +09:00
Andreas Nedbal
8f32064fea
refactor(client): refactor api-console to use Composition API (#8566) 2022-04-29 10:21:02 +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
a99cd645bb
refactor: use composition API (#8541) 2022-04-27 15:17:49 +09:00
Johann150
92d53f7441
add x,y parameters to rotate MFM 2022-04-26 22:26:22 +02:00
futchitwo
3f9a914718
Fix(client): fix profile tab link (#8536) 2022-04-24 14:21:46 +09: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
a7015e6f09 refactor 2022-04-11 22:50:53 +09:00
tamaina
e47a8bf666
fix theme-color apply (#8464) 2022-04-03 13:56:00 +09:00
syuilo
8e5f2690f2
feat: Webhook (#8457) 
* feat: introduce webhook

* wip

* wip

* wip

* Update CHANGELOG.md
 2022-04-02 15:28:49 +09:00
tamaina
f7030d4a42
enhance: タッチパッド・タッチスクリーンでのデッキの操作性を向上 (#8450) 
* enhance experience of deck with touchpad

* test: 単純にdeltaYを加算してみる

* clean up

* ios bug fix?

* ✌️

* use overflow-y

* Safari does not supports clip
 2022-04-02 15:12:01 +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
30fe632d54 fix of client 2022-03-27 16:21:09 +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
syuilo
ac8c66f5ab perf(server): refactor and performance improvements 2022-03-25 16:27:41 +09:00
syuilo
6f5282058f
Update account.ts 2022-03-25 02:43:48 +09:00
syuilo
863b6c48f8 enhance(client): アカウント情報の取得に失敗したとき強制ログアウトではなく警告を表示するように 2022-03-25 01:53:20 +09:00
syuilo
d0a346ed8a refactor: separate meta api for admin or not 2022-03-25 01:50:28 +09:00
syuilo
9320c1699a perf(server): disable some antenna features to improve performance 2022-03-22 00:07:43 +09:00
syuilo
ff19640171 perf(server): reduce db query 2022-03-21 20:43:43 +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
caadc0978a feat: introduce bull dashboard 2022-03-19 19:08:55 +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
MeiMei
a07037affc
テーマ選択から重複要素を排除するように (#8385) 2022-03-09 22:18:14 +09:00
syuilo
b929bffea5 fix federation chart 2022-03-08 22:56:46 +09:00
syuilo
513c83e374 delete needless instance drive columns 2022-03-07 21:20:14 +09:00
syuilo
ec64b5ea0b feat: add active to federation chart 2022-03-07 15:10:16 +09:00
syuilo
8ca8d77c1e tweak client 2022-03-06 23:21:25 +09:00
syuilo
0f736e7e9d tweak client 2022-03-06 23:21:19 +09:00
syuilo
69a801b472 tweak client 2022-03-06 19:18:34 +09:00
Andreas Nedbal
939773a5b9
Refactor: Switch Settings index page to setup sugar (#8374) 
* refactor(client): Make Settings index page use <script setup>

* chore(client): address review comments
 2022-03-06 19:17:43 +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
3e31d1fae9 chore(client): hide error report setting 
Close #8327
 2022-03-05 00:35:59 +09:00
syuilo
e68278f93e feat: 時限ミュート 
#7677
 2022-03-04 20:23:53 +09:00
Andreas Nedbal
7f4551b769
Fix: Only allow admins to access admin views (#8361) 
* fix(client): only allow admins to access /admin/*

* fix(client): Also allow moderators to access admin panel
 2022-03-04 17:13:10 +09:00
syuilo
5448ed643e tweak client 2022-03-04 16:26:21 +09:00
Kainoa Kanter
5d37b7a2ba
Add me as patron (#8369) 2022-03-03 01:19:17 +09:00
syuilo
0bd68902f9 feat(client): indicate dev build 2022-03-03 01:17:37 +09:00
syuilo
072799f674 fix(client): ユーザー名オートコンプリートが正しく動作しない問題を修正 2022-03-02 18:52:49 +09:00
syuilo
0893f36f46 🎨 2022-03-01 23:58:28 +09:00
syuilo
ba4ef23d6b feat: instance default theme 2022-03-01 23:58:01 +09:00
syuilo
bc9157a03b 🎨 2022-03-01 21:38:56 +09:00
syuilo
b80ec1fa3f refactor 2022-03-01 21:36:20 +09:00
syuilo
645dbebd86 Revert "refactor" 
This reverts commit 94d4f8271e.
 2022-03-01 03:51:31 +09:00
syuilo
94d4f8271e refactor 2022-02-28 22:42:32 +09:00
tamaina
e314be5b59
Fix avatar/banner proxy (#8346) 
* Fix avatar/banner proxy

Co-authored-by: mei23 <m@m544.net>

* use getAvatarUrl

* fix

* join avatar and banner to improve performance

* join

* Update hybrid-timeline.ts

* fix

Co-authored-by: mei23 <m@m544.net>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-02-27 13:59:10 +09:00
syuilo
0a882471f3 fix: better language settings 
Fix #8359
Fix #7968
 2022-02-26 15:13:44 +09:00
syuilo
9d301ae89e 🎨 2022-02-25 20:17:36 +09:00
syuilo
f003289816 refactor 2022-02-25 20:03:17 +09:00
syuilo
d51c18d96d refactor(client): use setup 2022-02-25 19:58:58 +09:00
syuilo
1576ce2e15 🎨 2022-02-25 19:56:59 +09:00
syuilo
2cd25c6f3a 🎨 2022-02-25 18:53:08 +09:00
syuilo
c1c71c2e79 🎨 2022-02-25 18:32:37 +09:00
Kainoa Kanter
52ab5d8fef
keepCw > true (#8350) 
Closes #8336
 2022-02-25 14:41:40 +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
syuilo
9422f88451 🎨 2022-02-20 19:01:13 +09:00
syuilo
92f5027c3c プロフィールの追加情報を最大16まで保存できるように 
Close #8225
Close #8234
 2022-02-20 16:53:06 +09:00
syuilo
7686fc6f4d Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-02-20 16:07:50 +09:00
syuilo
a1c7c1fb49 remove max note text length setting 
Resolve #8323
 2022-02-20 16:07:43 +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
1c6ab5447d fix(client): 一部環境でサイドバーの投稿ボタンが表示されない問題を修正 2022-02-12 17:28:33 +09:00
syuilo
e7d6bd19eb 🎨 2022-02-12 17:00:09 +09:00
syuilo
720d5db041 🎨 2022-02-12 16:52:01 +09:00
syuilo
fd3ce321c5 fix(client): フッターでセーフエリアを考慮するように 2022-02-12 14:48:01 +09:00
syuilo
7df8cd2b5d fix(client): tweak ui 
#8311
 2022-02-12 14:43:21 +09:00
tamaina
64f4231283
ソフトミュートですべてがマッチしてしまうのを修正 (#8307) 
* ソフトミュートですべてがマッチしてしまうのを修正

* Clean up

* Update packages/client/src/scripts/check-word-mute.ts

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

* fix

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-02-11 23:26:51 +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
0ab59a10b3 fix(client): word mute cannot save 2022-02-11 19:44:56 +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