From 54bcb80b447805f673e875ee98fd849879b73a4f Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 5 Mar 2021 13:51:22 +0900 Subject: Splash screen :sparkles: --- src/server/web/style.css | 22 +++++++--------------- src/server/web/views/base.pug | 6 ++---- 2 files changed, 9 insertions(+), 19 deletions(-) (limited to 'src/server') diff --git a/src/server/web/style.css b/src/server/web/style.css index 6ab2c2154a..acf8e083de 100644 --- a/src/server/web/style.css +++ b/src/server/web/style.css @@ -3,17 +3,20 @@ html { color: var(--fg); } -#ini { +#splash { position: fixed; - z-index: 1; + z-index: 10000; top: 0; left: 0; width: 100%; height: 100%; cursor: wait; + background-color: var(--bg); + opacity: 1; + transition: opacity 0.5s ease; } -#ini > svg { +#splash > img { position: absolute; top: 0; right: 0; @@ -22,16 +25,5 @@ html { margin: auto; width: 64px; height: 64px; - animation: ini 0.6s infinite linear; - color: var(--accent); - fill: currentColor; -} - -@keyframes ini { - from { - transform: rotate(0deg); - } - to { - transform: rotate(360deg); - } + pointer-events: none; } diff --git a/src/server/web/views/base.pug b/src/server/web/views/base.pug index 1b053438dc..9a5c674242 100644 --- a/src/server/web/views/base.pug +++ b/src/server/web/views/base.pug @@ -44,8 +44,6 @@ html | JavaScriptを有効にしてください br | Please turn on your JavaScript - div#ini. - - - + div#splash + img(src='/favicon.ico') block content -- cgit v1.2.3-freya From dc3329bae2f451c896fd2b86a2e28d68d329e837 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 5 Mar 2021 23:23:00 +0900 Subject: :art: --- src/server/web/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/web/style.css b/src/server/web/style.css index acf8e083de..43fbe1ab06 100644 --- a/src/server/web/style.css +++ b/src/server/web/style.css @@ -8,8 +8,8 @@ html { z-index: 10000; top: 0; left: 0; - width: 100%; - height: 100%; + width: 100vw; + height: 100vh; cursor: wait; background-color: var(--bg); opacity: 1; -- cgit v1.2.3-freya From bca4e5f0faf45ab227bf64a4a6b8f3793c7a79c2 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 6 Mar 2021 13:23:59 +0900 Subject: refactor assets --- assets/room/furnitures/banknote/banknote.blend | Bin 0 -> 716076 bytes assets/room/furnitures/banknote/banknote.glb | Bin 0 -> 48988 bytes assets/room/furnitures/banknote/tex.png | Bin 0 -> 43794 bytes assets/room/furnitures/bed/bed.blend | Bin 0 -> 573584 bytes assets/room/furnitures/bed/bed.glb | Bin 0 -> 8944 bytes assets/room/furnitures/bin/bin.blend | Bin 0 -> 695512 bytes assets/room/furnitures/bin/bin.glb | Bin 0 -> 22140 bytes assets/room/furnitures/book/book.blend | Bin 0 -> 511864 bytes assets/room/furnitures/book/book.glb | Bin 0 -> 4304 bytes assets/room/furnitures/book2/barcode.png | Bin 0 -> 3505 bytes assets/room/furnitures/book2/book2.blend | Bin 0 -> 521456 bytes assets/room/furnitures/book2/book2.glb | Bin 0 -> 82920 bytes assets/room/furnitures/book2/texture.afdesign | Bin 0 -> 875434 bytes assets/room/furnitures/book2/texture.png | Bin 0 -> 61019 bytes assets/room/furnitures/book2/uv.png | Bin 0 -> 8611 bytes .../furnitures/cardboard-box/cardboard-box.blend | Bin 0 -> 515036 bytes .../furnitures/cardboard-box/cardboard-box.glb | Bin 0 -> 4568 bytes .../furnitures/cardboard-box2/cardboard-box2.blend | Bin 0 -> 545788 bytes .../furnitures/cardboard-box2/cardboard-box2.glb | Bin 0 -> 24084 bytes assets/room/furnitures/cardboard-box2/texture.png | Bin 0 -> 16879 bytes assets/room/furnitures/cardboard-box2/uv.png | Bin 0 -> 4630 bytes .../furnitures/cardboard-box3/cardboard-box3.blend | Bin 0 -> 547868 bytes .../furnitures/cardboard-box3/cardboard-box3.glb | Bin 0 -> 23668 bytes assets/room/furnitures/cardboard-box3/texture.png | Bin 0 -> 16204 bytes assets/room/furnitures/cardboard-box3/texture.xcf | Bin 0 -> 242066 bytes assets/room/furnitures/cardboard-box3/uv.png | Bin 0 -> 3598 bytes .../furnitures/carpet-stripe/carpet-stripe.blend | Bin 0 -> 481784 bytes .../furnitures/carpet-stripe/carpet-stripe.glb | Bin 0 -> 4956 bytes assets/room/furnitures/chair/chair.blend | Bin 0 -> 500696 bytes assets/room/furnitures/chair/chair.glb | Bin 0 -> 4252 bytes assets/room/furnitures/chair2/chair2.blend | Bin 0 -> 523036 bytes assets/room/furnitures/chair2/chair2.glb | Bin 0 -> 6140 bytes assets/room/furnitures/color-box/color-box.blend | Bin 0 -> 631168 bytes assets/room/furnitures/color-box/color-box.glb | Bin 0 -> 7492 bytes assets/room/furnitures/corkboard/corkboard.blend | Bin 0 -> 565404 bytes assets/room/furnitures/corkboard/corkboard.glb | Bin 0 -> 7180 bytes assets/room/furnitures/cube/cube.blend | Bin 0 -> 646184 bytes assets/room/furnitures/cube/cube.glb | Bin 0 -> 188392 bytes assets/room/furnitures/cup-noodle/cup-noodle.blend | Bin 0 -> 855164 bytes assets/room/furnitures/cup-noodle/cup-noodle.glb | Bin 0 -> 318332 bytes assets/room/furnitures/cup-noodle/noodle.png | Bin 0 -> 297154 bytes assets/room/furnitures/desk/desk.blend | Bin 0 -> 541980 bytes assets/room/furnitures/desk/desk.glb | Bin 0 -> 10184 bytes assets/room/furnitures/doll-ai/doll-ai.blend | Bin 0 -> 1155028 bytes assets/room/furnitures/doll-ai/doll-ai.glb | Bin 0 -> 112160 bytes assets/room/furnitures/doll-ai/doll_ai_tex.png | Bin 0 -> 10712 bytes .../furnitures/energy-drink/energy-drink.blend | Bin 0 -> 724764 bytes .../room/furnitures/energy-drink/energy-drink.glb | Bin 0 -> 145836 bytes .../room/furnitures/energy-drink/texture.afdesign | Bin 0 -> 824566 bytes assets/room/furnitures/energy-drink/texture.png | Bin 0 -> 127510 bytes assets/room/furnitures/energy-drink/uv.png | Bin 0 -> 22142 bytes assets/room/furnitures/eraser/cover.png | Bin 0 -> 8336 bytes assets/room/furnitures/eraser/cover.psd | Bin 0 -> 219123 bytes assets/room/furnitures/eraser/eraser-uv.png | Bin 0 -> 11164 bytes assets/room/furnitures/eraser/eraser.blend | Bin 0 -> 527996 bytes assets/room/furnitures/eraser/eraser.glb | Bin 0 -> 15748 bytes .../furnitures/facial-tissue/facial-tissue-uv.png | Bin 0 -> 4470 bytes .../furnitures/facial-tissue/facial-tissue.blend | Bin 0 -> 533220 bytes .../furnitures/facial-tissue/facial-tissue.glb | Bin 0 -> 8332 bytes .../furnitures/facial-tissue/facial-tissue.png | Bin 0 -> 688 bytes .../furnitures/facial-tissue/facial-tissue.psd | Bin 0 -> 111968 bytes assets/room/furnitures/fan/fan.blend | Bin 0 -> 772732 bytes assets/room/furnitures/fan/fan.glb | Bin 0 -> 51612 bytes .../furnitures/holo-display/holo-display.blend | Bin 0 -> 788456 bytes .../room/furnitures/holo-display/holo-display.glb | Bin 0 -> 148928 bytes assets/room/furnitures/holo-display/ray-uv.png | Bin 0 -> 20901 bytes assets/room/furnitures/holo-display/ray.png | Bin 0 -> 104293 bytes assets/room/furnitures/keyboard/keyboard.blend | Bin 0 -> 1005588 bytes assets/room/furnitures/keyboard/keyboard.glb | Bin 0 -> 132360 bytes assets/room/furnitures/low-table/low-table.blend | Bin 0 -> 497336 bytes assets/room/furnitures/low-table/low-table.glb | Bin 0 -> 2364 bytes assets/room/furnitures/mat/mat.blend | Bin 0 -> 489304 bytes assets/room/furnitures/mat/mat.glb | Bin 0 -> 1700 bytes assets/room/furnitures/milk/milk-uv.png | Bin 0 -> 16577 bytes assets/room/furnitures/milk/milk.blend | Bin 0 -> 539836 bytes assets/room/furnitures/milk/milk.glb | Bin 0 -> 8456 bytes assets/room/furnitures/milk/milk.png | Bin 0 -> 658 bytes assets/room/furnitures/milk/milk.psd | Bin 0 -> 125415 bytes assets/room/furnitures/monitor/monitor.blend | Bin 0 -> 586820 bytes assets/room/furnitures/monitor/monitor.glb | Bin 0 -> 35300 bytes assets/room/furnitures/monitor/monitor.psd | Bin 0 -> 3692204 bytes assets/room/furnitures/monitor/screen-uv.png | Bin 0 -> 1495 bytes assets/room/furnitures/monitor/screen.jpg | Bin 0 -> 24842 bytes assets/room/furnitures/moon/moon.blend | Bin 0 -> 725536 bytes assets/room/furnitures/moon/moon.glb | Bin 0 -> 122112 bytes assets/room/furnitures/moon/moon.jpg | Bin 0 -> 87151 bytes assets/room/furnitures/mousepad/mousepad.blend | Bin 0 -> 495008 bytes assets/room/furnitures/mousepad/mousepad.glb | Bin 0 -> 4360 bytes assets/room/furnitures/pc/motherboard-uv.png | Bin 0 -> 2920 bytes assets/room/furnitures/pc/motherboard-uv.psd | Bin 0 -> 7131432 bytes assets/room/furnitures/pc/motherboard.jpg | Bin 0 -> 64600 bytes assets/room/furnitures/pc/pc.blend | Bin 0 -> 818152 bytes assets/room/furnitures/pc/pc.glb | Bin 0 -> 103620 bytes assets/room/furnitures/pencil/pencil.blend | Bin 0 -> 683032 bytes assets/room/furnitures/pencil/pencil.glb | Bin 0 -> 7788 bytes assets/room/furnitures/photoframe/photo-uv.png | Bin 0 -> 2639 bytes assets/room/furnitures/photoframe/photo.jpg | Bin 0 -> 30500 bytes assets/room/furnitures/photoframe/photoframe.blend | Bin 0 -> 551416 bytes assets/room/furnitures/photoframe/photoframe.glb | Bin 0 -> 37612 bytes assets/room/furnitures/piano/piano.blend | Bin 0 -> 713228 bytes assets/room/furnitures/piano/piano.glb | Bin 0 -> 73320 bytes assets/room/furnitures/pinguin/pinguin.blend | Bin 0 -> 778976 bytes assets/room/furnitures/pinguin/pinguin.glb | Bin 0 -> 60172 bytes assets/room/furnitures/plant/plant-soil-uv.png | Bin 0 -> 4509 bytes assets/room/furnitures/plant/plant-soil.png | Bin 0 -> 10852 bytes assets/room/furnitures/plant/plant-soil.psd | Bin 0 -> 390188 bytes assets/room/furnitures/plant/plant.blend | Bin 0 -> 604488 bytes assets/room/furnitures/plant/plant.glb | Bin 0 -> 27664 bytes assets/room/furnitures/plant2/plant2.blend | Bin 0 -> 1060816 bytes assets/room/furnitures/plant2/plant2.glb | Bin 0 -> 133212 bytes assets/room/furnitures/plant2/soil.png | Bin 0 -> 10852 bytes assets/room/furnitures/poster-h/poster-h.blend | Bin 0 -> 667604 bytes assets/room/furnitures/poster-h/poster-h.glb | Bin 0 -> 1280 bytes assets/room/furnitures/poster-h/uv.png | Bin 0 -> 3786 bytes assets/room/furnitures/poster-v/poster-v.blend | Bin 0 -> 650740 bytes assets/room/furnitures/poster-v/poster-v.glb | Bin 0 -> 1280 bytes assets/room/furnitures/poster-v/uv.png | Bin 0 -> 3795 bytes assets/room/furnitures/pudding/pudding.blend | Bin 0 -> 694784 bytes assets/room/furnitures/pudding/pudding.glb | Bin 0 -> 10612 bytes assets/room/furnitures/rubik-cube/rubik-cube.blend | Bin 0 -> 745960 bytes assets/room/furnitures/rubik-cube/rubik-cube.glb | Bin 0 -> 67688 bytes assets/room/furnitures/server/rack-uv.png | Bin 0 -> 6705 bytes assets/room/furnitures/server/rack.png | Bin 0 -> 7046 bytes assets/room/furnitures/server/server.blend | Bin 0 -> 684372 bytes assets/room/furnitures/server/server.glb | Bin 0 -> 149480 bytes assets/room/furnitures/server/server.png | Bin 0 -> 116866 bytes assets/room/furnitures/server/uv.png | Bin 0 -> 4012 bytes assets/room/furnitures/sofa/sofa.blend | Bin 0 -> 711488 bytes assets/room/furnitures/sofa/sofa.glb | Bin 0 -> 37656 bytes assets/room/furnitures/spiral/spiral.blend | Bin 0 -> 1241416 bytes assets/room/furnitures/spiral/spiral.glb | Bin 0 -> 251788 bytes assets/room/furnitures/tv/screen-uv.png | Bin 0 -> 3792 bytes assets/room/furnitures/tv/tv.blend | Bin 0 -> 587640 bytes assets/room/furnitures/tv/tv.glb | Bin 0 -> 8580 bytes assets/room/furnitures/wall-clock/wall-clock.blend | Bin 0 -> 574128 bytes assets/room/furnitures/wall-clock/wall-clock.glb | Bin 0 -> 47848 bytes assets/room/rooms/default/default.blend | Bin 0 -> 618364 bytes assets/room/rooms/default/default.glb | Bin 0 -> 12280 bytes assets/room/rooms/washitsu/husuma-uv.png | Bin 0 -> 4037 bytes assets/room/rooms/washitsu/husuma.png | Bin 0 -> 2539 bytes assets/room/rooms/washitsu/tatami-single1600.png | Bin 0 -> 1173343 bytes assets/room/rooms/washitsu/tatami-uv.png | Bin 0 -> 4075 bytes assets/room/rooms/washitsu/tatami.afdesign | Bin 0 -> 2501804 bytes assets/room/rooms/washitsu/tatami.png | Bin 0 -> 313722 bytes assets/room/rooms/washitsu/washitsu.blend | Bin 0 -> 664000 bytes assets/room/rooms/washitsu/washitsu.glb | Bin 0 -> 415180 bytes assets/sounds/aisha/1.mp3 | Bin 0 -> 34480 bytes assets/sounds/aisha/2.mp3 | Bin 0 -> 24031 bytes assets/sounds/aisha/3.mp3 | Bin 0 -> 29256 bytes assets/sounds/noizenecio/kick_gaba.mp3 | Bin 0 -> 18866 bytes assets/sounds/noizenecio/kick_gaba2.mp3 | Bin 0 -> 27144 bytes assets/sounds/syuilo/down.mp3 | Bin 0 -> 18240 bytes assets/sounds/syuilo/kick.mp3 | Bin 0 -> 15672 bytes assets/sounds/syuilo/pirori-square-wet.mp3 | Bin 0 -> 139200 bytes assets/sounds/syuilo/pirori-wet.mp3 | Bin 0 -> 139200 bytes assets/sounds/syuilo/pirori.mp3 | Bin 0 -> 19200 bytes assets/sounds/syuilo/poi1.mp3 | Bin 0 -> 18240 bytes assets/sounds/syuilo/poi2.mp3 | Bin 0 -> 18240 bytes assets/sounds/syuilo/pope1.mp3 | Bin 0 -> 18240 bytes assets/sounds/syuilo/pope2.mp3 | Bin 0 -> 18240 bytes assets/sounds/syuilo/popo.mp3 | Bin 0 -> 18240 bytes assets/sounds/syuilo/reverved.mp3 | Bin 0 -> 276480 bytes assets/sounds/syuilo/ryukyu.mp3 | Bin 0 -> 139200 bytes assets/sounds/syuilo/snare.mp3 | Bin 0 -> 26121 bytes assets/sounds/syuilo/square-pico.mp3 | Bin 0 -> 19200 bytes assets/sounds/syuilo/triple.mp3 | Bin 0 -> 18240 bytes assets/sounds/syuilo/up.mp3 | Bin 0 -> 18240 bytes assets/sounds/syuilo/waon.mp3 | Bin 0 -> 18240 bytes gulpfile.ts | 27 ++++--------------- src/client/assets/manifest.json | 4 +-- .../assets/room/furnitures/banknote/banknote.blend | Bin 716076 -> 0 bytes .../assets/room/furnitures/banknote/banknote.glb | Bin 48988 -> 0 bytes src/client/assets/room/furnitures/banknote/tex.png | Bin 43794 -> 0 bytes src/client/assets/room/furnitures/bed/bed.blend | Bin 573584 -> 0 bytes src/client/assets/room/furnitures/bed/bed.glb | Bin 8944 -> 0 bytes src/client/assets/room/furnitures/bin/bin.blend | Bin 695512 -> 0 bytes src/client/assets/room/furnitures/bin/bin.glb | Bin 22140 -> 0 bytes src/client/assets/room/furnitures/book/book.blend | Bin 511864 -> 0 bytes src/client/assets/room/furnitures/book/book.glb | Bin 4304 -> 0 bytes .../assets/room/furnitures/book2/barcode.png | Bin 3505 -> 0 bytes .../assets/room/furnitures/book2/book2.blend | Bin 521456 -> 0 bytes src/client/assets/room/furnitures/book2/book2.glb | Bin 82920 -> 0 bytes .../assets/room/furnitures/book2/texture.afdesign | Bin 875434 -> 0 bytes .../assets/room/furnitures/book2/texture.png | Bin 61019 -> 0 bytes src/client/assets/room/furnitures/book2/uv.png | Bin 8611 -> 0 bytes .../furnitures/cardboard-box/cardboard-box.blend | Bin 515036 -> 0 bytes .../furnitures/cardboard-box/cardboard-box.glb | Bin 4568 -> 0 bytes .../furnitures/cardboard-box2/cardboard-box2.blend | Bin 545788 -> 0 bytes .../furnitures/cardboard-box2/cardboard-box2.glb | Bin 24084 -> 0 bytes .../room/furnitures/cardboard-box2/texture.png | Bin 16879 -> 0 bytes .../assets/room/furnitures/cardboard-box2/uv.png | Bin 4630 -> 0 bytes .../furnitures/cardboard-box3/cardboard-box3.blend | Bin 547868 -> 0 bytes .../furnitures/cardboard-box3/cardboard-box3.glb | Bin 23668 -> 0 bytes .../room/furnitures/cardboard-box3/texture.png | Bin 16204 -> 0 bytes .../room/furnitures/cardboard-box3/texture.xcf | Bin 242066 -> 0 bytes .../assets/room/furnitures/cardboard-box3/uv.png | Bin 3598 -> 0 bytes .../furnitures/carpet-stripe/carpet-stripe.blend | Bin 481784 -> 0 bytes .../furnitures/carpet-stripe/carpet-stripe.glb | Bin 4956 -> 0 bytes .../assets/room/furnitures/chair/chair.blend | Bin 500696 -> 0 bytes src/client/assets/room/furnitures/chair/chair.glb | Bin 4252 -> 0 bytes .../assets/room/furnitures/chair2/chair2.blend | Bin 523036 -> 0 bytes .../assets/room/furnitures/chair2/chair2.glb | Bin 6140 -> 0 bytes .../room/furnitures/color-box/color-box.blend | Bin 631168 -> 0 bytes .../assets/room/furnitures/color-box/color-box.glb | Bin 7492 -> 0 bytes .../room/furnitures/corkboard/corkboard.blend | Bin 565404 -> 0 bytes .../assets/room/furnitures/corkboard/corkboard.glb | Bin 7180 -> 0 bytes src/client/assets/room/furnitures/cube/cube.blend | Bin 646184 -> 0 bytes src/client/assets/room/furnitures/cube/cube.glb | Bin 188392 -> 0 bytes .../room/furnitures/cup-noodle/cup-noodle.blend | Bin 855164 -> 0 bytes .../room/furnitures/cup-noodle/cup-noodle.glb | Bin 318332 -> 0 bytes .../assets/room/furnitures/cup-noodle/noodle.png | Bin 297154 -> 0 bytes src/client/assets/room/furnitures/desk/desk.blend | Bin 541980 -> 0 bytes src/client/assets/room/furnitures/desk/desk.glb | Bin 10184 -> 0 bytes .../assets/room/furnitures/doll-ai/doll-ai.blend | Bin 1155028 -> 0 bytes .../assets/room/furnitures/doll-ai/doll-ai.glb | Bin 112160 -> 0 bytes .../assets/room/furnitures/doll-ai/doll_ai_tex.png | Bin 10712 -> 0 bytes .../furnitures/energy-drink/energy-drink.blend | Bin 724764 -> 0 bytes .../room/furnitures/energy-drink/energy-drink.glb | Bin 145836 -> 0 bytes .../room/furnitures/energy-drink/texture.afdesign | Bin 824566 -> 0 bytes .../room/furnitures/energy-drink/texture.png | Bin 127510 -> 0 bytes .../assets/room/furnitures/energy-drink/uv.png | Bin 22142 -> 0 bytes src/client/assets/room/furnitures/eraser/cover.png | Bin 8336 -> 0 bytes src/client/assets/room/furnitures/eraser/cover.psd | Bin 219123 -> 0 bytes .../assets/room/furnitures/eraser/eraser-uv.png | Bin 11164 -> 0 bytes .../assets/room/furnitures/eraser/eraser.blend | Bin 527996 -> 0 bytes .../assets/room/furnitures/eraser/eraser.glb | Bin 15748 -> 0 bytes .../furnitures/facial-tissue/facial-tissue-uv.png | Bin 4470 -> 0 bytes .../furnitures/facial-tissue/facial-tissue.blend | Bin 533220 -> 0 bytes .../furnitures/facial-tissue/facial-tissue.glb | Bin 8332 -> 0 bytes .../furnitures/facial-tissue/facial-tissue.png | Bin 688 -> 0 bytes .../furnitures/facial-tissue/facial-tissue.psd | Bin 111968 -> 0 bytes src/client/assets/room/furnitures/fan/fan.blend | Bin 772732 -> 0 bytes src/client/assets/room/furnitures/fan/fan.glb | Bin 51612 -> 0 bytes .../furnitures/holo-display/holo-display.blend | Bin 788456 -> 0 bytes .../room/furnitures/holo-display/holo-display.glb | Bin 148928 -> 0 bytes .../assets/room/furnitures/holo-display/ray-uv.png | Bin 20901 -> 0 bytes .../assets/room/furnitures/holo-display/ray.png | Bin 104293 -> 0 bytes .../assets/room/furnitures/keyboard/keyboard.blend | Bin 1005588 -> 0 bytes .../assets/room/furnitures/keyboard/keyboard.glb | Bin 132360 -> 0 bytes .../room/furnitures/low-table/low-table.blend | Bin 497336 -> 0 bytes .../assets/room/furnitures/low-table/low-table.glb | Bin 2364 -> 0 bytes src/client/assets/room/furnitures/mat/mat.blend | Bin 489304 -> 0 bytes src/client/assets/room/furnitures/mat/mat.glb | Bin 1700 -> 0 bytes src/client/assets/room/furnitures/milk/milk-uv.png | Bin 16577 -> 0 bytes src/client/assets/room/furnitures/milk/milk.blend | Bin 539836 -> 0 bytes src/client/assets/room/furnitures/milk/milk.glb | Bin 8456 -> 0 bytes src/client/assets/room/furnitures/milk/milk.png | Bin 658 -> 0 bytes src/client/assets/room/furnitures/milk/milk.psd | Bin 125415 -> 0 bytes .../assets/room/furnitures/monitor/monitor.blend | Bin 586820 -> 0 bytes .../assets/room/furnitures/monitor/monitor.glb | Bin 35300 -> 0 bytes .../assets/room/furnitures/monitor/monitor.psd | Bin 3692204 -> 0 bytes .../assets/room/furnitures/monitor/screen-uv.png | Bin 1495 -> 0 bytes .../assets/room/furnitures/monitor/screen.jpg | Bin 24842 -> 0 bytes src/client/assets/room/furnitures/moon/moon.blend | Bin 725536 -> 0 bytes src/client/assets/room/furnitures/moon/moon.glb | Bin 122112 -> 0 bytes src/client/assets/room/furnitures/moon/moon.jpg | Bin 87151 -> 0 bytes .../assets/room/furnitures/mousepad/mousepad.blend | Bin 495008 -> 0 bytes .../assets/room/furnitures/mousepad/mousepad.glb | Bin 4360 -> 0 bytes .../assets/room/furnitures/pc/motherboard-uv.png | Bin 2920 -> 0 bytes .../assets/room/furnitures/pc/motherboard-uv.psd | Bin 7131432 -> 0 bytes .../assets/room/furnitures/pc/motherboard.jpg | Bin 64600 -> 0 bytes src/client/assets/room/furnitures/pc/pc.blend | Bin 818152 -> 0 bytes src/client/assets/room/furnitures/pc/pc.glb | Bin 103620 -> 0 bytes .../assets/room/furnitures/pencil/pencil.blend | Bin 683032 -> 0 bytes .../assets/room/furnitures/pencil/pencil.glb | Bin 7788 -> 0 bytes .../assets/room/furnitures/photoframe/photo-uv.png | Bin 2639 -> 0 bytes .../assets/room/furnitures/photoframe/photo.jpg | Bin 30500 -> 0 bytes .../room/furnitures/photoframe/photoframe.blend | Bin 551416 -> 0 bytes .../room/furnitures/photoframe/photoframe.glb | Bin 37612 -> 0 bytes .../assets/room/furnitures/piano/piano.blend | Bin 713228 -> 0 bytes src/client/assets/room/furnitures/piano/piano.glb | Bin 73320 -> 0 bytes .../assets/room/furnitures/pinguin/pinguin.blend | Bin 778976 -> 0 bytes .../assets/room/furnitures/pinguin/pinguin.glb | Bin 60172 -> 0 bytes .../assets/room/furnitures/plant/plant-soil-uv.png | Bin 4509 -> 0 bytes .../assets/room/furnitures/plant/plant-soil.png | Bin 10852 -> 0 bytes .../assets/room/furnitures/plant/plant-soil.psd | Bin 390188 -> 0 bytes .../assets/room/furnitures/plant/plant.blend | Bin 604488 -> 0 bytes src/client/assets/room/furnitures/plant/plant.glb | Bin 27664 -> 0 bytes .../assets/room/furnitures/plant2/plant2.blend | Bin 1060816 -> 0 bytes .../assets/room/furnitures/plant2/plant2.glb | Bin 133212 -> 0 bytes src/client/assets/room/furnitures/plant2/soil.png | Bin 10852 -> 0 bytes .../assets/room/furnitures/poster-h/poster-h.blend | Bin 667604 -> 0 bytes .../assets/room/furnitures/poster-h/poster-h.glb | Bin 1280 -> 0 bytes src/client/assets/room/furnitures/poster-h/uv.png | Bin 3786 -> 0 bytes .../assets/room/furnitures/poster-v/poster-v.blend | Bin 650740 -> 0 bytes .../assets/room/furnitures/poster-v/poster-v.glb | Bin 1280 -> 0 bytes src/client/assets/room/furnitures/poster-v/uv.png | Bin 3795 -> 0 bytes .../assets/room/furnitures/pudding/pudding.blend | Bin 694784 -> 0 bytes .../assets/room/furnitures/pudding/pudding.glb | Bin 10612 -> 0 bytes .../room/furnitures/rubik-cube/rubik-cube.blend | Bin 745960 -> 0 bytes .../room/furnitures/rubik-cube/rubik-cube.glb | Bin 67688 -> 0 bytes .../assets/room/furnitures/server/rack-uv.png | Bin 6705 -> 0 bytes src/client/assets/room/furnitures/server/rack.png | Bin 7046 -> 0 bytes .../assets/room/furnitures/server/server.blend | Bin 684372 -> 0 bytes .../assets/room/furnitures/server/server.glb | Bin 149480 -> 0 bytes .../assets/room/furnitures/server/server.png | Bin 116866 -> 0 bytes src/client/assets/room/furnitures/server/uv.png | Bin 4012 -> 0 bytes src/client/assets/room/furnitures/sofa/sofa.blend | Bin 711488 -> 0 bytes src/client/assets/room/furnitures/sofa/sofa.glb | Bin 37656 -> 0 bytes .../assets/room/furnitures/spiral/spiral.blend | Bin 1241416 -> 0 bytes .../assets/room/furnitures/spiral/spiral.glb | Bin 251788 -> 0 bytes src/client/assets/room/furnitures/tv/screen-uv.png | Bin 3792 -> 0 bytes src/client/assets/room/furnitures/tv/tv.blend | Bin 587640 -> 0 bytes src/client/assets/room/furnitures/tv/tv.glb | Bin 8580 -> 0 bytes .../room/furnitures/wall-clock/wall-clock.blend | Bin 574128 -> 0 bytes .../room/furnitures/wall-clock/wall-clock.glb | Bin 47848 -> 0 bytes src/client/assets/room/rooms/default/default.blend | Bin 618364 -> 0 bytes src/client/assets/room/rooms/default/default.glb | Bin 12280 -> 0 bytes .../assets/room/rooms/washitsu/husuma-uv.png | Bin 4037 -> 0 bytes src/client/assets/room/rooms/washitsu/husuma.png | Bin 2539 -> 0 bytes .../room/rooms/washitsu/tatami-single1600.png | Bin 1173343 -> 0 bytes .../assets/room/rooms/washitsu/tatami-uv.png | Bin 4075 -> 0 bytes .../assets/room/rooms/washitsu/tatami.afdesign | Bin 2501804 -> 0 bytes src/client/assets/room/rooms/washitsu/tatami.png | Bin 313722 -> 0 bytes .../assets/room/rooms/washitsu/washitsu.blend | Bin 664000 -> 0 bytes src/client/assets/room/rooms/washitsu/washitsu.glb | Bin 415180 -> 0 bytes src/client/assets/sounds/aisha/1.mp3 | Bin 34480 -> 0 bytes src/client/assets/sounds/aisha/2.mp3 | Bin 24031 -> 0 bytes src/client/assets/sounds/aisha/3.mp3 | Bin 29256 -> 0 bytes src/client/assets/sounds/noizenecio/kick_gaba.mp3 | Bin 18866 -> 0 bytes src/client/assets/sounds/noizenecio/kick_gaba2.mp3 | Bin 27144 -> 0 bytes src/client/assets/sounds/syuilo/down.mp3 | Bin 18240 -> 0 bytes src/client/assets/sounds/syuilo/kick.mp3 | Bin 15672 -> 0 bytes .../assets/sounds/syuilo/pirori-square-wet.mp3 | Bin 139200 -> 0 bytes src/client/assets/sounds/syuilo/pirori-wet.mp3 | Bin 139200 -> 0 bytes src/client/assets/sounds/syuilo/pirori.mp3 | Bin 19200 -> 0 bytes src/client/assets/sounds/syuilo/poi1.mp3 | Bin 18240 -> 0 bytes src/client/assets/sounds/syuilo/poi2.mp3 | Bin 18240 -> 0 bytes src/client/assets/sounds/syuilo/pope1.mp3 | Bin 18240 -> 0 bytes src/client/assets/sounds/syuilo/pope2.mp3 | Bin 18240 -> 0 bytes src/client/assets/sounds/syuilo/popo.mp3 | Bin 18240 -> 0 bytes src/client/assets/sounds/syuilo/reverved.mp3 | Bin 276480 -> 0 bytes src/client/assets/sounds/syuilo/ryukyu.mp3 | Bin 139200 -> 0 bytes src/client/assets/sounds/syuilo/snare.mp3 | Bin 26121 -> 0 bytes src/client/assets/sounds/syuilo/square-pico.mp3 | Bin 19200 -> 0 bytes src/client/assets/sounds/syuilo/triple.mp3 | Bin 18240 -> 0 bytes src/client/assets/sounds/syuilo/up.mp3 | Bin 18240 -> 0 bytes src/client/assets/sounds/syuilo/waon.mp3 | Bin 18240 -> 0 bytes src/client/pages/v.vue | 2 +- src/client/pages/welcome.entrance.a.vue | 2 +- src/client/pages/welcome.entrance.b.vue | 2 +- src/client/pages/welcome.entrance.c.vue | 2 +- src/client/scripts/room/room.ts | 4 +-- src/client/scripts/sound.ts | 2 +- src/server/api/openapi/gen-spec.ts | 2 +- src/server/web/index.ts | 30 +++++++++++++-------- src/server/web/manifest.ts | 2 +- src/server/web/views/info.pug | 2 +- src/services/send-email.ts | 2 +- webpack.config.ts | 2 +- 350 files changed, 38 insertions(+), 47 deletions(-) create mode 100644 assets/room/furnitures/banknote/banknote.blend create mode 100644 assets/room/furnitures/banknote/banknote.glb create mode 100644 assets/room/furnitures/banknote/tex.png create mode 100644 assets/room/furnitures/bed/bed.blend create mode 100644 assets/room/furnitures/bed/bed.glb create mode 100644 assets/room/furnitures/bin/bin.blend create mode 100644 assets/room/furnitures/bin/bin.glb create mode 100644 assets/room/furnitures/book/book.blend create mode 100644 assets/room/furnitures/book/book.glb create mode 100644 assets/room/furnitures/book2/barcode.png create mode 100644 assets/room/furnitures/book2/book2.blend create mode 100644 assets/room/furnitures/book2/book2.glb create mode 100644 assets/room/furnitures/book2/texture.afdesign create mode 100644 assets/room/furnitures/book2/texture.png create mode 100644 assets/room/furnitures/book2/uv.png create mode 100644 assets/room/furnitures/cardboard-box/cardboard-box.blend create mode 100644 assets/room/furnitures/cardboard-box/cardboard-box.glb create mode 100644 assets/room/furnitures/cardboard-box2/cardboard-box2.blend create mode 100644 assets/room/furnitures/cardboard-box2/cardboard-box2.glb create mode 100644 assets/room/furnitures/cardboard-box2/texture.png create mode 100644 assets/room/furnitures/cardboard-box2/uv.png create mode 100644 assets/room/furnitures/cardboard-box3/cardboard-box3.blend create mode 100644 assets/room/furnitures/cardboard-box3/cardboard-box3.glb create mode 100644 assets/room/furnitures/cardboard-box3/texture.png create mode 100644 assets/room/furnitures/cardboard-box3/texture.xcf create mode 100644 assets/room/furnitures/cardboard-box3/uv.png create mode 100644 assets/room/furnitures/carpet-stripe/carpet-stripe.blend create mode 100644 assets/room/furnitures/carpet-stripe/carpet-stripe.glb create mode 100644 assets/room/furnitures/chair/chair.blend create mode 100644 assets/room/furnitures/chair/chair.glb create mode 100644 assets/room/furnitures/chair2/chair2.blend create mode 100644 assets/room/furnitures/chair2/chair2.glb create mode 100644 assets/room/furnitures/color-box/color-box.blend create mode 100644 assets/room/furnitures/color-box/color-box.glb create mode 100644 assets/room/furnitures/corkboard/corkboard.blend create mode 100644 assets/room/furnitures/corkboard/corkboard.glb create mode 100644 assets/room/furnitures/cube/cube.blend create mode 100644 assets/room/furnitures/cube/cube.glb create mode 100644 assets/room/furnitures/cup-noodle/cup-noodle.blend create mode 100644 assets/room/furnitures/cup-noodle/cup-noodle.glb create mode 100644 assets/room/furnitures/cup-noodle/noodle.png create mode 100644 assets/room/furnitures/desk/desk.blend create mode 100644 assets/room/furnitures/desk/desk.glb create mode 100644 assets/room/furnitures/doll-ai/doll-ai.blend create mode 100644 assets/room/furnitures/doll-ai/doll-ai.glb create mode 100644 assets/room/furnitures/doll-ai/doll_ai_tex.png create mode 100644 assets/room/furnitures/energy-drink/energy-drink.blend create mode 100644 assets/room/furnitures/energy-drink/energy-drink.glb create mode 100644 assets/room/furnitures/energy-drink/texture.afdesign create mode 100644 assets/room/furnitures/energy-drink/texture.png create mode 100644 assets/room/furnitures/energy-drink/uv.png create mode 100644 assets/room/furnitures/eraser/cover.png create mode 100644 assets/room/furnitures/eraser/cover.psd create mode 100644 assets/room/furnitures/eraser/eraser-uv.png create mode 100644 assets/room/furnitures/eraser/eraser.blend create mode 100644 assets/room/furnitures/eraser/eraser.glb create mode 100644 assets/room/furnitures/facial-tissue/facial-tissue-uv.png create mode 100644 assets/room/furnitures/facial-tissue/facial-tissue.blend create mode 100644 assets/room/furnitures/facial-tissue/facial-tissue.glb create mode 100644 assets/room/furnitures/facial-tissue/facial-tissue.png create mode 100644 assets/room/furnitures/facial-tissue/facial-tissue.psd create mode 100644 assets/room/furnitures/fan/fan.blend create mode 100644 assets/room/furnitures/fan/fan.glb create mode 100644 assets/room/furnitures/holo-display/holo-display.blend create mode 100644 assets/room/furnitures/holo-display/holo-display.glb create mode 100644 assets/room/furnitures/holo-display/ray-uv.png create mode 100644 assets/room/furnitures/holo-display/ray.png create mode 100644 assets/room/furnitures/keyboard/keyboard.blend create mode 100644 assets/room/furnitures/keyboard/keyboard.glb create mode 100644 assets/room/furnitures/low-table/low-table.blend create mode 100644 assets/room/furnitures/low-table/low-table.glb create mode 100644 assets/room/furnitures/mat/mat.blend create mode 100644 assets/room/furnitures/mat/mat.glb create mode 100644 assets/room/furnitures/milk/milk-uv.png create mode 100644 assets/room/furnitures/milk/milk.blend create mode 100644 assets/room/furnitures/milk/milk.glb create mode 100644 assets/room/furnitures/milk/milk.png create mode 100644 assets/room/furnitures/milk/milk.psd create mode 100644 assets/room/furnitures/monitor/monitor.blend create mode 100644 assets/room/furnitures/monitor/monitor.glb create mode 100644 assets/room/furnitures/monitor/monitor.psd create mode 100644 assets/room/furnitures/monitor/screen-uv.png create mode 100644 assets/room/furnitures/monitor/screen.jpg create mode 100644 assets/room/furnitures/moon/moon.blend create mode 100644 assets/room/furnitures/moon/moon.glb create mode 100644 assets/room/furnitures/moon/moon.jpg create mode 100644 assets/room/furnitures/mousepad/mousepad.blend create mode 100644 assets/room/furnitures/mousepad/mousepad.glb create mode 100644 assets/room/furnitures/pc/motherboard-uv.png create mode 100644 assets/room/furnitures/pc/motherboard-uv.psd create mode 100644 assets/room/furnitures/pc/motherboard.jpg create mode 100644 assets/room/furnitures/pc/pc.blend create mode 100644 assets/room/furnitures/pc/pc.glb create mode 100644 assets/room/furnitures/pencil/pencil.blend create mode 100644 assets/room/furnitures/pencil/pencil.glb create mode 100644 assets/room/furnitures/photoframe/photo-uv.png create mode 100644 assets/room/furnitures/photoframe/photo.jpg create mode 100644 assets/room/furnitures/photoframe/photoframe.blend create mode 100644 assets/room/furnitures/photoframe/photoframe.glb create mode 100644 assets/room/furnitures/piano/piano.blend create mode 100644 assets/room/furnitures/piano/piano.glb create mode 100644 assets/room/furnitures/pinguin/pinguin.blend create mode 100644 assets/room/furnitures/pinguin/pinguin.glb create mode 100644 assets/room/furnitures/plant/plant-soil-uv.png create mode 100644 assets/room/furnitures/plant/plant-soil.png create mode 100644 assets/room/furnitures/plant/plant-soil.psd create mode 100644 assets/room/furnitures/plant/plant.blend create mode 100644 assets/room/furnitures/plant/plant.glb create mode 100644 assets/room/furnitures/plant2/plant2.blend create mode 100644 assets/room/furnitures/plant2/plant2.glb create mode 100644 assets/room/furnitures/plant2/soil.png create mode 100644 assets/room/furnitures/poster-h/poster-h.blend create mode 100644 assets/room/furnitures/poster-h/poster-h.glb create mode 100644 assets/room/furnitures/poster-h/uv.png create mode 100644 assets/room/furnitures/poster-v/poster-v.blend create mode 100644 assets/room/furnitures/poster-v/poster-v.glb create mode 100644 assets/room/furnitures/poster-v/uv.png create mode 100644 assets/room/furnitures/pudding/pudding.blend create mode 100644 assets/room/furnitures/pudding/pudding.glb create mode 100644 assets/room/furnitures/rubik-cube/rubik-cube.blend create mode 100644 assets/room/furnitures/rubik-cube/rubik-cube.glb create mode 100644 assets/room/furnitures/server/rack-uv.png create mode 100644 assets/room/furnitures/server/rack.png create mode 100644 assets/room/furnitures/server/server.blend create mode 100644 assets/room/furnitures/server/server.glb create mode 100644 assets/room/furnitures/server/server.png create mode 100644 assets/room/furnitures/server/uv.png create mode 100644 assets/room/furnitures/sofa/sofa.blend create mode 100644 assets/room/furnitures/sofa/sofa.glb create mode 100644 assets/room/furnitures/spiral/spiral.blend create mode 100644 assets/room/furnitures/spiral/spiral.glb create mode 100644 assets/room/furnitures/tv/screen-uv.png create mode 100644 assets/room/furnitures/tv/tv.blend create mode 100644 assets/room/furnitures/tv/tv.glb create mode 100644 assets/room/furnitures/wall-clock/wall-clock.blend create mode 100644 assets/room/furnitures/wall-clock/wall-clock.glb create mode 100644 assets/room/rooms/default/default.blend create mode 100644 assets/room/rooms/default/default.glb create mode 100644 assets/room/rooms/washitsu/husuma-uv.png create mode 100644 assets/room/rooms/washitsu/husuma.png create mode 100644 assets/room/rooms/washitsu/tatami-single1600.png create mode 100644 assets/room/rooms/washitsu/tatami-uv.png create mode 100644 assets/room/rooms/washitsu/tatami.afdesign create mode 100644 assets/room/rooms/washitsu/tatami.png create mode 100644 assets/room/rooms/washitsu/washitsu.blend create mode 100644 assets/room/rooms/washitsu/washitsu.glb create mode 100644 assets/sounds/aisha/1.mp3 create mode 100644 assets/sounds/aisha/2.mp3 create mode 100644 assets/sounds/aisha/3.mp3 create mode 100644 assets/sounds/noizenecio/kick_gaba.mp3 create mode 100644 assets/sounds/noizenecio/kick_gaba2.mp3 create mode 100644 assets/sounds/syuilo/down.mp3 create mode 100644 assets/sounds/syuilo/kick.mp3 create mode 100644 assets/sounds/syuilo/pirori-square-wet.mp3 create mode 100644 assets/sounds/syuilo/pirori-wet.mp3 create mode 100644 assets/sounds/syuilo/pirori.mp3 create mode 100644 assets/sounds/syuilo/poi1.mp3 create mode 100644 assets/sounds/syuilo/poi2.mp3 create mode 100644 assets/sounds/syuilo/pope1.mp3 create mode 100644 assets/sounds/syuilo/pope2.mp3 create mode 100644 assets/sounds/syuilo/popo.mp3 create mode 100644 assets/sounds/syuilo/reverved.mp3 create mode 100644 assets/sounds/syuilo/ryukyu.mp3 create mode 100644 assets/sounds/syuilo/snare.mp3 create mode 100644 assets/sounds/syuilo/square-pico.mp3 create mode 100644 assets/sounds/syuilo/triple.mp3 create mode 100644 assets/sounds/syuilo/up.mp3 create mode 100644 assets/sounds/syuilo/waon.mp3 delete mode 100644 src/client/assets/room/furnitures/banknote/banknote.blend delete mode 100644 src/client/assets/room/furnitures/banknote/banknote.glb delete mode 100644 src/client/assets/room/furnitures/banknote/tex.png delete mode 100644 src/client/assets/room/furnitures/bed/bed.blend delete mode 100644 src/client/assets/room/furnitures/bed/bed.glb delete mode 100644 src/client/assets/room/furnitures/bin/bin.blend delete mode 100644 src/client/assets/room/furnitures/bin/bin.glb delete mode 100644 src/client/assets/room/furnitures/book/book.blend delete mode 100644 src/client/assets/room/furnitures/book/book.glb delete mode 100644 src/client/assets/room/furnitures/book2/barcode.png delete mode 100644 src/client/assets/room/furnitures/book2/book2.blend delete mode 100644 src/client/assets/room/furnitures/book2/book2.glb delete mode 100644 src/client/assets/room/furnitures/book2/texture.afdesign delete mode 100644 src/client/assets/room/furnitures/book2/texture.png delete mode 100644 src/client/assets/room/furnitures/book2/uv.png delete mode 100644 src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend delete mode 100644 src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb delete mode 100644 src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend delete mode 100644 src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb delete mode 100644 src/client/assets/room/furnitures/cardboard-box2/texture.png delete mode 100644 src/client/assets/room/furnitures/cardboard-box2/uv.png delete mode 100644 src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend delete mode 100644 src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb delete mode 100644 src/client/assets/room/furnitures/cardboard-box3/texture.png delete mode 100644 src/client/assets/room/furnitures/cardboard-box3/texture.xcf delete mode 100644 src/client/assets/room/furnitures/cardboard-box3/uv.png delete mode 100644 src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend delete mode 100644 src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb delete mode 100644 src/client/assets/room/furnitures/chair/chair.blend delete mode 100644 src/client/assets/room/furnitures/chair/chair.glb delete mode 100644 src/client/assets/room/furnitures/chair2/chair2.blend delete mode 100644 src/client/assets/room/furnitures/chair2/chair2.glb delete mode 100644 src/client/assets/room/furnitures/color-box/color-box.blend delete mode 100644 src/client/assets/room/furnitures/color-box/color-box.glb delete mode 100644 src/client/assets/room/furnitures/corkboard/corkboard.blend delete mode 100644 src/client/assets/room/furnitures/corkboard/corkboard.glb delete mode 100644 src/client/assets/room/furnitures/cube/cube.blend delete mode 100644 src/client/assets/room/furnitures/cube/cube.glb delete mode 100644 src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend delete mode 100644 src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb delete mode 100644 src/client/assets/room/furnitures/cup-noodle/noodle.png delete mode 100644 src/client/assets/room/furnitures/desk/desk.blend delete mode 100644 src/client/assets/room/furnitures/desk/desk.glb delete mode 100644 src/client/assets/room/furnitures/doll-ai/doll-ai.blend delete mode 100644 src/client/assets/room/furnitures/doll-ai/doll-ai.glb delete mode 100644 src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png delete mode 100644 src/client/assets/room/furnitures/energy-drink/energy-drink.blend delete mode 100644 src/client/assets/room/furnitures/energy-drink/energy-drink.glb delete mode 100644 src/client/assets/room/furnitures/energy-drink/texture.afdesign delete mode 100644 src/client/assets/room/furnitures/energy-drink/texture.png delete mode 100644 src/client/assets/room/furnitures/energy-drink/uv.png delete mode 100644 src/client/assets/room/furnitures/eraser/cover.png delete mode 100644 src/client/assets/room/furnitures/eraser/cover.psd delete mode 100644 src/client/assets/room/furnitures/eraser/eraser-uv.png delete mode 100644 src/client/assets/room/furnitures/eraser/eraser.blend delete mode 100644 src/client/assets/room/furnitures/eraser/eraser.glb delete mode 100644 src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png delete mode 100644 src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend delete mode 100644 src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb delete mode 100644 src/client/assets/room/furnitures/facial-tissue/facial-tissue.png delete mode 100644 src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd delete mode 100644 src/client/assets/room/furnitures/fan/fan.blend delete mode 100644 src/client/assets/room/furnitures/fan/fan.glb delete mode 100644 src/client/assets/room/furnitures/holo-display/holo-display.blend delete mode 100644 src/client/assets/room/furnitures/holo-display/holo-display.glb delete mode 100644 src/client/assets/room/furnitures/holo-display/ray-uv.png delete mode 100644 src/client/assets/room/furnitures/holo-display/ray.png delete mode 100644 src/client/assets/room/furnitures/keyboard/keyboard.blend delete mode 100644 src/client/assets/room/furnitures/keyboard/keyboard.glb delete mode 100644 src/client/assets/room/furnitures/low-table/low-table.blend delete mode 100644 src/client/assets/room/furnitures/low-table/low-table.glb delete mode 100644 src/client/assets/room/furnitures/mat/mat.blend delete mode 100644 src/client/assets/room/furnitures/mat/mat.glb delete mode 100644 src/client/assets/room/furnitures/milk/milk-uv.png delete mode 100644 src/client/assets/room/furnitures/milk/milk.blend delete mode 100644 src/client/assets/room/furnitures/milk/milk.glb delete mode 100644 src/client/assets/room/furnitures/milk/milk.png delete mode 100644 src/client/assets/room/furnitures/milk/milk.psd delete mode 100644 src/client/assets/room/furnitures/monitor/monitor.blend delete mode 100644 src/client/assets/room/furnitures/monitor/monitor.glb delete mode 100644 src/client/assets/room/furnitures/monitor/monitor.psd delete mode 100644 src/client/assets/room/furnitures/monitor/screen-uv.png delete mode 100644 src/client/assets/room/furnitures/monitor/screen.jpg delete mode 100644 src/client/assets/room/furnitures/moon/moon.blend delete mode 100644 src/client/assets/room/furnitures/moon/moon.glb delete mode 100644 src/client/assets/room/furnitures/moon/moon.jpg delete mode 100644 src/client/assets/room/furnitures/mousepad/mousepad.blend delete mode 100644 src/client/assets/room/furnitures/mousepad/mousepad.glb delete mode 100644 src/client/assets/room/furnitures/pc/motherboard-uv.png delete mode 100644 src/client/assets/room/furnitures/pc/motherboard-uv.psd delete mode 100644 src/client/assets/room/furnitures/pc/motherboard.jpg delete mode 100644 src/client/assets/room/furnitures/pc/pc.blend delete mode 100644 src/client/assets/room/furnitures/pc/pc.glb delete mode 100644 src/client/assets/room/furnitures/pencil/pencil.blend delete mode 100644 src/client/assets/room/furnitures/pencil/pencil.glb delete mode 100644 src/client/assets/room/furnitures/photoframe/photo-uv.png delete mode 100644 src/client/assets/room/furnitures/photoframe/photo.jpg delete mode 100644 src/client/assets/room/furnitures/photoframe/photoframe.blend delete mode 100644 src/client/assets/room/furnitures/photoframe/photoframe.glb delete mode 100644 src/client/assets/room/furnitures/piano/piano.blend delete mode 100644 src/client/assets/room/furnitures/piano/piano.glb delete mode 100644 src/client/assets/room/furnitures/pinguin/pinguin.blend delete mode 100644 src/client/assets/room/furnitures/pinguin/pinguin.glb delete mode 100644 src/client/assets/room/furnitures/plant/plant-soil-uv.png delete mode 100644 src/client/assets/room/furnitures/plant/plant-soil.png delete mode 100644 src/client/assets/room/furnitures/plant/plant-soil.psd delete mode 100644 src/client/assets/room/furnitures/plant/plant.blend delete mode 100644 src/client/assets/room/furnitures/plant/plant.glb delete mode 100644 src/client/assets/room/furnitures/plant2/plant2.blend delete mode 100644 src/client/assets/room/furnitures/plant2/plant2.glb delete mode 100644 src/client/assets/room/furnitures/plant2/soil.png delete mode 100644 src/client/assets/room/furnitures/poster-h/poster-h.blend delete mode 100644 src/client/assets/room/furnitures/poster-h/poster-h.glb delete mode 100644 src/client/assets/room/furnitures/poster-h/uv.png delete mode 100644 src/client/assets/room/furnitures/poster-v/poster-v.blend delete mode 100644 src/client/assets/room/furnitures/poster-v/poster-v.glb delete mode 100644 src/client/assets/room/furnitures/poster-v/uv.png delete mode 100644 src/client/assets/room/furnitures/pudding/pudding.blend delete mode 100644 src/client/assets/room/furnitures/pudding/pudding.glb delete mode 100644 src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend delete mode 100644 src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb delete mode 100644 src/client/assets/room/furnitures/server/rack-uv.png delete mode 100644 src/client/assets/room/furnitures/server/rack.png delete mode 100644 src/client/assets/room/furnitures/server/server.blend delete mode 100644 src/client/assets/room/furnitures/server/server.glb delete mode 100644 src/client/assets/room/furnitures/server/server.png delete mode 100644 src/client/assets/room/furnitures/server/uv.png delete mode 100644 src/client/assets/room/furnitures/sofa/sofa.blend delete mode 100644 src/client/assets/room/furnitures/sofa/sofa.glb delete mode 100644 src/client/assets/room/furnitures/spiral/spiral.blend delete mode 100644 src/client/assets/room/furnitures/spiral/spiral.glb delete mode 100644 src/client/assets/room/furnitures/tv/screen-uv.png delete mode 100644 src/client/assets/room/furnitures/tv/tv.blend delete mode 100644 src/client/assets/room/furnitures/tv/tv.glb delete mode 100644 src/client/assets/room/furnitures/wall-clock/wall-clock.blend delete mode 100644 src/client/assets/room/furnitures/wall-clock/wall-clock.glb delete mode 100644 src/client/assets/room/rooms/default/default.blend delete mode 100644 src/client/assets/room/rooms/default/default.glb delete mode 100644 src/client/assets/room/rooms/washitsu/husuma-uv.png delete mode 100644 src/client/assets/room/rooms/washitsu/husuma.png delete mode 100644 src/client/assets/room/rooms/washitsu/tatami-single1600.png delete mode 100644 src/client/assets/room/rooms/washitsu/tatami-uv.png delete mode 100644 src/client/assets/room/rooms/washitsu/tatami.afdesign delete mode 100644 src/client/assets/room/rooms/washitsu/tatami.png delete mode 100644 src/client/assets/room/rooms/washitsu/washitsu.blend delete mode 100644 src/client/assets/room/rooms/washitsu/washitsu.glb delete mode 100644 src/client/assets/sounds/aisha/1.mp3 delete mode 100644 src/client/assets/sounds/aisha/2.mp3 delete mode 100644 src/client/assets/sounds/aisha/3.mp3 delete mode 100644 src/client/assets/sounds/noizenecio/kick_gaba.mp3 delete mode 100644 src/client/assets/sounds/noizenecio/kick_gaba2.mp3 delete mode 100644 src/client/assets/sounds/syuilo/down.mp3 delete mode 100644 src/client/assets/sounds/syuilo/kick.mp3 delete mode 100644 src/client/assets/sounds/syuilo/pirori-square-wet.mp3 delete mode 100644 src/client/assets/sounds/syuilo/pirori-wet.mp3 delete mode 100644 src/client/assets/sounds/syuilo/pirori.mp3 delete mode 100644 src/client/assets/sounds/syuilo/poi1.mp3 delete mode 100644 src/client/assets/sounds/syuilo/poi2.mp3 delete mode 100644 src/client/assets/sounds/syuilo/pope1.mp3 delete mode 100644 src/client/assets/sounds/syuilo/pope2.mp3 delete mode 100644 src/client/assets/sounds/syuilo/popo.mp3 delete mode 100644 src/client/assets/sounds/syuilo/reverved.mp3 delete mode 100644 src/client/assets/sounds/syuilo/ryukyu.mp3 delete mode 100644 src/client/assets/sounds/syuilo/snare.mp3 delete mode 100644 src/client/assets/sounds/syuilo/square-pico.mp3 delete mode 100644 src/client/assets/sounds/syuilo/triple.mp3 delete mode 100644 src/client/assets/sounds/syuilo/up.mp3 delete mode 100644 src/client/assets/sounds/syuilo/waon.mp3 (limited to 'src/server') diff --git a/assets/room/furnitures/banknote/banknote.blend b/assets/room/furnitures/banknote/banknote.blend new file mode 100644 index 0000000000..60b1968a29 Binary files /dev/null and b/assets/room/furnitures/banknote/banknote.blend differ diff --git a/assets/room/furnitures/banknote/banknote.glb b/assets/room/furnitures/banknote/banknote.glb new file mode 100644 index 0000000000..f4ef0b91e7 Binary files /dev/null and b/assets/room/furnitures/banknote/banknote.glb differ diff --git a/assets/room/furnitures/banknote/tex.png b/assets/room/furnitures/banknote/tex.png new file mode 100644 index 0000000000..9106dc1457 Binary files /dev/null and b/assets/room/furnitures/banknote/tex.png differ diff --git a/assets/room/furnitures/bed/bed.blend b/assets/room/furnitures/bed/bed.blend new file mode 100644 index 0000000000..731df76d0c Binary files /dev/null and b/assets/room/furnitures/bed/bed.blend differ diff --git a/assets/room/furnitures/bed/bed.glb b/assets/room/furnitures/bed/bed.glb new file mode 100644 index 0000000000..f35ecb9ef4 Binary files /dev/null and b/assets/room/furnitures/bed/bed.glb differ diff --git a/assets/room/furnitures/bin/bin.blend b/assets/room/furnitures/bin/bin.blend new file mode 100644 index 0000000000..8d459a0869 Binary files /dev/null and b/assets/room/furnitures/bin/bin.blend differ diff --git a/assets/room/furnitures/bin/bin.glb b/assets/room/furnitures/bin/bin.glb new file mode 100644 index 0000000000..b45f203802 Binary files /dev/null and b/assets/room/furnitures/bin/bin.glb differ diff --git a/assets/room/furnitures/book/book.blend b/assets/room/furnitures/book/book.blend new file mode 100644 index 0000000000..0d4899d4ae Binary files /dev/null and b/assets/room/furnitures/book/book.blend differ diff --git a/assets/room/furnitures/book/book.glb b/assets/room/furnitures/book/book.glb new file mode 100644 index 0000000000..546893da06 Binary files /dev/null and b/assets/room/furnitures/book/book.glb differ diff --git a/assets/room/furnitures/book2/barcode.png b/assets/room/furnitures/book2/barcode.png new file mode 100644 index 0000000000..37cfe5add3 Binary files /dev/null and b/assets/room/furnitures/book2/barcode.png differ diff --git a/assets/room/furnitures/book2/book2.blend b/assets/room/furnitures/book2/book2.blend new file mode 100644 index 0000000000..e0fdb48101 Binary files /dev/null and b/assets/room/furnitures/book2/book2.blend differ diff --git a/assets/room/furnitures/book2/book2.glb b/assets/room/furnitures/book2/book2.glb new file mode 100644 index 0000000000..2b26402f8c Binary files /dev/null and b/assets/room/furnitures/book2/book2.glb differ diff --git a/assets/room/furnitures/book2/texture.afdesign b/assets/room/furnitures/book2/texture.afdesign new file mode 100644 index 0000000000..b63771607a Binary files /dev/null and b/assets/room/furnitures/book2/texture.afdesign differ diff --git a/assets/room/furnitures/book2/texture.png b/assets/room/furnitures/book2/texture.png new file mode 100644 index 0000000000..5aa84f0340 Binary files /dev/null and b/assets/room/furnitures/book2/texture.png differ diff --git a/assets/room/furnitures/book2/uv.png b/assets/room/furnitures/book2/uv.png new file mode 100644 index 0000000000..61c4fb0400 Binary files /dev/null and b/assets/room/furnitures/book2/uv.png differ diff --git a/assets/room/furnitures/cardboard-box/cardboard-box.blend b/assets/room/furnitures/cardboard-box/cardboard-box.blend new file mode 100644 index 0000000000..3a528de32a Binary files /dev/null and b/assets/room/furnitures/cardboard-box/cardboard-box.blend differ diff --git a/assets/room/furnitures/cardboard-box/cardboard-box.glb b/assets/room/furnitures/cardboard-box/cardboard-box.glb new file mode 100644 index 0000000000..bed372e94f Binary files /dev/null and b/assets/room/furnitures/cardboard-box/cardboard-box.glb differ diff --git a/assets/room/furnitures/cardboard-box2/cardboard-box2.blend b/assets/room/furnitures/cardboard-box2/cardboard-box2.blend new file mode 100644 index 0000000000..5f146267ac Binary files /dev/null and b/assets/room/furnitures/cardboard-box2/cardboard-box2.blend differ diff --git a/assets/room/furnitures/cardboard-box2/cardboard-box2.glb b/assets/room/furnitures/cardboard-box2/cardboard-box2.glb new file mode 100644 index 0000000000..85fcb5c0b6 Binary files /dev/null and b/assets/room/furnitures/cardboard-box2/cardboard-box2.glb differ diff --git a/assets/room/furnitures/cardboard-box2/texture.png b/assets/room/furnitures/cardboard-box2/texture.png new file mode 100644 index 0000000000..e498d8f65b Binary files /dev/null and b/assets/room/furnitures/cardboard-box2/texture.png differ diff --git a/assets/room/furnitures/cardboard-box2/uv.png b/assets/room/furnitures/cardboard-box2/uv.png new file mode 100644 index 0000000000..d547843ee0 Binary files /dev/null and b/assets/room/furnitures/cardboard-box2/uv.png differ diff --git a/assets/room/furnitures/cardboard-box3/cardboard-box3.blend b/assets/room/furnitures/cardboard-box3/cardboard-box3.blend new file mode 100644 index 0000000000..00681a3cfd Binary files /dev/null and b/assets/room/furnitures/cardboard-box3/cardboard-box3.blend differ diff --git a/assets/room/furnitures/cardboard-box3/cardboard-box3.glb b/assets/room/furnitures/cardboard-box3/cardboard-box3.glb new file mode 100644 index 0000000000..1ef0427689 Binary files /dev/null and b/assets/room/furnitures/cardboard-box3/cardboard-box3.glb differ diff --git a/assets/room/furnitures/cardboard-box3/texture.png b/assets/room/furnitures/cardboard-box3/texture.png new file mode 100644 index 0000000000..56c914cb9d Binary files /dev/null and b/assets/room/furnitures/cardboard-box3/texture.png differ diff --git a/assets/room/furnitures/cardboard-box3/texture.xcf b/assets/room/furnitures/cardboard-box3/texture.xcf new file mode 100644 index 0000000000..7ffb3e3439 Binary files /dev/null and b/assets/room/furnitures/cardboard-box3/texture.xcf differ diff --git a/assets/room/furnitures/cardboard-box3/uv.png b/assets/room/furnitures/cardboard-box3/uv.png new file mode 100644 index 0000000000..797ac509db Binary files /dev/null and b/assets/room/furnitures/cardboard-box3/uv.png differ diff --git a/assets/room/furnitures/carpet-stripe/carpet-stripe.blend b/assets/room/furnitures/carpet-stripe/carpet-stripe.blend new file mode 100644 index 0000000000..750343d4f0 Binary files /dev/null and b/assets/room/furnitures/carpet-stripe/carpet-stripe.blend differ diff --git a/assets/room/furnitures/carpet-stripe/carpet-stripe.glb b/assets/room/furnitures/carpet-stripe/carpet-stripe.glb new file mode 100644 index 0000000000..3066a69e35 Binary files /dev/null and b/assets/room/furnitures/carpet-stripe/carpet-stripe.glb differ diff --git a/assets/room/furnitures/chair/chair.blend b/assets/room/furnitures/chair/chair.blend new file mode 100644 index 0000000000..79c29a8401 Binary files /dev/null and b/assets/room/furnitures/chair/chair.blend differ diff --git a/assets/room/furnitures/chair/chair.glb b/assets/room/furnitures/chair/chair.glb new file mode 100644 index 0000000000..08ee1a0bb0 Binary files /dev/null and b/assets/room/furnitures/chair/chair.glb differ diff --git a/assets/room/furnitures/chair2/chair2.blend b/assets/room/furnitures/chair2/chair2.blend new file mode 100644 index 0000000000..c6a1acd96f Binary files /dev/null and b/assets/room/furnitures/chair2/chair2.blend differ diff --git a/assets/room/furnitures/chair2/chair2.glb b/assets/room/furnitures/chair2/chair2.glb new file mode 100644 index 0000000000..5ea2f3518b Binary files /dev/null and b/assets/room/furnitures/chair2/chair2.glb differ diff --git a/assets/room/furnitures/color-box/color-box.blend b/assets/room/furnitures/color-box/color-box.blend new file mode 100644 index 0000000000..f96a4ff766 Binary files /dev/null and b/assets/room/furnitures/color-box/color-box.blend differ diff --git a/assets/room/furnitures/color-box/color-box.glb b/assets/room/furnitures/color-box/color-box.glb new file mode 100644 index 0000000000..43f2abcae8 Binary files /dev/null and b/assets/room/furnitures/color-box/color-box.glb differ diff --git a/assets/room/furnitures/corkboard/corkboard.blend b/assets/room/furnitures/corkboard/corkboard.blend new file mode 100644 index 0000000000..9a7e1878cd Binary files /dev/null and b/assets/room/furnitures/corkboard/corkboard.blend differ diff --git a/assets/room/furnitures/corkboard/corkboard.glb b/assets/room/furnitures/corkboard/corkboard.glb new file mode 100644 index 0000000000..fee108fb91 Binary files /dev/null and b/assets/room/furnitures/corkboard/corkboard.glb differ diff --git a/assets/room/furnitures/cube/cube.blend b/assets/room/furnitures/cube/cube.blend new file mode 100644 index 0000000000..1af5bf40a9 Binary files /dev/null and b/assets/room/furnitures/cube/cube.blend differ diff --git a/assets/room/furnitures/cube/cube.glb b/assets/room/furnitures/cube/cube.glb new file mode 100644 index 0000000000..4ac8b6036d Binary files /dev/null and b/assets/room/furnitures/cube/cube.glb differ diff --git a/assets/room/furnitures/cup-noodle/cup-noodle.blend b/assets/room/furnitures/cup-noodle/cup-noodle.blend new file mode 100644 index 0000000000..37ca8868c7 Binary files /dev/null and b/assets/room/furnitures/cup-noodle/cup-noodle.blend differ diff --git a/assets/room/furnitures/cup-noodle/cup-noodle.glb b/assets/room/furnitures/cup-noodle/cup-noodle.glb new file mode 100644 index 0000000000..58efb1b3b4 Binary files /dev/null and b/assets/room/furnitures/cup-noodle/cup-noodle.glb differ diff --git a/assets/room/furnitures/cup-noodle/noodle.png b/assets/room/furnitures/cup-noodle/noodle.png new file mode 100644 index 0000000000..1d74e0bbe7 Binary files /dev/null and b/assets/room/furnitures/cup-noodle/noodle.png differ diff --git a/assets/room/furnitures/desk/desk.blend b/assets/room/furnitures/desk/desk.blend new file mode 100644 index 0000000000..c88d01f0b2 Binary files /dev/null and b/assets/room/furnitures/desk/desk.blend differ diff --git a/assets/room/furnitures/desk/desk.glb b/assets/room/furnitures/desk/desk.glb new file mode 100644 index 0000000000..4a58513095 Binary files /dev/null and b/assets/room/furnitures/desk/desk.glb differ diff --git a/assets/room/furnitures/doll-ai/doll-ai.blend b/assets/room/furnitures/doll-ai/doll-ai.blend new file mode 100644 index 0000000000..a912231ecb Binary files /dev/null and b/assets/room/furnitures/doll-ai/doll-ai.blend differ diff --git a/assets/room/furnitures/doll-ai/doll-ai.glb b/assets/room/furnitures/doll-ai/doll-ai.glb new file mode 100644 index 0000000000..ec55a7bd7b Binary files /dev/null and b/assets/room/furnitures/doll-ai/doll-ai.glb differ diff --git a/assets/room/furnitures/doll-ai/doll_ai_tex.png b/assets/room/furnitures/doll-ai/doll_ai_tex.png new file mode 100644 index 0000000000..370ca5f75b Binary files /dev/null and b/assets/room/furnitures/doll-ai/doll_ai_tex.png differ diff --git a/assets/room/furnitures/energy-drink/energy-drink.blend b/assets/room/furnitures/energy-drink/energy-drink.blend new file mode 100644 index 0000000000..65fc41273e Binary files /dev/null and b/assets/room/furnitures/energy-drink/energy-drink.blend differ diff --git a/assets/room/furnitures/energy-drink/energy-drink.glb b/assets/room/furnitures/energy-drink/energy-drink.glb new file mode 100644 index 0000000000..7fb1c27836 Binary files /dev/null and b/assets/room/furnitures/energy-drink/energy-drink.glb differ diff --git a/assets/room/furnitures/energy-drink/texture.afdesign b/assets/room/furnitures/energy-drink/texture.afdesign new file mode 100644 index 0000000000..8c117a49b1 Binary files /dev/null and b/assets/room/furnitures/energy-drink/texture.afdesign differ diff --git a/assets/room/furnitures/energy-drink/texture.png b/assets/room/furnitures/energy-drink/texture.png new file mode 100644 index 0000000000..484ca0f96f Binary files /dev/null and b/assets/room/furnitures/energy-drink/texture.png differ diff --git a/assets/room/furnitures/energy-drink/uv.png b/assets/room/furnitures/energy-drink/uv.png new file mode 100644 index 0000000000..2a3f20c999 Binary files /dev/null and b/assets/room/furnitures/energy-drink/uv.png differ diff --git a/assets/room/furnitures/eraser/cover.png b/assets/room/furnitures/eraser/cover.png new file mode 100644 index 0000000000..932a3fc62e Binary files /dev/null and b/assets/room/furnitures/eraser/cover.png differ diff --git a/assets/room/furnitures/eraser/cover.psd b/assets/room/furnitures/eraser/cover.psd new file mode 100644 index 0000000000..c393337833 Binary files /dev/null and b/assets/room/furnitures/eraser/cover.psd differ diff --git a/assets/room/furnitures/eraser/eraser-uv.png b/assets/room/furnitures/eraser/eraser-uv.png new file mode 100644 index 0000000000..89e4ea4c45 Binary files /dev/null and b/assets/room/furnitures/eraser/eraser-uv.png differ diff --git a/assets/room/furnitures/eraser/eraser.blend b/assets/room/furnitures/eraser/eraser.blend new file mode 100644 index 0000000000..103c54fbae Binary files /dev/null and b/assets/room/furnitures/eraser/eraser.blend differ diff --git a/assets/room/furnitures/eraser/eraser.glb b/assets/room/furnitures/eraser/eraser.glb new file mode 100644 index 0000000000..016b60df20 Binary files /dev/null and b/assets/room/furnitures/eraser/eraser.glb differ diff --git a/assets/room/furnitures/facial-tissue/facial-tissue-uv.png b/assets/room/furnitures/facial-tissue/facial-tissue-uv.png new file mode 100644 index 0000000000..e3865ad15e Binary files /dev/null and b/assets/room/furnitures/facial-tissue/facial-tissue-uv.png differ diff --git a/assets/room/furnitures/facial-tissue/facial-tissue.blend b/assets/room/furnitures/facial-tissue/facial-tissue.blend new file mode 100644 index 0000000000..d59f87c1ee Binary files /dev/null and b/assets/room/furnitures/facial-tissue/facial-tissue.blend differ diff --git a/assets/room/furnitures/facial-tissue/facial-tissue.glb b/assets/room/furnitures/facial-tissue/facial-tissue.glb new file mode 100644 index 0000000000..48b36ef347 Binary files /dev/null and b/assets/room/furnitures/facial-tissue/facial-tissue.glb differ diff --git a/assets/room/furnitures/facial-tissue/facial-tissue.png b/assets/room/furnitures/facial-tissue/facial-tissue.png new file mode 100644 index 0000000000..7cee4b1859 Binary files /dev/null and b/assets/room/furnitures/facial-tissue/facial-tissue.png differ diff --git a/assets/room/furnitures/facial-tissue/facial-tissue.psd b/assets/room/furnitures/facial-tissue/facial-tissue.psd new file mode 100644 index 0000000000..cd59fc007b Binary files /dev/null and b/assets/room/furnitures/facial-tissue/facial-tissue.psd differ diff --git a/assets/room/furnitures/fan/fan.blend b/assets/room/furnitures/fan/fan.blend new file mode 100644 index 0000000000..8c8106e5fe Binary files /dev/null and b/assets/room/furnitures/fan/fan.blend differ diff --git a/assets/room/furnitures/fan/fan.glb b/assets/room/furnitures/fan/fan.glb new file mode 100644 index 0000000000..d9367f3534 Binary files /dev/null and b/assets/room/furnitures/fan/fan.glb differ diff --git a/assets/room/furnitures/holo-display/holo-display.blend b/assets/room/furnitures/holo-display/holo-display.blend new file mode 100644 index 0000000000..56d2e1f819 Binary files /dev/null and b/assets/room/furnitures/holo-display/holo-display.blend differ diff --git a/assets/room/furnitures/holo-display/holo-display.glb b/assets/room/furnitures/holo-display/holo-display.glb new file mode 100644 index 0000000000..4d042a59b3 Binary files /dev/null and b/assets/room/furnitures/holo-display/holo-display.glb differ diff --git a/assets/room/furnitures/holo-display/ray-uv.png b/assets/room/furnitures/holo-display/ray-uv.png new file mode 100644 index 0000000000..aa7e817e0f Binary files /dev/null and b/assets/room/furnitures/holo-display/ray-uv.png differ diff --git a/assets/room/furnitures/holo-display/ray.png b/assets/room/furnitures/holo-display/ray.png new file mode 100644 index 0000000000..6a5d24e143 Binary files /dev/null and b/assets/room/furnitures/holo-display/ray.png differ diff --git a/assets/room/furnitures/keyboard/keyboard.blend b/assets/room/furnitures/keyboard/keyboard.blend new file mode 100644 index 0000000000..ab33d134b3 Binary files /dev/null and b/assets/room/furnitures/keyboard/keyboard.blend differ diff --git a/assets/room/furnitures/keyboard/keyboard.glb b/assets/room/furnitures/keyboard/keyboard.glb new file mode 100644 index 0000000000..15dc69f47a Binary files /dev/null and b/assets/room/furnitures/keyboard/keyboard.glb differ diff --git a/assets/room/furnitures/low-table/low-table.blend b/assets/room/furnitures/low-table/low-table.blend new file mode 100644 index 0000000000..e1592174d9 Binary files /dev/null and b/assets/room/furnitures/low-table/low-table.blend differ diff --git a/assets/room/furnitures/low-table/low-table.glb b/assets/room/furnitures/low-table/low-table.glb new file mode 100644 index 0000000000..c69bf35d7b Binary files /dev/null and b/assets/room/furnitures/low-table/low-table.glb differ diff --git a/assets/room/furnitures/mat/mat.blend b/assets/room/furnitures/mat/mat.blend new file mode 100644 index 0000000000..a1e1a68c55 Binary files /dev/null and b/assets/room/furnitures/mat/mat.blend differ diff --git a/assets/room/furnitures/mat/mat.glb b/assets/room/furnitures/mat/mat.glb new file mode 100644 index 0000000000..87ccd44e1a Binary files /dev/null and b/assets/room/furnitures/mat/mat.glb differ diff --git a/assets/room/furnitures/milk/milk-uv.png b/assets/room/furnitures/milk/milk-uv.png new file mode 100644 index 0000000000..258fd54638 Binary files /dev/null and b/assets/room/furnitures/milk/milk-uv.png differ diff --git a/assets/room/furnitures/milk/milk.blend b/assets/room/furnitures/milk/milk.blend new file mode 100644 index 0000000000..2df508d5b9 Binary files /dev/null and b/assets/room/furnitures/milk/milk.blend differ diff --git a/assets/room/furnitures/milk/milk.glb b/assets/room/furnitures/milk/milk.glb new file mode 100644 index 0000000000..b335fe3d02 Binary files /dev/null and b/assets/room/furnitures/milk/milk.glb differ diff --git a/assets/room/furnitures/milk/milk.png b/assets/room/furnitures/milk/milk.png new file mode 100644 index 0000000000..35181c8c8c Binary files /dev/null and b/assets/room/furnitures/milk/milk.png differ diff --git a/assets/room/furnitures/milk/milk.psd b/assets/room/furnitures/milk/milk.psd new file mode 100644 index 0000000000..f31e439277 Binary files /dev/null and b/assets/room/furnitures/milk/milk.psd differ diff --git a/assets/room/furnitures/monitor/monitor.blend b/assets/room/furnitures/monitor/monitor.blend new file mode 100644 index 0000000000..6c042ccdd8 Binary files /dev/null and b/assets/room/furnitures/monitor/monitor.blend differ diff --git a/assets/room/furnitures/monitor/monitor.glb b/assets/room/furnitures/monitor/monitor.glb new file mode 100644 index 0000000000..fc33286a15 Binary files /dev/null and b/assets/room/furnitures/monitor/monitor.glb differ diff --git a/assets/room/furnitures/monitor/monitor.psd b/assets/room/furnitures/monitor/monitor.psd new file mode 100644 index 0000000000..57afff9cd9 Binary files /dev/null and b/assets/room/furnitures/monitor/monitor.psd differ diff --git a/assets/room/furnitures/monitor/screen-uv.png b/assets/room/furnitures/monitor/screen-uv.png new file mode 100644 index 0000000000..35f74de8aa Binary files /dev/null and b/assets/room/furnitures/monitor/screen-uv.png differ diff --git a/assets/room/furnitures/monitor/screen.jpg b/assets/room/furnitures/monitor/screen.jpg new file mode 100644 index 0000000000..4004a1ede9 Binary files /dev/null and b/assets/room/furnitures/monitor/screen.jpg differ diff --git a/assets/room/furnitures/moon/moon.blend b/assets/room/furnitures/moon/moon.blend new file mode 100644 index 0000000000..4ff3deab8e Binary files /dev/null and b/assets/room/furnitures/moon/moon.blend differ diff --git a/assets/room/furnitures/moon/moon.glb b/assets/room/furnitures/moon/moon.glb new file mode 100644 index 0000000000..07fa7e4c02 Binary files /dev/null and b/assets/room/furnitures/moon/moon.glb differ diff --git a/assets/room/furnitures/moon/moon.jpg b/assets/room/furnitures/moon/moon.jpg new file mode 100644 index 0000000000..8988ac64b9 Binary files /dev/null and b/assets/room/furnitures/moon/moon.jpg differ diff --git a/assets/room/furnitures/mousepad/mousepad.blend b/assets/room/furnitures/mousepad/mousepad.blend new file mode 100644 index 0000000000..14bd139c94 Binary files /dev/null and b/assets/room/furnitures/mousepad/mousepad.blend differ diff --git a/assets/room/furnitures/mousepad/mousepad.glb b/assets/room/furnitures/mousepad/mousepad.glb new file mode 100644 index 0000000000..681ada49cd Binary files /dev/null and b/assets/room/furnitures/mousepad/mousepad.glb differ diff --git a/assets/room/furnitures/pc/motherboard-uv.png b/assets/room/furnitures/pc/motherboard-uv.png new file mode 100644 index 0000000000..355009fe7c Binary files /dev/null and b/assets/room/furnitures/pc/motherboard-uv.png differ diff --git a/assets/room/furnitures/pc/motherboard-uv.psd b/assets/room/furnitures/pc/motherboard-uv.psd new file mode 100644 index 0000000000..971f33f79e Binary files /dev/null and b/assets/room/furnitures/pc/motherboard-uv.psd differ diff --git a/assets/room/furnitures/pc/motherboard.jpg b/assets/room/furnitures/pc/motherboard.jpg new file mode 100644 index 0000000000..d894e4efcf Binary files /dev/null and b/assets/room/furnitures/pc/motherboard.jpg differ diff --git a/assets/room/furnitures/pc/pc.blend b/assets/room/furnitures/pc/pc.blend new file mode 100644 index 0000000000..13dfec6ccc Binary files /dev/null and b/assets/room/furnitures/pc/pc.blend differ diff --git a/assets/room/furnitures/pc/pc.glb b/assets/room/furnitures/pc/pc.glb new file mode 100644 index 0000000000..44a48b18ae Binary files /dev/null and b/assets/room/furnitures/pc/pc.glb differ diff --git a/assets/room/furnitures/pencil/pencil.blend b/assets/room/furnitures/pencil/pencil.blend new file mode 100644 index 0000000000..0fc6bdd776 Binary files /dev/null and b/assets/room/furnitures/pencil/pencil.blend differ diff --git a/assets/room/furnitures/pencil/pencil.glb b/assets/room/furnitures/pencil/pencil.glb new file mode 100644 index 0000000000..a938b5cdcc Binary files /dev/null and b/assets/room/furnitures/pencil/pencil.glb differ diff --git a/assets/room/furnitures/photoframe/photo-uv.png b/assets/room/furnitures/photoframe/photo-uv.png new file mode 100644 index 0000000000..9b94906413 Binary files /dev/null and b/assets/room/furnitures/photoframe/photo-uv.png differ diff --git a/assets/room/furnitures/photoframe/photo.jpg b/assets/room/furnitures/photoframe/photo.jpg new file mode 100644 index 0000000000..af14f0f36a Binary files /dev/null and b/assets/room/furnitures/photoframe/photo.jpg differ diff --git a/assets/room/furnitures/photoframe/photoframe.blend b/assets/room/furnitures/photoframe/photoframe.blend new file mode 100644 index 0000000000..4224cde45b Binary files /dev/null and b/assets/room/furnitures/photoframe/photoframe.blend differ diff --git a/assets/room/furnitures/photoframe/photoframe.glb b/assets/room/furnitures/photoframe/photoframe.glb new file mode 100644 index 0000000000..4255a77de6 Binary files /dev/null and b/assets/room/furnitures/photoframe/photoframe.glb differ diff --git a/assets/room/furnitures/piano/piano.blend b/assets/room/furnitures/piano/piano.blend new file mode 100644 index 0000000000..7653cdf672 Binary files /dev/null and b/assets/room/furnitures/piano/piano.blend differ diff --git a/assets/room/furnitures/piano/piano.glb b/assets/room/furnitures/piano/piano.glb new file mode 100644 index 0000000000..7242e78ceb Binary files /dev/null and b/assets/room/furnitures/piano/piano.glb differ diff --git a/assets/room/furnitures/pinguin/pinguin.blend b/assets/room/furnitures/pinguin/pinguin.blend new file mode 100644 index 0000000000..514c713e4c Binary files /dev/null and b/assets/room/furnitures/pinguin/pinguin.blend differ diff --git a/assets/room/furnitures/pinguin/pinguin.glb b/assets/room/furnitures/pinguin/pinguin.glb new file mode 100644 index 0000000000..6df34c06e9 Binary files /dev/null and b/assets/room/furnitures/pinguin/pinguin.glb differ diff --git a/assets/room/furnitures/plant/plant-soil-uv.png b/assets/room/furnitures/plant/plant-soil-uv.png new file mode 100644 index 0000000000..d4971a896c Binary files /dev/null and b/assets/room/furnitures/plant/plant-soil-uv.png differ diff --git a/assets/room/furnitures/plant/plant-soil.png b/assets/room/furnitures/plant/plant-soil.png new file mode 100644 index 0000000000..e79ccd240e Binary files /dev/null and b/assets/room/furnitures/plant/plant-soil.png differ diff --git a/assets/room/furnitures/plant/plant-soil.psd b/assets/room/furnitures/plant/plant-soil.psd new file mode 100644 index 0000000000..1457b7ea5b Binary files /dev/null and b/assets/room/furnitures/plant/plant-soil.psd differ diff --git a/assets/room/furnitures/plant/plant.blend b/assets/room/furnitures/plant/plant.blend new file mode 100644 index 0000000000..aa38c7b54e Binary files /dev/null and b/assets/room/furnitures/plant/plant.blend differ diff --git a/assets/room/furnitures/plant/plant.glb b/assets/room/furnitures/plant/plant.glb new file mode 100644 index 0000000000..38422b4a9b Binary files /dev/null and b/assets/room/furnitures/plant/plant.glb differ diff --git a/assets/room/furnitures/plant2/plant2.blend b/assets/room/furnitures/plant2/plant2.blend new file mode 100644 index 0000000000..6592c5d98d Binary files /dev/null and b/assets/room/furnitures/plant2/plant2.blend differ diff --git a/assets/room/furnitures/plant2/plant2.glb b/assets/room/furnitures/plant2/plant2.glb new file mode 100644 index 0000000000..223e6f5834 Binary files /dev/null and b/assets/room/furnitures/plant2/plant2.glb differ diff --git a/assets/room/furnitures/plant2/soil.png b/assets/room/furnitures/plant2/soil.png new file mode 100644 index 0000000000..e79ccd240e Binary files /dev/null and b/assets/room/furnitures/plant2/soil.png differ diff --git a/assets/room/furnitures/poster-h/poster-h.blend b/assets/room/furnitures/poster-h/poster-h.blend new file mode 100644 index 0000000000..40f944f3c1 Binary files /dev/null and b/assets/room/furnitures/poster-h/poster-h.blend differ diff --git a/assets/room/furnitures/poster-h/poster-h.glb b/assets/room/furnitures/poster-h/poster-h.glb new file mode 100644 index 0000000000..c6032c1009 Binary files /dev/null and b/assets/room/furnitures/poster-h/poster-h.glb differ diff --git a/assets/room/furnitures/poster-h/uv.png b/assets/room/furnitures/poster-h/uv.png new file mode 100644 index 0000000000..f854231e0b Binary files /dev/null and b/assets/room/furnitures/poster-h/uv.png differ diff --git a/assets/room/furnitures/poster-v/poster-v.blend b/assets/room/furnitures/poster-v/poster-v.blend new file mode 100644 index 0000000000..07fe971634 Binary files /dev/null and b/assets/room/furnitures/poster-v/poster-v.blend differ diff --git a/assets/room/furnitures/poster-v/poster-v.glb b/assets/room/furnitures/poster-v/poster-v.glb new file mode 100644 index 0000000000..6e3782f193 Binary files /dev/null and b/assets/room/furnitures/poster-v/poster-v.glb differ diff --git a/assets/room/furnitures/poster-v/uv.png b/assets/room/furnitures/poster-v/uv.png new file mode 100644 index 0000000000..7bb2bf809e Binary files /dev/null and b/assets/room/furnitures/poster-v/uv.png differ diff --git a/assets/room/furnitures/pudding/pudding.blend b/assets/room/furnitures/pudding/pudding.blend new file mode 100644 index 0000000000..bba40ce161 Binary files /dev/null and b/assets/room/furnitures/pudding/pudding.blend differ diff --git a/assets/room/furnitures/pudding/pudding.glb b/assets/room/furnitures/pudding/pudding.glb new file mode 100644 index 0000000000..06c9ed80cc Binary files /dev/null and b/assets/room/furnitures/pudding/pudding.glb differ diff --git a/assets/room/furnitures/rubik-cube/rubik-cube.blend b/assets/room/furnitures/rubik-cube/rubik-cube.blend new file mode 100644 index 0000000000..6c09067e78 Binary files /dev/null and b/assets/room/furnitures/rubik-cube/rubik-cube.blend differ diff --git a/assets/room/furnitures/rubik-cube/rubik-cube.glb b/assets/room/furnitures/rubik-cube/rubik-cube.glb new file mode 100644 index 0000000000..d640df9b06 Binary files /dev/null and b/assets/room/furnitures/rubik-cube/rubik-cube.glb differ diff --git a/assets/room/furnitures/server/rack-uv.png b/assets/room/furnitures/server/rack-uv.png new file mode 100644 index 0000000000..65bdb0ffd9 Binary files /dev/null and b/assets/room/furnitures/server/rack-uv.png differ diff --git a/assets/room/furnitures/server/rack.png b/assets/room/furnitures/server/rack.png new file mode 100644 index 0000000000..b851295cfa Binary files /dev/null and b/assets/room/furnitures/server/rack.png differ diff --git a/assets/room/furnitures/server/server.blend b/assets/room/furnitures/server/server.blend new file mode 100644 index 0000000000..6675dfbdc2 Binary files /dev/null and b/assets/room/furnitures/server/server.blend differ diff --git a/assets/room/furnitures/server/server.glb b/assets/room/furnitures/server/server.glb new file mode 100644 index 0000000000..a8b530a2d2 Binary files /dev/null and b/assets/room/furnitures/server/server.glb differ diff --git a/assets/room/furnitures/server/server.png b/assets/room/furnitures/server/server.png new file mode 100644 index 0000000000..8e9a0d716c Binary files /dev/null and b/assets/room/furnitures/server/server.png differ diff --git a/assets/room/furnitures/server/uv.png b/assets/room/furnitures/server/uv.png new file mode 100644 index 0000000000..ca2e747d16 Binary files /dev/null and b/assets/room/furnitures/server/uv.png differ diff --git a/assets/room/furnitures/sofa/sofa.blend b/assets/room/furnitures/sofa/sofa.blend new file mode 100644 index 0000000000..fb5aa51a2c Binary files /dev/null and b/assets/room/furnitures/sofa/sofa.blend differ diff --git a/assets/room/furnitures/sofa/sofa.glb b/assets/room/furnitures/sofa/sofa.glb new file mode 100644 index 0000000000..6ce77d94ac Binary files /dev/null and b/assets/room/furnitures/sofa/sofa.glb differ diff --git a/assets/room/furnitures/spiral/spiral.blend b/assets/room/furnitures/spiral/spiral.blend new file mode 100644 index 0000000000..9d3be77bce Binary files /dev/null and b/assets/room/furnitures/spiral/spiral.blend differ diff --git a/assets/room/furnitures/spiral/spiral.glb b/assets/room/furnitures/spiral/spiral.glb new file mode 100644 index 0000000000..ee8e3c23b1 Binary files /dev/null and b/assets/room/furnitures/spiral/spiral.glb differ diff --git a/assets/room/furnitures/tv/screen-uv.png b/assets/room/furnitures/tv/screen-uv.png new file mode 100644 index 0000000000..4bb74f031f Binary files /dev/null and b/assets/room/furnitures/tv/screen-uv.png differ diff --git a/assets/room/furnitures/tv/tv.blend b/assets/room/furnitures/tv/tv.blend new file mode 100644 index 0000000000..490e298e7b Binary files /dev/null and b/assets/room/furnitures/tv/tv.blend differ diff --git a/assets/room/furnitures/tv/tv.glb b/assets/room/furnitures/tv/tv.glb new file mode 100644 index 0000000000..b9bd23896b Binary files /dev/null and b/assets/room/furnitures/tv/tv.glb differ diff --git a/assets/room/furnitures/wall-clock/wall-clock.blend b/assets/room/furnitures/wall-clock/wall-clock.blend new file mode 100644 index 0000000000..0a61c8f01e Binary files /dev/null and b/assets/room/furnitures/wall-clock/wall-clock.blend differ diff --git a/assets/room/furnitures/wall-clock/wall-clock.glb b/assets/room/furnitures/wall-clock/wall-clock.glb new file mode 100644 index 0000000000..b9f0093a8d Binary files /dev/null and b/assets/room/furnitures/wall-clock/wall-clock.glb differ diff --git a/assets/room/rooms/default/default.blend b/assets/room/rooms/default/default.blend new file mode 100644 index 0000000000..661154724a Binary files /dev/null and b/assets/room/rooms/default/default.blend differ diff --git a/assets/room/rooms/default/default.glb b/assets/room/rooms/default/default.glb new file mode 100644 index 0000000000..3d378deee2 Binary files /dev/null and b/assets/room/rooms/default/default.glb differ diff --git a/assets/room/rooms/washitsu/husuma-uv.png b/assets/room/rooms/washitsu/husuma-uv.png new file mode 100644 index 0000000000..ae2fca3911 Binary files /dev/null and b/assets/room/rooms/washitsu/husuma-uv.png differ diff --git a/assets/room/rooms/washitsu/husuma.png b/assets/room/rooms/washitsu/husuma.png new file mode 100644 index 0000000000..084cbed67c Binary files /dev/null and b/assets/room/rooms/washitsu/husuma.png differ diff --git a/assets/room/rooms/washitsu/tatami-single1600.png b/assets/room/rooms/washitsu/tatami-single1600.png new file mode 100644 index 0000000000..c0e684d743 Binary files /dev/null and b/assets/room/rooms/washitsu/tatami-single1600.png differ diff --git a/assets/room/rooms/washitsu/tatami-uv.png b/assets/room/rooms/washitsu/tatami-uv.png new file mode 100644 index 0000000000..5b16c66091 Binary files /dev/null and b/assets/room/rooms/washitsu/tatami-uv.png differ diff --git a/assets/room/rooms/washitsu/tatami.afdesign b/assets/room/rooms/washitsu/tatami.afdesign new file mode 100644 index 0000000000..9300a26950 Binary files /dev/null and b/assets/room/rooms/washitsu/tatami.afdesign differ diff --git a/assets/room/rooms/washitsu/tatami.png b/assets/room/rooms/washitsu/tatami.png new file mode 100644 index 0000000000..8894d040ae Binary files /dev/null and b/assets/room/rooms/washitsu/tatami.png differ diff --git a/assets/room/rooms/washitsu/washitsu.blend b/assets/room/rooms/washitsu/washitsu.blend new file mode 100644 index 0000000000..84dc11374d Binary files /dev/null and b/assets/room/rooms/washitsu/washitsu.blend differ diff --git a/assets/room/rooms/washitsu/washitsu.glb b/assets/room/rooms/washitsu/washitsu.glb new file mode 100644 index 0000000000..5b4767bc73 Binary files /dev/null and b/assets/room/rooms/washitsu/washitsu.glb differ diff --git a/assets/sounds/aisha/1.mp3 b/assets/sounds/aisha/1.mp3 new file mode 100644 index 0000000000..d8e9a2f265 Binary files /dev/null and b/assets/sounds/aisha/1.mp3 differ diff --git a/assets/sounds/aisha/2.mp3 b/assets/sounds/aisha/2.mp3 new file mode 100644 index 0000000000..477c2eba43 Binary files /dev/null and b/assets/sounds/aisha/2.mp3 differ diff --git a/assets/sounds/aisha/3.mp3 b/assets/sounds/aisha/3.mp3 new file mode 100644 index 0000000000..fe0d8063df Binary files /dev/null and b/assets/sounds/aisha/3.mp3 differ diff --git a/assets/sounds/noizenecio/kick_gaba.mp3 b/assets/sounds/noizenecio/kick_gaba.mp3 new file mode 100644 index 0000000000..616b506c4f Binary files /dev/null and b/assets/sounds/noizenecio/kick_gaba.mp3 differ diff --git a/assets/sounds/noizenecio/kick_gaba2.mp3 b/assets/sounds/noizenecio/kick_gaba2.mp3 new file mode 100644 index 0000000000..33c2837620 Binary files /dev/null and b/assets/sounds/noizenecio/kick_gaba2.mp3 differ diff --git a/assets/sounds/syuilo/down.mp3 b/assets/sounds/syuilo/down.mp3 new file mode 100644 index 0000000000..4cd421139d Binary files /dev/null and b/assets/sounds/syuilo/down.mp3 differ diff --git a/assets/sounds/syuilo/kick.mp3 b/assets/sounds/syuilo/kick.mp3 new file mode 100644 index 0000000000..4e0e72091c Binary files /dev/null and b/assets/sounds/syuilo/kick.mp3 differ diff --git a/assets/sounds/syuilo/pirori-square-wet.mp3 b/assets/sounds/syuilo/pirori-square-wet.mp3 new file mode 100644 index 0000000000..babf1fce60 Binary files /dev/null and b/assets/sounds/syuilo/pirori-square-wet.mp3 differ diff --git a/assets/sounds/syuilo/pirori-wet.mp3 b/assets/sounds/syuilo/pirori-wet.mp3 new file mode 100644 index 0000000000..25e2c46a64 Binary files /dev/null and b/assets/sounds/syuilo/pirori-wet.mp3 differ diff --git a/assets/sounds/syuilo/pirori.mp3 b/assets/sounds/syuilo/pirori.mp3 new file mode 100644 index 0000000000..a745415ac0 Binary files /dev/null and b/assets/sounds/syuilo/pirori.mp3 differ diff --git a/assets/sounds/syuilo/poi1.mp3 b/assets/sounds/syuilo/poi1.mp3 new file mode 100644 index 0000000000..59dae90965 Binary files /dev/null and b/assets/sounds/syuilo/poi1.mp3 differ diff --git a/assets/sounds/syuilo/poi2.mp3 b/assets/sounds/syuilo/poi2.mp3 new file mode 100644 index 0000000000..a65c653891 Binary files /dev/null and b/assets/sounds/syuilo/poi2.mp3 differ diff --git a/assets/sounds/syuilo/pope1.mp3 b/assets/sounds/syuilo/pope1.mp3 new file mode 100644 index 0000000000..d6f53cfacc Binary files /dev/null and b/assets/sounds/syuilo/pope1.mp3 differ diff --git a/assets/sounds/syuilo/pope2.mp3 b/assets/sounds/syuilo/pope2.mp3 new file mode 100644 index 0000000000..fe5d95e292 Binary files /dev/null and b/assets/sounds/syuilo/pope2.mp3 differ diff --git a/assets/sounds/syuilo/popo.mp3 b/assets/sounds/syuilo/popo.mp3 new file mode 100644 index 0000000000..a2a1605bbb Binary files /dev/null and b/assets/sounds/syuilo/popo.mp3 differ diff --git a/assets/sounds/syuilo/reverved.mp3 b/assets/sounds/syuilo/reverved.mp3 new file mode 100644 index 0000000000..47588ef270 Binary files /dev/null and b/assets/sounds/syuilo/reverved.mp3 differ diff --git a/assets/sounds/syuilo/ryukyu.mp3 b/assets/sounds/syuilo/ryukyu.mp3 new file mode 100644 index 0000000000..9e935e3f37 Binary files /dev/null and b/assets/sounds/syuilo/ryukyu.mp3 differ diff --git a/assets/sounds/syuilo/snare.mp3 b/assets/sounds/syuilo/snare.mp3 new file mode 100644 index 0000000000..9244189c2d Binary files /dev/null and b/assets/sounds/syuilo/snare.mp3 differ diff --git a/assets/sounds/syuilo/square-pico.mp3 b/assets/sounds/syuilo/square-pico.mp3 new file mode 100644 index 0000000000..c4d8305ae7 Binary files /dev/null and b/assets/sounds/syuilo/square-pico.mp3 differ diff --git a/assets/sounds/syuilo/triple.mp3 b/assets/sounds/syuilo/triple.mp3 new file mode 100644 index 0000000000..54ab974d46 Binary files /dev/null and b/assets/sounds/syuilo/triple.mp3 differ diff --git a/assets/sounds/syuilo/up.mp3 b/assets/sounds/syuilo/up.mp3 new file mode 100644 index 0000000000..3f30867764 Binary files /dev/null and b/assets/sounds/syuilo/up.mp3 differ diff --git a/assets/sounds/syuilo/waon.mp3 b/assets/sounds/syuilo/waon.mp3 new file mode 100644 index 0000000000..a4af473861 Binary files /dev/null and b/assets/sounds/syuilo/waon.mp3 differ diff --git a/gulpfile.ts b/gulpfile.ts index 7d20aba4e7..95b2394887 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -6,7 +6,6 @@ import * as fs from 'fs'; import * as gulp from 'gulp'; import * as ts from 'gulp-typescript'; import * as rimraf from 'rimraf'; -import * as rename from 'gulp-rename'; import * as replace from 'gulp-replace'; const terser = require('gulp-terser'); const cssnano = require('gulp-cssnano'); @@ -29,16 +28,16 @@ gulp.task('build:copy:views', () => ); gulp.task('build:copy:fonts', () => - gulp.src('./node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/client/assets/fonts/')) + gulp.src('./node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/assets/fonts/')) ); gulp.task('build:copy:locales', cb => { - fs.mkdirSync('./built/client/assets/locales', { recursive: true }); + fs.mkdirSync('./built/assets/locales', { recursive: true }); const v = { '_version_': meta.version }; for (const [lang, locale] of Object.entries(locales)) { - fs.writeFileSync(`./built/client/assets/locales/${lang}.${meta.version}.json`, JSON.stringify({ ...locale, ...v }), 'utf-8'); + fs.writeFileSync(`./built/assets/locales/${lang}.${meta.version}.json`, JSON.stringify({ ...locale, ...v }), 'utf-8'); } cb(); @@ -79,33 +78,17 @@ gulp.task('cleanall', gulp.parallel('clean', cb => rimraf('./node_modules', cb) )); -gulp.task('copy:client', () => - gulp.src([ - './assets/**/*', - './src/client/assets/**/*', - ]) - .pipe(rename(path => { - path.dirname = path.dirname!.replace('assets', '.'); - })) - .pipe(gulp.dest('./built/client/assets/')) -); - gulp.task('copy:docs', () => gulp.src([ './src/docs/**/*', ]) - .pipe(gulp.dest('./built/client/assets/docs/')) + .pipe(gulp.dest('./built/assets/docs/')) ); -gulp.task('build:client', gulp.parallel( - 'copy:client', - 'copy:docs' -)); - gulp.task('build', gulp.parallel( 'build:ts', 'build:copy', - 'build:client', + 'copy:docs', )); gulp.task('default', gulp.task('build')); diff --git a/src/client/assets/manifest.json b/src/client/assets/manifest.json index f5a1d47a8a..48030a2980 100644 --- a/src/client/assets/manifest.json +++ b/src/client/assets/manifest.json @@ -7,12 +7,12 @@ "theme_color": "#86b300", "icons": [ { - "src": "/assets/icons/192.png", + "src": "/static-assets/icons/192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "/assets/icons/512.png", + "src": "/static-assets/icons/512.png", "sizes": "512x512", "type": "image/png" } diff --git a/src/client/assets/room/furnitures/banknote/banknote.blend b/src/client/assets/room/furnitures/banknote/banknote.blend deleted file mode 100644 index 60b1968a29..0000000000 Binary files a/src/client/assets/room/furnitures/banknote/banknote.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/banknote/banknote.glb b/src/client/assets/room/furnitures/banknote/banknote.glb deleted file mode 100644 index f4ef0b91e7..0000000000 Binary files a/src/client/assets/room/furnitures/banknote/banknote.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/banknote/tex.png b/src/client/assets/room/furnitures/banknote/tex.png deleted file mode 100644 index 9106dc1457..0000000000 Binary files a/src/client/assets/room/furnitures/banknote/tex.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/bed/bed.blend b/src/client/assets/room/furnitures/bed/bed.blend deleted file mode 100644 index 731df76d0c..0000000000 Binary files a/src/client/assets/room/furnitures/bed/bed.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/bed/bed.glb b/src/client/assets/room/furnitures/bed/bed.glb deleted file mode 100644 index f35ecb9ef4..0000000000 Binary files a/src/client/assets/room/furnitures/bed/bed.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/bin/bin.blend b/src/client/assets/room/furnitures/bin/bin.blend deleted file mode 100644 index 8d459a0869..0000000000 Binary files a/src/client/assets/room/furnitures/bin/bin.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/bin/bin.glb b/src/client/assets/room/furnitures/bin/bin.glb deleted file mode 100644 index b45f203802..0000000000 Binary files a/src/client/assets/room/furnitures/bin/bin.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/book/book.blend b/src/client/assets/room/furnitures/book/book.blend deleted file mode 100644 index 0d4899d4ae..0000000000 Binary files a/src/client/assets/room/furnitures/book/book.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/book/book.glb b/src/client/assets/room/furnitures/book/book.glb deleted file mode 100644 index 546893da06..0000000000 Binary files a/src/client/assets/room/furnitures/book/book.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/book2/barcode.png b/src/client/assets/room/furnitures/book2/barcode.png deleted file mode 100644 index 37cfe5add3..0000000000 Binary files a/src/client/assets/room/furnitures/book2/barcode.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/book2/book2.blend b/src/client/assets/room/furnitures/book2/book2.blend deleted file mode 100644 index e0fdb48101..0000000000 Binary files a/src/client/assets/room/furnitures/book2/book2.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/book2/book2.glb b/src/client/assets/room/furnitures/book2/book2.glb deleted file mode 100644 index 2b26402f8c..0000000000 Binary files a/src/client/assets/room/furnitures/book2/book2.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/book2/texture.afdesign b/src/client/assets/room/furnitures/book2/texture.afdesign deleted file mode 100644 index b63771607a..0000000000 Binary files a/src/client/assets/room/furnitures/book2/texture.afdesign and /dev/null differ diff --git a/src/client/assets/room/furnitures/book2/texture.png b/src/client/assets/room/furnitures/book2/texture.png deleted file mode 100644 index 5aa84f0340..0000000000 Binary files a/src/client/assets/room/furnitures/book2/texture.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/book2/uv.png b/src/client/assets/room/furnitures/book2/uv.png deleted file mode 100644 index 61c4fb0400..0000000000 Binary files a/src/client/assets/room/furnitures/book2/uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend b/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend deleted file mode 100644 index 3a528de32a..0000000000 Binary files a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb b/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb deleted file mode 100644 index bed372e94f..0000000000 Binary files a/src/client/assets/room/furnitures/cardboard-box/cardboard-box.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend b/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend deleted file mode 100644 index 5f146267ac..0000000000 Binary files a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb b/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb deleted file mode 100644 index 85fcb5c0b6..0000000000 Binary files a/src/client/assets/room/furnitures/cardboard-box2/cardboard-box2.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/cardboard-box2/texture.png b/src/client/assets/room/furnitures/cardboard-box2/texture.png deleted file mode 100644 index e498d8f65b..0000000000 Binary files a/src/client/assets/room/furnitures/cardboard-box2/texture.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/cardboard-box2/uv.png b/src/client/assets/room/furnitures/cardboard-box2/uv.png deleted file mode 100644 index d547843ee0..0000000000 Binary files a/src/client/assets/room/furnitures/cardboard-box2/uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend b/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend deleted file mode 100644 index 00681a3cfd..0000000000 Binary files a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb b/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb deleted file mode 100644 index 1ef0427689..0000000000 Binary files a/src/client/assets/room/furnitures/cardboard-box3/cardboard-box3.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/cardboard-box3/texture.png b/src/client/assets/room/furnitures/cardboard-box3/texture.png deleted file mode 100644 index 56c914cb9d..0000000000 Binary files a/src/client/assets/room/furnitures/cardboard-box3/texture.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/cardboard-box3/texture.xcf b/src/client/assets/room/furnitures/cardboard-box3/texture.xcf deleted file mode 100644 index 7ffb3e3439..0000000000 Binary files a/src/client/assets/room/furnitures/cardboard-box3/texture.xcf and /dev/null differ diff --git a/src/client/assets/room/furnitures/cardboard-box3/uv.png b/src/client/assets/room/furnitures/cardboard-box3/uv.png deleted file mode 100644 index 797ac509db..0000000000 Binary files a/src/client/assets/room/furnitures/cardboard-box3/uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend b/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend deleted file mode 100644 index 750343d4f0..0000000000 Binary files a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb b/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb deleted file mode 100644 index 3066a69e35..0000000000 Binary files a/src/client/assets/room/furnitures/carpet-stripe/carpet-stripe.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/chair/chair.blend b/src/client/assets/room/furnitures/chair/chair.blend deleted file mode 100644 index 79c29a8401..0000000000 Binary files a/src/client/assets/room/furnitures/chair/chair.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/chair/chair.glb b/src/client/assets/room/furnitures/chair/chair.glb deleted file mode 100644 index 08ee1a0bb0..0000000000 Binary files a/src/client/assets/room/furnitures/chair/chair.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/chair2/chair2.blend b/src/client/assets/room/furnitures/chair2/chair2.blend deleted file mode 100644 index c6a1acd96f..0000000000 Binary files a/src/client/assets/room/furnitures/chair2/chair2.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/chair2/chair2.glb b/src/client/assets/room/furnitures/chair2/chair2.glb deleted file mode 100644 index 5ea2f3518b..0000000000 Binary files a/src/client/assets/room/furnitures/chair2/chair2.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/color-box/color-box.blend b/src/client/assets/room/furnitures/color-box/color-box.blend deleted file mode 100644 index f96a4ff766..0000000000 Binary files a/src/client/assets/room/furnitures/color-box/color-box.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/color-box/color-box.glb b/src/client/assets/room/furnitures/color-box/color-box.glb deleted file mode 100644 index 43f2abcae8..0000000000 Binary files a/src/client/assets/room/furnitures/color-box/color-box.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/corkboard/corkboard.blend b/src/client/assets/room/furnitures/corkboard/corkboard.blend deleted file mode 100644 index 9a7e1878cd..0000000000 Binary files a/src/client/assets/room/furnitures/corkboard/corkboard.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/corkboard/corkboard.glb b/src/client/assets/room/furnitures/corkboard/corkboard.glb deleted file mode 100644 index fee108fb91..0000000000 Binary files a/src/client/assets/room/furnitures/corkboard/corkboard.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/cube/cube.blend b/src/client/assets/room/furnitures/cube/cube.blend deleted file mode 100644 index 1af5bf40a9..0000000000 Binary files a/src/client/assets/room/furnitures/cube/cube.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/cube/cube.glb b/src/client/assets/room/furnitures/cube/cube.glb deleted file mode 100644 index 4ac8b6036d..0000000000 Binary files a/src/client/assets/room/furnitures/cube/cube.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend b/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend deleted file mode 100644 index 37ca8868c7..0000000000 Binary files a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb b/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb deleted file mode 100644 index 58efb1b3b4..0000000000 Binary files a/src/client/assets/room/furnitures/cup-noodle/cup-noodle.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/cup-noodle/noodle.png b/src/client/assets/room/furnitures/cup-noodle/noodle.png deleted file mode 100644 index 1d74e0bbe7..0000000000 Binary files a/src/client/assets/room/furnitures/cup-noodle/noodle.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/desk/desk.blend b/src/client/assets/room/furnitures/desk/desk.blend deleted file mode 100644 index c88d01f0b2..0000000000 Binary files a/src/client/assets/room/furnitures/desk/desk.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/desk/desk.glb b/src/client/assets/room/furnitures/desk/desk.glb deleted file mode 100644 index 4a58513095..0000000000 Binary files a/src/client/assets/room/furnitures/desk/desk.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/doll-ai/doll-ai.blend b/src/client/assets/room/furnitures/doll-ai/doll-ai.blend deleted file mode 100644 index a912231ecb..0000000000 Binary files a/src/client/assets/room/furnitures/doll-ai/doll-ai.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/doll-ai/doll-ai.glb b/src/client/assets/room/furnitures/doll-ai/doll-ai.glb deleted file mode 100644 index ec55a7bd7b..0000000000 Binary files a/src/client/assets/room/furnitures/doll-ai/doll-ai.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png b/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png deleted file mode 100644 index 370ca5f75b..0000000000 Binary files a/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.blend b/src/client/assets/room/furnitures/energy-drink/energy-drink.blend deleted file mode 100644 index 65fc41273e..0000000000 Binary files a/src/client/assets/room/furnitures/energy-drink/energy-drink.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/energy-drink/energy-drink.glb b/src/client/assets/room/furnitures/energy-drink/energy-drink.glb deleted file mode 100644 index 7fb1c27836..0000000000 Binary files a/src/client/assets/room/furnitures/energy-drink/energy-drink.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/energy-drink/texture.afdesign b/src/client/assets/room/furnitures/energy-drink/texture.afdesign deleted file mode 100644 index 8c117a49b1..0000000000 Binary files a/src/client/assets/room/furnitures/energy-drink/texture.afdesign and /dev/null differ diff --git a/src/client/assets/room/furnitures/energy-drink/texture.png b/src/client/assets/room/furnitures/energy-drink/texture.png deleted file mode 100644 index 484ca0f96f..0000000000 Binary files a/src/client/assets/room/furnitures/energy-drink/texture.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/energy-drink/uv.png b/src/client/assets/room/furnitures/energy-drink/uv.png deleted file mode 100644 index 2a3f20c999..0000000000 Binary files a/src/client/assets/room/furnitures/energy-drink/uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/eraser/cover.png b/src/client/assets/room/furnitures/eraser/cover.png deleted file mode 100644 index 932a3fc62e..0000000000 Binary files a/src/client/assets/room/furnitures/eraser/cover.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/eraser/cover.psd b/src/client/assets/room/furnitures/eraser/cover.psd deleted file mode 100644 index c393337833..0000000000 Binary files a/src/client/assets/room/furnitures/eraser/cover.psd and /dev/null differ diff --git a/src/client/assets/room/furnitures/eraser/eraser-uv.png b/src/client/assets/room/furnitures/eraser/eraser-uv.png deleted file mode 100644 index 89e4ea4c45..0000000000 Binary files a/src/client/assets/room/furnitures/eraser/eraser-uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/eraser/eraser.blend b/src/client/assets/room/furnitures/eraser/eraser.blend deleted file mode 100644 index 103c54fbae..0000000000 Binary files a/src/client/assets/room/furnitures/eraser/eraser.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/eraser/eraser.glb b/src/client/assets/room/furnitures/eraser/eraser.glb deleted file mode 100644 index 016b60df20..0000000000 Binary files a/src/client/assets/room/furnitures/eraser/eraser.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png b/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png deleted file mode 100644 index e3865ad15e..0000000000 Binary files a/src/client/assets/room/furnitures/facial-tissue/facial-tissue-uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend deleted file mode 100644 index d59f87c1ee..0000000000 Binary files a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb deleted file mode 100644 index 48b36ef347..0000000000 Binary files a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png deleted file mode 100644 index 7cee4b1859..0000000000 Binary files a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd b/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd deleted file mode 100644 index cd59fc007b..0000000000 Binary files a/src/client/assets/room/furnitures/facial-tissue/facial-tissue.psd and /dev/null differ diff --git a/src/client/assets/room/furnitures/fan/fan.blend b/src/client/assets/room/furnitures/fan/fan.blend deleted file mode 100644 index 8c8106e5fe..0000000000 Binary files a/src/client/assets/room/furnitures/fan/fan.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/fan/fan.glb b/src/client/assets/room/furnitures/fan/fan.glb deleted file mode 100644 index d9367f3534..0000000000 Binary files a/src/client/assets/room/furnitures/fan/fan.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/holo-display/holo-display.blend b/src/client/assets/room/furnitures/holo-display/holo-display.blend deleted file mode 100644 index 56d2e1f819..0000000000 Binary files a/src/client/assets/room/furnitures/holo-display/holo-display.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/holo-display/holo-display.glb b/src/client/assets/room/furnitures/holo-display/holo-display.glb deleted file mode 100644 index 4d042a59b3..0000000000 Binary files a/src/client/assets/room/furnitures/holo-display/holo-display.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/holo-display/ray-uv.png b/src/client/assets/room/furnitures/holo-display/ray-uv.png deleted file mode 100644 index aa7e817e0f..0000000000 Binary files a/src/client/assets/room/furnitures/holo-display/ray-uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/holo-display/ray.png b/src/client/assets/room/furnitures/holo-display/ray.png deleted file mode 100644 index 6a5d24e143..0000000000 Binary files a/src/client/assets/room/furnitures/holo-display/ray.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/keyboard/keyboard.blend b/src/client/assets/room/furnitures/keyboard/keyboard.blend deleted file mode 100644 index ab33d134b3..0000000000 Binary files a/src/client/assets/room/furnitures/keyboard/keyboard.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/keyboard/keyboard.glb b/src/client/assets/room/furnitures/keyboard/keyboard.glb deleted file mode 100644 index 15dc69f47a..0000000000 Binary files a/src/client/assets/room/furnitures/keyboard/keyboard.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/low-table/low-table.blend b/src/client/assets/room/furnitures/low-table/low-table.blend deleted file mode 100644 index e1592174d9..0000000000 Binary files a/src/client/assets/room/furnitures/low-table/low-table.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/low-table/low-table.glb b/src/client/assets/room/furnitures/low-table/low-table.glb deleted file mode 100644 index c69bf35d7b..0000000000 Binary files a/src/client/assets/room/furnitures/low-table/low-table.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/mat/mat.blend b/src/client/assets/room/furnitures/mat/mat.blend deleted file mode 100644 index a1e1a68c55..0000000000 Binary files a/src/client/assets/room/furnitures/mat/mat.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/mat/mat.glb b/src/client/assets/room/furnitures/mat/mat.glb deleted file mode 100644 index 87ccd44e1a..0000000000 Binary files a/src/client/assets/room/furnitures/mat/mat.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/milk/milk-uv.png b/src/client/assets/room/furnitures/milk/milk-uv.png deleted file mode 100644 index 258fd54638..0000000000 Binary files a/src/client/assets/room/furnitures/milk/milk-uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/milk/milk.blend b/src/client/assets/room/furnitures/milk/milk.blend deleted file mode 100644 index 2df508d5b9..0000000000 Binary files a/src/client/assets/room/furnitures/milk/milk.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/milk/milk.glb b/src/client/assets/room/furnitures/milk/milk.glb deleted file mode 100644 index b335fe3d02..0000000000 Binary files a/src/client/assets/room/furnitures/milk/milk.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/milk/milk.png b/src/client/assets/room/furnitures/milk/milk.png deleted file mode 100644 index 35181c8c8c..0000000000 Binary files a/src/client/assets/room/furnitures/milk/milk.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/milk/milk.psd b/src/client/assets/room/furnitures/milk/milk.psd deleted file mode 100644 index f31e439277..0000000000 Binary files a/src/client/assets/room/furnitures/milk/milk.psd and /dev/null differ diff --git a/src/client/assets/room/furnitures/monitor/monitor.blend b/src/client/assets/room/furnitures/monitor/monitor.blend deleted file mode 100644 index 6c042ccdd8..0000000000 Binary files a/src/client/assets/room/furnitures/monitor/monitor.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/monitor/monitor.glb b/src/client/assets/room/furnitures/monitor/monitor.glb deleted file mode 100644 index fc33286a15..0000000000 Binary files a/src/client/assets/room/furnitures/monitor/monitor.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/monitor/monitor.psd b/src/client/assets/room/furnitures/monitor/monitor.psd deleted file mode 100644 index 57afff9cd9..0000000000 Binary files a/src/client/assets/room/furnitures/monitor/monitor.psd and /dev/null differ diff --git a/src/client/assets/room/furnitures/monitor/screen-uv.png b/src/client/assets/room/furnitures/monitor/screen-uv.png deleted file mode 100644 index 35f74de8aa..0000000000 Binary files a/src/client/assets/room/furnitures/monitor/screen-uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/monitor/screen.jpg b/src/client/assets/room/furnitures/monitor/screen.jpg deleted file mode 100644 index 4004a1ede9..0000000000 Binary files a/src/client/assets/room/furnitures/monitor/screen.jpg and /dev/null differ diff --git a/src/client/assets/room/furnitures/moon/moon.blend b/src/client/assets/room/furnitures/moon/moon.blend deleted file mode 100644 index 4ff3deab8e..0000000000 Binary files a/src/client/assets/room/furnitures/moon/moon.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/moon/moon.glb b/src/client/assets/room/furnitures/moon/moon.glb deleted file mode 100644 index 07fa7e4c02..0000000000 Binary files a/src/client/assets/room/furnitures/moon/moon.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/moon/moon.jpg b/src/client/assets/room/furnitures/moon/moon.jpg deleted file mode 100644 index 8988ac64b9..0000000000 Binary files a/src/client/assets/room/furnitures/moon/moon.jpg and /dev/null differ diff --git a/src/client/assets/room/furnitures/mousepad/mousepad.blend b/src/client/assets/room/furnitures/mousepad/mousepad.blend deleted file mode 100644 index 14bd139c94..0000000000 Binary files a/src/client/assets/room/furnitures/mousepad/mousepad.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/mousepad/mousepad.glb b/src/client/assets/room/furnitures/mousepad/mousepad.glb deleted file mode 100644 index 681ada49cd..0000000000 Binary files a/src/client/assets/room/furnitures/mousepad/mousepad.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/pc/motherboard-uv.png b/src/client/assets/room/furnitures/pc/motherboard-uv.png deleted file mode 100644 index 355009fe7c..0000000000 Binary files a/src/client/assets/room/furnitures/pc/motherboard-uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/pc/motherboard-uv.psd b/src/client/assets/room/furnitures/pc/motherboard-uv.psd deleted file mode 100644 index 971f33f79e..0000000000 Binary files a/src/client/assets/room/furnitures/pc/motherboard-uv.psd and /dev/null differ diff --git a/src/client/assets/room/furnitures/pc/motherboard.jpg b/src/client/assets/room/furnitures/pc/motherboard.jpg deleted file mode 100644 index d894e4efcf..0000000000 Binary files a/src/client/assets/room/furnitures/pc/motherboard.jpg and /dev/null differ diff --git a/src/client/assets/room/furnitures/pc/pc.blend b/src/client/assets/room/furnitures/pc/pc.blend deleted file mode 100644 index 13dfec6ccc..0000000000 Binary files a/src/client/assets/room/furnitures/pc/pc.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/pc/pc.glb b/src/client/assets/room/furnitures/pc/pc.glb deleted file mode 100644 index 44a48b18ae..0000000000 Binary files a/src/client/assets/room/furnitures/pc/pc.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/pencil/pencil.blend b/src/client/assets/room/furnitures/pencil/pencil.blend deleted file mode 100644 index 0fc6bdd776..0000000000 Binary files a/src/client/assets/room/furnitures/pencil/pencil.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/pencil/pencil.glb b/src/client/assets/room/furnitures/pencil/pencil.glb deleted file mode 100644 index a938b5cdcc..0000000000 Binary files a/src/client/assets/room/furnitures/pencil/pencil.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/photoframe/photo-uv.png b/src/client/assets/room/furnitures/photoframe/photo-uv.png deleted file mode 100644 index 9b94906413..0000000000 Binary files a/src/client/assets/room/furnitures/photoframe/photo-uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/photoframe/photo.jpg b/src/client/assets/room/furnitures/photoframe/photo.jpg deleted file mode 100644 index af14f0f36a..0000000000 Binary files a/src/client/assets/room/furnitures/photoframe/photo.jpg and /dev/null differ diff --git a/src/client/assets/room/furnitures/photoframe/photoframe.blend b/src/client/assets/room/furnitures/photoframe/photoframe.blend deleted file mode 100644 index 4224cde45b..0000000000 Binary files a/src/client/assets/room/furnitures/photoframe/photoframe.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/photoframe/photoframe.glb b/src/client/assets/room/furnitures/photoframe/photoframe.glb deleted file mode 100644 index 4255a77de6..0000000000 Binary files a/src/client/assets/room/furnitures/photoframe/photoframe.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/piano/piano.blend b/src/client/assets/room/furnitures/piano/piano.blend deleted file mode 100644 index 7653cdf672..0000000000 Binary files a/src/client/assets/room/furnitures/piano/piano.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/piano/piano.glb b/src/client/assets/room/furnitures/piano/piano.glb deleted file mode 100644 index 7242e78ceb..0000000000 Binary files a/src/client/assets/room/furnitures/piano/piano.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/pinguin/pinguin.blend b/src/client/assets/room/furnitures/pinguin/pinguin.blend deleted file mode 100644 index 514c713e4c..0000000000 Binary files a/src/client/assets/room/furnitures/pinguin/pinguin.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/pinguin/pinguin.glb b/src/client/assets/room/furnitures/pinguin/pinguin.glb deleted file mode 100644 index 6df34c06e9..0000000000 Binary files a/src/client/assets/room/furnitures/pinguin/pinguin.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/plant/plant-soil-uv.png b/src/client/assets/room/furnitures/plant/plant-soil-uv.png deleted file mode 100644 index d4971a896c..0000000000 Binary files a/src/client/assets/room/furnitures/plant/plant-soil-uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/plant/plant-soil.png b/src/client/assets/room/furnitures/plant/plant-soil.png deleted file mode 100644 index e79ccd240e..0000000000 Binary files a/src/client/assets/room/furnitures/plant/plant-soil.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/plant/plant-soil.psd b/src/client/assets/room/furnitures/plant/plant-soil.psd deleted file mode 100644 index 1457b7ea5b..0000000000 Binary files a/src/client/assets/room/furnitures/plant/plant-soil.psd and /dev/null differ diff --git a/src/client/assets/room/furnitures/plant/plant.blend b/src/client/assets/room/furnitures/plant/plant.blend deleted file mode 100644 index aa38c7b54e..0000000000 Binary files a/src/client/assets/room/furnitures/plant/plant.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/plant/plant.glb b/src/client/assets/room/furnitures/plant/plant.glb deleted file mode 100644 index 38422b4a9b..0000000000 Binary files a/src/client/assets/room/furnitures/plant/plant.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/plant2/plant2.blend b/src/client/assets/room/furnitures/plant2/plant2.blend deleted file mode 100644 index 6592c5d98d..0000000000 Binary files a/src/client/assets/room/furnitures/plant2/plant2.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/plant2/plant2.glb b/src/client/assets/room/furnitures/plant2/plant2.glb deleted file mode 100644 index 223e6f5834..0000000000 Binary files a/src/client/assets/room/furnitures/plant2/plant2.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/plant2/soil.png b/src/client/assets/room/furnitures/plant2/soil.png deleted file mode 100644 index e79ccd240e..0000000000 Binary files a/src/client/assets/room/furnitures/plant2/soil.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/poster-h/poster-h.blend b/src/client/assets/room/furnitures/poster-h/poster-h.blend deleted file mode 100644 index 40f944f3c1..0000000000 Binary files a/src/client/assets/room/furnitures/poster-h/poster-h.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/poster-h/poster-h.glb b/src/client/assets/room/furnitures/poster-h/poster-h.glb deleted file mode 100644 index c6032c1009..0000000000 Binary files a/src/client/assets/room/furnitures/poster-h/poster-h.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/poster-h/uv.png b/src/client/assets/room/furnitures/poster-h/uv.png deleted file mode 100644 index f854231e0b..0000000000 Binary files a/src/client/assets/room/furnitures/poster-h/uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/poster-v/poster-v.blend b/src/client/assets/room/furnitures/poster-v/poster-v.blend deleted file mode 100644 index 07fe971634..0000000000 Binary files a/src/client/assets/room/furnitures/poster-v/poster-v.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/poster-v/poster-v.glb b/src/client/assets/room/furnitures/poster-v/poster-v.glb deleted file mode 100644 index 6e3782f193..0000000000 Binary files a/src/client/assets/room/furnitures/poster-v/poster-v.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/poster-v/uv.png b/src/client/assets/room/furnitures/poster-v/uv.png deleted file mode 100644 index 7bb2bf809e..0000000000 Binary files a/src/client/assets/room/furnitures/poster-v/uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/pudding/pudding.blend b/src/client/assets/room/furnitures/pudding/pudding.blend deleted file mode 100644 index bba40ce161..0000000000 Binary files a/src/client/assets/room/furnitures/pudding/pudding.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/pudding/pudding.glb b/src/client/assets/room/furnitures/pudding/pudding.glb deleted file mode 100644 index 06c9ed80cc..0000000000 Binary files a/src/client/assets/room/furnitures/pudding/pudding.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend b/src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend deleted file mode 100644 index 6c09067e78..0000000000 Binary files a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb b/src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb deleted file mode 100644 index d640df9b06..0000000000 Binary files a/src/client/assets/room/furnitures/rubik-cube/rubik-cube.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/server/rack-uv.png b/src/client/assets/room/furnitures/server/rack-uv.png deleted file mode 100644 index 65bdb0ffd9..0000000000 Binary files a/src/client/assets/room/furnitures/server/rack-uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/server/rack.png b/src/client/assets/room/furnitures/server/rack.png deleted file mode 100644 index b851295cfa..0000000000 Binary files a/src/client/assets/room/furnitures/server/rack.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/server/server.blend b/src/client/assets/room/furnitures/server/server.blend deleted file mode 100644 index 6675dfbdc2..0000000000 Binary files a/src/client/assets/room/furnitures/server/server.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/server/server.glb b/src/client/assets/room/furnitures/server/server.glb deleted file mode 100644 index a8b530a2d2..0000000000 Binary files a/src/client/assets/room/furnitures/server/server.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/server/server.png b/src/client/assets/room/furnitures/server/server.png deleted file mode 100644 index 8e9a0d716c..0000000000 Binary files a/src/client/assets/room/furnitures/server/server.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/server/uv.png b/src/client/assets/room/furnitures/server/uv.png deleted file mode 100644 index ca2e747d16..0000000000 Binary files a/src/client/assets/room/furnitures/server/uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/sofa/sofa.blend b/src/client/assets/room/furnitures/sofa/sofa.blend deleted file mode 100644 index fb5aa51a2c..0000000000 Binary files a/src/client/assets/room/furnitures/sofa/sofa.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/sofa/sofa.glb b/src/client/assets/room/furnitures/sofa/sofa.glb deleted file mode 100644 index 6ce77d94ac..0000000000 Binary files a/src/client/assets/room/furnitures/sofa/sofa.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/spiral/spiral.blend b/src/client/assets/room/furnitures/spiral/spiral.blend deleted file mode 100644 index 9d3be77bce..0000000000 Binary files a/src/client/assets/room/furnitures/spiral/spiral.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/spiral/spiral.glb b/src/client/assets/room/furnitures/spiral/spiral.glb deleted file mode 100644 index ee8e3c23b1..0000000000 Binary files a/src/client/assets/room/furnitures/spiral/spiral.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/tv/screen-uv.png b/src/client/assets/room/furnitures/tv/screen-uv.png deleted file mode 100644 index 4bb74f031f..0000000000 Binary files a/src/client/assets/room/furnitures/tv/screen-uv.png and /dev/null differ diff --git a/src/client/assets/room/furnitures/tv/tv.blend b/src/client/assets/room/furnitures/tv/tv.blend deleted file mode 100644 index 490e298e7b..0000000000 Binary files a/src/client/assets/room/furnitures/tv/tv.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/tv/tv.glb b/src/client/assets/room/furnitures/tv/tv.glb deleted file mode 100644 index b9bd23896b..0000000000 Binary files a/src/client/assets/room/furnitures/tv/tv.glb and /dev/null differ diff --git a/src/client/assets/room/furnitures/wall-clock/wall-clock.blend b/src/client/assets/room/furnitures/wall-clock/wall-clock.blend deleted file mode 100644 index 0a61c8f01e..0000000000 Binary files a/src/client/assets/room/furnitures/wall-clock/wall-clock.blend and /dev/null differ diff --git a/src/client/assets/room/furnitures/wall-clock/wall-clock.glb b/src/client/assets/room/furnitures/wall-clock/wall-clock.glb deleted file mode 100644 index b9f0093a8d..0000000000 Binary files a/src/client/assets/room/furnitures/wall-clock/wall-clock.glb and /dev/null differ diff --git a/src/client/assets/room/rooms/default/default.blend b/src/client/assets/room/rooms/default/default.blend deleted file mode 100644 index 661154724a..0000000000 Binary files a/src/client/assets/room/rooms/default/default.blend and /dev/null differ diff --git a/src/client/assets/room/rooms/default/default.glb b/src/client/assets/room/rooms/default/default.glb deleted file mode 100644 index 3d378deee2..0000000000 Binary files a/src/client/assets/room/rooms/default/default.glb and /dev/null differ diff --git a/src/client/assets/room/rooms/washitsu/husuma-uv.png b/src/client/assets/room/rooms/washitsu/husuma-uv.png deleted file mode 100644 index ae2fca3911..0000000000 Binary files a/src/client/assets/room/rooms/washitsu/husuma-uv.png and /dev/null differ diff --git a/src/client/assets/room/rooms/washitsu/husuma.png b/src/client/assets/room/rooms/washitsu/husuma.png deleted file mode 100644 index 084cbed67c..0000000000 Binary files a/src/client/assets/room/rooms/washitsu/husuma.png and /dev/null differ diff --git a/src/client/assets/room/rooms/washitsu/tatami-single1600.png b/src/client/assets/room/rooms/washitsu/tatami-single1600.png deleted file mode 100644 index c0e684d743..0000000000 Binary files a/src/client/assets/room/rooms/washitsu/tatami-single1600.png and /dev/null differ diff --git a/src/client/assets/room/rooms/washitsu/tatami-uv.png b/src/client/assets/room/rooms/washitsu/tatami-uv.png deleted file mode 100644 index 5b16c66091..0000000000 Binary files a/src/client/assets/room/rooms/washitsu/tatami-uv.png and /dev/null differ diff --git a/src/client/assets/room/rooms/washitsu/tatami.afdesign b/src/client/assets/room/rooms/washitsu/tatami.afdesign deleted file mode 100644 index 9300a26950..0000000000 Binary files a/src/client/assets/room/rooms/washitsu/tatami.afdesign and /dev/null differ diff --git a/src/client/assets/room/rooms/washitsu/tatami.png b/src/client/assets/room/rooms/washitsu/tatami.png deleted file mode 100644 index 8894d040ae..0000000000 Binary files a/src/client/assets/room/rooms/washitsu/tatami.png and /dev/null differ diff --git a/src/client/assets/room/rooms/washitsu/washitsu.blend b/src/client/assets/room/rooms/washitsu/washitsu.blend deleted file mode 100644 index 84dc11374d..0000000000 Binary files a/src/client/assets/room/rooms/washitsu/washitsu.blend and /dev/null differ diff --git a/src/client/assets/room/rooms/washitsu/washitsu.glb b/src/client/assets/room/rooms/washitsu/washitsu.glb deleted file mode 100644 index 5b4767bc73..0000000000 Binary files a/src/client/assets/room/rooms/washitsu/washitsu.glb and /dev/null differ diff --git a/src/client/assets/sounds/aisha/1.mp3 b/src/client/assets/sounds/aisha/1.mp3 deleted file mode 100644 index d8e9a2f265..0000000000 Binary files a/src/client/assets/sounds/aisha/1.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/aisha/2.mp3 b/src/client/assets/sounds/aisha/2.mp3 deleted file mode 100644 index 477c2eba43..0000000000 Binary files a/src/client/assets/sounds/aisha/2.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/aisha/3.mp3 b/src/client/assets/sounds/aisha/3.mp3 deleted file mode 100644 index fe0d8063df..0000000000 Binary files a/src/client/assets/sounds/aisha/3.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/noizenecio/kick_gaba.mp3 b/src/client/assets/sounds/noizenecio/kick_gaba.mp3 deleted file mode 100644 index 616b506c4f..0000000000 Binary files a/src/client/assets/sounds/noizenecio/kick_gaba.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/noizenecio/kick_gaba2.mp3 b/src/client/assets/sounds/noizenecio/kick_gaba2.mp3 deleted file mode 100644 index 33c2837620..0000000000 Binary files a/src/client/assets/sounds/noizenecio/kick_gaba2.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/down.mp3 b/src/client/assets/sounds/syuilo/down.mp3 deleted file mode 100644 index 4cd421139d..0000000000 Binary files a/src/client/assets/sounds/syuilo/down.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/kick.mp3 b/src/client/assets/sounds/syuilo/kick.mp3 deleted file mode 100644 index 4e0e72091c..0000000000 Binary files a/src/client/assets/sounds/syuilo/kick.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/pirori-square-wet.mp3 b/src/client/assets/sounds/syuilo/pirori-square-wet.mp3 deleted file mode 100644 index babf1fce60..0000000000 Binary files a/src/client/assets/sounds/syuilo/pirori-square-wet.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/pirori-wet.mp3 b/src/client/assets/sounds/syuilo/pirori-wet.mp3 deleted file mode 100644 index 25e2c46a64..0000000000 Binary files a/src/client/assets/sounds/syuilo/pirori-wet.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/pirori.mp3 b/src/client/assets/sounds/syuilo/pirori.mp3 deleted file mode 100644 index a745415ac0..0000000000 Binary files a/src/client/assets/sounds/syuilo/pirori.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/poi1.mp3 b/src/client/assets/sounds/syuilo/poi1.mp3 deleted file mode 100644 index 59dae90965..0000000000 Binary files a/src/client/assets/sounds/syuilo/poi1.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/poi2.mp3 b/src/client/assets/sounds/syuilo/poi2.mp3 deleted file mode 100644 index a65c653891..0000000000 Binary files a/src/client/assets/sounds/syuilo/poi2.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/pope1.mp3 b/src/client/assets/sounds/syuilo/pope1.mp3 deleted file mode 100644 index d6f53cfacc..0000000000 Binary files a/src/client/assets/sounds/syuilo/pope1.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/pope2.mp3 b/src/client/assets/sounds/syuilo/pope2.mp3 deleted file mode 100644 index fe5d95e292..0000000000 Binary files a/src/client/assets/sounds/syuilo/pope2.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/popo.mp3 b/src/client/assets/sounds/syuilo/popo.mp3 deleted file mode 100644 index a2a1605bbb..0000000000 Binary files a/src/client/assets/sounds/syuilo/popo.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/reverved.mp3 b/src/client/assets/sounds/syuilo/reverved.mp3 deleted file mode 100644 index 47588ef270..0000000000 Binary files a/src/client/assets/sounds/syuilo/reverved.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/ryukyu.mp3 b/src/client/assets/sounds/syuilo/ryukyu.mp3 deleted file mode 100644 index 9e935e3f37..0000000000 Binary files a/src/client/assets/sounds/syuilo/ryukyu.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/snare.mp3 b/src/client/assets/sounds/syuilo/snare.mp3 deleted file mode 100644 index 9244189c2d..0000000000 Binary files a/src/client/assets/sounds/syuilo/snare.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/square-pico.mp3 b/src/client/assets/sounds/syuilo/square-pico.mp3 deleted file mode 100644 index c4d8305ae7..0000000000 Binary files a/src/client/assets/sounds/syuilo/square-pico.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/triple.mp3 b/src/client/assets/sounds/syuilo/triple.mp3 deleted file mode 100644 index 54ab974d46..0000000000 Binary files a/src/client/assets/sounds/syuilo/triple.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/up.mp3 b/src/client/assets/sounds/syuilo/up.mp3 deleted file mode 100644 index 3f30867764..0000000000 Binary files a/src/client/assets/sounds/syuilo/up.mp3 and /dev/null differ diff --git a/src/client/assets/sounds/syuilo/waon.mp3 b/src/client/assets/sounds/syuilo/waon.mp3 deleted file mode 100644 index a4af473861..0000000000 Binary files a/src/client/assets/sounds/syuilo/waon.mp3 and /dev/null differ diff --git a/src/client/pages/v.vue b/src/client/pages/v.vue index 021f8908fb..f456a29993 100644 --- a/src/client/pages/v.vue +++ b/src/client/pages/v.vue @@ -2,7 +2,7 @@
- +
Misskey
v{{ version }}
diff --git a/src/client/pages/welcome.entrance.a.vue b/src/client/pages/welcome.entrance.a.vue index 43d21d920a..872ea8797f 100644 --- a/src/client/pages/welcome.entrance.a.vue +++ b/src/client/pages/welcome.entrance.a.vue @@ -5,7 +5,7 @@
- +
diff --git a/src/client/pages/welcome.entrance.b.vue b/src/client/pages/welcome.entrance.b.vue index 8a6f60e726..95b99fb466 100644 --- a/src/client/pages/welcome.entrance.b.vue +++ b/src/client/pages/welcome.entrance.b.vue @@ -29,7 +29,7 @@
- + diff --git a/src/client/pages/welcome.entrance.c.vue b/src/client/pages/welcome.entrance.c.vue index e9df492cb6..8aba80e781 100644 --- a/src/client/pages/welcome.entrance.c.vue +++ b/src/client/pages/welcome.entrance.c.vue @@ -11,7 +11,7 @@
- +
diff --git a/src/client/scripts/room/room.ts b/src/client/scripts/room/room.ts index 45ccd59b70..8fe3ebdeb0 100644 --- a/src/client/scripts/room/room.ts +++ b/src/client/scripts/room/room.ts @@ -340,7 +340,7 @@ export class Room { @autobind private loadRoom() { const type = this.roomInfo.roomType; - new GLTFLoader().load(`/assets/room/rooms/${type}/${type}.glb`, gltf => { + new GLTFLoader().load(`/static-assets/room/rooms/${type}/${type}.glb`, gltf => { gltf.scene.traverse(child => { if (!(child instanceof THREE.Mesh)) return; @@ -375,7 +375,7 @@ export class Room { const def = furnitureDefs.find(d => d.id === furniture.type); return new Promise((res, rej) => { const loader = new GLTFLoader(); - loader.load(`/assets/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => { + loader.load(`/static-assets/room/furnitures/${furniture.type}/${furniture.type}.glb`, gltf => { const model = gltf.scene; // Load animation diff --git a/src/client/scripts/sound.ts b/src/client/scripts/sound.ts index 176d2b68bf..bb4cfee06a 100644 --- a/src/client/scripts/sound.ts +++ b/src/client/scripts/sound.ts @@ -16,7 +16,7 @@ export function playFile(file: string, volume: number) { if (cache.has(file)) { audio = cache.get(file); } else { - audio = new Audio(`/assets/sounds/${file}.mp3`); + audio = new Audio(`/static-assets/sounds/${file}.mp3`); cache.set(file, audio); } audio.volume = masterVolume - ((1 - volume) * masterVolume); diff --git a/src/server/api/openapi/gen-spec.ts b/src/server/api/openapi/gen-spec.ts index 78e4810376..8fc634d69b 100644 --- a/src/server/api/openapi/gen-spec.ts +++ b/src/server/api/openapi/gen-spec.ts @@ -13,7 +13,7 @@ export function genOpenapiSpec(lang = 'ja-JP') { version: 'v1', title: 'Misskey API', description: getDescription(lang), - 'x-logo': { url: '/assets/api-doc.png' } + 'x-logo': { url: '/static-assets/api-doc.png' } }, externalDocs: { diff --git a/src/server/web/index.ts b/src/server/web/index.ts index a1d79100a6..27fa495f8d 100644 --- a/src/server/web/index.ts +++ b/src/server/web/index.ts @@ -28,7 +28,8 @@ const markdown = MarkdownIt({ html: true }); -const client = `${__dirname}/../../client/`; +const staticAssets = `${__dirname}/../../../assets/`; +const assets = `${__dirname}/../../assets/`; // Init app const app = new Koa(); @@ -57,24 +58,31 @@ const router = new Router(); //#region static assets +router.get('/static-assets/(.*)', async ctx => { + await send(ctx as any, ctx.path.replace('/static-assets/', ''), { + root: staticAssets, + maxage: ms('7 days'), + }); +}); + router.get('/assets/(.*)', async ctx => { - await send(ctx as any, ctx.path, { - root: client, + await send(ctx as any, ctx.path.replace('/assets/', ''), { + root: assets, maxage: ms('7 days'), }); }); // Apple touch icon router.get('/apple-touch-icon.png', async ctx => { - await send(ctx as any, '/assets/apple-touch-icon.png', { - root: client + await send(ctx as any, '/apple-touch-icon.png', { + root: assets }); }); // ServiceWorker router.get('/sw.js', async ctx => { - await send(ctx as any, `/assets/sw.${config.version}.js`, { - root: client + await send(ctx as any, `/sw.${config.version}.js`, { + root: assets }); }); @@ -82,8 +90,8 @@ router.get('/sw.js', async ctx => { router.get('/manifest.json', require('./manifest')); router.get('/robots.txt', async ctx => { - await send(ctx as any, '/assets/robots.txt', { - root: client + await send(ctx as any, '/robots.txt', { + root: assets }); }); @@ -91,8 +99,8 @@ router.get('/robots.txt', async ctx => { // Docs router.get('/api-doc', async ctx => { - await send(ctx as any, '/assets/redoc.html', { - root: client + await send(ctx as any, '/redoc.html', { + root: assets }); }); diff --git a/src/server/web/manifest.ts b/src/server/web/manifest.ts index 36c901d267..a1c937703b 100644 --- a/src/server/web/manifest.ts +++ b/src/server/web/manifest.ts @@ -1,5 +1,5 @@ import * as Koa from 'koa'; -import * as manifest from '../../client/assets/manifest.json'; +import * as manifest from '../../../src/client/assets/manifest.json'; import { fetchMeta } from '../../misc/fetch-meta'; module.exports = async (ctx: Koa.Context) => { diff --git a/src/server/web/views/info.pug b/src/server/web/views/info.pug index eed69fc99e..323dce974f 100644 --- a/src/server/web/views/info.pug +++ b/src/server/web/views/info.pug @@ -66,7 +66,7 @@ html main header h1 Misskey Version #{version} - img(src='/assets/misskey-php-like-logo.png' alt='') + img(src='/static-assets/misskey-php-like-logo.png' alt='') table tr th Instance diff --git a/src/services/send-email.ts b/src/services/send-email.ts index c716b36715..4814808392 100644 --- a/src/services/send-email.ts +++ b/src/services/send-email.ts @@ -8,7 +8,7 @@ export const logger = new Logger('email'); export async function sendEmail(to: string, subject: string, html: string, text: string) { const meta = await fetchMeta(true); - const iconUrl = `${config.url}/assets/mi-white.png`; + const iconUrl = `${config.url}/static-assets/mi-white.png`; const emailSettingUrl = `${config.url}/settings/email`; const enableAuth = meta.smtpUser != null && meta.smtpUser !== ''; diff --git a/webpack.config.ts b/webpack.config.ts index cc5264ceb1..c530cf335c 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -147,7 +147,7 @@ module.exports = { }), ], output: { - path: __dirname + '/built/client/assets', + path: __dirname + '/built/assets', filename: `[name].${meta.version}.js`, publicPath: `/assets/`, pathinfo: false, -- cgit v1.2.3-freya From a07d753da84191bc8c185a7bcd6d73fab9529b5d Mon Sep 17 00:00:00 2001 From: YuzuRyo61 Date: Sat, 6 Mar 2021 22:34:11 +0900 Subject: APIドキュメントの改善 (#6757) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update api document in admin/announcements * Update api document in announcements * Update api document in i/read-announcements * Update api document in username/available * Update api document & Fix typo in API 403 error * Update api document * Update api document * Update api document * Fix API permission definition * Update api document * Update api document * Update api document * Update api document * Update api document * Update api document * Update api document * Update api document * Fix bug in users (api) * Apply reviews #6757 * Apply reviews #6757 Co-authored-by: syuilo --- src/models/repositories/antenna.ts | 70 +++- src/models/repositories/app.ts | 30 +- src/models/repositories/drive-file.ts | 62 +++- src/models/repositories/federation-instance.ts | 106 ++++++ src/models/repositories/queue.ts | 30 ++ src/models/repositories/user.ts | 263 +++++++++++--- .../api/endpoints/admin/abuse-user-reports.ts | 73 ++++ src/server/api/endpoints/admin/accounts/create.ts | 18 + .../api/endpoints/admin/announcements/create.ts | 46 +++ .../api/endpoints/admin/announcements/delete.ts | 5 + .../api/endpoints/admin/announcements/list.ts | 55 +++ .../api/endpoints/admin/announcements/update.ts | 5 + .../endpoints/admin/delete-all-files-of-a-user.ts | 5 + src/server/api/endpoints/admin/delete-logs.ts | 5 + .../endpoints/admin/drive/clean-remote-files.ts | 5 + src/server/api/endpoints/admin/drive/cleanup.ts | 5 + src/server/api/endpoints/admin/drive/files.ts | 15 + src/server/api/endpoints/admin/drive/show-file.ts | 148 ++++++++ src/server/api/endpoints/admin/emoji/copy.ts | 18 + .../api/endpoints/admin/emoji/list-remote.ts | 49 ++- src/server/api/endpoints/admin/emoji/list.ts | 49 ++- .../endpoints/admin/federation/delete-all-files.ts | 5 + .../admin/federation/remove-all-following.ts | 5 + .../endpoints/admin/federation/update-instance.ts | 5 + src/server/api/endpoints/admin/get-table-stats.ts | 12 + src/server/api/endpoints/admin/invite.ts | 20 +- src/server/api/endpoints/admin/logs.ts | 59 ++++ src/server/api/endpoints/admin/promo/create.ts | 5 + src/server/api/endpoints/admin/queue/clear.ts | 5 + .../api/endpoints/admin/queue/deliver-delayed.ts | 30 ++ .../api/endpoints/admin/queue/inbox-delayed.ts | 30 ++ src/server/api/endpoints/admin/queue/jobs.ts | 37 ++ src/server/api/endpoints/admin/queue/stats.ts | 26 +- src/server/api/endpoints/admin/relays/add.ts | 30 +- src/server/api/endpoints/admin/relays/list.ts | 34 +- src/server/api/endpoints/admin/relays/remove.ts | 3 +- src/server/api/endpoints/admin/reset-password.ts | 14 + .../endpoints/admin/resolve-abuse-user-report.ts | 5 + src/server/api/endpoints/admin/resync-chart.ts | 5 + src/server/api/endpoints/admin/send-email.ts | 5 + src/server/api/endpoints/admin/server-info.ts | 88 +++++ .../api/endpoints/admin/show-moderation-logs.ts | 44 +++ src/server/api/endpoints/admin/show-user.ts | 146 +++++++- src/server/api/endpoints/admin/show-users.ts | 15 + src/server/api/endpoints/admin/vacuum.ts | 5 + src/server/api/endpoints/announcements.ts | 55 +++ src/server/api/endpoints/antennas/create.ts | 11 + src/server/api/endpoints/antennas/delete.ts | 5 + src/server/api/endpoints/antennas/list.ts | 15 + src/server/api/endpoints/antennas/notes.ts | 15 + src/server/api/endpoints/antennas/show.ts | 11 + src/server/api/endpoints/antennas/update.ts | 11 + src/server/api/endpoints/ap/show.ts | 19 +- src/server/api/endpoints/app/show.ts | 6 + src/server/api/endpoints/auth/session/show.ts | 21 ++ src/server/api/endpoints/blocking/create.ts | 6 + src/server/api/endpoints/blocking/delete.ts | 70 ++++ src/server/api/endpoints/clips/create.ts | 6 + src/server/api/endpoints/clips/list.ts | 10 + src/server/api/endpoints/clips/notes.ts | 10 + src/server/api/endpoints/clips/show.ts | 6 + src/server/api/endpoints/clips/update.ts | 6 + src/server/api/endpoints/drive/files/update.ts | 6 + src/server/api/endpoints/drive/folders/create.ts | 6 + src/server/api/endpoints/drive/folders/update.ts | 6 + src/server/api/endpoints/endpoints.ts | 20 ++ src/server/api/endpoints/federation/instances.ts | 11 + .../api/endpoints/federation/show-instance.ts | 7 + src/server/api/endpoints/following/create.ts | 6 + src/server/api/endpoints/following/delete.ts | 6 + .../api/endpoints/following/requests/cancel.ts | 6 + .../api/endpoints/following/requests/list.ts | 28 +- src/server/api/endpoints/games/reversi/games.ts | 107 ++++++ .../api/endpoints/games/reversi/games/show.ts | 119 +++++++ .../api/endpoints/games/reversi/invitations.ts | 43 ++- .../api/endpoints/i/get-word-muted-notes-count.ts | 11 + src/server/api/endpoints/i/page-likes.ts | 17 + src/server/api/endpoints/i/pages.ts | 10 + src/server/api/endpoints/i/pin.ts | 6 + src/server/api/endpoints/i/read-announcement.ts | 5 + src/server/api/endpoints/i/unpin.ts | 6 + src/server/api/endpoints/i/update.ts | 6 + src/server/api/endpoints/i/user-group-invites.ts | 21 ++ src/server/api/endpoints/meta.ts | 378 ++++++++++++++++++++- src/server/api/endpoints/miauth/gen-token.ts | 11 + src/server/api/endpoints/my/apps.ts | 49 +++ .../api/endpoints/notes/polls/recommendation.ts | 10 + src/server/api/endpoints/notes/state.ts | 15 + src/server/api/endpoints/notifications/create.ts | 4 + src/server/api/endpoints/promo/read.ts | 5 + src/server/api/endpoints/room/show.ts | 79 ++++- src/server/api/endpoints/room/update.ts | 1 + src/server/api/endpoints/stats.ts | 9 + src/server/api/endpoints/sw/register.ts | 16 + src/server/api/endpoints/username/available.ts | 17 + src/server/api/endpoints/users.ts | 5 + src/server/api/endpoints/users/lists/update.ts | 6 + src/server/api/endpoints/users/relation.ts | 87 +++++ src/server/api/openapi/gen-spec.ts | 2 +- src/server/api/openapi/schemas.ts | 8 + 100 files changed, 3037 insertions(+), 96 deletions(-) create mode 100644 src/models/repositories/federation-instance.ts create mode 100644 src/models/repositories/queue.ts (limited to 'src/server') diff --git a/src/models/repositories/antenna.ts b/src/models/repositories/antenna.ts index b20da26c5d..0f0a5c0171 100644 --- a/src/models/repositories/antenna.ts +++ b/src/models/repositories/antenna.ts @@ -41,20 +41,78 @@ export const packedAntennaSchema = { id: { type: 'string' as const, optional: false as const, nullable: false as const, - format: 'id', - description: 'The unique identifier for this Antenna.', - example: 'xxxxxxxxxx', + format: 'id' }, createdAt: { type: 'string' as const, optional: false as const, nullable: false as const, - format: 'date-time', - description: 'The date that the Antenna was created.' + format: 'date-time' }, name: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + keywords: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'string' as const, + optional: false as const, nullable: false as const + } + }, + execludeKeywords: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'string' as const, + optional: false as const, nullable: false as const + } + }, + src: { type: 'string' as const, optional: false as const, nullable: false as const, - description: 'The name of the Antenna.' + enum: ['home', 'all', 'users', 'list', 'group'] + }, + userListId: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'id' + }, + userGroupId: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'id' }, + users: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'string' as const, + optional: false as const, nullable: false as const + } + }, + caseSensitive: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + default: false + }, + notify: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + withReplies: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + default: false + }, + withFile: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + hasUnreadNote: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + default: false + } }, }; diff --git a/src/models/repositories/app.ts b/src/models/repositories/app.ts index f5cc10787a..33e0f41156 100644 --- a/src/models/repositories/app.ts +++ b/src/models/repositories/app.ts @@ -46,33 +46,35 @@ export const packedAppSchema = { properties: { id: { type: 'string' as const, - optional: false as const, nullable: false as const, - format: 'id', - description: 'The unique identifier for this Note.', - example: 'xxxxxxxxxx', + optional: false as const, nullable: false as const }, name: { type: 'string' as const, - optional: false as const, nullable: false as const, - description: 'アプリケーションの名前' + optional: false as const, nullable: false as const + }, + createdAt: { + type: 'string' as const, + optional: false as const, nullable: false as const }, - callbackUrl: { + lastUsedAt: { type: 'string' as const, - optional: false as const, nullable: true as const, - description: 'コールバックするURL' + optional: false as const, nullable: false as const }, permission: { type: 'array' as const, - optional: true as const, nullable: false as const, + optional: false as const, nullable: false as const, items: { type: 'string' as const, - optional: false as const, nullable: false as const, + optional: false as const, nullable: false as const } }, secret: { type: 'string' as const, - optional: true as const, nullable: false as const, - description: 'アプリケーションのシークレットキー' + optional: true as const, nullable: false as const + }, + isAuthorized: { + type: 'boolean' as const, + optional: true as const, nullable: false as const } - }, + } }; diff --git a/src/models/repositories/drive-file.ts b/src/models/repositories/drive-file.ts index 3d013b8bb2..5085c76e92 100644 --- a/src/models/repositories/drive-file.ts +++ b/src/models/repositories/drive-file.ts @@ -182,12 +182,52 @@ export const packedDriveFileSchema = { description: 'The size of this Drive file. (bytes)', example: 51469 }, + isSensitive: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + description: 'Whether this Drive file is sensitive.', + }, + blurhash: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + properties: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + width: { + type: 'number' as const, + optional: false as const, nullable: false as const, + example: 1280 + }, + height: { + type: 'number' as const, + optional: false as const, nullable: false as const, + example: 720 + }, + avgColor: { + type: 'string' as const, + optional: true as const, nullable: false as const, + example: 'rgb(40,65,87)' + } + } + }, url: { type: 'string' as const, optional: false as const, nullable: true as const, format: 'url', description: 'The URL of this Drive file.', }, + thumbnailUrl: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'url', + description: 'The thumbnail URL of this Drive file.', + }, + comment: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, folderId: { type: 'string' as const, optional: false as const, nullable: true as const, @@ -195,10 +235,24 @@ export const packedDriveFileSchema = { description: 'The parent folder ID of this Drive file.', example: 'xxxxxxxxxx', }, - isSensitive: { - type: 'boolean' as const, - optional: false as const, nullable: false as const, - description: 'Whether this Drive file is sensitive.', + folder: { + type: 'object' as const, + optional: true as const, nullable: true as const, + description: 'The parent folder of this Drive file.', + ref: 'DriveFolder' }, + userId: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'id', + description: 'Owner ID of this Drive file.', + example: 'xxxxxxxxxx', + }, + user: { + type: 'object' as const, + optional: true as const, nullable: true as const, + description: 'Owner of this Drive file.', + ref: 'User' + } }, }; diff --git a/src/models/repositories/federation-instance.ts b/src/models/repositories/federation-instance.ts new file mode 100644 index 0000000000..c6b08dc101 --- /dev/null +++ b/src/models/repositories/federation-instance.ts @@ -0,0 +1,106 @@ +import config from '../../config'; + +export const packedFederationInstanceSchema = { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + caughtAt: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'date-time' + }, + host: { + type: 'string' as const, + optional: false as const, nullable: false as const, + example: 'misskey.example.com' + }, + usersCount: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + notesCount: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + followingCount: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + followersCount: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + driveUsage: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + driveFiles: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + latestRequestSentAt: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'date-time' + }, + lastCommunicatedAt: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'date-time' + }, + isNotResponding: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + isSuspended: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + softwareName: { + type: 'string' as const, + optional: false as const, nullable: true as const, + example: 'misskey' + }, + softwareVersion: { + type: 'string' as const, + optional: false as const, nullable: true as const, + example: config.version + }, + openRegistrations: { + type: 'boolean' as const, + optional: false as const, nullable: true as const, + example: true + }, + name: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + description: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + maintainerName: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + maintainerEmail: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + iconUrl: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'url' + }, + infoUpdatedAt: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'date-time' + } + } +}; diff --git a/src/models/repositories/queue.ts b/src/models/repositories/queue.ts new file mode 100644 index 0000000000..161751ddc8 --- /dev/null +++ b/src/models/repositories/queue.ts @@ -0,0 +1,30 @@ +export const packedQueueCountSchema = { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + waiting: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + active: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + completed: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + failed: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + delayed: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + paused: { + type: 'number' as const, + optional: false as const, nullable: false as const + } + } +}; diff --git a/src/models/repositories/user.ts b/src/models/repositories/user.ts index 7502e7a08e..3a6ab48c5f 100644 --- a/src/models/repositories/user.ts +++ b/src/models/repositories/user.ts @@ -330,22 +330,22 @@ export const packedUserSchema = { description: 'The unique identifier for this User.', example: 'xxxxxxxxxx', }, + name: { + type: 'string' as const, + nullable: true as const, optional: false as const, + description: 'The name of the user, as they’ve defined it.', + example: '藍' + }, username: { type: 'string' as const, nullable: false as const, optional: false as const, description: 'The screen name, handle, or alias that this user identifies themselves with.', example: 'ai' }, - name: { + host: { type: 'string' as const, nullable: true as const, optional: false as const, - description: 'The name of the user, as they’ve defined it.', - example: '藍' - }, - url: { - type: 'string' as const, - format: 'url', - nullable: true as const, optional: true as const, + example: 'misskey.example.com' }, avatarUrl: { type: 'string' as const, @@ -356,6 +356,80 @@ export const packedUserSchema = { type: 'any' as const, nullable: true as const, optional: false as const, }, + avatarColor: { + type: 'any' as const, + nullable: true as const, optional: false as const, + default: null + }, + isAdmin: { + type: 'boolean' as const, + nullable: false as const, optional: false as const, + description: 'Whether this account is the admin.', + default: false + }, + isModerator: { + type: 'boolean' as const, + nullable: false as const, optional: false as const, + description: 'Whether this account is a moderator.', + default: false + }, + isBot: { + type: 'boolean' as const, + nullable: false as const, optional: true as const, + description: 'Whether this account is a bot.' + }, + isCat: { + type: 'boolean' as const, + nullable: false as const, optional: true as const, + description: 'Whether this account is a cat.' + }, + emojis: { + type: 'array' as const, + nullable: false as const, optional: false as const, + items: { + type: 'object' as const, + nullable: false as const, optional: false as const, + properties: { + name: { + type: 'string' as const, + nullable: false as const, optional: false as const + }, + host: { + type: 'string' as const, + nullable: true as const, optional: false as const + }, + url: { + type: 'string' as const, + nullable: false as const, optional: false as const, + format: 'url' + }, + aliases: { + type: 'array' as const, + nullable: false as const, optional: false as const, + items: { + type: 'string' as const, + nullable: false as const, optional: false as const + } + } + } + } + }, + url: { + type: 'string' as const, + format: 'url', + nullable: true as const, optional: true as const, + }, + createdAt: { + type: 'string' as const, + nullable: false as const, optional: true as const, + format: 'date-time', + description: 'The date that the user account was created on Misskey.' + }, + updatedAt: { + type: 'string' as const, + nullable: true as const, optional: true as const, + format: 'date-time', + }, bannerUrl: { type: 'string' as const, format: 'url', @@ -365,14 +439,19 @@ export const packedUserSchema = { type: 'any' as const, nullable: true as const, optional: true as const, }, - emojis: { + bannerColor: { type: 'any' as const, - nullable: true as const, optional: false as const, + nullable: true as const, optional: true as const, + default: null }, - host: { - type: 'string' as const, - nullable: true as const, optional: false as const, - example: 'misskey.example.com' + isLocked: { + type: 'boolean' as const, + nullable: false as const, optional: true as const, + }, + isSuspended: { + type: 'boolean' as const, + nullable: false as const, optional: false as const, + example: false }, description: { type: 'string' as const, @@ -380,25 +459,33 @@ export const packedUserSchema = { description: 'The user-defined UTF-8 string describing their account.', example: 'Hi masters, I am Ai!' }, - birthday: { + location: { type: 'string' as const, nullable: true as const, optional: true as const, - example: '2018-03-12' - }, - createdAt: { - type: 'string' as const, - nullable: false as const, optional: true as const, - format: 'date-time', - description: 'The date that the user account was created on Misskey.' }, - updatedAt: { + birthday: { type: 'string' as const, nullable: true as const, optional: true as const, - format: 'date-time', + example: '2018-03-12' }, - location: { - type: 'string' as const, - nullable: true as const, optional: true as const, + fields: { + type: 'array' as const, + nullable: false as const, optional: false as const, + items: { + type: 'object' as const, + nullable: false as const, optional: false as const, + properties: { + name: { + type: 'string' as const, + nullable: false as const, optional: false as const + }, + value: { + type: 'string' as const, + nullable: false as const, optional: false as const + } + }, + maxLength: 4 + } }, followersCount: { type: 'number' as const, @@ -415,11 +502,6 @@ export const packedUserSchema = { nullable: false as const, optional: true as const, description: 'The number of Notes (including renotes) issued by the user.' }, - isBot: { - type: 'boolean' as const, - nullable: false as const, optional: true as const, - description: 'Whether this account is a bot.' - }, pinnedNoteIds: { type: 'array' as const, nullable: false as const, optional: true as const, @@ -438,32 +520,131 @@ export const packedUserSchema = { ref: 'Note' } }, - isCat: { + pinnedPageId: { + type: 'string' as const, + nullable: true as const, optional: false as const + }, + pinnedPage: { + type: 'object' as const, + nullable: true as const, optional: false as const, + ref: 'Page' + }, + twoFactorEnabled: { + type: 'boolean' as const, + nullable: false as const, optional: false as const, + default: false + }, + usePasswordLessLogin: { + type: 'boolean' as const, + nullable: false as const, optional: false as const, + default: false + }, + securityKeys: { + type: 'boolean' as const, + nullable: false as const, optional: false as const, + default: false + }, + avatarId: { + type: 'string' as const, + nullable: true as const, optional: true as const, + format: 'id' + }, + bannerId: { + type: 'string' as const, + nullable: true as const, optional: true as const, + format: 'id' + }, + autoWatch: { + type: 'boolean' as const, + nullable: false as const, optional: true as const + }, + injectFeaturedNote: { + type: 'boolean' as const, + nullable: false as const, optional: true as const + }, + alwaysMarkNsfw: { + type: 'boolean' as const, + nullable: false as const, optional: true as const + }, + carefulBot: { + type: 'boolean' as const, + nullable: false as const, optional: true as const + }, + autoAcceptFollowed: { + type: 'boolean' as const, + nullable: false as const, optional: true as const + }, + hasUnreadSpecifiedNotes: { type: 'boolean' as const, nullable: false as const, optional: true as const, - description: 'Whether this account is a cat.' }, - isAdmin: { + hasUnreadMentions: { type: 'boolean' as const, nullable: false as const, optional: true as const, - description: 'Whether this account is the admin.' }, - isModerator: { + hasUnreadAnnouncement: { type: 'boolean' as const, nullable: false as const, optional: true as const, - description: 'Whether this account is a moderator.' }, - isLocked: { + hasUnreadAntenna: { type: 'boolean' as const, nullable: false as const, optional: true as const, }, - hasUnreadSpecifiedNotes: { + hasUnreadChannel: { type: 'boolean' as const, nullable: false as const, optional: true as const, }, - hasUnreadMentions: { + hasUnreadMessagingMessage: { type: 'boolean' as const, nullable: false as const, optional: true as const, }, + hasUnreadNotification: { + type: 'boolean' as const, + nullable: false as const, optional: true as const, + }, + hasPendingReceivedFollowRequest: { + type: 'boolean' as const, + nullable: false as const, optional: true as const, + }, + integrations: { + type: 'object' as const, + nullable: false as const, optional: true as const + }, + mutedWords: { + type: 'array' as const, + nullable: false as const, optional: true as const + }, + mutingNotificationTypes: { + type: 'array' as const, + nullable: false as const, optional: true as const + }, + isFollowing: { + type: 'boolean' as const, + optional: true as const, nullable: false as const + }, + hasPendingFollowRequestFromYou: { + type: 'boolean' as const, + optional: true as const, nullable: false as const + }, + hasPendingFollowRequestToYou: { + type: 'boolean' as const, + optional: true as const, nullable: false as const + }, + isFollowed: { + type: 'boolean' as const, + optional: true as const, nullable: false as const + }, + isBlocking: { + type: 'boolean' as const, + optional: true as const, nullable: false as const + }, + isBlocked: { + type: 'boolean' as const, + optional: true as const, nullable: false as const + }, + isMuted: { + type: 'boolean' as const, + optional: true as const, nullable: false as const + } }, }; diff --git a/src/server/api/endpoints/admin/abuse-user-reports.ts b/src/server/api/endpoints/admin/abuse-user-reports.ts index 6a7f380e16..d63997d203 100644 --- a/src/server/api/endpoints/admin/abuse-user-reports.ts +++ b/src/server/api/endpoints/admin/abuse-user-reports.ts @@ -5,6 +5,11 @@ import { AbuseUserReports } from '../../../../models'; import { makePaginationQuery } from '../../common/make-pagination-query'; export const meta = { + desc: { + 'ja-JP': '通報一覧を表示します。', + 'en-US': 'Show list of abuse user reports.' + }, + tags: ['admin'], requireCredential: true as const, @@ -46,6 +51,74 @@ export const meta = { ]), default: 'combined' }, + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + nullable: false as const, optional: false as const, + format: 'id', + description: 'The unique identifier for this User.', + example: 'xxxxxxxxxx', + }, + createdAt: { + type: 'string' as const, + nullable: false as const, optional: false as const, + format: 'date-time', + description: 'The date that the abuse user report was created on Misskey.' + }, + comment: { + type: 'string' as const, + nullable: false as const, optional: false as const, + description: 'The content of the report.', + }, + resolved: { + type: 'boolean' as const, + nullable: false as const, optional: false as const, + description: 'Returns whether this report has been resolved', + example: false + }, + reporterId: { + type: 'string' as const, + nullable: false as const, optional: false as const, + format: 'id', + description: 'Reporter\'s user ID.' + }, + targetUserId: { + type: 'string' as const, + nullable: false as const, optional: false as const, + format: 'id', + description: 'User ID of the person to be reported.' + }, + assigneeId: { + type: 'string' as const, + nullable: true as const, optional: false as const, + format: 'id', + description: 'User ID of the person who responded to the report.' + }, + reporter: { + type: 'object' as const, + nullable: false as const, optional: false as const, + ref: 'User' + }, + targetUser: { + type: 'object' as const, + nullable: false as const, optional: false as const, + ref: 'User' + }, + assignee: { + type: 'object' as const, + nullable: true as const, optional: true as const, + ref: 'User' + } + } + } } }; diff --git a/src/server/api/endpoints/admin/accounts/create.ts b/src/server/api/endpoints/admin/accounts/create.ts index 98e5642bed..27ceca158b 100644 --- a/src/server/api/endpoints/admin/accounts/create.ts +++ b/src/server/api/endpoints/admin/accounts/create.ts @@ -3,6 +3,11 @@ import { Users } from '../../../../../models'; import { signup } from '../../../common/signup'; export const meta = { + desc: { + 'ja-JP': 'アカウントを作成します。', + 'en-US': 'Create a account.' + }, + tags: ['admin'], params: { @@ -13,6 +18,19 @@ export const meta = { password: { validator: Users.validatePassword, } + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User', + properties: { + token: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Token to access this user.' + } + } } }; diff --git a/src/server/api/endpoints/admin/announcements/create.ts b/src/server/api/endpoints/admin/announcements/create.ts index f9fb30f49f..dc01621c75 100644 --- a/src/server/api/endpoints/admin/announcements/create.ts +++ b/src/server/api/endpoints/admin/announcements/create.ts @@ -4,6 +4,11 @@ import { Announcements } from '../../../../../models'; import { genId } from '../../../../../misc/gen-id'; export const meta = { + desc: { + 'ja-JP': 'アナウンスを作成します。', + 'en-US': 'Create a announcement.' + }, + tags: ['admin'], requireCredential: true as const, @@ -19,6 +24,47 @@ export const meta = { imageUrl: { validator: $.nullable.str.min(1) } + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id', + description: 'The unique identifier for this Announcement.', + example: 'xxxxxxxxxx', + }, + createdAt: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'date-time', + description: 'The date that the Announcement was created.' + }, + updatedAt: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'date-time', + description: 'The date that the Announcement was updated.' + }, + title: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Announcement title.' + }, + text: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Announcement text.' + }, + imageUrl: { + type: 'string' as const, + optional: false as const, nullable: true as const, + description: 'Announcement image.' + } + } } }; diff --git a/src/server/api/endpoints/admin/announcements/delete.ts b/src/server/api/endpoints/admin/announcements/delete.ts index 1b7a0bf921..6c9c065757 100644 --- a/src/server/api/endpoints/admin/announcements/delete.ts +++ b/src/server/api/endpoints/admin/announcements/delete.ts @@ -10,6 +10,11 @@ export const meta = { requireCredential: true as const, requireModerator: true, + desc: { + 'ja-JP': 'アナウンスを削除します。', + 'en-US': 'Delete a announcement.' + }, + params: { id: { validator: $.type(ID) diff --git a/src/server/api/endpoints/admin/announcements/list.ts b/src/server/api/endpoints/admin/announcements/list.ts index 4c3af5a318..5489b0d2c7 100644 --- a/src/server/api/endpoints/admin/announcements/list.ts +++ b/src/server/api/endpoints/admin/announcements/list.ts @@ -5,6 +5,11 @@ import { Announcements, AnnouncementReads } from '../../../../../models'; import { makePaginationQuery } from '../../../common/make-pagination-query'; export const meta = { + desc: { + 'ja-JP': 'アナウンスのリストを表示します。', + 'en-US': 'List announcements.' + }, + tags: ['admin'], requireCredential: true as const, @@ -23,6 +28,56 @@ export const meta = { untilId: { validator: $.optional.type(ID), }, + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id', + description: 'The unique identifier for this Announcement.', + example: 'xxxxxxxxxx', + }, + createdAt: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'date-time', + description: 'The date that the Announcement was created.' + }, + updatedAt: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'date-time', + description: 'The date that the Announcement was updated.' + }, + text: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Announcement text.' + }, + title: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Announcement title.' + }, + imageUrl: { + type: 'string' as const, + optional: false as const, nullable: true as const, + description: 'Announcement image.' + }, + reads: { + type: 'number' as const, + optional: false as const, nullable: false as const, + description: 'Number of people who read this announcement.' + } + } + } } }; diff --git a/src/server/api/endpoints/admin/announcements/update.ts b/src/server/api/endpoints/admin/announcements/update.ts index fd24f8cc8e..9c4165eae0 100644 --- a/src/server/api/endpoints/admin/announcements/update.ts +++ b/src/server/api/endpoints/admin/announcements/update.ts @@ -5,6 +5,11 @@ import { Announcements } from '../../../../../models'; import { ApiError } from '../../../error'; export const meta = { + desc: { + 'ja-JP': 'アナウンスの内容を変更します。', + 'en-US': 'Update a annoucement.' + }, + tags: ['admin'], requireCredential: true as const, diff --git a/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts b/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts index 83397f1079..9da3b632ac 100644 --- a/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts +++ b/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts @@ -5,6 +5,11 @@ import { DriveFiles } from '../../../../models'; import { ID } from '../../../../misc/cafy-id'; export const meta = { + desc: { + 'ja-JP': '対象のユーザーのファイルを全て削除します。', + 'en-US': 'Delete all files to specified user.' + }, + tags: ['admin'], requireCredential: true as const, diff --git a/src/server/api/endpoints/admin/delete-logs.ts b/src/server/api/endpoints/admin/delete-logs.ts index 9cb9f809d7..3719387312 100644 --- a/src/server/api/endpoints/admin/delete-logs.ts +++ b/src/server/api/endpoints/admin/delete-logs.ts @@ -2,6 +2,11 @@ import define from '../../define'; import { Logs } from '../../../../models'; export const meta = { + desc: { + 'ja-JP': 'ログを全て削除します。', + 'en-US': 'Delete all logs.' + }, + tags: ['admin'], requireCredential: true as const, diff --git a/src/server/api/endpoints/admin/drive/clean-remote-files.ts b/src/server/api/endpoints/admin/drive/clean-remote-files.ts index 5a5adb8a8b..20856da1cf 100644 --- a/src/server/api/endpoints/admin/drive/clean-remote-files.ts +++ b/src/server/api/endpoints/admin/drive/clean-remote-files.ts @@ -2,6 +2,11 @@ import define from '../../../define'; import { createCleanRemoteFilesJob } from '../../../../../queue'; export const meta = { + desc: { + 'ja-JP': 'キャッシュされたリモートファイルをすべて削除します。', + 'en-US': 'Deletes all cached remote files.' + }, + tags: ['admin'], requireCredential: true as const, diff --git a/src/server/api/endpoints/admin/drive/cleanup.ts b/src/server/api/endpoints/admin/drive/cleanup.ts index b76236a7f0..f4867597f3 100644 --- a/src/server/api/endpoints/admin/drive/cleanup.ts +++ b/src/server/api/endpoints/admin/drive/cleanup.ts @@ -4,6 +4,11 @@ import { deleteFile } from '../../../../../services/drive/delete-file'; import { DriveFiles } from '../../../../../models'; export const meta = { + desc: { + 'ja-JP': '使用されていないユーザーのファイルを削除します。', + 'en-US': 'Delete the unused user\'s files.' + }, + tags: ['admin'], requireCredential: true as const, diff --git a/src/server/api/endpoints/admin/drive/files.ts b/src/server/api/endpoints/admin/drive/files.ts index f6296b8947..496050d2df 100644 --- a/src/server/api/endpoints/admin/drive/files.ts +++ b/src/server/api/endpoints/admin/drive/files.ts @@ -5,6 +5,11 @@ import { makePaginationQuery } from '../../../common/make-pagination-query'; import { ID } from '../../../../../misc/cafy-id'; export const meta = { + desc: { + 'ja-JP': '管理用のドライブの一覧を表示します。', + 'en-US': 'Displays a list of management drives.' + }, + tags: ['admin'], requireCredential: false as const, @@ -41,6 +46,16 @@ export const meta = { validator: $.optional.nullable.str, default: null }, + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'DriveFile' + } } }; diff --git a/src/server/api/endpoints/admin/drive/show-file.ts b/src/server/api/endpoints/admin/drive/show-file.ts index 36403bb1c3..96478a1c7d 100644 --- a/src/server/api/endpoints/admin/drive/show-file.ts +++ b/src/server/api/endpoints/admin/drive/show-file.ts @@ -26,6 +26,154 @@ export const meta = { code: 'NO_SUCH_FILE', id: 'caf3ca38-c6e5-472e-a30c-b05377dcc240' } + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id', + description: 'The unique identifier for this Drive file.', + example: 'xxxxxxxxxx', + }, + createdAt: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'date-time', + description: 'The date that the Drive file was created on Misskey.' + }, + userId: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'id', + description: 'Owner ID of this Drive file.', + example: 'xxxxxxxxxx', + }, + userHost: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + md5: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'md5', + description: 'The MD5 hash of this Drive file.', + example: '15eca7fba0480996e2245f5185bf39f2' + }, + name: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'The file name with extension.', + example: 'lenna.jpg' + }, + type: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'The MIME type of this Drive file.', + example: 'image/jpeg' + }, + size: { + type: 'number' as const, + optional: false as const, nullable: false as const, + description: 'The size of this Drive file. (bytes)', + example: 51469 + }, + comment: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + blurhash: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + properties: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + width: { + type: 'number' as const, + optional: false as const, nullable: false as const, + example: 1280 + }, + height: { + type: 'number' as const, + optional: false as const, nullable: false as const, + example: 720 + }, + avgColor: { + type: 'string' as const, + optional: true as const, nullable: false as const, + example: 'rgb(40,65,87)' + } + } + }, + storedInternal: { + type: 'boolean' as const, + optional: false as const, nullable: true as const, + description: 'Indicates whether this file is stored in the same location as Misskey itself', + example: true + }, + url: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'url', + description: 'The URL of this Drive file.', + }, + thumbnailUrl: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'url', + description: 'The thumbnail URL of this Drive file.', + }, + webpublicUrl: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'url', + description: 'The public URL of this Drive file.', + }, + accessKey: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Access key to access this file' + }, + thumbnailAccessKey: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Access key to access this file for thumbnail' + }, + webpublicAccessKey: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Access key to access this file for webpublic' + }, + uri: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + src: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + folderId: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'id', + description: 'The parent folder ID of this Drive file.', + example: 'xxxxxxxxxx', + }, + isSensitive: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + description: 'Whether this Drive file is sensitive.', + }, + isLink: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + } + } } }; diff --git a/src/server/api/endpoints/admin/emoji/copy.ts b/src/server/api/endpoints/admin/emoji/copy.ts index 5d4e57a28f..5c3c4f6fc5 100644 --- a/src/server/api/endpoints/admin/emoji/copy.ts +++ b/src/server/api/endpoints/admin/emoji/copy.ts @@ -9,6 +9,11 @@ import { ID } from '../../../../../misc/cafy-id'; import uploadFromUrl from '../../../../../services/drive/upload-from-url'; export const meta = { + desc: { + 'ja-JP': '選択したカスタム絵文字をコピーします。', + 'en-US': 'Copies the selected custom emoji.' + }, + tags: ['admin'], requireCredential: true as const, @@ -26,6 +31,19 @@ export const meta = { code: 'NO_SUCH_EMOJI', id: 'e2785b66-dca3-4087-9cac-b93c541cc425' } + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id', + description: 'New copied emoji ID' + } + } } }; diff --git a/src/server/api/endpoints/admin/emoji/list-remote.ts b/src/server/api/endpoints/admin/emoji/list-remote.ts index cbdcaa681c..81029fbbba 100644 --- a/src/server/api/endpoints/admin/emoji/list-remote.ts +++ b/src/server/api/endpoints/admin/emoji/list-remote.ts @@ -7,7 +7,8 @@ import { ID } from '../../../../../misc/cafy-id'; export const meta = { desc: { - 'ja-JP': 'カスタム絵文字を取得します。' + 'ja-JP': 'リモートのカスタム絵文字一覧を取得します。', + 'en-US': 'Gets a list of remote custom emojis.' }, tags: ['admin'], @@ -38,6 +39,52 @@ export const meta = { untilId: { validator: $.optional.type(ID), } + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id', + description: 'The unique identifier for this Emoji.' + }, + aliases: { + type: 'array' as const, + optional: false as const, nullable: false as const, + description: 'List to make it easier to be displayed as a candidate when entering emoji.', + items: { + type: 'string' as const, + optional: false as const, nullable: false as const + } + }, + name: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Official name of custom emoji.' + }, + category: { + type: 'string' as const, + optional: false as const, nullable: true as const, + description: 'Names categorized in the emoji list.' + }, + host: { + type: 'string' as const, + optional: false as const, nullable: true as const, + description: 'If it is another server, the FQDN will be returned here.' + }, + url: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Image URL of emoji.' + } + } + } } }; diff --git a/src/server/api/endpoints/admin/emoji/list.ts b/src/server/api/endpoints/admin/emoji/list.ts index bd3e294851..6d042b0afd 100644 --- a/src/server/api/endpoints/admin/emoji/list.ts +++ b/src/server/api/endpoints/admin/emoji/list.ts @@ -7,7 +7,8 @@ import { Emoji } from '../../../../../models/entities/emoji'; export const meta = { desc: { - 'ja-JP': 'カスタム絵文字を取得します。' + 'ja-JP': 'カスタム絵文字一覧を取得します。', + 'en-US': 'List custom emojis.' }, tags: ['admin'], @@ -33,6 +34,52 @@ export const meta = { untilId: { validator: $.optional.type(ID), } + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id', + description: 'The unique identifier for this Emoji.' + }, + aliases: { + type: 'array' as const, + optional: false as const, nullable: false as const, + description: 'List to make it easier to be displayed as a candidate when entering emoji.', + items: { + type: 'string' as const, + optional: false as const, nullable: false as const + } + }, + name: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Official name of custom emoji.' + }, + category: { + type: 'string' as const, + optional: false as const, nullable: true as const, + description: 'Names categorized in the emoji list.' + }, + host: { + type: 'string' as const, + optional: false as const, nullable: true as const, + description: 'If it is another server, the FQDN will be returned here.' + }, + url: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Image URL of emoji.' + } + } + } } }; diff --git a/src/server/api/endpoints/admin/federation/delete-all-files.ts b/src/server/api/endpoints/admin/federation/delete-all-files.ts index eef53cd92c..c0a8c94f4c 100644 --- a/src/server/api/endpoints/admin/federation/delete-all-files.ts +++ b/src/server/api/endpoints/admin/federation/delete-all-files.ts @@ -4,6 +4,11 @@ import { deleteFile } from '../../../../../services/drive/delete-file'; import { DriveFiles } from '../../../../../models'; export const meta = { + desc: { + 'ja-JP': '指定したドメインのファイルを全て削除します。', + 'en-US': 'Deletes all files in the specified domain.' + }, + tags: ['admin'], requireCredential: true as const, diff --git a/src/server/api/endpoints/admin/federation/remove-all-following.ts b/src/server/api/endpoints/admin/federation/remove-all-following.ts index e593193552..4a6f6e6261 100644 --- a/src/server/api/endpoints/admin/federation/remove-all-following.ts +++ b/src/server/api/endpoints/admin/federation/remove-all-following.ts @@ -4,6 +4,11 @@ import deleteFollowing from '../../../../../services/following/delete'; import { Followings, Users } from '../../../../../models'; export const meta = { + desc: { + 'ja-JP': '指定したドメインの全ユーザーのフォローを全て解除します。', + 'en-US': 'Unfollow all users in the specified domain.' + }, + tags: ['admin'], requireCredential: true as const, diff --git a/src/server/api/endpoints/admin/federation/update-instance.ts b/src/server/api/endpoints/admin/federation/update-instance.ts index 8f8b3334b3..7206e4fb2e 100644 --- a/src/server/api/endpoints/admin/federation/update-instance.ts +++ b/src/server/api/endpoints/admin/federation/update-instance.ts @@ -4,6 +4,11 @@ import { Instances } from '../../../../../models'; import { toPuny } from '../../../../../misc/convert-host'; export const meta = { + desc: { + 'ja-JP': '指定したドメインのアクティビティの配信を停止するかを選択します。', + 'en-US': 'Select whether to undeliver the activity for the specified domain.' + }, + tags: ['admin'], requireCredential: true as const, diff --git a/src/server/api/endpoints/admin/get-table-stats.ts b/src/server/api/endpoints/admin/get-table-stats.ts index eb9f26fc05..351c230033 100644 --- a/src/server/api/endpoints/admin/get-table-stats.ts +++ b/src/server/api/endpoints/admin/get-table-stats.ts @@ -6,6 +6,7 @@ export const meta = { requireModerator: true, desc: { + 'ja-JP': 'テーブル情報を取得します。', 'en-US': 'Get table stats' }, @@ -13,6 +14,17 @@ export const meta = { params: { }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + example: { + migrations: { + count: 66, + size: 32768 + }, + } + } }; export default define(meta, async () => { diff --git a/src/server/api/endpoints/admin/invite.ts b/src/server/api/endpoints/admin/invite.ts index 52e3da8f84..4529d16adf 100644 --- a/src/server/api/endpoints/admin/invite.ts +++ b/src/server/api/endpoints/admin/invite.ts @@ -5,7 +5,8 @@ import { genId } from '../../../../misc/gen-id'; export const meta = { desc: { - 'ja-JP': '招待コードを発行します。' + 'ja-JP': '招待コードを発行します。', + 'en-US': 'Issue an invitation code.' }, tags: ['admin'], @@ -13,7 +14,22 @@ export const meta = { requireCredential: true as const, requireModerator: true, - params: {} + params: {}, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + code: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Give this code to the applicant for registration.', + example: '2ERUA5VR', + maxLength: 8, + minLength: 8 + } + } + } }; export default define(meta, async () => { diff --git a/src/server/api/endpoints/admin/logs.ts b/src/server/api/endpoints/admin/logs.ts index fef2eab80b..5e19b1a6f4 100644 --- a/src/server/api/endpoints/admin/logs.ts +++ b/src/server/api/endpoints/admin/logs.ts @@ -4,6 +4,11 @@ import { Logs } from '../../../../models'; import { Brackets } from 'typeorm'; export const meta = { + desc: { + 'ja-JP': 'ログを表示します。', + 'en-US': 'Show logs.' + }, + tags: ['admin'], requireCredential: true as const, @@ -24,6 +29,60 @@ export const meta = { validator: $.optional.nullable.str, default: null as any } + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id', + description: 'The unique identifier for this log.', + example: 'xxxxxxxxxx', + }, + createdAt: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'date-time', + description: 'The date that the Drive file was created on Misskey.' + }, + domain: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'string' as const, + optional: true as const, nullable: false as const + } + }, + level: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + worker: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + machine: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'The name of the running machine.' + }, + message: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Log body.' + }, + data: { + type: 'object' as const, + optional: false as const, nullable: false as const + } + } + } } }; diff --git a/src/server/api/endpoints/admin/promo/create.ts b/src/server/api/endpoints/admin/promo/create.ts index e3c03d2f4b..8b96d563c2 100644 --- a/src/server/api/endpoints/admin/promo/create.ts +++ b/src/server/api/endpoints/admin/promo/create.ts @@ -6,6 +6,11 @@ import { getNote } from '../../../common/getters'; import { PromoNotes } from '../../../../../models'; export const meta = { + desc: { + 'ja-JP': 'プロモーションを作成します。', + 'en-US': 'Create a promotion.' + }, + tags: ['admin'], requireCredential: true as const, diff --git a/src/server/api/endpoints/admin/queue/clear.ts b/src/server/api/endpoints/admin/queue/clear.ts index 0375f55f01..bc55a02ec1 100644 --- a/src/server/api/endpoints/admin/queue/clear.ts +++ b/src/server/api/endpoints/admin/queue/clear.ts @@ -3,6 +3,11 @@ import { destroy } from '../../../../../queue'; import { insertModerationLog } from '../../../../../services/insert-moderation-log'; export const meta = { + desc: { + 'ja-JP': 'ジョブキューを全て削除します。', + 'en-US': 'Delete all job queues.' + }, + tags: ['admin'], requireCredential: true as const, diff --git a/src/server/api/endpoints/admin/queue/deliver-delayed.ts b/src/server/api/endpoints/admin/queue/deliver-delayed.ts index 6bfb5b50fe..221aa35e48 100644 --- a/src/server/api/endpoints/admin/queue/deliver-delayed.ts +++ b/src/server/api/endpoints/admin/queue/deliver-delayed.ts @@ -2,12 +2,42 @@ import define from '../../../define'; import { deliverQueue } from '../../../../../queue'; export const meta = { + desc: { + 'ja-JP': '他サーバーへ送るキューの遅延一覧を返します。', + 'en-US': 'Returns a list of delays in queues sent to other servers.' + }, + tags: ['admin'], requireCredential: true as const, requireModerator: true, params: { + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + anyOf: [ + { + type: 'string' as const, + description: 'FQDN to fediverse server' + }, + { + type: 'number' as const, + description: 'Delayed queue counts' + } + ] + } + }, + example: [[ + 'example.com', + 12 + ]] } }; diff --git a/src/server/api/endpoints/admin/queue/inbox-delayed.ts b/src/server/api/endpoints/admin/queue/inbox-delayed.ts index 4627cefdd8..52f67cb514 100644 --- a/src/server/api/endpoints/admin/queue/inbox-delayed.ts +++ b/src/server/api/endpoints/admin/queue/inbox-delayed.ts @@ -2,12 +2,42 @@ import define from '../../../define'; import { inboxQueue } from '../../../../../queue'; export const meta = { + desc: { + 'ja-JP': 'このサーバーへのキューの遅延一覧を返します。', + 'en-US': 'Returns a list of queue delays to this server.' + }, + tags: ['admin'], requireCredential: true as const, requireModerator: true, params: { + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + anyOf: [ + { + type: 'string' as const, + description: 'FQDN to fediverse server' + }, + { + type: 'number' as const, + description: 'Delayed queue counts' + } + ] + } + }, + example: [[ + 'example.com', + 12 + ]] } }; diff --git a/src/server/api/endpoints/admin/queue/jobs.ts b/src/server/api/endpoints/admin/queue/jobs.ts index 0cd3f40d4e..5ab78e3c48 100644 --- a/src/server/api/endpoints/admin/queue/jobs.ts +++ b/src/server/api/endpoints/admin/queue/jobs.ts @@ -3,6 +3,11 @@ import define from '../../../define'; import { deliverQueue, inboxQueue, dbQueue, objectStorageQueue } from '../../../../../queue'; export const meta = { + desc: { + 'ja-JP': 'ジョブ一覧を表示します。', + 'en-US': 'Display the job list.' + }, + tags: ['admin'], requireCredential: true as const, @@ -21,6 +26,38 @@ export const meta = { validator: $.optional.num, default: 50 }, + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + data: { + type: 'object' as const, + optional: false as const, nullable: false as const + }, + attempts: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + maxAttempts: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + timestamp: { + type: 'number' as const, + optional: false as const, nullable: false as const + } + } + } } }; diff --git a/src/server/api/endpoints/admin/queue/stats.ts b/src/server/api/endpoints/admin/queue/stats.ts index da29c5285e..bd64d2ac06 100644 --- a/src/server/api/endpoints/admin/queue/stats.ts +++ b/src/server/api/endpoints/admin/queue/stats.ts @@ -2,12 +2,36 @@ import define from '../../../define'; import { deliverQueue, inboxQueue, dbQueue, objectStorageQueue } from '../../../../../queue'; export const meta = { + desc: { + 'ja-JP': 'キューの状態を返します。', + 'en-US': 'Returns the status of the queue.' + }, + tags: ['admin'], requireCredential: true as const, requireModerator: true, - params: {} + params: {}, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + deliver: { + ref: 'QueueCount' + }, + inbox: { + ref: 'QueueCount' + }, + db: { + ref: 'QueueCount' + }, + objectStorage: { + ref: 'QueueCount' + } + } + } }; export default define(meta, async (ps) => { diff --git a/src/server/api/endpoints/admin/relays/add.ts b/src/server/api/endpoints/admin/relays/add.ts index bcda1050e8..831e05c835 100644 --- a/src/server/api/endpoints/admin/relays/add.ts +++ b/src/server/api/endpoints/admin/relays/add.ts @@ -5,7 +5,8 @@ import { ApiError } from '../../../error'; export const meta = { desc: { - 'ja-JP': 'Add relay' + 'ja-JP': 'リレーを追加します。', + 'en-US': 'Add relay' }, tags: ['admin'], @@ -25,6 +26,33 @@ export const meta = { code: 'INVALID_URL', id: 'fb8c92d3-d4e5-44e7-b3d4-800d5cef8b2c' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + inbox: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'url' + }, + status: { + type: 'string' as const, + optional: false as const, nullable: false as const, + default: 'requesting', + enum: [ + 'requesting', + 'accepted', + 'rejected' + ] + } + } } }; diff --git a/src/server/api/endpoints/admin/relays/list.ts b/src/server/api/endpoints/admin/relays/list.ts index 3b132f73b3..da05ac0a24 100644 --- a/src/server/api/endpoints/admin/relays/list.ts +++ b/src/server/api/endpoints/admin/relays/list.ts @@ -3,7 +3,8 @@ import { listRelay } from '../../../../../services/relay'; export const meta = { desc: { - 'ja-JP': 'List relay' + 'ja-JP': 'リレー一覧を表示します。', + 'en-US': 'List relay' }, tags: ['admin'], @@ -13,6 +14,37 @@ export const meta = { params: { }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + inbox: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'url' + }, + status: { + type: 'string' as const, + optional: false as const, nullable: false as const, + default: 'requesting', + enum: [ + 'requesting', + 'accepted', + 'rejected' + ] + } + } + } + } }; export default define(meta, async (ps, user) => { diff --git a/src/server/api/endpoints/admin/relays/remove.ts b/src/server/api/endpoints/admin/relays/remove.ts index df95e0329a..572d51cfca 100644 --- a/src/server/api/endpoints/admin/relays/remove.ts +++ b/src/server/api/endpoints/admin/relays/remove.ts @@ -4,7 +4,8 @@ import { removeRelay } from '../../../../../services/relay'; export const meta = { desc: { - 'ja-JP': 'Remove relay' + 'ja-JP': 'リレーを削除します。', + 'en-US': 'Remove relay' }, tags: ['admin'], diff --git a/src/server/api/endpoints/admin/reset-password.ts b/src/server/api/endpoints/admin/reset-password.ts index 1b8a5ee651..2f55cf23a1 100644 --- a/src/server/api/endpoints/admin/reset-password.ts +++ b/src/server/api/endpoints/admin/reset-password.ts @@ -8,6 +8,7 @@ import { Users, UserProfiles } from '../../../../models'; export const meta = { desc: { 'ja-JP': '指定したユーザーのパスワードをリセットします。', + 'en-US': 'Reset password to specified user.' }, tags: ['admin'], @@ -23,6 +24,19 @@ export const meta = { 'en-US': 'The user ID which you want to suspend' } }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + password: { + type: 'string' as const, + optional: false as const, nullable: false as const, + minLength: 8, + maxLength: 8 + } + } } }; diff --git a/src/server/api/endpoints/admin/resolve-abuse-user-report.ts b/src/server/api/endpoints/admin/resolve-abuse-user-report.ts index 0a62b5f365..f8cd8def57 100644 --- a/src/server/api/endpoints/admin/resolve-abuse-user-report.ts +++ b/src/server/api/endpoints/admin/resolve-abuse-user-report.ts @@ -4,6 +4,11 @@ import define from '../../define'; import { AbuseUserReports } from '../../../../models'; export const meta = { + desc: { + 'ja-JP': '指定した通報を解決済みにします。', + 'en-US': 'Marks the specified report as resolved.' + }, + tags: ['admin'], requireCredential: true as const, diff --git a/src/server/api/endpoints/admin/resync-chart.ts b/src/server/api/endpoints/admin/resync-chart.ts index 84e19d37e6..13254a3ca3 100644 --- a/src/server/api/endpoints/admin/resync-chart.ts +++ b/src/server/api/endpoints/admin/resync-chart.ts @@ -3,6 +3,11 @@ import { driveChart, notesChart, usersChart, instanceChart } from '../../../../s import { insertModerationLog } from '../../../../services/insert-moderation-log'; export const meta = { + desc: { + 'ja-JP': 'チャートを再同期します。', + 'en-US': 'Resync the chart.' + }, + tags: ['admin'], requireCredential: true as const, diff --git a/src/server/api/endpoints/admin/send-email.ts b/src/server/api/endpoints/admin/send-email.ts index c0e77e1621..51f92230a2 100644 --- a/src/server/api/endpoints/admin/send-email.ts +++ b/src/server/api/endpoints/admin/send-email.ts @@ -3,6 +3,11 @@ import define from '../../define'; import { sendEmail } from '../../../../services/send-email'; export const meta = { + desc: { + 'ja-JP': 'メールを送信します。', + 'en-US': 'Send a mail.' + }, + tags: ['admin'], requireCredential: true as const, diff --git a/src/server/api/endpoints/admin/server-info.ts b/src/server/api/endpoints/admin/server-info.ts index de4e933471..3b48a811e5 100644 --- a/src/server/api/endpoints/admin/server-info.ts +++ b/src/server/api/endpoints/admin/server-info.ts @@ -9,12 +9,100 @@ export const meta = { requireModerator: true, desc: { + 'ja-JP': 'サーバー情報を表示します。', + 'en-US': 'Show server information.' }, tags: ['admin', 'meta'], params: { }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + machine: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'The name of the running server' + }, + os: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'OS used by the server', + example: 'linux' + }, + node: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Version of Node.js' + }, + psql: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Version of Postgresql' + }, + cpu: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + model: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'The name of the CPU you are using' + }, + cores: { + type: 'number' as const, + optional: false as const, nullable: false as const, + description: 'Number of CPU cores used (number of logical processors)' + } + } + }, + mem: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + total: { + type: 'number' as const, + optional: false as const, nullable: false as const, + format: 'bytes', + description: 'RAM capacity.' + } + } + }, + fs: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + total: { + type: 'number' as const, + optional: false as const, nullable: false as const, + format: 'bytes', + description: 'Total storage capacity.' + }, + used: { + type: 'number' as const, + optional: false as const, nullable: false as const, + format: 'bytes', + description: 'Amount of storage used' + } + } + }, + net: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + interface: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'The interface name of your network.', + example: 'eth0' + } + } + } + } + } }; export default define(meta, async () => { diff --git a/src/server/api/endpoints/admin/show-moderation-logs.ts b/src/server/api/endpoints/admin/show-moderation-logs.ts index acdfda51ab..f41d91647a 100644 --- a/src/server/api/endpoints/admin/show-moderation-logs.ts +++ b/src/server/api/endpoints/admin/show-moderation-logs.ts @@ -5,6 +5,11 @@ import { ModerationLogs } from '../../../../models'; import { makePaginationQuery } from '../../common/make-pagination-query'; export const meta = { + desc: { + 'ja-JP': 'モデレーションログ一覧を表示します。', + 'en-US': 'Display the moderation log list.' + }, + tags: ['admin'], requireCredential: true as const, @@ -23,6 +28,45 @@ export const meta = { untilId: { validator: $.optional.type(ID), }, + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + createdAt: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'date-time' + }, + type: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + info: { + type: 'object' as const, + optional: false as const, nullable: false as const + }, + userId: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + user: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' + } + } + } } }; diff --git a/src/server/api/endpoints/admin/show-user.ts b/src/server/api/endpoints/admin/show-user.ts index ea4df141f3..63889a9e6b 100644 --- a/src/server/api/endpoints/admin/show-user.ts +++ b/src/server/api/endpoints/admin/show-user.ts @@ -5,7 +5,8 @@ import { Users } from '../../../../models'; export const meta = { desc: { - 'ja-JP': '指定したユーザーの情報を取得します。', + 'ja-JP': '指定したユーザーの情報を取得します（管理者向け）。', + 'en-US': 'Gets the information of the specified user (for administrators).' }, tags: ['admin'], @@ -21,6 +22,149 @@ export const meta = { 'en-US': 'The user ID which you want to suspend' } }, + }, + + res: { + type: 'object' as const, + nullable: false as const, optional: false as const, + properties: { + id: { + type: 'string' as const, + nullable: false as const, optional: false as const, + format: 'id' + }, + createdAt: { + type: 'string' as const, + nullable: false as const, optional: false as const, + format: 'date-time' + }, + updatedAt: { + type: 'string' as const, + nullable: true as const, optional: false as const, + format: 'date-time' + }, + lastFetchedAt: { + type: 'string' as const, + nullable: true as const, optional: false as const + }, + username: { + type: 'string' as const, + nullable: false as const, optional: false as const + }, + name: { + type: 'string' as const, + nullable: false as const, optional: false as const + }, + folowersCount: { + type: 'number' as const, + nullable: false as const, optional: false as const + }, + followingCount: { + type: 'number' as const, + nullable: false as const, optional: false as const + }, + notesCount: { + type: 'number' as const, + nullable: false as const, optional: false as const + }, + avatarId: { + type: 'string' as const, + nullable: true as const, optional: false as const + }, + bannerId: { + type: 'string' as const, + nullable: true as const, optional: false as const + }, + tags: { + type: 'array' as const, + nullable: false as const, optional: false as const, + items: { + type: 'string' as const, + nullable: false as const, optional: false as const + } + }, + avatarUrl: { + type: 'string' as const, + nullable: true as const, optional: false as const, + format: 'url' + }, + bannerUrl: { + type: 'string' as const, + nullable: true as const, optional: false as const, + format: 'url' + }, + avatarBlurhash: { + type: 'any' as const, + nullable: true as const, optional: false as const, + default: null + }, + bannerBlurhash: { + type: 'any' as const, + nullable: true as const, optional: false as const, + default: null + }, + isSuspended: { + type: 'boolean' as const, + nullable: false as const, optional: false as const + }, + isSilenced: { + type: 'boolean' as const, + nullable: false as const, optional: false as const + }, + isLocked: { + type: 'boolean' as const, + nullable: false as const, optional: false as const, + }, + isBot: { + type: 'boolean' as const, + nullable: false as const, optional: false as const + }, + isCat: { + type: 'boolean' as const, + nullable: false as const, optional: false as const + }, + isAdmin: { + type: 'boolean' as const, + nullable: false as const, optional: false as const + }, + isModerator: { + type: 'boolean' as const, + nullable: false as const, optional: false as const + }, + emojis: { + type: 'array' as const, + nullable: false as const, optional: false as const, + items: { + type: 'string' as const, + nullable: false as const, optional: false as const + } + }, + host: { + type: 'string' as const, + nullable: true as const, optional: false as const + }, + inbox: { + type: 'string' as const, + nullable: true as const, optional: false as const + }, + sharedInbox: { + type: 'string' as const, + nullable: true as const, optional: false as const + }, + featured: { + type: 'string' as const, + nullable: true as const, optional: false as const + }, + uri: { + type: 'string' as const, + nullable: true as const, optional: false as const + }, + token: { + type: 'string' as const, + nullable: false as const, optional: false as const, + default: '' + } + } } }; diff --git a/src/server/api/endpoints/admin/show-users.ts b/src/server/api/endpoints/admin/show-users.ts index 03abe7a57b..a853805201 100644 --- a/src/server/api/endpoints/admin/show-users.ts +++ b/src/server/api/endpoints/admin/show-users.ts @@ -3,6 +3,11 @@ import define from '../../define'; import { Users } from '../../../../models'; export const meta = { + desc: { + 'ja-JP': '管理者用のユーザー一覧を表示します。', + 'en-US': 'Displays a list of users for administrators.' + }, + tags: ['admin'], requireCredential: true as const, @@ -61,6 +66,16 @@ export const meta = { validator: $.optional.str, default: null } + }, + + res: { + type: 'array' as const, + nullable: false as const, optional: false as const, + items: { + type: 'object' as const, + nullable: false as const, optional: false as const, + ref: 'User' + } } }; diff --git a/src/server/api/endpoints/admin/vacuum.ts b/src/server/api/endpoints/admin/vacuum.ts index e041e65431..14136c751c 100644 --- a/src/server/api/endpoints/admin/vacuum.ts +++ b/src/server/api/endpoints/admin/vacuum.ts @@ -4,6 +4,11 @@ import { getConnection } from 'typeorm'; import { insertModerationLog } from '../../../../services/insert-moderation-log'; export const meta = { + desc: { + 'ja-JP': 'データベースのメンテナンスを行います。', + 'en-US': 'Perform database maintenance.' + }, + tags: ['admin'], requireCredential: true as const, diff --git a/src/server/api/endpoints/announcements.ts b/src/server/api/endpoints/announcements.ts index ca46192de2..5d0fd9bdfa 100644 --- a/src/server/api/endpoints/announcements.ts +++ b/src/server/api/endpoints/announcements.ts @@ -5,6 +5,11 @@ import { Announcements, AnnouncementReads } from '../../../models'; import { makePaginationQuery } from '../common/make-pagination-query'; export const meta = { + desc: { + 'ja-JP': 'アナウンスを表示します。', + 'en-US': 'Show announcements.' + }, + tags: ['meta'], requireCredential: false as const, @@ -27,6 +32,56 @@ export const meta = { untilId: { validator: $.optional.type(ID), }, + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id', + description: 'The unique identifier for this Announcement.', + example: 'xxxxxxxxxx', + }, + createdAt: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'date-time', + description: 'The date that the Announcement was created.' + }, + updatedAt: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'date-time', + description: 'The date that the Announcement was updated.' + }, + text: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Announcement text.' + }, + title: { + type: 'string' as const, + optional: false as const, nullable: false as const, + description: 'Announcement title.' + }, + imageUrl: { + type: 'string' as const, + optional: false as const, nullable: true as const, + description: 'Announcement image.' + }, + isRead: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + description: 'Indicates that you have read this announcement' + } + } + } } }; diff --git a/src/server/api/endpoints/antennas/create.ts b/src/server/api/endpoints/antennas/create.ts index bc79385260..b5f0eead2a 100644 --- a/src/server/api/endpoints/antennas/create.ts +++ b/src/server/api/endpoints/antennas/create.ts @@ -6,6 +6,11 @@ import { ID } from '../../../../misc/cafy-id'; import { ApiError } from '../../error'; export const meta = { + desc: { + 'ja-JP': 'アンテナを作成します。', + 'en-US': 'Create a antenna.' + }, + tags: ['antennas'], requireCredential: true as const, @@ -70,6 +75,12 @@ export const meta = { code: 'NO_SUCH_USER_GROUP', id: 'aa3c0b9a-8cae-47c0-92ac-202ce5906682' } + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'Antenna' } }; diff --git a/src/server/api/endpoints/antennas/delete.ts b/src/server/api/endpoints/antennas/delete.ts index 087834a7bd..9008c37c8e 100644 --- a/src/server/api/endpoints/antennas/delete.ts +++ b/src/server/api/endpoints/antennas/delete.ts @@ -5,6 +5,11 @@ import { ApiError } from '../../error'; import { Antennas } from '../../../../models'; export const meta = { + desc: { + 'ja-JP': 'アンテナを削除します。', + 'en-US': 'Delete a antenna.' + }, + tags: ['antennas'], requireCredential: true as const, diff --git a/src/server/api/endpoints/antennas/list.ts b/src/server/api/endpoints/antennas/list.ts index cbc4e827b9..bc9685887f 100644 --- a/src/server/api/endpoints/antennas/list.ts +++ b/src/server/api/endpoints/antennas/list.ts @@ -2,11 +2,26 @@ import define from '../../define'; import { Antennas } from '../../../../models'; export const meta = { + desc: { + 'ja-JP': 'アンテナの一覧を取得します。', + 'en-US': 'Get a list of antennas.' + }, + tags: ['antennas', 'account'], requireCredential: true as const, kind: 'read:account', + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'Antenna' + } + } }; export default define(meta, async (ps, me) => { diff --git a/src/server/api/endpoints/antennas/notes.ts b/src/server/api/endpoints/antennas/notes.ts index 402a2758bb..750fc080cf 100644 --- a/src/server/api/endpoints/antennas/notes.ts +++ b/src/server/api/endpoints/antennas/notes.ts @@ -8,6 +8,11 @@ import { generateMutedUserQuery } from '../../common/generate-muted-user-query'; import { ApiError } from '../../error'; export const meta = { + desc: { + 'ja-JP': '指定したアンテナのノート一覧を表示します。', + 'en-US': 'Displays a list of notes for the specified antenna.' + }, + tags: ['antennas', 'account', 'notes'], requireCredential: true as const, @@ -39,6 +44,16 @@ export const meta = { code: 'NO_SUCH_ANTENNA', id: '850926e0-fd3b-49b6-b69a-b28a5dbd82fe' } + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'Note' + } } }; diff --git a/src/server/api/endpoints/antennas/show.ts b/src/server/api/endpoints/antennas/show.ts index bc2093ba61..ed400f830c 100644 --- a/src/server/api/endpoints/antennas/show.ts +++ b/src/server/api/endpoints/antennas/show.ts @@ -5,6 +5,11 @@ import { ApiError } from '../../error'; import { Antennas } from '../../../../models'; export const meta = { + desc: { + 'ja-JP': '指定したアンテナの情報を取得します。', + 'en-US': 'Acquires the information of the specified antenna.' + }, + tags: ['antennas', 'account'], requireCredential: true as const, @@ -23,6 +28,12 @@ export const meta = { code: 'NO_SUCH_ANTENNA', id: 'c06569fb-b025-4f23-b22d-1fcd20d2816b' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'Antenna' } }; diff --git a/src/server/api/endpoints/antennas/update.ts b/src/server/api/endpoints/antennas/update.ts index b329e86ade..58f4e68c89 100644 --- a/src/server/api/endpoints/antennas/update.ts +++ b/src/server/api/endpoints/antennas/update.ts @@ -5,6 +5,11 @@ import { ApiError } from '../../error'; import { Antennas, UserLists, UserGroupJoinings } from '../../../../models'; export const meta = { + desc: { + 'ja-JP': 'アンテナの情報を更新します。', + 'en-US': 'Updates the information of the specified antenna.' + }, + tags: ['antennas'], requireCredential: true as const, @@ -79,6 +84,12 @@ export const meta = { code: 'NO_SUCH_USER_GROUP', id: '109ed789-b6eb-456e-b8a9-6059d567d385' } + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'Antenna' } }; diff --git a/src/server/api/endpoints/ap/show.ts b/src/server/api/endpoints/ap/show.ts index 214116c8c3..e8297db472 100644 --- a/src/server/api/endpoints/ap/show.ts +++ b/src/server/api/endpoints/ap/show.ts @@ -16,7 +16,8 @@ export const meta = { tags: ['federation'], desc: { - 'ja-JP': 'URIを指定してActivityPubオブジェクトを参照します。' + 'ja-JP': 'URIを指定してActivityPubオブジェクトを参照します。', + 'en-US': 'Browse to the ActivityPub object by specifying the URI.' }, requireCredential: false as const, @@ -36,6 +37,22 @@ export const meta = { code: 'NO_SUCH_OBJECT', id: 'dc94d745-1262-4e63-a17d-fecaa57efc82' } + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + type: { + type: 'string' as const, + optional: false as const, nullable: false as const, + enum: ['User', 'Note'] + }, + object: { + type: 'object' as const, + optional: false as const, nullable: false as const + } + } } }; diff --git a/src/server/api/endpoints/app/show.ts b/src/server/api/endpoints/app/show.ts index ca4f3549f5..254ae30884 100644 --- a/src/server/api/endpoints/app/show.ts +++ b/src/server/api/endpoints/app/show.ts @@ -25,6 +25,12 @@ export const meta = { code: 'NO_SUCH_APP', id: 'dce83913-2dc6-4093-8a7b-71dbb11718a3' } + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'App' } }; diff --git a/src/server/api/endpoints/auth/session/show.ts b/src/server/api/endpoints/auth/session/show.ts index fe92ff3624..9e0d6d90a4 100644 --- a/src/server/api/endpoints/auth/session/show.ts +++ b/src/server/api/endpoints/auth/session/show.ts @@ -24,6 +24,27 @@ export const meta = { code: 'NO_SUCH_SESSION', id: 'bd72c97d-eba7-4adb-a467-f171b8847250' } + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + app: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'App' + }, + token: { + type: 'string' as const, + optional: false as const, nullable: false as const + } + } } }; diff --git a/src/server/api/endpoints/blocking/create.ts b/src/server/api/endpoints/blocking/create.ts index bdaccc79ed..dfab338a8b 100644 --- a/src/server/api/endpoints/blocking/create.ts +++ b/src/server/api/endpoints/blocking/create.ts @@ -52,6 +52,12 @@ export const meta = { code: 'ALREADY_BLOCKING', id: '787fed64-acb9-464a-82eb-afbd745b9614' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' } }; diff --git a/src/server/api/endpoints/blocking/delete.ts b/src/server/api/endpoints/blocking/delete.ts index 451da1c915..22d2df5970 100644 --- a/src/server/api/endpoints/blocking/delete.ts +++ b/src/server/api/endpoints/blocking/delete.ts @@ -52,6 +52,76 @@ export const meta = { code: 'NOT_BLOCKING', id: '291b2efa-60c6-45c0-9f6a-045c8f9b02cd' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id', + description: 'The unique identifier for this blocking.', + example: 'xxxxxxxxxx', + }, + name: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + username: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + host: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + avatarUrl: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'url' + }, + avatarBlurhash: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + avatarColor: { + type: 'any' as const, + optional: false as const, nullable: true as const + }, + emojis: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + nullable: false as const, optional: false as const, + properties: { + name: { + type: 'string' as const, + nullable: false as const, optional: false as const + }, + host: { + type: 'string' as const, + nullable: true as const, optional: false as const + }, + url: { + type: 'string' as const, + nullable: false as const, optional: false as const, + format: 'url' + }, + aliases: { + type: 'array' as const, + nullable: false as const, optional: false as const, + items: { + type: 'string' as const, + nullable: false as const, optional: false as const + } + } + } + } + } + } } }; diff --git a/src/server/api/endpoints/clips/create.ts b/src/server/api/endpoints/clips/create.ts index 0d122dbb9b..b26c42c56c 100644 --- a/src/server/api/endpoints/clips/create.ts +++ b/src/server/api/endpoints/clips/create.ts @@ -23,6 +23,12 @@ export const meta = { validator: $.optional.nullable.str.range(1, 2048) } }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'Clip' + } }; export default define(meta, async (ps, user) => { diff --git a/src/server/api/endpoints/clips/list.ts b/src/server/api/endpoints/clips/list.ts index 6ede8ea0fc..6b90b114df 100644 --- a/src/server/api/endpoints/clips/list.ts +++ b/src/server/api/endpoints/clips/list.ts @@ -7,6 +7,16 @@ export const meta = { requireCredential: true as const, kind: 'read:account', + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'Clip' + } + } }; export default define(meta, async (ps, me) => { diff --git a/src/server/api/endpoints/clips/notes.ts b/src/server/api/endpoints/clips/notes.ts index 13983d99f7..6a507e2036 100644 --- a/src/server/api/endpoints/clips/notes.ts +++ b/src/server/api/endpoints/clips/notes.ts @@ -39,6 +39,16 @@ export const meta = { code: 'NO_SUCH_CLIP', id: '1d7645e6-2b6d-4635-b0fe-fe22b0e72e00' } + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'Note' + } } }; diff --git a/src/server/api/endpoints/clips/show.ts b/src/server/api/endpoints/clips/show.ts index dc730d64a3..8c285d88b5 100644 --- a/src/server/api/endpoints/clips/show.ts +++ b/src/server/api/endpoints/clips/show.ts @@ -23,6 +23,12 @@ export const meta = { code: 'NO_SUCH_CLIP', id: 'c3c5fe33-d62c-44d2-9ea5-d997703f5c20' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'Clip' } }; diff --git a/src/server/api/endpoints/clips/update.ts b/src/server/api/endpoints/clips/update.ts index 4a1a31eb95..041691da2a 100644 --- a/src/server/api/endpoints/clips/update.ts +++ b/src/server/api/endpoints/clips/update.ts @@ -35,6 +35,12 @@ export const meta = { code: 'NO_SUCH_CLIP', id: 'b4d92d70-b216-46fa-9a3f-a8c811699257' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'Clip' } }; diff --git a/src/server/api/endpoints/drive/files/update.ts b/src/server/api/endpoints/drive/files/update.ts index f57166a2f6..7e43765c06 100644 --- a/src/server/api/endpoints/drive/files/update.ts +++ b/src/server/api/endpoints/drive/files/update.ts @@ -70,6 +70,12 @@ export const meta = { code: 'NO_SUCH_FOLDER', id: 'ea8fb7a5-af77-4a08-b608-c0218176cd73' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'DriveFile' } }; diff --git a/src/server/api/endpoints/drive/folders/create.ts b/src/server/api/endpoints/drive/folders/create.ts index d88bfcc3d4..edaa74532d 100644 --- a/src/server/api/endpoints/drive/folders/create.ts +++ b/src/server/api/endpoints/drive/folders/create.ts @@ -43,6 +43,12 @@ export const meta = { code: 'NO_SUCH_FOLDER', id: '53326628-a00d-40a6-a3cd-8975105c0f95' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'DriveFolder' } }; diff --git a/src/server/api/endpoints/drive/folders/update.ts b/src/server/api/endpoints/drive/folders/update.ts index e23a824d16..c2a272c247 100644 --- a/src/server/api/endpoints/drive/folders/update.ts +++ b/src/server/api/endpoints/drive/folders/update.ts @@ -61,6 +61,12 @@ export const meta = { code: 'NO_SUCH_PARENT_FOLDER', id: 'ce104e3a-faaf-49d5-b459-10ff0cbbcaa1' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'DriveFolder' } }; diff --git a/src/server/api/endpoints/endpoints.ts b/src/server/api/endpoints/endpoints.ts index 3ab14389a9..84ab107c6a 100644 --- a/src/server/api/endpoints/endpoints.ts +++ b/src/server/api/endpoints/endpoints.ts @@ -2,12 +2,32 @@ import define from '../define'; import endpoints from '../endpoints'; export const meta = { + desc: { + 'ja-JP': '使用できるAPI一覧を返します。', + 'en-US': 'Returns a list of available APIs.' + }, + requireCredential: false as const, tags: ['meta'], params: { }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + example: [ + 'admin/abuse-user-reports', + 'admin/accounts/create', + 'admin/announcements/create', + '...' + ] + } }; export default define(meta, async () => { diff --git a/src/server/api/endpoints/federation/instances.ts b/src/server/api/endpoints/federation/instances.ts index 6b6fe42a40..239756af53 100644 --- a/src/server/api/endpoints/federation/instances.ts +++ b/src/server/api/endpoints/federation/instances.ts @@ -1,4 +1,5 @@ import $ from 'cafy'; +import config from '../../../../config'; import define from '../../define'; import { Instances } from '../../../../models'; import { fetchMeta } from '../../../../misc/fetch-meta'; @@ -50,6 +51,16 @@ export const meta = { sort: { validator: $.optional.str, } + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'FederationInstance' + } } }; diff --git a/src/server/api/endpoints/federation/show-instance.ts b/src/server/api/endpoints/federation/show-instance.ts index 8c3b469972..1a0bcdb23e 100644 --- a/src/server/api/endpoints/federation/show-instance.ts +++ b/src/server/api/endpoints/federation/show-instance.ts @@ -2,6 +2,7 @@ import $ from 'cafy'; import define from '../../define'; import { Instances } from '../../../../models'; import { toPuny } from '../../../../misc/convert-host'; +import config from '../../../../config'; export const meta = { tags: ['federation'], @@ -12,6 +13,12 @@ export const meta = { host: { validator: $.str } + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'FederationInstance' } }; diff --git a/src/server/api/endpoints/following/create.ts b/src/server/api/endpoints/following/create.ts index d5ade3073a..ca46d59c78 100644 --- a/src/server/api/endpoints/following/create.ts +++ b/src/server/api/endpoints/following/create.ts @@ -64,6 +64,12 @@ export const meta = { code: 'BLOCKED', id: 'c4ab57cc-4e41-45e9-bfd9-584f61e35ce0' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' } }; diff --git a/src/server/api/endpoints/following/delete.ts b/src/server/api/endpoints/following/delete.ts index 692ac92144..d3abda9265 100644 --- a/src/server/api/endpoints/following/delete.ts +++ b/src/server/api/endpoints/following/delete.ts @@ -52,6 +52,12 @@ export const meta = { code: 'NOT_FOLLOWING', id: '5dbf82f5-c92b-40b1-87d1-6c8c0741fd09' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' } }; diff --git a/src/server/api/endpoints/following/requests/cancel.ts b/src/server/api/endpoints/following/requests/cancel.ts index a12e1f76b6..ef21ee4f27 100644 --- a/src/server/api/endpoints/following/requests/cancel.ts +++ b/src/server/api/endpoints/following/requests/cancel.ts @@ -40,6 +40,12 @@ export const meta = { code: 'FOLLOW_REQUEST_NOT_FOUND', id: '089b125b-d338-482a-9a09-e2622ac9f8d4' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' } }; diff --git a/src/server/api/endpoints/following/requests/list.ts b/src/server/api/endpoints/following/requests/list.ts index 78f937bb0b..4afd448516 100644 --- a/src/server/api/endpoints/following/requests/list.ts +++ b/src/server/api/endpoints/following/requests/list.ts @@ -11,7 +11,33 @@ export const meta = { requireCredential: true as const, - kind: 'read:following' + kind: 'read:following', + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + follower: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' + }, + followee: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' + } + } + } + } }; export default define(meta, async (ps, user) => { diff --git a/src/server/api/endpoints/games/reversi/games.ts b/src/server/api/endpoints/games/reversi/games.ts index 7267157e0e..fa8bf20353 100644 --- a/src/server/api/endpoints/games/reversi/games.ts +++ b/src/server/api/endpoints/games/reversi/games.ts @@ -26,6 +26,113 @@ export const meta = { validator: $.optional.bool, default: false } + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + createdAt: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'date-time' + }, + startedAt: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'date-time' + }, + isStarted: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + isEnded: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + form1: { + type: 'any' as const, + optional: false as const, nullable: true as const + }, + form2: { + type: 'any' as const, + optional: false as const, nullable: true as const + }, + user1Accepted: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + default: false + }, + user2Accepted: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + default: false + }, + user1Id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + user2Id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + user1: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' + }, + user2: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' + }, + winnerId: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'id' + }, + winner: { + type: 'object' as const, + optional: false as const, nullable: true as const, + ref: 'User' + }, + surrendered: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'id' + }, + black: { + type: 'number' as const, + optional: false as const, nullable: true as const + }, + bw: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + isLlotheo: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + }, + canPutEverywhere: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + loopedBoard: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + } + } + } } }; diff --git a/src/server/api/endpoints/games/reversi/games/show.ts b/src/server/api/endpoints/games/reversi/games/show.ts index ea2776b16f..75599885c9 100644 --- a/src/server/api/endpoints/games/reversi/games/show.ts +++ b/src/server/api/endpoints/games/reversi/games/show.ts @@ -20,6 +20,125 @@ export const meta = { code: 'NO_SUCH_GAME', id: 'f13a03db-fae1-46c9-87f3-43c8165419e1' }, + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + createdAt: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'date-time' + }, + startedAt: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'date-time' + }, + isStarted: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + isEnded: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + form1: { + type: 'any' as const, + optional: false as const, nullable: true as const + }, + form2: { + type: 'any' as const, + optional: false as const, nullable: true as const + }, + user1Accepted: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + default: false + }, + user2Accepted: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + default: false + }, + user1Id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + user2Id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + user1: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' + }, + user2: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' + }, + winnerId: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'id' + }, + winner: { + type: 'object' as const, + optional: false as const, nullable: true as const, + ref: 'User' + }, + surrendered: { + type: 'string' as const, + optional: false as const, nullable: true as const, + format: 'id' + }, + black: { + type: 'number' as const, + optional: false as const, nullable: true as const + }, + bw: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + isLlotheo: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + }, + canPutEverywhere: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + loopedBoard: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + board: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'any' as const, + optional: false as const, nullable: false as const + } + }, + turn: { + type: 'any' as const, + optional: false as const, nullable: false as const + } + } + } } }; diff --git a/src/server/api/endpoints/games/reversi/invitations.ts b/src/server/api/endpoints/games/reversi/invitations.ts index 93ea1bd58e..6a73bdf0c4 100644 --- a/src/server/api/endpoints/games/reversi/invitations.ts +++ b/src/server/api/endpoints/games/reversi/invitations.ts @@ -4,7 +4,48 @@ import { ReversiMatchings } from '../../../../../models'; export const meta = { tags: ['games'], - requireCredential: true as const + requireCredential: true as const, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + createdAt: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'date-time' + }, + parentId: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + parent: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' + }, + childId: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + child: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' + } + } + } + } }; export default define(meta, async (ps, user) => { diff --git a/src/server/api/endpoints/i/get-word-muted-notes-count.ts b/src/server/api/endpoints/i/get-word-muted-notes-count.ts index e88d697bfd..a69ebc286a 100644 --- a/src/server/api/endpoints/i/get-word-muted-notes-count.ts +++ b/src/server/api/endpoints/i/get-word-muted-notes-count.ts @@ -9,6 +9,17 @@ export const meta = { kind: 'read:account', params: { + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + count: { + type: 'number' as const, + optional: false as const, nullable: false as const + } + } } }; diff --git a/src/server/api/endpoints/i/page-likes.ts b/src/server/api/endpoints/i/page-likes.ts index 7f44df85db..9a83cc1d43 100644 --- a/src/server/api/endpoints/i/page-likes.ts +++ b/src/server/api/endpoints/i/page-likes.ts @@ -29,6 +29,23 @@ export const meta = { untilId: { validator: $.optional.type(ID), }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + page: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'Page' + } + } } }; diff --git a/src/server/api/endpoints/i/pages.ts b/src/server/api/endpoints/i/pages.ts index f55f228d80..3fc00e370a 100644 --- a/src/server/api/endpoints/i/pages.ts +++ b/src/server/api/endpoints/i/pages.ts @@ -29,6 +29,16 @@ export const meta = { untilId: { validator: $.optional.type(ID), }, + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'Page' + } } }; diff --git a/src/server/api/endpoints/i/pin.ts b/src/server/api/endpoints/i/pin.ts index 59b2f23e3d..e13873f601 100644 --- a/src/server/api/endpoints/i/pin.ts +++ b/src/server/api/endpoints/i/pin.ts @@ -44,6 +44,12 @@ export const meta = { code: 'ALREADY_PINNED', id: '8b18c2b7-68fe-4edb-9892-c0cbaeb6c913' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' } }; diff --git a/src/server/api/endpoints/i/read-announcement.ts b/src/server/api/endpoints/i/read-announcement.ts index 070e49eed0..4a4a021af9 100644 --- a/src/server/api/endpoints/i/read-announcement.ts +++ b/src/server/api/endpoints/i/read-announcement.ts @@ -7,6 +7,11 @@ import { AnnouncementReads, Announcements, Users } from '../../../../models'; import { publishMainStream } from '../../../../services/stream'; export const meta = { + desc: { + 'ja-JP': '指定したアナウンスを既読にします。', + 'en-US': 'Marks the specified announcement as read.' + }, + tags: ['account'], requireCredential: true as const, diff --git a/src/server/api/endpoints/i/unpin.ts b/src/server/api/endpoints/i/unpin.ts index e1ea3a6295..6f06e38598 100644 --- a/src/server/api/endpoints/i/unpin.ts +++ b/src/server/api/endpoints/i/unpin.ts @@ -32,6 +32,12 @@ export const meta = { code: 'NO_SUCH_NOTE', id: '454170ce-9d63-4a43-9da1-ea10afe81e21' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' } }; diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index 3d7f1fa76f..a1faf8f1c2 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -196,6 +196,12 @@ export const meta = { code: 'NO_SUCH_PAGE', id: '8e01b590-7eb9-431b-a239-860e086c408e' }, + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'User' } }; diff --git a/src/server/api/endpoints/i/user-group-invites.ts b/src/server/api/endpoints/i/user-group-invites.ts index 9885082a49..4c5105fa7b 100644 --- a/src/server/api/endpoints/i/user-group-invites.ts +++ b/src/server/api/endpoints/i/user-group-invites.ts @@ -29,6 +29,27 @@ export const meta = { untilId: { validator: $.optional.type(ID), }, + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + group: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'UserGroup' + } + } + } } }; diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index 3b647e21cd..c2f4190e1c 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -26,6 +26,14 @@ export const meta = { type: 'object' as const, optional: false as const, nullable: false as const, properties: { + maintainerName: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + maintainerEmail: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, version: { type: 'string' as const, optional: false as const, nullable: false as const, @@ -37,47 +45,383 @@ export const meta = { optional: false as const, nullable: false as const, description: 'The name of this instance.', }, - description: { + uri: { type: 'string' as const, optional: false as const, nullable: false as const, + format: 'url', + example: 'https://misskey.example.com' + }, + description: { + type: 'string' as const, + optional: false as const, nullable: true as const, description: 'The description of this instance.', }, - announcements: { + langs: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'string' as const, + optional: false as const, nullable: false as const + } + }, + tosUrl: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + repositoryUrl: { + type: 'string' as const, + optional: false as const, nullable: false as const, + default: 'https://github.com/syuilo/misskey' + }, + feedbackUrl: { + type: 'string' as const, + optional: false as const, nullable: false as const, + default: 'https://github.com/syuilo/misskey/issues/new' + }, + secure: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + default: false + }, + disableRegistration: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + description: 'Whether disabled open registration.', + }, + disableLocalTimeline: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + description: 'Whether disabled LTL and STL.', + }, + disableGlobalTimeline: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + description: 'Whether disabled GTL.', + }, + driveCapacityPerLocalUserMb: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + driveCapacityPerRemoteUserMb: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + cacheRemoteFiles: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + proxyRemoteFiles: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + enableHcaptcha: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + hcaptchaSiteKey: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + enableRecaptcha: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + recaptchaSiteKey: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + swPublickey: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + mascotImageUrl: { + type: 'string' as const, + optional: false as const, nullable: false as const, + default: '/assets/ai.png' + }, + bannerUrl: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + errorImageUrl: { + type: 'string' as const, + optional: false as const, nullable: false as const, + default: 'https://xn--931a.moe/aiart/yubitun.png' + }, + iconUrl: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + maxNoteTextLength: { + type: 'number' as const, + optional: false as const, nullable: false as const, + default: 500 + }, + emojis: { type: 'array' as const, optional: false as const, nullable: false as const, items: { type: 'object' as const, optional: false as const, nullable: false as const, properties: { - title: { + id: { type: 'string' as const, optional: false as const, nullable: false as const, - description: 'The title of the announcement.', + format: 'id' }, - text: { - type: 'string' as const, + aliases: { + type: 'array' as const, optional: false as const, nullable: false as const, - description: 'The text of the announcement. (can be HTML)', + items: { + type: 'string' as const, + optional: false as const, nullable: false as const + } }, + category: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + host: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + url: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'url' + } } - }, - description: 'The announcements of this instance.', + } }, - disableRegistration: { + requireSetup: { type: 'boolean' as const, optional: false as const, nullable: false as const, - description: 'Whether disabled open registration.', + example: false }, - disableLocalTimeline: { + enableEmail: { type: 'boolean' as const, - optional: false as const, nullable: false as const, - description: 'Whether disabled LTL and STL.', + optional: false as const, nullable: false as const }, - disableGlobalTimeline: { + enableTwitterIntegration: { type: 'boolean' as const, - optional: false as const, nullable: false as const, - description: 'Whether disabled GTL.', + optional: false as const, nullable: false as const + }, + enableGithubIntegration: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + enableDiscordIntegration: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + enableServiceWorker: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + proxyAccountName: { + type: 'string' as const, + optional: false as const, nullable: true as const + }, + features: { + type: 'object' as const, + optional: true as const, nullable: false as const, + properties: { + registration: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + localTimeLine: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + globalTimeLine: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + elasticsearch: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + hcaptcha: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + recaptcha: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + objectStorage: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + twitter: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + github: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + discord: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + serviceWorker: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + miauth: { + type: 'boolean' as const, + optional: true as const, nullable: false as const, + default: true + }, + } + }, + userStarForReactionFallback: { + type: 'boolean' as const, + optional: true as const, nullable: false as const, + }, + pinnedUsers: { + type: 'array' as const, + optional: true as const, nullable: false as const, + items: { + type: 'string' as const, + optional: false as const, nullable: false as const + } + }, + hiddenTags: { + type: 'array' as const, + optional: true as const, nullable: false as const, + items: { + type: 'string' as const, + optional: false as const, nullable: false as const + } + }, + blockedHosts: { + type: 'array' as const, + optional: true as const, nullable: false as const, + items: { + type: 'string' as const, + optional: false as const, nullable: false as const + } + }, + hcaptchaSecretKey: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + recaptchaSecretKey: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + proxyAccountId: { + type: 'string' as const, + optional: true as const, nullable: true as const, + format: 'id' + }, + twitterConsumerKey: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + twitterConsumerSecret: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + githubClientId: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + githubClientSecret: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + discordClientId: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + discordClientSecret: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + summaryProxy: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + email: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + smtpSecure: { + type: 'boolean' as const, + optional: true as const, nullable: false as const + }, + smtpHost: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + smtpPort: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + smtpUser: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + smtpPass: { + type: 'string' as const, + optional: true as const, nullable: true as const }, + swPrivateKey: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + useObjectStorage: { + type: 'boolean' as const, + optional: true as const, nullable: false as const + }, + objectStorageBaseUrl: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + objectStorageBucket: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + objectStoragePrefix: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + objectStorageEndpoint: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + objectStorageRegion: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + objectStoragePort: { + type: 'number' as const, + optional: true as const, nullable: true as const + }, + objectStorageAccessKey: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + objectStorageSecretKey: { + type: 'string' as const, + optional: true as const, nullable: true as const + }, + objectStorageUseSSL: { + type: 'boolean' as const, + optional: true as const, nullable: false as const + }, + objectStorageUseProxy: { + type: 'boolean' as const, + optional: true as const, nullable: false as const + }, + objectStorageSetPublicRead: { + type: 'boolean' as const, + optional: true as const, nullable: false as const + } } } }; diff --git a/src/server/api/endpoints/miauth/gen-token.ts b/src/server/api/endpoints/miauth/gen-token.ts index a5fa194008..0634debb1e 100644 --- a/src/server/api/endpoints/miauth/gen-token.ts +++ b/src/server/api/endpoints/miauth/gen-token.ts @@ -32,6 +32,17 @@ export const meta = { validator: $.arr($.str).unique(), }, }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + token: { + type: 'string' as const, + optional: false as const, nullable: false as const + } + } + } }; export default define(meta, async (ps, user) => { diff --git a/src/server/api/endpoints/my/apps.ts b/src/server/api/endpoints/my/apps.ts index 348cbfc9f8..2ca882fd6d 100644 --- a/src/server/api/endpoints/my/apps.ts +++ b/src/server/api/endpoints/my/apps.ts @@ -22,6 +22,55 @@ export const meta = { validator: $.optional.num.min(0), default: 0 } + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + name: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + callbackUrl: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + permission: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'string' as const, + optional: false as const, nullable: false as const + } + }, + secret: { + type: 'string' as const, + optional: true as const, nullable: false as const + }, + isAuthorized: { + type: 'object' as const, + optional: true as const, nullable: false as const, + properties: { + appId: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + userId: { + type: 'string' as const, + optional: false as const, nullable: false as const + } + } + } + } + } } }; diff --git a/src/server/api/endpoints/notes/polls/recommendation.ts b/src/server/api/endpoints/notes/polls/recommendation.ts index a915c95a3f..93c9ff08ca 100644 --- a/src/server/api/endpoints/notes/polls/recommendation.ts +++ b/src/server/api/endpoints/notes/polls/recommendation.ts @@ -23,6 +23,16 @@ export const meta = { validator: $.optional.num.min(0), default: 0 } + }, + + res: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'Note' + } } }; diff --git a/src/server/api/endpoints/notes/state.ts b/src/server/api/endpoints/notes/state.ts index b41b56162c..b8b17820ee 100644 --- a/src/server/api/endpoints/notes/state.ts +++ b/src/server/api/endpoints/notes/state.ts @@ -21,6 +21,21 @@ export const meta = { 'en-US': 'Target note ID.' } } + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + isFavorited: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + isWatching: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + } + } } }; diff --git a/src/server/api/endpoints/notifications/create.ts b/src/server/api/endpoints/notifications/create.ts index 6267699e90..e447a32e0b 100644 --- a/src/server/api/endpoints/notifications/create.ts +++ b/src/server/api/endpoints/notifications/create.ts @@ -3,6 +3,10 @@ import define from '../../define'; import { createNotification } from '../../../../services/create-notification'; export const meta = { + desc: { + 'ja-JP': '通知を作成します。' + }, + tags: ['notifications'], requireCredential: true as const, diff --git a/src/server/api/endpoints/promo/read.ts b/src/server/api/endpoints/promo/read.ts index 9ce253374b..57eb0681e5 100644 --- a/src/server/api/endpoints/promo/read.ts +++ b/src/server/api/endpoints/promo/read.ts @@ -7,6 +7,11 @@ import { PromoReads } from '../../../../models'; import { genId } from '../../../../misc/gen-id'; export const meta = { + desc: { + 'ja-JP': '指定したノートのプロモーションを既読にします。', + 'en-US': 'Marks the promotion for the specified note as read.' + }, + tags: ['notes'], requireCredential: true as const, diff --git a/src/server/api/endpoints/room/show.ts b/src/server/api/endpoints/room/show.ts index e8af68956d..a12d9b8f26 100644 --- a/src/server/api/endpoints/room/show.ts +++ b/src/server/api/endpoints/room/show.ts @@ -7,7 +7,7 @@ import { toPunyNullable } from '../../../../misc/convert-host'; export const meta = { desc: { - 'ja-JP': '指定した部屋の情報を取得します。', + 'ja-JP': '指定したユーザーの部屋の情報を取得します。', }, tags: ['room'], @@ -38,6 +38,83 @@ export const meta = { code: 'NO_SUCH_USER', id: '7ad3fa3e-5e12-42f0-b23a-f3d13f10ee4b' } + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + roomType: { + type: 'string' as const, + optional: false as const, nullable: false as const, + enum: ['default', 'washitsu'] + }, + furnitures: { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + type: { + type: 'string' as const, + optional: false as const, nullable: false as const + }, + props: { + type: 'object' as const, + optional: true as const, nullable: false as const, + description: 'Properties vary depending on the furniture' + }, + position: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + x: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + y: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + z: { + type: 'number' as const, + optional: false as const, nullable: false as const + } + } + }, + rotation: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + x: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + y: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + z: { + type: 'number' as const, + optional: false as const, nullable: false as const + } + } + } + } + } + }, + carpetColor: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'hex', + example: '#85CAF0' + } + } } }; diff --git a/src/server/api/endpoints/room/update.ts b/src/server/api/endpoints/room/update.ts index 3022b96b1d..af8b80be9a 100644 --- a/src/server/api/endpoints/room/update.ts +++ b/src/server/api/endpoints/room/update.ts @@ -46,5 +46,6 @@ export default define(meta, async (ps, user) => { // Publish meUpdated event publishMainStream(user.id, 'meUpdated', iObj); + // TODO: レスポンスがおかしいと思う by YuzuRyo61 return iObj; }); diff --git a/src/server/api/endpoints/stats.ts b/src/server/api/endpoints/stats.ts index 955a791948..33d6af515b 100644 --- a/src/server/api/endpoints/stats.ts +++ b/src/server/api/endpoints/stats.ts @@ -6,6 +6,7 @@ export const meta = { requireCredential: false as const, desc: { + 'ja-JP': 'インスタンスの統計を取得します。', 'en-US': 'Get the instance\'s statistics' }, @@ -43,6 +44,14 @@ export const meta = { optional: false as const, nullable: false as const, description: 'The count of federated instances.', }, + driveUsageLocal: { + type: 'number' as const, + optional: false as const, nullable: false as const + }, + driveUsageRemote: { + type: 'number' as const, + optional: false as const, nullable: false as const + } } } }; diff --git a/src/server/api/endpoints/sw/register.ts b/src/server/api/endpoints/sw/register.ts index 4253c9557e..ceb70a9274 100644 --- a/src/server/api/endpoints/sw/register.ts +++ b/src/server/api/endpoints/sw/register.ts @@ -21,6 +21,22 @@ export const meta = { publickey: { validator: $.str } + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + state: { + type: 'string' as const, + optional: false as const, nullable: false as const, + enum: ['already-subscribed', 'subscribed'] + }, + key: { + type: 'string' as const, + optional: false as const, nullable: false as const + } + } } }; diff --git a/src/server/api/endpoints/username/available.ts b/src/server/api/endpoints/username/available.ts index 89f14d3dc2..6a5146e432 100644 --- a/src/server/api/endpoints/username/available.ts +++ b/src/server/api/endpoints/username/available.ts @@ -3,6 +3,11 @@ import define from '../../define'; import { Users, UsedUsernames } from '../../../../models'; export const meta = { + desc: { + 'ja-JP': 'ユーザーネームが使用されていないかをチェックします。', + 'en-US': 'Check if the username is being used.' + }, + tags: ['users'], requireCredential: false as const, @@ -11,6 +16,18 @@ export const meta = { username: { validator: $.use(Users.validateLocalUsername) } + }, + + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + available: { + type: 'boolean' as const, + optional: false as const, nullable: false as const, + description: 'Returns true if the username is not used.' + } + } } }; diff --git a/src/server/api/endpoints/users.ts b/src/server/api/endpoints/users.ts index 1c16472578..3fe2fcea42 100644 --- a/src/server/api/endpoints/users.ts +++ b/src/server/api/endpoints/users.ts @@ -4,6 +4,11 @@ import { Users } from '../../../models'; import { generateMutedUserQueryForUsers } from '../common/generate-muted-user-query'; export const meta = { + desc: { + 'ja-JP': 'ユーザー一覧を表示します。', + 'en-US': 'Display the user list.' + }, + tags: ['users'], requireCredential: false as const, diff --git a/src/server/api/endpoints/users/lists/update.ts b/src/server/api/endpoints/users/lists/update.ts index 600d834f9e..3ced871ae8 100644 --- a/src/server/api/endpoints/users/lists/update.ts +++ b/src/server/api/endpoints/users/lists/update.ts @@ -34,6 +34,12 @@ export const meta = { } }, + res: { + type: 'object' as const, + optional: false as const, nullable: false as const, + ref: 'UserList', + }, + errors: { noSuchList: { message: 'No such list.', diff --git a/src/server/api/endpoints/users/relation.ts b/src/server/api/endpoints/users/relation.ts index 086e9bd1ea..1beb925398 100644 --- a/src/server/api/endpoints/users/relation.ts +++ b/src/server/api/endpoints/users/relation.ts @@ -19,6 +19,93 @@ export const meta = { 'ja-JP': 'ユーザーID (配列でも可)' } } + }, + + res: { + oneOf: [ + { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + isFollowing: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + hasPendingFollowRequestFromYou: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + hasPendingFollowRequestToYou: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + isFollowed: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + isBlocking: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + isBlocked: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + isMuted: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + } + } + }, + { + type: 'array' as const, + optional: false as const, nullable: false as const, + items: { + type: 'object' as const, + optional: false as const, nullable: false as const, + properties: { + id: { + type: 'string' as const, + optional: false as const, nullable: false as const, + format: 'id' + }, + isFollowing: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + hasPendingFollowRequestFromYou: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + hasPendingFollowRequestToYou: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + isFollowed: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + isBlocking: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + isBlocked: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + }, + isMuted: { + type: 'boolean' as const, + optional: false as const, nullable: false as const + } + } + } + } + ] } }; diff --git a/src/server/api/openapi/gen-spec.ts b/src/server/api/openapi/gen-spec.ts index 8fc634d69b..5185696675 100644 --- a/src/server/api/openapi/gen-spec.ts +++ b/src/server/api/openapi/gen-spec.ts @@ -180,7 +180,7 @@ export function genOpenapiSpec(lang = 'ja-JP') { } }, '403': { - description: 'Forbiddon error', + description: 'Forbidden error', content: { 'application/json': { schema: { diff --git a/src/server/api/openapi/schemas.ts b/src/server/api/openapi/schemas.ts index b96d1f457f..99107c986e 100644 --- a/src/server/api/openapi/schemas.ts +++ b/src/server/api/openapi/schemas.ts @@ -16,6 +16,10 @@ import { packedPageSchema } from '../../../models/repositories/page'; import { packedUserGroupSchema } from '../../../models/repositories/user-group'; import { packedNoteFavoriteSchema } from '../../../models/repositories/note-favorite'; import { packedChannelSchema } from '../../../models/repositories/channel'; +import { packedAntennaSchema } from '../../../models/repositories/antenna'; +import { packedClipSchema } from '../../../models/repositories/clip'; +import { packedFederationInstanceSchema } from '../../../models/repositories/federation-instance'; +import { packedQueueCountSchema } from '../../../models/repositories/queue'; export function convertSchemaToOpenApiSchema(schema: Schema) { const res: any = schema; @@ -84,4 +88,8 @@ export const schemas = { Hashtag: convertSchemaToOpenApiSchema(packedHashtagSchema), Page: convertSchemaToOpenApiSchema(packedPageSchema), Channel: convertSchemaToOpenApiSchema(packedChannelSchema), + QueueCount: convertSchemaToOpenApiSchema(packedQueueCountSchema), + Antenna: convertSchemaToOpenApiSchema(packedAntennaSchema), + Clip: convertSchemaToOpenApiSchema(packedClipSchema), + FederationInstance: convertSchemaToOpenApiSchema(packedFederationInstanceSchema), }; -- cgit v1.2.3-freya From 344e13ebcbc65b3b064def0108c343f876f96ebc Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 6 Mar 2021 22:34:26 +0900 Subject: fix bug --- src/server/api/endpoints/admin/show-users.ts | 2 +- src/server/api/endpoints/users.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/api/endpoints/admin/show-users.ts b/src/server/api/endpoints/admin/show-users.ts index 03abe7a57b..17fbefdf61 100644 --- a/src/server/api/endpoints/admin/show-users.ts +++ b/src/server/api/endpoints/admin/show-users.ts @@ -71,7 +71,7 @@ export default define(meta, async (ps, me) => { case 'available': query.where('user.isSuspended = FALSE'); break; case 'admin': query.where('user.isAdmin = TRUE'); break; case 'moderator': query.where('user.isModerator = TRUE'); break; - case 'adminOrModerator': query.where('user.isAdmin = TRUE OR isModerator = TRUE'); break; + case 'adminOrModerator': query.where('user.isAdmin = TRUE OR user.isModerator = TRUE'); break; case 'alive': query.where('user.updatedAt > :date', { date: new Date(Date.now() - 1000 * 60 * 60 * 24 * 5) }); break; case 'silenced': query.where('user.isSilenced = TRUE'); break; case 'suspended': query.where('user.isSuspended = TRUE'); break; diff --git a/src/server/api/endpoints/users.ts b/src/server/api/endpoints/users.ts index 1c16472578..933eb70b6f 100644 --- a/src/server/api/endpoints/users.ts +++ b/src/server/api/endpoints/users.ts @@ -69,7 +69,7 @@ export default define(meta, async (ps, me) => { switch (ps.state) { case 'admin': query.andWhere('user.isAdmin = TRUE'); break; case 'moderator': query.andWhere('user.isModerator = TRUE'); break; - case 'adminOrModerator': query.andWhere('user.isAdmin = TRUE OR isModerator = TRUE'); break; + case 'adminOrModerator': query.andWhere('user.isAdmin = TRUE OR user.isModerator = TRUE'); break; case 'alive': query.andWhere('user.updatedAt > :date', { date: new Date(Date.now() - 1000 * 60 * 60 * 24 * 5) }); break; } -- cgit v1.2.3-freya