graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-30 12:53:09 +02:00
Code Issues Projects Releases Packages Wiki Activity
20926 commits 62 branches 916 tags 154 MiB
Commit graph

1318 commits

Author SHA1 Message Date
syuilo
da239b8362 chore(server): tweak api for admin 2022-07-07 19:08:18 +09:00
dependabot[bot]
10f7e976ee
chore(deps): bump moment from 2.29.3 to 2.29.4 in /packages/backend (#8958) 
Bumps [moment](https://github.com/moment/moment) from 2.29.3 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.3...2.29.4)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-07-07 18:29:42 +09:00
syuilo
3ffe674e80 update deps 2022-07-07 18:28:43 +09:00
syuilo
423e7692db chore(server): tweak api for admin 2022-07-07 18:09: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
37bc81595a Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-07-07 17:36:45 +09:00
Kainoa Kanter
a23f59b996
enhance: Styled error screen (#8946) 
* Styled error screen

* Make details margin auto

* Update boot.css

* Replace fontawesome with tabler svg

* Remove hr

* Add new style to flush screen

* Rename to `error.css`

* Fix

* Update base.pug

* Finally fix!

* Wrap details in `<code>`

* Add style to flush

* Fix

* BIOS -> Repair tool

* Fix

* Typo

* Adjust style

* Adjust text

* Flush -> Clear

* Revert flush changes

* Responsive

* Also hide splash
 2022-07-07 17:35:56 +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
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
b35c3114c8 revert: feat: styled error screen (#8930) 2022-07-06 06:36:14 +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
syuilo
cb246d3459 rename: BIOS -> Repair Tool 2022-07-05 17:46:17 +09:00
Kainoa Kanter
40656e3ee2
feat: styled error screen (#8930) 
* Styled error screen

* Make details margin auto

* Update boot.css

* Replace fontawesome with tabler svg

* Remove hr

* Add new style to flush screen

* Rename to `error.css`
 2022-07-05 17:44:05 +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
08c6ed04bf update vite 2022-07-04 21:29:07 +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
MeiMei
034c5d792b
fix: streamingテストおそい (#8912) 2022-07-03 20:54:54 +09:00
syuilo
1163c85db6 enhance(client): refine deck 
Fix #7720
 2022-07-03 20:30:58 +09:00
syuilo
af6dd4194f fix(client): contextmenu of deck not working 2022-07-03 19:11:10 +09:00
syuilo
26c89e053d fix typo 2022-07-03 19:01:08 +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
0de973d293 update eslint rules 2022-07-02 23:01:13 +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
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
52a1ec9af1 enhance(server): アンケートを新しい順にソート 2022-07-02 12:34:22 +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
MeiMei
2f65d91ea8
migrate parse5 to 7.0.0 (#8916) 
* migrate parse5 to 7.0.0

* fix
 2022-07-01 13:48:03 +09:00
syuilo
b846ebeb97 use parse5 6.0.1 
Fix #8914
 2022-07-01 11:07:14 +09:00
Johann150
66b27bdc97
fix typo 
Co-authored-by: mei23 <m@m544.net>
 2022-06-30 22:03:04 +02:00
syuilo
649bb672df chore(client): fix pie rendering 2022-07-01 00:38:20 +09:00
syuilo
e3bf53ea84 update deps 2022-07-01 00:21:25 +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
1069ae6525 update vite 2022-06-30 20:15:40 +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
324f5525b5 fix(server): cannot show users 2022-06-30 15:36:09 +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
6a7dff1c82 Update .eslintrc.js 2022-06-29 23:06:03 +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
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
7d8a70f99e fix(api): fix instance schema 2022-06-28 12:16:11 +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
c04d3d22af feat(api): add federation/stats endpoint 2022-06-28 10:41:22 +09:00
syuilo
164d4a9825 fix(api): add missing themeColor property of instance 2022-06-28 10:40:49 +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
Johann150
bc3ae901cc
refactor: remove duplicate code (#8895) 2022-06-27 21:48:10 +09:00
syuilo
0ec266abf7 chore(client): tweak client 2022-06-26 19:41:21 +09:00
MeiMei
f834d6a813
fix: mocha テストが動かないのを修正 v2 (#8892) 
* on push

* Fix mute test

* fix note test

* api

* inc timeout

* uploadUrl

* Revert "on push"

This reverts commit 778a58df61ff9a22421f8ec5dcce96b364eab38d.

* lint

* waitFire

* Wrap connectStream

* return
 2022-06-26 19:16:32 +09:00
syuilo
4634920866 fix #8894 2022-06-26 17:38:50 +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
3183a02824 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-26 13:28:49 +09:00
syuilo
0cae0a49e2 chore(client): tweak ui 2022-06-26 13:28:47 +09:00
tamaina
2366f568b9
enhance(client): Enhance boot error display (#8879) 
* Change boot error message

* fix

* ✌️

* fix
 2022-06-26 12:47:43 +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
dependabot[bot]
126011c1a7
chore(deps): bump jsrsasign from 10.5.24 to 10.5.25 in /packages/backend (#8889) 
Bumps [jsrsasign](https://github.com/kjur/jsrsasign) from 10.5.24 to 10.5.25.
- [Release notes](https://github.com/kjur/jsrsasign/releases)
- [Changelog](https://github.com/kjur/jsrsasign/blob/master/ChangeLog.txt)
- [Commits](https://github.com/kjur/jsrsasign/compare/10.5.24...10.5.25)

---
updated-dependencies:
- dependency-name: jsrsasign
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-25 16:28:36 +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
Johann150
5728350267
fix: always respect instance mutes (#8854) 
* fix: muted user query also checks instances

This way it can be ensured that the instance mute is used everywhere it
is required without checking the whole codebase again. Muted users and
muted instances should be used together anyways.

* fix lint
 2022-06-25 14:23:59 +09:00
dependabot[bot]
e3461f1b58
chore(deps): bump jpeg-js from 0.4.1 to 0.4.4 in /packages/backend (#8843) 
Bumps [jpeg-js](https://github.com/eugeneware/jpeg-js) from 0.4.1 to 0.4.4.
- [Release notes](https://github.com/eugeneware/jpeg-js/releases)
- [Commits](https://github.com/eugeneware/jpeg-js/compare/v0.4.1...v0.4.4)

---
updated-dependencies:
- dependency-name: jpeg-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-25 13:50:15 +09:00
dependabot[bot]
ca5200d1f1
chore(deps): bump undici from 5.4.0 to 5.5.1 in /packages/backend (#8842) 
Bumps [undici](https://github.com/nodejs/undici) from 5.4.0 to 5.5.1.
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v5.4.0...v5.5.1)

---
updated-dependencies:
- dependency-name: undici
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-06-25 13:50:06 +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
MeiMei
6f8e3fe366
enhance: Redisをioredisに統一してIPv6サポート (#8869) 
* Use ioredis, Supports IPv6 host

https://github.com/misskey-dev/misskey/issues/8862

* Fix import

* order

* a

* i

* fix

* flushdb

* family

* CHANGELOG

* redis_version

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-06-24 19:22:19 +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
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
4f4d2b7c53
refactor: simplify ap/show with DbResolver (#8838) 
Using the existing code in DbResolver we can avoid separate code for
parsing the URIs in this endpoint.

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-06-23 21:32:17 +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
2a2020b797 chore(dev): improve eslint config 2022-06-23 13:19:17 +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
4efee455b1 fix(server): faviconUrl of federated instance is missing 2022-06-21 14:28:43 +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
MeiMei
6422cde5f2
enhance: Improve player detection in URL preview (#8849) 
* enhance: Improve player detection in URL preview

* CHANGELOG
 2022-06-18 16:02:31 +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
Johann150
6078c986d3
fix: render empty note content correctly 
Instead of coercing to `null`, coercing to an empty string should simplify handling.
 2022-06-16 12:51:44 +02:00
Johann150
b54f906605
fix: correctly render note text 
Fix a regression from #8787 that was previously fixed in #8440.
 2022-06-16 12:32:09 +02:00
syuilo
4a55425fdb enhance(client): improve files page of control panel 2022-06-16 16:05:43 +09:00
MeiMei
1d8ec102f1
fix: GenerateVideoThumbnail (#8825) 
* fix: GenerateVideoThumbnail

* CHANGELOG

* fix cleanup

* Revert "fix cleanup"

This reverts commit d54cf8262ac01a3deb6b8dd7689ec144d4d09ea8.
 2022-06-14 23:02:14 +09:00
Johann150
3a42fe50c6
fix: tmpdir cleanup removes contained files (#8826) 2022-06-14 23:00:10 +09:00
syuilo
e4dc25dd5c enhance(server): モデレーターであってもレートリミットを有効に 2022-06-14 22:59:19 +09:00
tamaina
f1e6fa8ee2
fix: add limit to i/notifications (#8836) 
* fix: add limit to i/notifications

* ms

* remove ms
 2022-06-14 22:55:58 +09:00
Johann150
10d979bd65
fix(docs): use correct description property 2022-06-14 11:55:58 +02:00
Johann150
b5390c0922
fix: remove unused parameter 2022-06-14 11:54:55 +02:00
syuilo
963f538728 lint fixes 2022-06-14 18:01:23 +09:00
Johann150
963758d8ec
fix: missing file name parameter (#8820) 2022-06-13 00:25:06 +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
tamaina
11a6bd890c
fix: some fixes of multiple notification read (#8819) 
* fix: limit multiple notification read

* fix

* fix
 2022-06-12 19:28:13 +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
99eb971c3d Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-11 16:46:23 +09:00
syuilo
410210cf6f fix(client): オブジェクトストレージを使用していると画像のクロップができない 2022-06-11 16:46:21 +09:00
Johann150
7db09103e7
chore: synchronize visibility checks (#8687) 
* reuse single meId parameter

* unify code style

Use template string to avoid having to use escaped quote marks.

* fix: follower only notes are visible to mentioned users

This synchronizes the visibility rules with the Notes.isVisibleForMe
method from packages/backend/src/models/repositories/note.ts

* add comment
 2022-06-11 16:14:44 +09:00
syuilo
ecb3c43520
feat: image cropping (#8808) 
* wip

* wip

* wip
 2022-06-11 15:45:44 +09:00
syuilo
ec6b418a23 update deps 2022-06-10 15:06:42 +09:00
syuilo
b9c64053e8 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-10 14:56:07 +09:00
syuilo
f5ba73e7c8 chore: tweak logo 2022-06-10 14:56:05 +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
a683a7092d
enhance(federation): use ActivityPub defined property in favour of proprietary property. (#8787) 
* add activitypub `source` property

* parse MFM from new `source` attribute
 2022-06-10 14:31:58 +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
Johann150
78df3dc484
enhance: improve documentation for /users/ endpoints (#8790) 
* docs: category & description for reset password

* docs: category & description for testing

* docs: descriptions for groups endpoints

* docs: descriptions for drive file endpoints

* docs: descriptions for sw endpoints

* docs: descriptions for user list endpoints

* docs: descriptions & result type for gallery posts

* docs: descriptions & result type for user endpoints

* docs: add return type for stats
 2022-06-10 14:25:20 +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
Johann150
0fa2a52fac
refactor: use awaitAll to reduce duplication (#8791) 
* refactor: use awaitAll to reduce duplication

* fix lint

* fix typo
 2022-06-08 17:59:48 +09:00
syuilo
d17298d3b5 fix(test): make chart tests working 2022-06-05 20:37:24 +09:00
syuilo
09b749eb97 Update .mocharc.json 2022-06-05 19:46:52 +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
89419c05b2 use node 16 2022-06-04 17:26:56 +09:00
syuilo
abcd5bc951 update summaly 2022-06-04 17:24:41 +09:00
syuilo
71150f21cd Revert "feat: option to collapse long notes (#8561)" 
This reverts commit e675ffcf38.
 2022-06-04 15:23:53 +09:00
syuilo
11afdf7e24 fix bug 2022-06-04 15:15:44 +09:00
syuilo
702edfd3d3 fix test 2022-06-04 14:25:30 +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
32dff28460
fix: add id for activitypub follows (#8689) 
* add id for activitypub follows

* fix lint

* fix: follower must be local, followee must be remote

Misskey will only use ActivityPub follow requests for users that are local
and are requesting to follow a remote user. This check is to ensure that
this endpoint can not be used by other services or instances.

* fix: missing import

* render block with id

* fix comment
 2022-06-04 13:52:42 +09:00
Johann150
9954c054a7
fix: ensure resolver does not fetch local resources via HTTP(S) (#8733) 
* refactor: parseUri types and checks

The type has been refined to better represent what it actually is. Uses of
parseUri are now also checking the parsed object type before resolving.

* cannot resolve URLs with fragments

* also take remaining part of URL into account

Needed for parsing the follows URIs.

* Resolver uses DbResolver for local

* remove unnecessary use of DbResolver

Using DbResolver would mean that the URL is parsed and handled again.
This duplicated processing can be avoided by querying the database directly.

* fix missing property name
 2022-06-04 11:29:20 +09:00
Johann150
81109b14b5
fix: correctly render empty note text (#8746) 
Ensure that the _misskey_content attribute will always exist. Because
the API endpoint does not require the existence of the `text` field,
that field may be `undefined`. By using `?? null` it can be ensured
that the value is at least `null`.

Furthermore, the rendered HTML of a note with empty text will also be
the empty string. From git blame it seems that this behaviour was added
because of a Mastodon bug that might have previously existed. Hoever,
this seems to be no longer the case as I can find mastodon posts that
have empty content.

The code could be made a bit more succinct by using the null coercion
operator.
 2022-06-03 23:18:44 +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
syuilo
71c230b7b7 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-03 23:08:18 +09:00
syuilo
a3fed7d0fb fix(test): reset redis in e2e test 
#7986
 2022-06-03 23:08:15 +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
Johann150
025bf4a5e7
fix(mfm): remove duplicate br tag/newline (#8616) 2022-05-31 18:57:55 +09:00
Johann150
c56e45ecef
fix: always remove completed tasks (#8771) 2022-05-31 17:54:02 +09:00
MeiMei
c05723ca6a
Fix IP address rate limit (#8758) 
* Fix IP address rate limit

* CHANGELOG

* Tune getIpHash
 2022-05-31 17:44:22 +09:00
tamaina
857055a9dd chore: fix import tinycolor 2022-05-30 12:09:22 +00:00
tamaina
465531d56c Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-05-30 05:53:40 +00:00
tamaina
9759ca7d24 chore: remove packages/sw/webpack.config.js 2022-05-30 05:53:36 +00:00
Andreas Nedbal
3905185463
fix(client): import shared ESLint config in client package (#8761) 2022-05-30 11:37:34 +09:00
Johann150
ebc2566130
fix: add missing import 
fix #8756
 2022-05-29 14:33:42 +02: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
f1d2398eac
fix(client): Vite related boot mechanism revision (#8753) 
* preload app css

* remove salt

* APP_FETCH_FAILED error

* set max-age to 15s
 2022-05-29 10:58:54 +09:00
tamaina
4917961736
preload app css (#8752) 2022-05-29 10:57:06 +09:00
Johann150
e54aa56ee1
chore: remove unused imports 2022-05-28 21:17:23 +02:00
Johann150
21d54f2758
fix: validate text is not empty 
fix #8747
 2022-05-28 17:26:17 +02: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
63a814c70e
fix(docs): correct information for drive upload (#8736) 2022-05-27 22:03:25 +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
9c80403072
use http-signature module that supports hs2019 (#8635) 2022-05-26 09:12:17 +09:00
syuilo
b3ad04fcb0 update deps 2022-05-25 23:28:56 +09:00
syuilo
3c3140a100 refactor: use === 2022-05-25 23:19:39 +09:00
Johann150
8d5c9e96e4
fix: assume remote users are following each other (#8734) 
Misskey does not know if two remote users are following each other.
Because ActivityPub actions would otherwise fail on followers only
notes, we have to assume that two remote users are following each other
when an interaction about a remote note occurs.
 2022-05-25 23:17:00 +09:00