Compare commits

...

1242 Commits
v4 ... dev

Author SHA1 Message Date
Pig Fang
52f6fefed0
chore: remove unavailable sponsor info 2026-03-30 21:42:23 +08:00
Steven Qiu
840555df42
make tests happy 2026-03-09 23:13:47 +08:00
Steven Qiu
9aa867e8aa
refactor: do not catch exceptions when cannot read options 2026-03-09 20:21:43 +08:00
Steven Qiu
d70b39f445
feat: add Auto-Submitted header to emails
@see https://datatracker.ietf.org/doc/html/rfc3834
Hopefully this could prevent sender being spammed by auto replies...
2025-10-09 01:54:37 +08:00
SANYE-YA
33055ecbf9
fix avatar (refactor needed) (#666) 2025-08-07 05:08:13 +08:00
Steven Qiu
2e39fbce77
fix: avatar (refactor needed) 2025-07-31 19:59:29 +08:00
Steven Qiu
1b3b020d52
fix: make imagick sanitize result stable 2025-07-27 03:34:35 +08:00
Steven Qiu
33d805ee82
fix: skinlib 2d preview (refactor needed) 2025-07-26 21:38:33 +08:00
Steven Qiu
57c02dd51c
fix: check if imagick installed 2025-07-25 17:43:53 +08:00
Steven Qiu
5b6bb98860
chore: update README 2025-07-25 17:39:02 +08:00
Steven Qiu
c01112a6c1
chore: use imagick for Intervention\Image 2025-07-25 17:13:54 +08:00
Steven Qiu
064b0967fc
chore: complete Facade namespaces in use statements 2025-07-02 19:29:19 +08:00
Steven Qiu
9f4c59abec
chore: no .DS_Store [skip ci] 2025-07-02 19:29:19 +08:00
Steven Qiu
d8547a0a3d
refactor: use Intervention/Image to sanitize textures 2025-07-02 19:12:46 +08:00
Steven Qiu
9c51bd602b chore: remove redundant VSCode launch profile 2025-06-29 16:50:14 +08:00
Steven Qiu
bc3f504ca3 chore: ci 2025-06-29 16:50:14 +08:00
Steven Qiu
761cbb7828
feat: max texture width & texture sanitize (#662)
* feat: sanitize uploaded file when user upload texture

* feat: limit max texture width to avoid png bomb

* style: apply php-cs-fixer fixes

* chore: set default value for max_texture_width option

* Update skinlib.yml

Co-authored-by: Pig Fang <g-plane@hotmail.com>

---------

Co-authored-by: Pig Fang <g-plane@hotmail.com>
2025-06-29 16:09:55 +08:00
Steven Qiu
01fe3eb4cb
chore: set filename for ci snapshot build artifact 2025-06-28 17:48:16 +08:00
Steven Qiu
f03dd8122b
chore: remove redundant command in ci 2025-06-28 17:47:28 +08:00
Steven Qiu
cfda2a6bf8
style: apply php-cs-fixer fixes 2025-06-28 06:17:40 +08:00
Steven Qiu
74ce668221
fix: phpunit test 2025-06-28 06:16:49 +08:00
Steven Qiu
5a18d24464
fix: db exception in tests 2025-06-28 03:46:17 +08:00
Steven Qiu
5125862f80
fix: unexpected db query during composer install 2025-06-27 19:23:20 +08:00
Steven Qiu
fa791857ec
fix: ci snapshot build 2025-06-26 21:47:35 +08:00
Steven Qiu
24ad29ea99
style: apply php-cs-fixer fixes 2025-06-26 21:16:56 +08:00
Steven Qiu
cdfb972bd0 fix: scopes missing after cache clear 2025-06-26 21:15:53 +08:00
Zephyr Lykos
1985ce6ff8
config: switch default registry 2025-06-25 22:57:43 +08:00
Steven Qiu
d84eb65d55
Handle null route when request is handled by middleware 2025-06-22 21:50:57 +08:00
Steven Qiu
16474fb5d0
Remove locale cookie for API requests (#660)
* Do not set locale cookie for API requests

https://t.me/blessing_skin/184899

* Remove redundant code
2025-06-22 17:48:48 +08:00
Jerry
186138b884
Fix Netlify links (#656)
* Update README-zh.md

fix: wrong link

* Fix Netlify link

---------

Co-authored-by: Steven Qiu <tnqzh123@littlesk.in>
2025-06-22 17:40:50 +08:00
Zephyr Lykos
9ca6e37e39
chore: update deps 2025-01-18 16:44:33 +08:00
Steven Qiu
866e182c31
Fix #583 (#584) 2024-01-12 20:44:58 +08:00
Zephyr Lykos
739b9c97d7
tests: fix CheckRoleTest warning 2024-01-12 20:41:37 +08:00
Zephyr Lykos
0a43c5aa67
style: format code 2024-01-12 20:37:11 +08:00
Zephyr Lykos
35bd4524e6
ci: bump snapshot builds to PHP 8.2 2024-01-12 20:35:16 +08:00
Zephyr Lykos
eba91d5f1d
chore: update frontend deps 2024-01-12 20:31:53 +08:00
Zephyr Lykos
d764836244
ci: update deps 2024-01-12 20:31:37 +08:00
Zephyr Lykos
b1b4a71c3e
chore: update deps 2024-01-12 20:24:47 +08:00
Zephyr Lykos
fb74b43d64
upgrade dependencies 2023-08-26 14:29:53 +08:00
Zephyr Lykos
2a24506c15
config: switch default registry to CloudFront 2023-07-22 15:10:29 +08:00
Asnxthaony
f436c056e0
fix: load PluginServiceProvider first 2023-05-31 16:47:56 +08:00
Asnxthaony
77b58de7ef
update to checkout@v3 2023-05-30 17:57:08 +08:00
Asnxthaony
f5a5367e3e
fix ci 2023-05-30 17:42:45 +08:00
Asnxthaony
b811a7ae41
BREAKING: increase PHP version requirement to 8.1.0 2023-05-30 16:43:57 +08:00
Asnxthaony
d96dff1144
revert auto load Console commands 2023-05-30 15:09:39 +08:00
Asnxthaony
169ca11030
BREAKING: get ready for Laravel 10 2023-05-30 14:56:27 +08:00
Asnxthaony
b25b7588a9
use twig 3 & upgrade dependencies 2023-05-30 13:19:17 +08:00
Asnxthaony
46cccdb708
feat: generate source maps for production 2023-05-27 00:39:09 +08:00
Asnxthaony
7d9b34ecc9
fix: allow open CLI from anywhere 2023-05-27 00:37:47 +08:00
Asnxthaony
a13879f2df
fix: use unique routes name 2023-05-27 00:36:01 +08:00
Asnxthaony
1e8c0f85d5
upgrade dependencies 2023-05-26 23:46:10 +08:00
Tianle Xu
2a181c9a77
fix(i18n): typo in en/auth.yml (#527) 2023-05-06 00:36:17 +08:00
Haowei Wen
1698f1162e fix ci 2023-02-10 21:28:31 +00:00
Haowei Wen
cba50ecc59 Make skin viewer resizable 2023-02-10 20:35:30 +00:00
Haowei Wen
908f191ac8 Fix sending request to /textures/undefined 2023-02-10 19:30:04 +00:00
Haowei Wen
5a5dbea05b Upgrade skinview3d 2023-02-10 06:48:55 +08:00
Haowei Wen
950f2e6c7a Update fontawesome to 6.3.0 2023-02-09 20:13:05 +00:00
Haowei Wen
ec7be1bf63 Fix dev container 2023-02-09 19:48:30 +00:00
Pig Fang
5c4afe8f80
update middlewares 2023-01-29 11:59:30 +08:00
Pig Fang
ececb3486b
upgrade PHP dependencies 2023-01-29 11:51:06 +08:00
Pig Fang
bebdea9c20
user menu can be controlled by plugins 2023-01-26 09:37:23 +08:00
Pig Fang
b8188c91be
remove meta.js file 2023-01-25 12:01:29 +08:00
Pig Fang
0b516d02c5
clean up 2023-01-25 11:48:46 +08:00
Pig Fang
82dd87703f
first argument of option() function is required 2023-01-25 11:45:33 +08:00
Pig Fang
63b828d46b
remove Workbox 2023-01-24 18:22:16 +08:00
Pig Fang
7d005f7e4a
update test 2023-01-17 10:09:44 +08:00
Pig Fang
5750c1ae94
add test 2023-01-17 10:08:04 +08:00
Pig Fang
7eff0cb66d
update Composer lock file 2023-01-17 10:05:39 +08:00
Pig Fang
eff859a864
update php-cs-fixer config & apply fixes 2023-01-16 23:15:41 +08:00
Pig Fang
64dea61ec9
refactor 2023-01-16 23:06:31 +08:00
Pig Fang
0b169df679
fix running php-cs-fixer 2023-01-16 23:02:44 +08:00
Pig Fang
e72b68f8d6
disable PHP 8.0 in CI temporarily 2023-01-16 22:58:37 +08:00
Pig Fang
f1414c1dcb
add PHP 8.2 in CI 2023-01-16 22:56:27 +08:00
Pig Fang
7086098536
fix #463 2023-01-16 22:54:49 +08:00
Pig Fang
fb35d58a65
update Composer lock file 2023-01-16 22:53:08 +08:00
薄荷牛奶萌
9120efe1c6
The interface has been modified. (#514)
Co-authored-by: Pig Fang <g-plane@hotmail.com>
Co-authored-by: Zephyr Lykos <git@mochaa.ws>
2023-01-11 12:58:37 +08:00
Asnxthaony
564672b436
fix: allow logout when user are banned 2022-12-29 12:06:58 +08:00
Pig Fang
cc8873ec31
New translations setup.yml (Chinese Simplified) (#510) 2022-12-10 10:08:44 +08:00
Pig Fang
fa90b96682
bundle Font Awesome 2022-10-08 15:58:14 +08:00
Pig Fang
f1c7845b8d
New translations admin.yml (Japanese) (#479) 2022-09-29 22:58:56 +08:00
Pig Fang
be244cde60
New translations user.yml (Chinese Simplified) (#469) 2022-08-21 15:02:10 +08:00
bingling_sama
2dc2409d3f
fix: email verification resend link visibility on dark mode (#461) 2022-08-05 14:26:11 +08:00
Pig Fang
32fa6a8a52
New Crowdin updates (#455)
* New translations auth.yml (Spanish)

* New translations options.yml (Spanish)

* New translations user.yml (Spanish)
2022-08-05 14:24:03 +08:00
mochaaP
ec790b41f1
chore(bootstrap): remove environment check
This is not necessary as we should leave troubleshooting to users themselves. It's not our responsibility to warn about misconfigurations.
2022-07-14 03:31:52 +08:00
Pig Fang
b8337bed19
New translations user.yml (Chinese Traditional) (#439) 2022-07-13 01:14:24 +08:00
mochaaP
73e308f15a fix(admin): chart title color on dark mode 2022-07-11 21:16:47 +00:00
mochaaP
3e50237846 Revert "chore(gitpod): private port by default"
This reverts commit b7c3e06590.
2022-07-11 21:05:33 +00:00
Pig Fang
33b64625d9
New translations auth.yml (Spanish) (#436) 2022-07-12 04:15:52 +08:00
Pig Fang
c2c6ef8e51
New Crowdin updates (#432)
* New translations user.yml (French)

* New translations user.yml (Spanish)

* New translations user.yml (German)

* New translations user.yml (Greek)

* New translations user.yml (Italian)

* New translations user.yml (Japanese)

* New translations user.yml (Korean)

* New translations user.yml (Dutch)

* New translations user.yml (Portuguese)

* New translations user.yml (Russian)

* New translations user.yml (Chinese Simplified)

* New translations user.yml (Chinese Traditional)
2022-07-06 14:00:13 +08:00
Haowei Wen
a153753dc5 fix typo 2022-07-06 13:43:14 +08:00
Asnxthaony
e965a53c18
feat(closet): add sanity check on closet management 2022-07-05 17:09:06 +08:00
Asnxthaony
1a7f76ea69
fix(skinlib): cast allow_downloading_texture to boolean 2022-07-04 19:11:05 +08:00
mochaaP
fe7307d655
chore(docs): add requirement for OpenSSL 1.1.1 [skip ci] 2022-06-28 14:56:24 +08:00
mochaaP
411f85b43b
chore(docs): add requirement for OpenSSL 1.1.1 2022-06-28 14:55:18 +08:00
mochaaP
4303d14e64
chore: remove stale bot 2022-06-27 11:39:46 +08:00
mochaaP
b7c3e06590 chore(gitpod): private port by default 2022-06-23 10:19:33 +00:00
mochaaP
8fd8b806b1 Revert "fix(test): disable concurrency"
This reverts commit b190ffb3d2.
2022-06-23 09:18:57 +00:00
mochaaP
2786626a3f fix: text overflow on home page 2022-06-23 08:39:43 +00:00
mochaaP
8279817d8c chore: switch default marketplace source 2022-06-23 08:19:46 +00:00
mochaaP
b737a65f5f Bump version to 6.0.2 2022-06-23 07:58:55 +00:00
mochaaP
01f3bd4eea Revert "fix: update lockfile"
This reverts commit b35a526d7b.
2022-06-23 07:55:23 +00:00
mochaaP
a8f2f64260 chore(ci): frozen yarn lockfile on test 2022-06-23 07:43:05 +00:00
mochaaP
b190ffb3d2 fix(test): disable concurrency 2022-06-23 07:19:50 +00:00
mochaaP
3686f6a2bd fix(ci): yarn cache 2022-06-23 07:16:26 +00:00
mochaaP
b35a526d7b fix: update lockfile 2022-06-23 07:13:58 +00:00
mochaaP
e7d4eaa69a Revert "chore: bump dependencies"
This reverts commit aa55856d91.
2022-06-23 07:03:53 +00:00
mochaaP
d3599b1a1c fix(test): workaround race condition 2022-06-23 07:00:38 +00:00
mochaaP
aa55856d91 chore: bump dependencies 2022-06-23 06:31:10 +00:00
mochaaP
ac63dc368c chore: fixed width icons 2022-06-23 06:02:11 +00:00
mochaaP
c81fd58ec4 chore: align checkbox with title 2022-06-23 06:01:24 +00:00
mochaaP
f0a692f492 fix: card color on dark mode 2022-06-23 06:00:47 +00:00
mochaaP
68701d1b3c fix: export global with Object.assign 2022-06-21 15:07:47 +00:00
mochaaP
190642224d fix: running on gitpod 2022-06-21 15:07:22 +00:00
mochaaP
6ebe817b47
Bump version to 6.0.1 2022-06-19 16:01:46 +08:00
mochaaP
0f31756643 fix: export globals
This reverts commit 899de768f0.
2022-06-17 07:49:13 +00:00
mochaaP
f90a8c5371 fix: jQuery export 2022-06-17 07:38:37 +00:00
mochaaP
0394597b52 chore: use project typescript in vscode 2022-06-17 07:21:31 +00:00
mochaaP
9384e7dde6 chore: migrate to gp ports wait 2022-06-17 07:21:06 +00:00
mochaaP
eca2dffc31 fix: remove gitpod config from tsconfig 2022-06-17 14:03:20 +08:00
mochaaP
cca94c85ad chore: move in gitpod config 2022-06-17 13:47:29 +08:00
mochaaP
899de768f0 fix: export globals 2022-06-17 13:24:52 +08:00
mochaaP
74db97c644 Revert "expose React globals"
This reverts commit ccbb4f42f0.
2022-06-17 13:20:49 +08:00
Pig Fang
ccbb4f42f0
expose React globals
fix bs-community/blessing-skin-plugins#145
2022-06-15 14:16:37 +08:00
Pig Fang
e57038256c Bump version to 6.0.0 2022-06-13 17:41:08 +08:00
graywolf
663d9120b6
feat: sort closet by desc (#412)
for consistency with skinlib
2022-06-03 20:11:59 +08:00
Pig Fang
205f89bfc5
New translations setup.yml (Japanese) (#391) 2022-04-20 14:06:34 +08:00
mochaaP
7b267497c0
fix(build): composer autoload 2022-04-18 22:21:29 +08:00
mochaaP
c0112c7e25
chore(ci): manual notification push 2022-04-17 05:32:39 +08:00
mochaaP
81b7d0d7b7
feat(ci): snapshot builds 2022-04-17 03:43:18 +08:00
mochaaP
d4ea48c904
chore: make typescript happy (explicit any) 2022-04-17 02:33:36 +08:00
mochaaP
e4d35ad012
feat: re-add docker build support (#395)
also fixed failed ci
2022-04-17 02:23:48 +08:00
mochaaP
2452ed06da
chore: new copyright footer options (#392)
Squashed commit of the following:

commit ea640e77447e5a120f679c0b8f27d048487dd560
Author: Cinnamoroll-Rabbit <101342651+Cinnamoroll-Rabbit@users.noreply.github.com>
Date:   Sat Apr 16 23:16:00 2022 +0800

    chore: new copyright footer options
2022-04-17 02:17:54 +08:00
Pig Fang
b738b388ae
New Crowdin updates (#390) 2022-04-15 11:46:44 +08:00
Pig Fang
157994aaea
New translations options.yml (Russian) (#388) 2022-04-10 09:31:57 +08:00
Asnxthaony
c2a6ba9570
fix webpack config 2022-03-26 02:07:55 +08:00
Pig Fang
5596c636b7
New Crowdin updates (#383) 2022-03-24 08:30:37 +08:00
Pig Fang
5fc5c2c8c2
remove usage of jsDelivr
fix #369
fix #372
fix #375
2022-02-16 17:57:01 +08:00
Pig Fang
424ab20db1
fix possible React Hooks issues 2022-02-13 12:09:08 +08:00
Pig Fang
8b3376bf9b
refactor: use facade instead of service container 2022-02-13 12:05:39 +08:00
Pig Fang
ca42d65d1c reset page when changing skin library search query
fix #362
2022-02-12 18:11:48 +08:00
Asnxthaony
ab58c86695
reset page to 1 on new search 2022-02-12 18:04:49 +08:00
Pig Fang
3ebaf81880
fix loading AdminLTE dependencies 2022-02-12 17:57:47 +08:00
Pig Fang
8ecfc076fd
add pre-commit hook to format code 2022-02-12 17:37:16 +08:00
Pig Fang
fce1e8874f
apply Prettier fixes 2022-02-12 17:35:09 +08:00
Pig Fang
192c968bae
fix tests 2022-02-12 17:31:17 +08:00
Pig Fang
04065aa427
upgrade AdminLTE 2022-02-12 17:26:38 +08:00
Pig Fang
1cfbbd6967
fix WebP compatibility 2022-02-07 09:19:48 +08:00
Pig Fang
e4bd8a7702
Bump version to 6.0.0-rc.2 2022-02-05 22:16:25 +08:00
Pig Fang
b42f87eaa2
check prerelease when releasing 2022-02-05 22:14:08 +08:00
Pig Fang
7de23b6652
fix WebP compatibility 2022-02-05 22:04:17 +08:00
Pig Fang
b8205cd71f
apply Prettier fixes 2022-02-05 16:24:37 +08:00
Pig Fang
e0bbc2f3f5
fix tests 2022-02-05 16:16:41 +08:00
Pig Fang
5579bed8f0
upgrade skinview3d 2022-02-05 15:02:58 +08:00
Pig Fang
1c105629fc
simplify VS Code extensions recommendation [skip ci] 2022-02-04 22:54:21 +08:00
Pig Fang
1b55037db6
add npm script for type checking 2022-02-03 18:00:08 +08:00
Pig Fang
69e54d3198
fix logo in readme [skip ci] 2022-01-05 11:19:45 +08:00
Pig Fang
11a2c602ee
fix rendering content policy 2021-12-14 23:23:13 +08:00
Pig Fang
72be88b494
remove an extension recommendation 2021-12-14 23:12:12 +08:00
Pig Fang
2530f13f60
add PHP 8.1 to CI 2021-12-12 19:41:08 +08:00
Pig Fang
89db8299bb Bump version to 6.0.0-rc.1 2021-12-12 19:36:55 +08:00
Pig Fang
1b00600c3b
BREAKING: increase PHP version requirement to 8.0.2 2021-12-12 19:20:06 +08:00
Pig Fang
b2c5cca240
remove PHP 7.4 from CI 2021-12-12 18:15:21 +08:00
Pig Fang
efa20f4940
fix test 2021-12-12 18:13:39 +08:00
Pig Fang
faea0126ea
apply php-cs-fixer fixes 2021-12-12 17:59:27 +08:00
Pig Fang
88b5da401a
upgrade PHP dependencies 2021-12-12 10:58:08 +08:00
mochaaP
f3d1b196ff
fix: build on node 17 2021-11-12 14:54:22 +08:00
Pig Fang
0276d2a35b
bump version to 6.0.0-beta.4 2021-10-31 15:26:58 +08:00
Pig Fang
e253e7bff5
upgrade dependency (fix #311) 2021-10-31 15:07:47 +08:00
Pig Fang
09b7f949b7
update sponsors and backers 2021-09-04 17:19:49 +08:00
Pig Fang
07c79da198
ignore size limit warning 2021-08-23 15:35:14 +08:00
Pig Fang
e89b65afdf
fix chart data (fix #336) 2021-08-22 19:27:34 +08:00
Pig Fang
6db0a0adeb
change date format of chart in admin panel 2021-08-22 18:14:56 +08:00
Pig Fang
458791df14
New Crowdin updates (#335) 2021-08-22 17:21:29 +08:00
Pig Fang
3f7ba49c2c
fix player name rule 2021-08-22 16:45:26 +08:00
Pig Fang
2c579a4043
fix chart data 2021-08-22 12:47:25 +08:00
Pig Fang
d98beae262
tweak charts of admin panel 2021-08-22 12:04:13 +08:00
Pig Fang
014864e47d
change font of usage in admin panel 2021-08-22 11:06:55 +08:00
Pig Fang
b5eecc837d
New Crowdin updates (#329) 2021-08-22 10:58:46 +08:00
Pig Fang
e0d6403499
apply Prettier fixes 2021-08-22 10:57:45 +08:00
Pig Fang
79ec6e206a
fix duplicated logout modal (fix #332) 2021-08-22 10:50:58 +08:00
Pig Fang
e8ec0c4c0d
remove "url-loader" and "file-loader" 2021-08-22 10:39:41 +08:00
Pig Fang
61f0bf174f
report webpack warnings 2021-08-21 23:06:23 +08:00
Pig Fang
ff017573c3
use lock icon to indicate a private texture 2021-08-19 23:23:02 +08:00
Pig Fang
c12c1fbd01
make whole card of skin library item clickable 2021-08-19 23:15:56 +08:00
Pig Fang
7512eeb465
upgrade blessing/texture-renderer to accept fixes 2021-08-15 15:05:38 +08:00
Pig Fang
2b4364f2f7
New Crowdin updates (#322) 2021-08-11 23:27:02 +08:00
Pig Fang
4044e50aa5
enable Russian translations option 2021-08-08 13:29:56 +08:00
Pig Fang
d8a02a6a46
New Crowdin updates (#319)
Finished Russian.
2021-08-08 13:16:00 +08:00
Asnxthaony
61ce97ad79
use cached scopes 2021-08-07 13:20:47 +08:00
Pig Fang
a79cb1c639
update issue templates config 2021-07-30 14:46:26 +08:00
Pig Fang
e1262b4179
update issue templates 2021-07-30 14:41:27 +08:00
Asnxthaony
20e299e6c3
fix i18n 2021-07-30 06:27:57 +08:00
Asnxthaony
1f24e75f76
added missing service provider 2021-07-27 08:06:13 +08:00
Pig Fang
861412dcfb
update stale label 2021-07-26 09:38:08 +08:00
Pig Fang
38a6e436a9
New Crowdin updates (#303) 2021-07-25 13:26:40 +08:00
Pig Fang
4875564ee4
apply php-cs-fixer fix 2021-07-25 13:26:13 +08:00
Pig Fang
baf4921479
new player name rule: allow UTF-8 2021-07-25 13:14:08 +08:00
Pig Fang
1b0e9ae8d5
add stale bot 2021-07-25 11:43:58 +08:00
dz_paji
b886556137
Update auth.yml (#309) 2021-07-15 20:35:30 +08:00
Pig Fang
12801e5f04 Bump version to 6.0.0-beta.3 2021-07-03 15:42:21 +08:00
Pig Fang
ab8d1a970c
New Crowdin updates (#297) 2021-06-21 09:25:14 +08:00
Pig Fang
3ef1b249f4 update readme 2021-06-07 09:56:36 +08:00
Pig Fang
46c0119c7f fix dependencies 2021-06-07 09:54:29 +08:00
Pig Fang
35963a7e70 Revert "upgrade PHP dependencies"
This reverts commit 7388e46a2d.
2021-06-07 09:49:32 +08:00
Pig Fang
7388e46a2d upgrade PHP dependencies 2021-06-07 09:39:58 +08:00
Pig Fang
af76ac1a6b
fix color in dark mode 2021-06-06 22:41:02 +08:00
Pig Fang
073da66623
support toggling dark mode 2021-06-06 18:07:08 +08:00
Pig Fang
9c54427b08
add IDE helper 2021-06-06 17:32:35 +08:00
Pig Fang
b941210d3c
fix TypeScript errors 2021-06-06 14:33:28 +08:00
Pig Fang
7e04f72292
support dark mode UI 2021-06-06 14:27:21 +08:00
Pig Fang
1ad19878f8
upgrade AdminLTE 2021-06-05 20:05:12 +08:00
Pig Fang
09bba22227
upgrade Prettier 2021-06-05 17:11:42 +08:00
Pig Fang
7381699690
upgrade Jest and TypeScript 2021-06-05 17:10:41 +08:00
Pig Fang
ed82469f88
upgrade webpack-related dependencies 2021-06-05 16:14:39 +08:00
Pig Fang
c9838025f6
New Crowdin updates (#288) 2021-05-22 16:37:39 +08:00
Pig Fang
c4e292c877
fix resolving report with non-existing reporter 2021-05-04 18:32:35 +08:00
Pig Fang
b7af1ebf19
fix: check texture size for capes 2021-05-04 18:20:24 +08:00
Pig Fang
6226784b10
apply php-cs-fixer fixes 2021-05-04 18:17:45 +08:00
Pig Fang
5550b877df
add php-cs-fixer as dev dependency 2021-05-04 18:17:01 +08:00
Pig Fang
bb0a1dbc40
upgrade composer/semver 2021-05-04 18:05:39 +08:00
Pig Fang
8813e58269
re-enable PHP 8.0 on CI 2021-05-02 11:40:05 +08:00
Pig Fang
9cf1269798
upgrade PHP dependencies 2021-05-02 11:35:41 +08:00
Pig Fang
14fd06a11f
fix tests 2021-05-02 11:35:28 +08:00
Pig Fang
332b8cf7ef
remove unnessary "skip-ci" detection 2021-05-02 11:23:09 +08:00
Pig Fang
0a74ddd903
fix linting error 2021-05-02 11:22:11 +08:00
Pig Fang
4ccee9e47e
update sponsors and backers 2021-05-02 11:13:44 +08:00
Asnxthaony
387fe81a60
feat: OAuth scope (#287)
Co-authored-by: Pig Fang <g-plane@hotmail.com>
2021-04-18 15:31:57 +08:00
Pig Fang
5fb4240a47
fix page isn't updated when switching category in closet
fix #284
2021-04-03 10:14:21 +08:00
Pig Fang
6f638dd9fc
fix tests 2021-04-03 09:42:24 +08:00
Pig Fang
2b474437f0
don't switch category when click current closet tab
fix #279
2021-04-03 09:24:01 +08:00
Pig Fang
25a93d79b7
upgrade testing-library 2021-04-03 09:04:19 +08:00
Pig Fang
49df9d92a0
New Crowdin updates (#267) 2021-02-20 10:59:34 +08:00
Pig Fang
97057bc432
fix order of loading front-end l10n file 2021-02-18 09:43:23 +08:00
Pig Fang
fa3a3a16cb
upgrade Jest 2021-02-18 09:39:30 +08:00
Pig Fang
1db946e372
fix panic on empty notification content 2021-02-17 22:40:02 +08:00
Pig Fang
de1f596401
Bump version to 6.0.0-beta.2 2021-02-17 16:04:27 +08:00
Pig Fang
460153104c
upgrade "blessing/texture-renderer" 2021-02-17 16:01:13 +08:00
Pig Fang
28b80278ba
upgrade Laravel 2021-02-17 10:32:32 +08:00
Pig Fang
45a854450e
swap readme default language 2021-02-17 10:25:54 +08:00
Pig Fang
ad6eabff0d
update sponsors 2021-02-15 11:07:12 +08:00
Pig Fang
7be5a4ea62
Bump version to 6.0.0-beta.1 2021-02-15 10:58:56 +08:00
Pig Fang
89bb2b4db9
reject single-layer alex texture 2021-02-13 15:19:12 +08:00
Pig Fang
6f97c1efcc
remove usage of iconv 2021-01-30 17:31:43 +08:00
Pig Fang
eae6ff887c
remove "tymon/jwt-auth" package 2021-01-30 16:43:14 +08:00
Pig Fang
4020571e53
enable "zh-TW" option 2021-01-30 13:00:50 +08:00
Pig Fang
d229cb1190
upgrade webpack-related deps 2021-01-30 12:54:14 +08:00
Pig Fang
9a88570387
New Crowdin updates (#255) 2021-01-30 11:58:55 +08:00
Pig Fang
03076a9405
New Crowdin updates (#244) 2021-01-02 16:48:31 +08:00
Pig Fang
f2ddcb6ce4
use React 17 new JSX runtime 2021-01-02 16:38:18 +08:00
Pig Fang
746832a9f6
upgrade TypeScript 2021-01-02 16:12:59 +08:00
Pig Fang
928d6ffa8c
Revert "add PHP 8.0 tests on CI"
This reverts commit 2b620c3338.
2021-01-02 16:06:02 +08:00
Pig Fang
d5fd4e4c1b
upgrade PHP dependencies 2021-01-02 16:04:38 +08:00
Pig Fang
2b620c3338
add PHP 8.0 tests on CI 2021-01-02 15:55:32 +08:00
Pig Fang
4ae6368931
run php-cs-fixer 2021-01-02 15:51:37 +08:00
Pig Fang
64f2beda02
upgrade PHP dependencies (fix #247) 2021-01-01 19:03:58 +08:00
Steven Qiu
5b7bf8e7aa
Correct a word 2020-12-24 09:34:19 +08:00
Pig Fang
84c544b683
New Crowdin updates (#243) 2020-11-08 16:41:05 +08:00
Pig Fang
34c90b50f2
upgrade to webpack 5
Web CLI update:
* commander -> cac
* enquirer -> prompts
2020-11-06 15:37:45 +08:00
Pig Fang
b07e227e91
upgrade webpack loaders and plugins 2020-11-04 14:31:32 +08:00
Pig Fang
7e8f7a4a68
tweak CSS minification 2020-11-04 11:34:36 +08:00
Pig Fang
d2ffb5b9bf
fix test 2020-10-31 10:54:50 +08:00
Pig Fang
66eb658410
generate asset tags at compile time 2020-10-31 10:43:47 +08:00
Pig Fang
17ad007d40
scripts -> tools 2020-10-30 10:11:50 +08:00
Pig Fang
2163356f7e
remove Composer --no-suggest flag 2020-10-30 10:04:51 +08:00
Pig Fang
4731fc0940
fix prefetch 2020-10-26 16:12:09 +08:00
Pig Fang
3669f18e6f
update sponsors 2020-10-26 11:37:32 +08:00
Pig Fang
cf4ebfeaff
upgrade React to 17 2020-10-26 11:22:44 +08:00
Restent Ou
e9dc9ab32f
fix broken link in readme (#241) 2020-10-25 20:05:56 +08:00
Pig Fang
43d410081e
run fmt 2020-10-25 17:46:40 +08:00
Pig Fang
ddb939e562
upgrade front-end tests related deps 2020-10-25 17:35:27 +08:00
Pig Fang
d3ebd0432e
enable React strict mode 2020-10-25 10:55:58 +08:00
Pig Fang
9bfc0e6076
don't allow to render avatar for non-skin texture 2020-10-18 12:12:28 +08:00
Pig Fang
311b0690fc
upgrade Laravel to 8 2020-10-14 11:56:34 +08:00
Pig Fang
a5921770f0
use PHP 7.4 syntaxes 2020-10-14 09:48:45 +08:00
Pig Fang
0959ec02d1
tweak CI 2020-10-13 11:10:49 +08:00
Pig Fang
2c226fb1fd
upgrade PHPUnit 2020-10-13 11:06:35 +08:00
Pig Fang
986a64fe71
require PHP 7.4 2020-10-13 10:10:03 +08:00
Pig Fang
59f7bc106d
update backers 2020-10-13 09:52:34 +08:00
Pig Fang
4054301101
tweak CI 2020-10-13 09:48:05 +08:00
Pig Fang
6bc5d4468d
fix release step on CI 2020-10-13 09:46:24 +08:00
Pig Fang
3146144733
Bump version to 5.2.0 2020-10-13 09:20:01 +08:00
mochaaP
fad9e87990
chore(docs): Discord badge & markdownlint (#235) 2020-10-03 00:24:53 +08:00
Pig Fang
27499848f1
improve forms UX by adding proper HTML attributes (#234) 2020-10-01 20:37:27 +08:00
Pig Fang
3815b9d4c6
disallow admin to delete self (fix #229) (#233) 2020-10-01 16:33:42 +08:00
Pig Fang
aa78ca9535
New Crowdin updates (#232) 2020-10-01 10:57:10 +08:00
Pig Fang
2751e824b9
New Crowdin updates (#231) 2020-09-18 19:37:48 +08:00
Pig Fang
d6ac5eb5d1
support .well-known/change-password 2020-09-07 19:19:16 +08:00
Pig Fang
f9d3a500db
New Crowdin updates (#228) 2020-09-03 09:27:53 +08:00
Pig Fang
1d82dcb5df
require submitting email when verifying email 2020-08-31 19:48:31 +08:00
Pig Fang
171ea171d5
New Crowdin updates (#227) 2020-08-30 23:02:30 +08:00
Pig Fang
93a3d64eff
add missing i18n text 2020-08-30 22:44:57 +08:00
Pig Fang
f6971892a3
relax "disabled functions" check 2020-08-29 10:09:53 +08:00
Pig Fang
81a343dd56
fix CI config 2020-08-24 10:05:44 +08:00
Pig Fang
22193a4991
Bump version to 5.1.1 2020-08-24 09:59:53 +08:00
Pig Fang
f665c7fe31
fix texture is missing from uploader's closet
when set to private
2020-08-24 09:50:58 +08:00
Pig Fang
9916ad1344
fix incorrect behavior of option_localized function 2020-08-22 18:23:01 +08:00
Pig Fang
5f4ad85f0f
fix front end i18n can't be updated
fix bs-community/blessing-skin-plugins#74
2020-08-22 18:10:37 +08:00
Pig Fang
10d5b95358
use GitHub Actions to release 2020-08-22 17:15:14 +08:00
Pig Fang
5d2384498c
tweak CI config 2020-08-22 15:59:05 +08:00
Pig Fang
acddaf92ba
fix re-enable an enabled plugin 2020-08-22 15:10:33 +08:00
Pig Fang
02ca2108a3
New Crowdin updates (#221) 2020-08-22 11:30:37 +08:00
Pig Fang
a783470343
remove changelog files 2020-08-22 11:05:25 +08:00
Pig Fang
02b66161e0
fix release script 2020-08-22 10:39:06 +08:00
Pig Fang
999674457c
mark plugin_assets function as deprecated 2020-08-22 09:53:37 +08:00
Pig Fang
d13e1ba2af
use relative URL for route function (fix #222) 2020-08-21 23:10:14 +08:00
Pig Fang
479e1cbda3
fix tsc errors 2020-08-21 18:53:33 +08:00
Pig Fang
b9de4223f8
upgrade TypeScript to 4.0 2020-08-21 10:11:29 +08:00
Pig Fang
5449ac6395
Bump version to 5.1.0 2020-08-20 11:52:56 +08:00
Pig Fang
03c705ec35
change plugins marketplace source 2020-08-20 11:52:28 +08:00
Pig Fang
9998786b9b
remove parsedown 2020-08-20 10:42:04 +08:00
Pig Fang
8f731e9031
parsedown -> commonmark 2020-08-20 10:28:27 +08:00
Pig Fang
d75a7d3ead
fix that private texture can be used as avatar 2020-08-20 10:14:38 +08:00
Pig Fang
3c6325ca46
fix report page 2020-08-20 09:51:46 +08:00
Pig Fang
963334e5ee
refactor access control 2020-08-20 08:53:43 +08:00
Pig Fang
5b738ffe6f
refactor SkinlibController 2020-08-20 08:48:53 +08:00
Pig Fang
d10bcae197
provide better message when texture is missing 2020-08-19 18:34:17 +08:00
Pig Fang
fe1a03fd8f
tiny tweak 2020-08-19 18:02:25 +08:00
Pig Fang
0f791f42cc
tweak UI text 2020-08-19 17:58:31 +08:00
Pig Fang
bf860d6a68
fix that texture isn't checked if it's existed in closet
when being applied to player
2020-08-19 12:13:19 +08:00
Pig Fang
3f717e1d1e
New Crowdin updates (#216) 2020-08-19 11:27:58 +08:00
Pig Fang
f4201f091d
clean up i18n 2020-08-19 10:37:46 +08:00
Pig Fang
423b46d006
update issue template 2020-08-18 09:39:31 +08:00
Pig Fang
995d191afb
tweak CI 2020-08-17 15:08:18 +08:00
Pig Fang
7f8f773ceb
update sponsors 2020-08-17 15:05:18 +08:00
Pig Fang
e9dbb5f713
fix status code for private texture 2020-08-14 10:32:08 +08:00
Pig Fang
765b63d5cb
clean up i18n 2020-08-09 16:54:35 +08:00
Pig Fang
7997393fb3
clean up i18n 2020-08-08 22:44:29 +08:00
Pig Fang
9b416897dc
clean up i18n 2020-08-08 22:21:49 +08:00
Pig Fang
ade67fa6f8
clean up i18n 2020-08-08 21:53:21 +08:00
Pig Fang
76a78e187f
fix message for private textures
doesn't match with HTTP status code
2020-08-08 09:31:31 +08:00
Pig Fang
7e4d58d9f0
update sponsor 2020-08-07 09:02:02 +08:00
Pig Fang
6b50357347
update sponsors and backers 2020-08-01 09:47:23 +08:00
Pig Fang
3a874a1aba
upgrade dependencies 2020-07-29 19:16:01 +08:00
Pig Fang
2066987bde
refactor tests 2020-07-29 18:50:45 +08:00
Pig Fang
353db6f250
fix previews and avatars cannot be indivdually cached
by image format

fix #212
2020-07-29 18:38:21 +08:00
Pig Fang
f607ba8a41
add API of fetching avatar and preview by texture hash 2020-07-29 10:57:53 +08:00
Pig Fang
e50aed9017
New Crowdin updates (#209) 2020-07-29 10:33:45 +08:00
lookas
36ad2cf781
Fix a bug of redirecting https to http (#208) 2020-07-23 10:57:41 +08:00
Pig Fang
db57a56e25
display errors when checking environment 2020-07-20 23:13:38 +08:00
Pig Fang
b5a1f2ffc2
fix duplication of private textures (fix #194) 2020-07-20 23:08:28 +08:00
Pig Fang
8f2e48df52
tweak linting 2020-07-20 22:19:24 +08:00
mochaaP
20b172c842
fix: homepage nav links not vertically centered (#201) 2020-07-20 07:16:14 +08:00
mochaaP
701541a4ad
feat(docs): links for README badges (#202) 2020-07-20 07:15:13 +08:00
Pig Fang
8baca0306a
update changelogs 2020-07-19 15:28:35 +08:00
Pig Fang
5517e70cda
fix route names duplication (fix #199) 2020-07-19 15:22:03 +08:00
Pig Fang
f33ee62c92
New Crowdin updates (#195) 2020-07-19 07:31:31 +08:00
mochaaP
b4527664d6
feat: click to select hash (#198)
* feat: click to select hash

* chore: lint
2020-07-19 07:30:46 +08:00
Pig Fang
58da4edf2f Bump version to 5.0.0 2020-07-18 11:31:41 +08:00
Pig Fang
d4546e24f3
remove pre-release argument 2020-07-17 21:47:01 +08:00
Pig Fang
a4849c702a
add missing url 2020-07-16 18:51:28 +08:00
Pig Fang
2d92d6f35c
update url 2020-07-16 18:35:03 +08:00
Pig Fang
11305acc6a
re-enable eslint 2020-07-13 11:25:40 +08:00
Pig Fang
dce22c49ad
tweak tsconfig 2020-07-13 10:40:31 +08:00
Pig Fang
5f6f84bb4c
fix environment check 2020-07-13 10:26:06 +08:00
Pig Fang
aea797869b
fix env file 2020-07-12 23:31:40 +08:00
Pig Fang
cc4549d059
fix reading notification 2020-07-12 11:02:29 +08:00
Pig Fang
2d1bac84e0
tweak avatar style 2020-07-09 22:15:09 +08:00
Pig Fang
58a4d6bea0
update readme 2020-07-08 15:19:35 +08:00
Pig Fang
6a161d6ee1
update readme 2020-07-08 14:39:45 +08:00
Pig Fang
92bd000181
tweak CSS 2020-07-07 09:55:39 +08:00
Pig Fang
60f711143d
add more checks before setup 2020-07-06 09:27:11 +08:00
Pig Fang
05b0437e4c
check "zip" extension 2020-07-05 11:43:49 +08:00
Pig Fang
30c4779f3b
Bump version to 5.0.0-rc.5 2020-07-05 10:24:48 +08:00
Pig Fang
743f9119a6
upgrade dependencies 2020-07-05 09:46:57 +08:00
Pig Fang
c145803840
tiny tweak 2020-07-04 18:32:16 +08:00
Pig Fang
2bfa018e96
fix viewer background 2020-07-04 18:10:13 +08:00
Pig Fang
62ac0f5f9c
fix css of skin library item 2020-07-04 17:54:05 +08:00
Pig Fang
e786fff10d
set perPage according to screen width 2020-07-04 17:45:55 +08:00
Pig Fang
9856157cec
tweak UI state 2020-07-04 17:12:26 +08:00
Pig Fang
5a5c255f77
tweak pagination 2020-07-04 16:41:30 +08:00
Pig Fang
c798b4cb25
don't escape inline css 2020-07-04 16:34:49 +08:00
Pig Fang
08e9f8be98
add skeleton for texture detail page 2020-07-04 16:25:48 +08:00
Pig Fang
b44d0724ef
fix fetching Telegram bot 2020-07-04 15:21:43 +08:00
Pig Fang
96a3f5d987
add token to fetch bot binary 2020-07-04 15:20:39 +08:00
Pig Fang
a6c10ced20
no need to copy lang files 2020-07-04 15:13:23 +08:00
Pig Fang
9feb567d41
tweak side menu 2020-07-04 15:02:38 +08:00
Pig Fang
bf01939452
fix for too long nickname at skin library 2020-07-04 11:52:44 +08:00
Pig Fang
44a31de2cd
add skeleton for players management 2020-07-04 11:23:24 +08:00
Pig Fang
49ff44ee6f
add skeleton for users management 2020-07-04 10:54:10 +08:00
Pig Fang
6b695a745b
add skeleton for closet 2020-07-04 09:36:46 +08:00
Pig Fang
feda32b726
allow to customize perPage at closet 2020-07-04 09:30:57 +08:00
Pig Fang
a28abb70ac
add skeleton 2020-07-03 19:10:45 +08:00
Pig Fang
0bf1458b0a
refactor webpack config with TS 2020-07-03 16:30:46 +08:00
Pig Fang
14e969ebbb
upgrade dependencies 2020-07-03 15:56:58 +08:00
Pig Fang
e9f8be1653
implement RFC 0001 2020-07-02 12:20:05 +08:00
Pig Fang
cf40ca01ea
move jQuery to devDependencies 2020-07-02 11:26:40 +08:00
Pig Fang
cd01b26168
tweak TS config 2020-07-02 11:19:53 +08:00
Pig Fang
26c04824d7
extend valid time of cookie locale 2020-07-02 09:22:30 +08:00
Pig Fang
56c1c481f5
tweak chart 2020-07-01 16:27:34 +08:00
Pig Fang
6b7e7a8370
fix displaying number of label in admin chart 2020-07-01 16:08:00 +08:00
Pig Fang
a26ddfbf19
allow to customize fallback locale 2020-07-01 15:33:50 +08:00
Pig Fang
a12b8aeefa
fix typo 2020-06-30 17:49:04 +08:00
Pig Fang
d38e159205
allow to register custom Web CLI programs 2020-06-30 17:48:03 +08:00
Pig Fang
42c10d7856
fix message text for enabling/disabling plugin
at artisan CLI
2020-06-30 11:03:54 +08:00
Pig Fang
2d68b3c818
update environment checker 2020-06-30 10:18:48 +08:00
Pig Fang
c8af8ccd3e
update route of notifications 2020-06-30 09:28:22 +08:00
Pig Fang
db74a9c051
remove unnecessary code 2020-06-30 09:27:40 +08:00
Pig Fang
e018ced5d8
fix TypeScript errors 2020-06-28 22:49:24 +08:00
Pig Fang
d4e482abb7
tweak URL of user avatar 2020-06-28 22:43:41 +08:00
Pig Fang
b8dab4b57a
fix blessing global 2020-06-28 22:23:10 +08:00
Pig Fang
d242c124e9
fix TypeScript errors 2020-06-28 16:33:35 +08:00
Pig Fang
62a5e856e3
increase service worker file version 2020-06-28 16:18:53 +08:00
Pig Fang
9c5945235c
update type definition 2020-06-28 16:14:56 +08:00
Pig Fang
54fda11cb4
fix tests 2020-06-28 16:05:29 +08:00
Pig Fang
78491fcca6
fix CI 2020-06-28 15:59:42 +08:00
Pig Fang
017db1788b
add migration 2020-06-28 15:57:46 +08:00
Pig Fang
d87791ab3d
fix loading assets from CDN 2020-06-28 15:54:41 +08:00
Pig Fang
9b6bf7ba7a
clean up 2020-06-28 15:43:44 +08:00
Pig Fang
aa4c34dd01
fix cross origin issue for assets 2020-06-28 15:35:48 +08:00
Pig Fang
49b7483cdb
update config 2020-06-28 11:35:52 +08:00
Pig Fang
a3ea8e3c62 fix test 2020-06-26 09:21:09 +08:00
Pig Fang
ea26abcc3b add missing migration from laravel/passport 2020-06-26 09:06:45 +08:00
Pig Fang
4e3ce6782f mark addUserBadge deprecated 2020-06-26 08:59:51 +08:00
Pig Fang
db2e04ab64 update readme 2020-06-25 16:17:02 +08:00
Pig Fang
835ce71a16 update readme 2020-06-25 16:13:52 +08:00
Pig Fang
ae687b8cf5 Bump version to 5.0.0-rc.4 2020-06-24 16:31:23 +08:00
Pig Fang
a955fdfefa add t to global blessing variable 2020-06-24 16:12:29 +08:00
Pig Fang
87bc54e6f8 clean up 2020-06-24 16:12:11 +08:00
Pig Fang
38943ababf rename 2020-06-24 16:12:01 +08:00
Pig Fang
694f882931 upgrade dependencies 2020-06-24 16:00:05 +08:00
Pig Fang
78c1373960 clean up comments 2020-06-24 15:25:36 +08:00
Pig Fang
98714a8851 apply php-cs-fixer 2020-06-24 10:52:02 +08:00
Pig Fang
ffef98ad2e refactor update 2020-06-24 10:49:53 +08:00
Pig Fang
ce43f9a586 fix loading i18n of plugins 2020-06-23 18:17:16 +08:00
Pig Fang
49b18783ba fix toast tests 2020-06-23 17:52:50 +08:00
Pig Fang
7a78c612bf fix toast 2020-06-23 15:37:18 +08:00
Pig Fang
56ec01f32a disable cache at development 2020-06-23 10:24:28 +08:00
Pig Fang
ffc5ae4619 make suggestions customizable 2020-06-22 16:31:43 +08:00
Pig Fang
d4aa16773d improve email input control 2020-06-22 16:16:09 +08:00
Pig Fang
94a28806e1 refactor 2020-06-22 10:17:08 +08:00
Pig Fang
5a42f3c44d fix name of email "from" not recognized
(close #187)
2020-06-21 18:57:48 +08:00
Pig Fang
a7b9d19b9b update sponsors 2020-06-20 10:41:13 +08:00
Pig Fang
dba8e5a035 Bump version to 5.0.0-rc.3 2020-06-20 09:42:17 +08:00
Pig Fang
06b937f8ce fix 503 page 2020-06-20 09:42:02 +08:00
Pig Fang
07ba462073
New Crowdin updates (#186) 2020-06-20 09:32:04 +08:00
Pig Fang
ef7dfd2a71 extract "disable-registration" as plugin 2020-06-19 19:05:51 +08:00
Pig Fang
4d22e0d2ee fix tsc errors 2020-06-18 11:52:17 +08:00
Pig Fang
153d852f76 fix delete method doesn't work on AliCDN
fix #184
2020-06-18 11:45:10 +08:00
Pig Fang
46f4a1b3c5
New Crowdin translations (#181) 2020-06-18 09:47:09 +08:00
Pig Fang
f4161d8fc5 add missing route
close bs-community/blessing-skin-plugins#59
2020-06-16 10:03:28 +08:00
Pig Fang
6568ed311d tweak routes of i18n management 2020-06-16 09:50:30 +08:00
Pig Fang
86c39e6b12 remove inline scripts as possible 2020-06-11 19:27:15 +08:00
Pig Fang
9f6cec56a8 fix previewing textures at players page 2020-06-11 17:53:21 +08:00
Pig Fang
d018f207f3 remove unnecessary SQL queries 2020-06-11 15:34:18 +08:00
Pig Fang
6c4eb5441e Bump version to 5.0.0-rc.2 2020-06-11 10:23:04 +08:00
Pig Fang
40300ca17f fix uploading texture (fix #180) 2020-06-11 10:22:52 +08:00
Pig Fang
2df480fe94 update sponsors 2020-06-10 22:25:49 +08:00
Pig Fang
1a914b0db6 fix installing plugin 2020-06-09 10:23:26 +08:00
Pig Fang
44a86e70c5 reimplement hooks 2020-06-08 10:40:23 +08:00
Pig Fang
f22867c7cf remove unnecessary hook 2020-06-08 09:56:21 +08:00
Pig Fang
2fb67537df optimize querying reports 2020-06-08 09:51:35 +08:00
Pig Fang
322b1a4c5e Bump version to 5.0.0-rc.1 2020-06-08 08:30:40 +08:00
Pig Fang
7bcee679c7 fix tsc error 2020-06-07 23:41:15 +08:00
Pig Fang
aeb8a0800c extract oauth client as plugin 2020-06-07 23:38:08 +08:00
Pig Fang
1e85794256 add UI rows for auth pages 2020-06-07 18:54:52 +08:00
Pig Fang
95fed10535 fix mounted event 2020-06-07 18:09:21 +08:00
Pig Fang
b0ea5cdd63 tweak plugins management page 2020-06-07 17:38:18 +08:00
Pig Fang
30e25cf0a8 fix player isn't updated
after closet item was removed
2020-06-07 11:10:04 +08:00
Pig Fang
88e3ed7a07 add more events for ClosetManagementController 2020-06-07 10:54:26 +08:00
Pig Fang
de95ea8111 tiny tweaks 2020-06-07 10:28:54 +08:00
Pig Fang
0053df977a update tests 2020-06-07 10:25:09 +08:00
Pig Fang
73c529c152 add more events and filters for SkinlibController 2020-06-07 10:11:35 +08:00
Pig Fang
b9a40af92d add more fillable fields on models 2020-06-06 15:48:43 +08:00
Pig Fang
ab264604e0 tiny tweak 2020-06-06 11:22:16 +08:00
Pig Fang
c7b8cdab40 correct the implementation of useMount 2020-06-06 10:12:16 +08:00
Pig Fang
a1ce50609f update changelog 2020-06-06 09:53:19 +08:00
Pig Fang
78f6c6c286 clean up 2020-06-05 23:42:12 +08:00
Pig Fang
946896117a refactor SkinlibController 2020-06-05 23:35:49 +08:00
Pig Fang
160dbff834 fix blade template 2020-06-05 23:25:59 +08:00
Pig Fang
3b7d3c2c34 add cs check on CI 2020-06-04 21:50:46 +08:00
Pig Fang
f1294c8f57 fix build script 2020-06-04 21:32:33 +08:00
Pig Fang
9141af2a70 refactor fetching texture info 2020-06-04 18:12:58 +08:00
Pig Fang
0ce4610c0c tiny tweaks 2020-06-04 16:42:10 +08:00
Pig Fang
b8d85ad2b3 refactor texture uploading 2020-06-04 16:36:10 +08:00
Pig Fang
d991db1640
New Crowdin translations (#179) 2020-06-04 16:26:07 +08:00
Pig Fang
d09fcc0f96 update i18n of validation message 2020-06-04 15:59:41 +08:00
Pig Fang
8dde6e0e2f update i18n of validation message 2020-06-04 15:47:46 +08:00
Pig Fang
fa30825656 tweak about locale 2020-06-04 14:53:13 +08:00
Pig Fang
3841459bcf remove EncryptUserPassword event 2020-06-03 17:08:22 +08:00
Pig Fang
70bf5f10bc
New Crowdin translations (#178) 2020-06-03 14:57:06 +08:00
Pig Fang
7ae9a05f0c extract "single-player" function as plugin 2020-06-03 14:47:44 +08:00
Pig Fang
f4c2da3b31 fix routes 2020-06-03 10:21:16 +08:00
Pig Fang
e54fecd6e5 simplify player owner checking 2020-06-03 09:24:31 +08:00
Pig Fang
f78d37cd6e refactor filter usage 2020-06-03 09:14:47 +08:00
Pig Fang
a451c498d6 refactor routes 2020-06-03 09:02:25 +08:00
Pig Fang
e4d8289eba refactor validation 2020-06-02 18:34:10 +08:00
Pig Fang
b8ab1f41e5 add more events and filters for PlayerController 2020-06-02 18:24:00 +08:00
Pig Fang
1f291bd671 apply php-cs-fixer 2020-06-02 18:23:36 +08:00
Pig Fang
069ec27e6f add type annotation 2020-06-02 15:46:04 +08:00
Pig Fang
d40bc66438 add more events and filters for AuthController 2020-06-02 10:49:06 +08:00
Pig Fang
a3aa914520
New Crowdin translations (#177) 2020-06-02 10:07:36 +08:00
Pig Fang
a454f526ba add more events and filters for UserController 2020-06-01 17:29:24 +08:00
Pig Fang
cf95b3a345 simplify sign calculation 2020-06-01 16:59:42 +08:00
Pig Fang
ecc3d02167 tweak service worker 2020-06-01 16:20:28 +08:00
Pig Fang
1f842a09dd update sponsors and backers 2020-06-01 09:26:49 +08:00
Pig Fang
d7f92bf3b2 tweak user API 2020-06-01 09:07:26 +08:00
Pig Fang
f6650c1636 fix dependency issue 2020-05-31 19:17:15 +08:00
Pig Fang
c121747cc0 upgrade PHP dependencies 2020-05-31 18:22:08 +08:00
Pig Fang
b8a4dd8e34 fix foot composer 2020-05-31 16:43:52 +08:00
Pig Fang
eabcc540e2 update .vscode 2020-05-31 16:40:15 +08:00
Pig Fang
0acfa1174b refactor 2020-05-31 16:37:09 +08:00
Pig Fang
ba251beeca add filters for head and foot composers 2020-05-31 16:30:56 +08:00
Pig Fang
d86bdd22d9 add filter for user panel 2020-05-31 16:20:34 +08:00
Pig Fang
30e4c7d28a add filter for side menu 2020-05-30 16:39:01 +08:00
Pig Fang
dde61d31f4 convert viewer background images format to WebP 2020-05-30 11:35:24 +08:00
Pig Fang
4d25b2042d convert background image format to WebP 2020-05-30 11:18:13 +08:00
Pig Fang
248362487f update coverage ignore 2020-05-30 11:16:49 +08:00
Pig Fang
1cf4101cde commit generated code to vcs 2020-05-30 11:10:38 +08:00
Pig Fang
c662121ad9 fix output 2020-05-30 10:58:53 +08:00
Pig Fang
2656b92fce tweak build 2020-05-30 10:55:30 +08:00
Pig Fang
5094cff07a generate URLs by codegen 2020-05-30 10:44:36 +08:00
Pig Fang
46223eba4f fix score calculation at upload page (fix #174) 2020-05-29 10:34:48 +08:00
Pig Fang
6f55045f9e refactor routes 2020-05-29 09:09:10 +08:00
Pig Fang
f36852a24b add events and filters for closet 2020-05-28 18:44:42 +08:00
Pig Fang
8b2f2db6eb refactor controllers 2020-05-27 17:28:24 +08:00
Pig Fang
d2d549b657 send verification email after registering 2020-05-27 16:37:55 +08:00
Asnxthaony
975464efb6
remove defer attr 2020-05-25 19:21:36 +08:00
Pig Fang
9bcace175d Bump version to 5.0.0-beta.9 2020-05-22 09:30:05 +08:00
Pig Fang
cb2e7bb866 fix test 2020-05-21 22:42:24 +08:00
Pig Fang
d6953ac5bb fix test 2020-05-21 22:37:08 +08:00
Pig Fang
cde0c7bbbb tweak tests 2020-05-21 22:30:15 +08:00
Pig Fang
d9dbe8ee65 fix test 2020-05-21 19:22:02 +08:00
Pig Fang
2c0bd3be74 fix test 2020-05-21 19:16:38 +08:00
Pig Fang
3bcdcd0533 fix tests 2020-05-21 19:14:00 +08:00
Pig Fang
de44c0b785 add fallback for creating avatar and preview 2020-05-21 18:33:01 +08:00
Pig Fang
9211e6fb33 fix tests 2020-05-21 15:04:47 +08:00
Pig Fang
3e919367dd fix tests 2020-05-21 14:42:17 +08:00
Pig Fang
12dab489d6 change format of avatar and 2D preview to WebP 2020-05-21 11:49:16 +08:00
Pig Fang
361868038f add missing css 2020-05-21 11:36:41 +08:00
Pig Fang
24d3a2e50a revert 2020-05-21 11:35:27 +08:00
Pig Fang
cccaef302a template tweak 2020-05-21 11:22:56 +08:00
Pig Fang
d1afc6645c optimize loading css 2020-05-21 10:52:14 +08:00
Pig Fang
93880b5ac1 tweak service worker 2020-05-20 12:12:48 +08:00
Pig Fang
ed73106116 add prefetch at home page 2020-05-20 12:07:37 +08:00
Pig Fang
3e2ff83cc8
New Crowdin translations (#173) 2020-05-20 10:17:01 +08:00
Pig Fang
8f6c2fc8b8 run prettier 2020-05-20 10:11:38 +08:00
Pig Fang
6de0f8ef60 add tid at reports management page 2020-05-20 10:09:31 +08:00
Pig Fang
6b536a04ac update icon 2020-05-20 10:06:51 +08:00
Pig Fang
3ba1726774 reduce resource size of home page 2020-05-20 10:03:47 +08:00
Pig Fang
71ba65bd85 tweak heading level of score dialog 2020-05-20 09:31:56 +08:00
Pig Fang
31a3fa6564 add missing user.banned event 2020-05-19 19:02:09 +08:00
Pig Fang
abf19161f9 fix 2020-05-19 18:47:14 +08:00
Pig Fang
3395bda800 fix webpack config 2020-05-19 18:25:57 +08:00
Pig Fang
8b0891d1da split React package 2020-05-19 17:10:55 +08:00
Pig Fang
68d57da1d9 use service worker to cache resources 2020-05-19 17:02:54 +08:00
Pig Fang
6d84747458 fix css class name 2020-05-19 15:04:18 +08:00
Pig Fang
e0c7dc346e update JS dependencies 2020-05-19 09:33:41 +08:00
Pig Fang
1a894513c5 update PHP dependencies 2020-05-18 19:16:40 +08:00
Pig Fang
1042de2f8f tweak 2020-05-18 16:46:19 +08:00
Pig Fang
907d370b19 tweak resources loading 2020-05-18 16:40:31 +08:00
Asnxthaony
50502baea7
fix i18n 2020-05-18 12:25:22 +08:00
Pig Fang
8a59985180 fix tsc errors 2020-05-16 22:11:15 +08:00
Pig Fang
c48583dd6d run prettier 2020-05-16 22:05:16 +08:00
Pig Fang
ec24dff36a refactor styling system 2020-05-16 21:56:08 +08:00
Pig Fang
16b4ee7b6d refactor: trans -> t 2020-05-15 11:39:31 +08:00
Pig Fang
dfeff83b5e clean up 2020-05-15 11:31:30 +08:00
Pig Fang
291efe730f rewrite reports management page with React 2020-05-15 11:05:04 +08:00
Pig Fang
c0d9d18efc fix modal "applying texture to player" 2020-05-14 23:16:39 +08:00
Pig Fang
bfe205ddb3 tweak css 2020-05-14 09:41:40 +08:00
Pig Fang
94642a7cd7 tweak 2020-05-14 09:30:20 +08:00
Pig Fang
42508a9990 fix readme link 2020-05-14 09:21:18 +08:00
Pig Fang
b9c986db59 remove unused code 2020-05-13 18:49:47 +08:00
Pig Fang
3556f29a24 refactor with const enum 2020-05-13 18:40:09 +08:00
Pig Fang
3e1a10a461 rewrite users management page with React 2020-05-13 18:12:01 +08:00
Pig Fang
f795194dc3 refactor tests 2020-05-13 10:54:35 +08:00
Pig Fang
b8c60aa948 simplify 2020-05-13 10:42:35 +08:00
Pig Fang
2f3dbe7f89 test: add assertion 2020-05-13 09:28:23 +08:00
Pig Fang
496b732cb9 upgrade TypeScript 2020-05-13 09:23:17 +08:00
Pig Fang
fff60b37ac require super admin to download or upload plugin 2020-05-12 18:50:58 +08:00
Pig Fang
370311db54 simplify 2020-05-11 11:17:00 +08:00
Pig Fang
6ecb068376
New Crowdin translations (#169) 2020-05-11 09:20:13 +08:00
Pig Fang
15af883976 tiny tweaks 2020-05-10 23:34:04 +08:00
Pig Fang
504d985c8d tweak players API (breaking change) 2020-05-09 10:11:07 +08:00
Pig Fang
88d9901e77 clean up 2020-05-08 23:29:14 +08:00
Pig Fang
5e051eadfe refactor 2020-05-08 23:16:13 +08:00
Pig Fang
63556cabae tiny tweak 2020-05-08 16:21:40 +08:00
Pig Fang
b4b75151fd fix globals for Wappalyzer detection 2020-05-06 11:45:01 +08:00
Pig Fang
ca8d743870 move Dockerfile out 2020-05-04 11:34:17 +08:00
Pig Fang
0e755dbc53 add Docker (Apache) 2020-05-03 15:41:06 +08:00
Pig Fang
437ac5b120 rewrite plugins market with React 2020-05-01 23:44:30 +08:00
Pig Fang
b183dae6bd add API for closet management 2020-05-01 22:52:43 +08:00
Pig Fang
0dbdcc255e tweak UI text 2020-05-01 12:14:02 +08:00
Pig Fang
e6f919940f refactor with immer 2020-05-01 09:00:57 +08:00
Pig Fang
3ad2f93c82 fix wrong texture type after resetting viewer 2020-05-01 08:38:39 +08:00
Pig Fang
1b7f14e0e0 add missing title 2020-05-01 08:36:11 +08:00
Pig Fang
7c6bfd6271 add API for players management 2020-05-01 08:34:47 +08:00
Pig Fang
d7849346cc refactor 2020-05-01 08:30:18 +08:00
Pig Fang
aff278622c add table view mode for players management 2020-05-01 08:25:02 +08:00
Pig Fang
3df0f1c65a update changelog 2020-04-30 23:00:06 +08:00
Pig Fang
6e82468692 refactor hooks 2020-04-30 22:57:57 +08:00
Pig Fang
80d67c4518 update sponsors 2020-04-30 18:49:47 +08:00
Pig Fang
af351d211b rewrite players management page with React 2020-04-30 18:47:37 +08:00
Pig Fang
c6ef42d477
New Crowdin translations (#168) 2020-04-30 11:26:29 +08:00
Pig Fang
55990f24be fix searching textures in skin library 2020-04-27 18:46:22 +08:00
Pig Fang
5ea1187f2a fix adding texture from skinlib to closet 2020-04-26 21:57:14 +08:00
Pig Fang
840722c80b fix pagination 2020-04-26 21:31:19 +08:00
Pig Fang
bec071fdb9 remove first page and last page of pagination 2020-04-26 17:52:18 +08:00
Pig Fang
262dca0f8e tweak html tag 2020-04-26 11:12:10 +08:00
Pig Fang
c9a8fddd57 meta: update name 2020-04-26 11:01:07 +08:00
Pig Fang
79b770a8f0 update sponsors 2020-04-24 17:32:08 +08:00
Pig Fang
70e9570057 upgrade dependencies 2020-04-23 15:40:17 +08:00
Pig Fang
f4eae872d1 remove fallback locale property 2020-04-23 11:47:26 +08:00
Pig Fang
57632d52bc fix plugins management page 2020-04-23 11:34:42 +08:00
Pig Fang
beb2c96aef fix title of plugin readme 2020-04-23 11:09:45 +08:00
Pig Fang
00eaa15cf2 add PHPDoc 2020-04-19 19:36:39 +08:00
Pig Fang
7093eaedd1 Bump version to 5.0.0-beta.8 2020-04-08 08:55:18 +08:00
Pig Fang
75887efda6 run php-cs-fixer 2020-04-07 16:09:38 +08:00
Pig Fang
1669269ca3 allow l10n of plugins market registry 2020-04-07 16:09:30 +08:00
Pig Fang
f0e3b6a866 fix skin library page 2020-04-07 15:52:57 +08:00
Pig Fang
cad6845e68 Merge branch 'dev' of github.com:bs-community/blessing-skin-server into dev 2020-04-07 14:16:56 +08:00
Pig Fang
d116b10b16 fix loading artisan commands 2020-04-07 14:16:48 +08:00
Asnxthaony
800370ca47
converted CRLF line break to LF 2020-04-07 12:54:48 +08:00
Asnxthaony
7479217d03
Bump version to 5.0.0-beta.7 2020-04-07 12:14:56 +08:00
Pig Fang
b53ccd4801 update registry url 2020-04-07 11:56:54 +08:00
Pig Fang
ef4e925058 update issue template 2020-04-07 10:04:38 +08:00
Pig Fang
71a1caf95d expose React to global at development env 2020-04-06 16:55:12 +08:00
Pig Fang
0f45600e21 add filters for login and registration 2020-04-06 11:13:56 +08:00
Pig Fang
04703cc7e5 handle http 400 properly 2020-04-06 10:53:51 +08:00
Pig Fang
2039a0a554 tweak test 2020-04-05 10:22:09 +08:00
Pig Fang
ca37fa8db2
New Crowdin translations (#157) 2020-04-05 10:21:32 +08:00
Pig Fang
988b0ace8c add commands for managing plugin 2020-04-05 10:15:00 +08:00
Pig Fang
afd7ea993b allow to login even update is pending 2020-04-01 16:31:34 +08:00
Pig Fang
67f2d513ea tweak tests 2020-04-01 15:34:14 +08:00
Pig Fang
7afdc9e9ba add new command for update 2020-04-01 15:34:06 +08:00
Pig Fang
31bd48eec7 add missing page URL query 2020-04-01 14:43:21 +08:00
Pig Fang
a4e51def37 Bump version to 5.0.0-beta.6 2020-04-01 10:32:34 +08:00
Pig Fang
efb2bdccea ignore some tests temporarily 2020-04-01 10:30:07 +08:00
Pig Fang
6423afdc2d fix tests 2020-04-01 10:19:25 +08:00
Pig Fang
31ebd8bd35 fix i18n of missing uploader 2020-04-01 10:07:34 +08:00
Pig Fang
33e249f5d2 fix missing dependency 2020-03-31 16:14:37 +08:00
Pig Fang
850efe9fe2 load core libraries from jsDelivr 2020-03-30 17:21:02 +08:00
Pig Fang
058e0d9f22 clean up 2020-03-30 12:15:17 +08:00
Pig Fang
a886935b12 extract vue from main chunk 2020-03-30 10:29:17 +08:00
Pig Fang
fd2e3f2c1b rewrite "password reset" with React 2020-03-30 10:12:35 +08:00
Pig Fang
b7ac9bbfa1 add signature check for visiting "reset" page 2020-03-30 10:01:37 +08:00
Pig Fang
9e87f42dd9 add pagination for reports 2020-03-30 09:38:05 +08:00
Pig Fang
33dbb9a3da update changelog 2020-03-30 09:29:34 +08:00
Pig Fang
490f8f3bac fix type errors 2020-03-30 09:22:18 +08:00
Pig Fang
361444ca7e rewrite registration page with React 2020-03-29 23:02:43 +08:00
Pig Fang
6c4f5d61f4 tweak 2020-03-29 10:16:06 +08:00
Pig Fang
1c97734bf6 fix email url 2020-03-29 09:53:24 +08:00
Pig Fang
5d9bb28281 attempt to fix "invalid signature" issue 2020-03-28 22:36:27 +08:00
Pig Fang
b93efb91ae simplify 2020-03-28 18:26:07 +08:00
Pig Fang
9f560c67bd rewrite "Translations" page with React 2020-03-28 18:25:12 +08:00
Pig Fang
0efcde3172 tweak modal types 2020-03-28 16:09:12 +08:00
Pig Fang
6dc22f73f7 upgrade deps 2020-03-28 12:18:52 +08:00
Pig Fang
aa835f7d03 rewrite login page with React 2020-03-27 22:56:08 +08:00
Pig Fang
2e78da928b make url generation flexible 2020-03-27 22:34:14 +08:00
Pig Fang
effba662a0 fix pagination click event 2020-03-27 16:38:07 +08:00
Pig Fang
231b9ee5bf tweak 2020-03-27 16:01:29 +08:00
Pig Fang
8f2f57ffc8 fix skin library history state 2020-03-27 12:24:11 +08:00
Pig Fang
6bd7e4744f fix test 2020-03-26 18:35:12 +08:00
Pig Fang
2229fcf66b rewrite "auth.forgot" page with React 2020-03-26 18:15:13 +08:00
Pig Fang
1b8c335cac add captcha component 2020-03-26 17:54:01 +08:00
Pig Fang
375fcb38b4 fix emitting mounted event 2020-03-26 11:49:34 +08:00
Pig Fang
9a29df2a07 load front end i18n as assets 2020-03-26 11:20:12 +08:00
Pig Fang
dbef3043eb do not break when failed to load i18n 2020-03-26 11:19:43 +08:00
Pig Fang
3fbf32ed14 clean up 2020-03-26 10:32:36 +08:00
Pig Fang
458d462831 load viewer backgrounds via webpack 2020-03-26 10:24:44 +08:00
Pig Fang
530ed88bd1 unify generating webpack asset url 2020-03-26 10:15:48 +08:00
Pig Fang
04dfdfb6c2 run php-cs-fixer 2020-03-26 10:15:18 +08:00
Pig Fang
be46c524ef add initial value for blessing.extra 2020-03-26 10:14:28 +08:00
Pig Fang
4417cdc0c4 fix webpack config 2020-03-26 10:13:40 +08:00
Pig Fang
f4276d1ccf "table" tag should not be used for layout 2020-03-24 18:44:45 +08:00
Pig Fang
c219a0f03f rewrite skin library with React 2020-03-24 18:05:46 +08:00
Pig Fang
1d6da0eab9 add command 2020-03-24 10:07:04 +08:00
Pig Fang
4007a46736 add prettier 2020-03-23 17:14:20 +08:00
Pig Fang
79bacf69e0 remove outline for "a" element 2020-03-23 10:38:45 +08:00
Pig Fang
c50f265b8e refactor closet command 2020-03-22 12:21:17 +08:00
Pig Fang
ce297f66f9 tweak 2020-03-21 17:34:42 +08:00
Pig Fang
4c981529e1 add closet command for Web CLI 2020-03-21 17:30:44 +08:00
Pig Fang
d57dabe188 fix 2020-03-21 11:08:41 +08:00
Pig Fang
24adc02f17 refactor 2020-03-21 11:06:24 +08:00
Pig Fang
ced43d4277 simplify 2020-03-21 09:38:46 +08:00
Pig Fang
4c52f82393 refactor pagination 2020-03-20 19:03:10 +08:00
Pig Fang
d603f48bad refactor 2020-03-20 17:14:18 +08:00
Pig Fang
76f0b040ad upgrade deps 2020-03-20 16:19:28 +08:00
Pig Fang
b6c58ef23f rewrite texture detail page with React 2020-03-20 16:19:18 +08:00
Pig Fang
2c313ebde2 update vscode-related 2020-03-19 16:26:04 +08:00
Pig Fang
a2e8632ca4 remove dump-server 2020-03-19 15:26:03 +08:00
Pig Fang
a409404263 add PHP debug 2020-03-19 15:09:36 +08:00
Pig Fang
0671964ead add debugger 2020-03-19 11:19:07 +08:00
Pig Fang
d27034425a fix toast style 2020-03-19 10:00:21 +08:00
Pig Fang
4f76f05003 fix closet previewer don't apply texture type
fix #152
2020-03-19 09:26:29 +08:00
Pig Fang
2a3d9c544d fix formatting unresolved plugins 2020-03-18 11:23:46 +08:00
Pig Fang
52340ff28c Bump version to 5.0.0-beta.5 2020-03-18 11:01:41 +08:00
Pig Fang
ecf2f6792f es2016 -> es2017 2020-03-18 11:01:28 +08:00
Pig Fang
dd44b43b04 tweak webpack 2020-03-18 11:00:32 +08:00
Pig Fang
9ca87451ed
New Crowdin translations (#151) 2020-03-18 11:00:01 +08:00
Pig Fang
9f8f1e786a increase browser requirement 2020-03-18 10:48:13 +08:00
Pig Fang
60c628dd11 tweak style of avatar (close #150) 2020-03-18 10:33:07 +08:00
Pig Fang
ff7f81939d fix #147 2020-03-18 09:51:33 +08:00
Pig Fang
9ff956a9f8 Bump version to 5.0.0-beta.4 2020-03-17 11:42:17 +08:00
Pig Fang
2907ad4bb4 refactor 2020-03-16 14:27:30 +08:00
Pig Fang
a879af3405 reduce build size 2020-03-14 17:00:35 +08:00
Pig Fang
76a504bb9c tweak webpack build 2020-03-14 16:13:56 +08:00
Pig Fang
b1801f0819 remove duplicate 2020-03-14 15:32:55 +08:00
Pig Fang
63cb6ad657 update changelog 2020-03-14 15:00:34 +08:00
Pig Fang
97705755c5 fix admin can't add private texture 2020-03-14 14:59:52 +08:00
Pig Fang
8a07597265 clean up 2020-03-12 11:27:41 +08:00
Pig Fang
f1f6a6fafb
New Crowdin translations (#148) 2020-03-12 11:25:37 +08:00
Pig Fang
24a5962576 fix build script 2020-03-12 11:24:20 +08:00
Pig Fang
b63149d30a fix test 2020-03-12 11:22:40 +08:00
Pig Fang
7d3325966b update ci config 2020-03-12 11:19:17 +08:00
Pig Fang
496f5a5b23 tweak typescript build 2020-03-12 11:06:23 +08:00
Pig Fang
8cfe2e1292 fix types error 2020-03-12 10:56:14 +08:00
Pig Fang
271c950ad9 add two new ways to install plugin 2020-03-12 10:41:41 +08:00
Pig Fang
ba757d98a8 refactor tests 2020-03-11 22:42:22 +08:00
Pig Fang
ccfcceed37 run php-cs-fixer 2020-03-11 22:31:45 +08:00
Pig Fang
4ce25a918c return an object when fetch failed 2020-03-11 22:24:20 +08:00
Pig Fang
59f8f33df7 extract component 2020-03-10 15:57:57 +08:00
Pig Fang
cd2f977bff tweak status page 2020-03-10 15:20:42 +08:00
Pig Fang
dcd48a086c fix notifying failed plugin 2020-03-10 15:12:03 +08:00
Pig Fang
b66a48181f add migration for lengthening ip field 2020-03-10 14:59:50 +08:00
Pig Fang
31c56e9121 remove predis 2020-03-10 10:05:46 +08:00
Pig Fang
5d426e8c92 refactor: use HTTP client wrapper of Laravel 2020-03-09 17:18:36 +08:00
Pig Fang
6463a33744 refactor 2020-03-09 15:26:28 +08:00
Pig Fang
db49cedb06 tweak about testing 2020-03-09 15:08:45 +08:00
Pig Fang
4d3f6a29ca accept upstream config files (close #144) 2020-03-09 15:08:30 +08:00
Pig Fang
0eb7d50d1c upgrade to Laravel 7 2020-03-09 12:29:00 +08:00
Pig Fang
48de60b43a update detect method of texture type 2020-03-07 09:54:06 +08:00
Pig Fang
f6d3b014ad update changelog 2020-03-07 09:05:05 +08:00
Pig Fang
a47973f4f2 add vscode extensions recommendation 2020-03-07 09:04:11 +08:00
Steven Qiu
eb0da1a0d4
update readme and changelog 2020-03-06 15:25:31 +08:00
Pig Fang
537d34c0bf increase PHP version requirement 2020-03-06 10:19:56 +08:00
Pig Fang
ed04dd1740 fix "score cost per closet item" isn't calculated
at "texture upload" page
2020-03-06 10:15:01 +08:00
Pig Fang
998c5f011a update dependencies 2020-03-05 18:24:23 +08:00
Pig Fang
f3e57756a5 fix test 2020-03-05 17:09:30 +08:00
Pig Fang
18a2817472 fix style of background 2020-03-05 16:39:14 +08:00
Pig Fang
27e6042b93 rewrite texture upload page 2020-03-05 16:16:08 +08:00
Pig Fang
d4c3264324 fix 2d preview 2020-03-05 09:58:10 +08:00
Pig Fang
bc0531c737 fix button style of skin viewer 2020-03-05 09:34:45 +08:00
Pig Fang
5052e9ab04 update changelog 2020-03-05 09:33:55 +08:00
Pig Fang
63eb7c3d74
New Crowdin translations (#142)
[skip ci]
2020-03-04 21:10:33 +08:00
Pig Fang
af24dcf9f9 add custom background for skin viewer 2020-03-04 19:37:17 +08:00
Pig Fang
a804bb8d7b update dependencies 2020-03-04 10:53:44 +08:00
Pig Fang
9d624fd299 add filters for retrieving ip 2020-03-02 15:02:39 +08:00
Pig Fang
c4ce144be2 make terminal window be draggable 2020-03-01 22:07:45 +08:00
Pig Fang
60373e6290 update GitHub Actions 2020-02-29 16:44:36 +08:00
Pig Fang
25394ddf50
New Crowdin translations (#139)
[skip ci]
2020-02-27 18:40:32 +08:00
Pig Fang
ed588a9569 disable MySQL strict mode 2020-02-27 18:07:02 +08:00
Pig Fang
5d977882bb update changelog [skip ci] 2020-02-27 17:48:05 +08:00
Steven Qiu
33c6f00da6
send less verification emails (#138) 2020-02-27 17:45:07 +08:00
Pig Fang
4dde7fc13c make "CSRF token mismatched" error friendly 2020-02-27 16:02:39 +08:00
Pig Fang
898e178d45
New Crowdin translations (#135)
[skip ci]
2020-02-27 15:33:45 +08:00
Pig Fang
3cb6f40be5 fix config files 2020-02-27 15:31:29 +08:00
Pig Fang
9ab8a5ca8b fix tests 2020-02-27 10:50:09 +08:00
Pig Fang
afd0858b24 merge upstream configs 2020-02-26 15:09:06 +08:00
Pig Fang
97cd8974f3 fix 2020-02-26 10:40:20 +08:00
Pig Fang
57beeb2c86 update config about mail 2020-02-26 10:36:25 +08:00
Pig Fang
efc71da574 refactor 2020-02-24 09:27:28 +08:00
Pig Fang
054b25da6d update changelog [skip ci] 2020-02-23 09:43:34 +08:00
Pig Fang
bec33650f0 fix missing alert when uploading duplicated texture
(fix #132)
2020-02-23 09:37:10 +08:00
Pig Fang
73d83bd191 update changelog 2020-02-23 09:28:17 +08:00
Pig Fang
56d5e20d3b
New Crowdin translations (#134) 2020-02-23 09:06:29 +08:00
Steven Qiu
1b0e1b154b
change judgement of duplicate textures (fix #132) (#133)
* change judgement of duplicate textures

* fix test
2020-02-23 08:38:36 +08:00
Pig Fang
f721ac269c add bsh 2020-02-17 18:27:56 +08:00
Pig Fang
39e135e644
New Crowdin translations (#131)
* New translations skinlib.yml (Japanese)
[skip ci]

* New translations skinlib.yml (Korean)
[skip ci]

* New translations skinlib.yml (Portuguese)
[skip ci]

* New translations skinlib.yml (Russian)
[skip ci]

* New translations skinlib.yml (Spanish)
[skip ci]

* New translations skinlib.yml (Italian)
[skip ci]

* New translations skinlib.yml (Chinese Simplified)
[skip ci]

* New translations skinlib.yml (Chinese Traditional)
[skip ci]

* New translations skinlib.yml (Dutch)
[skip ci]

* New translations skinlib.yml (French)
[skip ci]

* New translations skinlib.yml (German)
[skip ci]

* New translations skinlib.yml (Greek)
[skip ci]
2020-02-17 12:08:46 +08:00
Pig Fang
7e61f27106 update changelog 2020-02-17 12:06:18 +08:00
Pig Fang
e2c10c78ac fix i18n 2020-02-17 12:01:20 +08:00
Pig Fang
76bf342681 Merge branch 'react' into dev 2020-02-16 10:07:23 +08:00
Pig Fang
5ac9b59116 fix test 2020-02-16 10:03:47 +08:00
Pig Fang
d811f92dda add missing "mounted" event 2020-02-12 10:11:06 +08:00
Pig Fang
ec4e222c0e remove unnecessary "async" 2020-02-12 10:03:52 +08:00
Pig Fang
ca7db2585f rewrite "EmailVerification" UI widget 2020-02-12 10:02:15 +08:00
Pig Fang
19ad09920b build closet page with React 2020-02-11 16:40:26 +08:00
Pig Fang
9dca4c1585 hide pagination when total pages is invalid 2020-02-10 17:52:36 +08:00
Pig Fang
89055fe192 add pagination component 2020-02-10 15:59:56 +08:00
Pig Fang
576a4c442f fix type errors 2020-02-10 11:56:16 +08:00
Pig Fang
3dcd6bfac1 remove unused code 2020-02-10 11:47:27 +08:00
Pig Fang
34f4faaff1 disable lint on CI temporarily 2020-02-10 11:45:25 +08:00
Pig Fang
ec948ef1c2 build "bind players" page with React 2020-02-09 11:05:02 +08:00
Pig Fang
6a7d9d0fde clean up 2020-02-09 10:50:15 +08:00
Pig Fang
8e104c2422 build notifications list with React 2020-02-08 18:22:52 +08:00
Pig Fang
a6dc3bd068 clean up 2020-02-08 17:14:32 +08:00
Pig Fang
22f68cd9fc build players page with React 2020-02-08 17:09:43 +08:00
Pig Fang
d119b054be tweak OAuth mgmt page 2020-02-08 09:51:46 +08:00
Pig Fang
55f9ba1cff refactor 2020-02-07 15:21:43 +08:00
Pig Fang
2d57248654 add alias 2020-02-07 15:20:02 +08:00
Pig Fang
39ed588d83 make it immutable 2020-02-07 15:15:38 +08:00
Pig Fang
36328f1cb8 remove unused attribute 2020-02-07 10:34:01 +08:00
Pig Fang
aa1ce17351 tweak viewer component 2020-02-07 09:59:49 +08:00
Pig Fang
210244f5b4 add path alias 2020-02-07 09:59:10 +08:00
Pig Fang
a5085af86c turn custom fallback as function 2020-02-06 14:54:23 +08:00
Pig Fang
5b7055611d fix skin viewer 2020-02-06 09:56:09 +08:00
Pig Fang
d6834a2ead tweak plugins mgmt page 2020-02-06 09:49:33 +08:00
Pig Fang
6e559ef90e tweak tests 2020-02-06 09:27:27 +08:00
Pig Fang
dc62f87b74 allow to clear toasts 2020-02-06 09:22:10 +08:00
Pig Fang
de08ab6736 allow custom fallback 2020-02-06 09:01:21 +08:00
Pig Fang
82dade1ee1 tweak Modal 2020-02-06 08:53:37 +08:00
Pig Fang
b083ee8788 refactor Modal mechanism 2020-02-05 18:48:30 +08:00
Pig Fang
54c4891fd2 allow to pass element directly 2020-02-05 14:56:49 +08:00
Pig Fang
93f64b034f build OAuth mgmt page with React 2020-02-05 10:37:14 +08:00
Pig Fang
de64694002 clear timeout on unmount 2020-02-05 10:05:32 +08:00
Pig Fang
5917e62286 add role for toast 2020-02-05 09:21:29 +08:00
Pig Fang
09c5aae79a add more tests 2020-02-04 12:28:35 +08:00
Pig Fang
54b948d01e rework toast with React 2020-02-04 12:23:14 +08:00
Pig Fang
d9f55d610c refactor event emitter 2020-02-04 11:29:58 +08:00
Pig Fang
ef2da499e5 tweak Suspense fallback 2020-02-03 10:16:21 +08:00
Pig Fang
6430576761 simplify code 2020-02-02 15:48:14 +08:00
Pig Fang
f0599d5a88 build skin viewer with React 2020-02-02 10:18:05 +08:00
Pig Fang
e01af8e7d9 tweak tsconfig 2020-02-01 12:45:07 +08:00
Pig Fang
100e5960e7 rework error pages and setup pages 2020-02-01 12:44:39 +08:00
Pig Fang
25a31302ae fix test 2020-02-01 10:12:31 +08:00
Pig Fang
2bd1a8c073 fix tests 2020-01-31 15:58:48 +08:00
Pig Fang
1d87171808 rewrite user dashboard with React 2020-01-31 15:58:37 +08:00
Pig Fang
e6cb4072e5 quick fix 2020-01-30 18:50:51 +08:00
Pig Fang
36a516d584 add generics at fetch 2020-01-28 16:27:11 +08:00
Pig Fang
4953e15369 add new Modal option 2020-01-28 10:41:10 +08:00
Pig Fang
364608a0c6 fix webpack config 2020-01-28 10:38:46 +08:00
Pig Fang
6b714ad7b3 remove webpackbar 2020-01-27 15:56:09 +08:00
Pig Fang
d62db082e7 add scss 2020-01-27 15:49:09 +08:00
Pig Fang
60e883c5e7 remove cache-loader for .ts and .tsx 2020-01-27 15:47:24 +08:00
Pig Fang
225985834a fix tsconfig 2020-01-27 11:56:32 +08:00
Pig Fang
999167e11e fix hooks deps 2020-01-27 11:50:29 +08:00
Pig Fang
7c144b3e14 rewrite "Modal" component in React 2020-01-23 22:52:09 +08:00
Pig Fang
11e927cc61 add "jest-dom" 2020-01-23 09:51:50 +08:00
Steven Qiu
ad528520ca Support custom textures storage directory (#127)
* Support custom textures storage directory

* fix test

* update changelog

Co-authored-by: Pig Fang <g-plane@hotmail.com>
2020-01-22 11:06:02 +08:00
Pig Fang
be0f74ad64 remove unused code 2020-01-21 11:08:52 +08:00
Pig Fang
4c066ac38a make user report page be static 2020-01-21 11:07:20 +08:00
Pig Fang
cd3260af3e rewrite plugins mgmt page with react 2020-01-21 10:22:20 +08:00
Pig Fang
640a714d8e Bump version to 5.0.0-beta.3 2020-01-16 16:19:20 +08:00
Pig Fang
dff01981d7 update build step 2020-01-16 16:14:49 +08:00
Pig Fang
8bb6f2e53c tweak loading brand icons 2020-01-16 15:48:28 +08:00
Pig Fang
7ecea9e7e6 new plugins management page 2020-01-16 12:33:14 +08:00
Pig Fang
85f9f8378a use correct html element 2020-01-15 10:11:17 +08:00
Pig Fang
4c735aa8e4 refactor plugins marketplace 2020-01-14 11:37:21 +08:00
Pig Fang
078fcf47ec refactor downloader 2020-01-14 10:58:20 +08:00
Pig Fang
16916fd006 fix tests 2020-01-13 17:31:10 +08:00
Pig Fang
8c06286607 fix TypeScript errors 2020-01-13 17:19:34 +08:00
Pig Fang
cf6f1aa547 support searching players when applying textures 2020-01-13 12:01:13 +08:00
Pig Fang
9e792b9c3a upgrade deps 2020-01-13 10:59:32 +08:00
Pig Fang
52629f6cc4 remove unused code 2020-01-13 09:32:44 +08:00
Pig Fang
c87d19f258 tweak middlewares 2020-01-13 09:25:07 +08:00
Pig Fang
c1923cfaa1
New Crowdin translations (#124)
[skip ci]
2020-01-13 08:58:56 +08:00
Pig Fang
780b6800ba remove unused code 2020-01-13 08:57:51 +08:00
Pig Fang
6c64d191ab remove responding 204 for unexisted players 2020-01-13 08:41:35 +08:00
Pig Fang
092eedfdf4 refactor routes 2020-01-13 08:37:57 +08:00
Pig Fang
1807309449 remove unused code 2020-01-12 17:14:23 +08:00
Pig Fang
4a97edbd53 remove middlewares for profile API 2020-01-12 17:12:00 +08:00
Pig Fang
f46737c8e3 remove "CheckPlayerExists" event in some places 2020-01-12 12:09:58 +08:00
Pig Fang
1170a528d6 removed cache for existence of player 2020-01-12 11:58:34 +08:00
Pig Fang
b816eb1c06 simplify 2020-01-12 11:47:36 +08:00
Pig Fang
97ec85b289 remove cache for profile json 2020-01-12 10:28:43 +08:00
Pig Fang
d85c6d840b update changelog 2020-01-12 10:04:51 +08:00
Pig Fang
6b3446cf86 display 3D avatar when applying texture to player 2020-01-12 09:57:55 +08:00
Pig Fang
b1ccdb47f2 switch server-side texture renderer 2020-01-12 09:27:39 +08:00
Pig Fang
6c221c28d6 refactor updater 2020-01-06 22:47:29 +08:00
Pig Fang
04c3c7908c fix test 2020-01-05 18:21:24 +08:00
Pig Fang
d7a60a842d remove auto update check 2020-01-05 17:37:56 +08:00
Pig Fang
c3a0018219 remove unused code 2020-01-05 11:30:58 +08:00
Pig Fang
1eba808974 tweak test 2020-01-05 11:30:29 +08:00
Pig Fang
3c8f820780 remove unreachable code 2020-01-05 11:24:30 +08:00
Pig Fang
9608555345 hide block when no oauth providers 2020-01-05 11:07:25 +08:00
Pig Fang
516c5ef762 add more events about players 2020-01-05 11:05:22 +08:00
Pig Fang
70d8614d84 support utf8mb4 2020-01-04 10:30:05 +08:00
Asnxthaony
1c5cb7fdba
Change default update source [skip ci] 2020-01-03 19:03:22 +08:00
Pig Fang
18765a7133 Bump version to 5.0.0-beta.2 2020-01-03 10:27:00 +08:00
Asnxthaony
2abadd65b1
Update default plugins registry url 2020-01-02 18:13:39 +08:00
Asnxthaony
bcca87936a
Fix 2d preview in player management 2020-01-01 08:50:31 +08:00
Pig Fang
9988520f45 fixed avatar can't be resized
when requesting an non-existed user
2019-12-31 23:03:37 +08:00
Pig Fang
8703495f8f refactor 2019-12-31 22:39:33 +08:00
Pig Fang
1829f1dab5 App\Services\Rejection -> Blessing\Rejection 2019-12-31 18:41:16 +08:00
Pig Fang
02fecd46ae refactor 2019-12-31 18:34:52 +08:00
Pig Fang
5b2d2743a6 remove unused code 2019-12-31 11:27:51 +08:00
Pig Fang
d4202149e1 update .gitignore 2019-12-31 10:38:58 +08:00
Pig Fang
1f5c0af0aa fix lang attribute of HTML 2019-12-31 10:00:27 +08:00
Pig Fang
e97d2743fb Clean up 2019-12-30 23:51:12 +08:00
Pig Fang
611f6c8cee Remove Universal Skin API from core 2019-12-30 23:29:44 +08:00
Pig Fang
22128d360c Remove deprecated player_name attribute on player instance 2019-12-30 17:04:19 +08:00
Pig Fang
07566c4c16 Remove Legacy API from core 2019-12-30 11:09:01 +08:00
Pig Fang
f9e4436503 Update changelog 2019-12-30 10:12:13 +08:00
Pig Fang
b220b60ece Fix retrieving keyword from query string 2019-12-29 23:57:44 +08:00
Pig Fang
874bc8a73e Fix artisan 2019-12-29 19:00:52 +08:00
Pig Fang
9aac544d0c Refactor bootstrap 2019-12-29 17:39:34 +08:00
Pig Fang
cd2af03663
New Crowdin translations (#123) [skip ci] 2019-12-29 15:57:29 +08:00
Pig Fang
a18f068387 Remove enabling or disabling Redis via Web UI 2019-12-29 15:51:43 +08:00
Pig Fang
4689010466 Remove API preference 2019-12-29 15:43:40 +08:00
Pig Fang
1f899d1393 Refactor 2019-12-29 14:50:25 +08:00
Pig Fang
d40726a718 App\Services\Filter -> Blessing\Filter 2019-12-29 11:49:31 +08:00
Pig Fang
7f46e1510b Remove helper function "get_string_replaced" 2019-12-25 18:37:10 +08:00
Pig Fang
56e63b8c38
New Crowdin translations (#120)
[skip ci]
2019-12-25 17:41:07 +08:00
Pig Fang
71543da2f7 Remove "3rd-party comment" from core 2019-12-25 17:33:57 +08:00
Pig Fang
c868b05232 New password algorithm: Argon2i 2019-12-25 16:28:24 +08:00
Pig Fang
cf8358fdcd Don't check cipher when boostrapping 2019-12-25 16:16:09 +08:00
Pig Fang
10d0957d66 Tweak UI 2019-12-25 16:11:13 +08:00
Pig Fang
ad1201b226 Refactor 2019-12-25 15:59:20 +08:00
Pig Fang
facd92356c Simplify code 2019-12-25 15:50:34 +08:00
Pig Fang
9eae104402 Invoke Parsedown directly 2019-12-25 15:48:34 +08:00
Pig Fang
4efd787460
New Crowdin translations (#119)
[skip ci]
2019-12-25 15:25:17 +08:00
Pig Fang
87256a56e9 Fix tests 2019-12-25 15:08:07 +08:00
Pig Fang
cf497ad38c Change method of retrieving IP 2019-12-24 23:59:25 +08:00
Pig Fang
b0435351fa Use native fs functions for bootstrapping tests 2019-12-24 23:37:57 +08:00
Pig Fang
78ae974e7a Optimize invoking skinview3d 2019-12-24 19:33:35 +08:00
Pig Fang
2b827cf651 Add more events for authentication 2019-12-24 17:09:30 +08:00
Pig Fang
0195b0fbd0 Tweak path of options cache file 2019-12-23 23:28:46 +08:00
Pig Fang
da422ab1e8 Update gitignore policy 2019-12-23 23:14:31 +08:00
Pig Fang
cb9aaf35f1 Tweak test 2019-12-23 10:08:19 +08:00
Pig Fang
7314b19a85 Tiny tweaks 2019-12-23 10:03:08 +08:00
Pig Fang
166bd2e5ef Fix tests 2019-12-22 23:27:59 +08:00
Pig Fang
3ab0d12a71 Update GitHub Actions config 2019-12-22 23:05:49 +08:00
Pig Fang
ae4be6fbda Refactor static routes 2019-12-22 17:28:55 +08:00
Pig Fang
591b9969aa Add filters for avatar 2019-12-22 17:22:05 +08:00
Pig Fang
3e249a9902
New Crowdin translations (#117)
[skip ci]
2019-12-22 16:56:17 +08:00
Pig Fang
95d1ebe3ba Tweak user profile page 2019-12-22 16:38:42 +08:00
Pig Fang
8c8e7bbc23 Refactor 2019-12-22 16:18:59 +08:00
Pig Fang
35c07cdb63 Fix validating player name 2019-12-22 14:25:22 +08:00
Pig Fang
2d73124fed
New Crowdin translations (#116)
[skip ci]
2019-12-22 12:38:36 +08:00
Pig Fang
85d0104362 Allow char "§" for player name & Refactor 2019-12-22 11:50:39 +08:00
Pig Fang
fd61380758
New Crowdin translations (#115)
[skip ci]
2019-12-22 11:17:43 +08:00
Pig Fang
9cc83dad30 Remove restriction of texture name and nickname 2019-12-22 10:46:10 +08:00
Pig Fang
e21fb0fa31 Inline some helper functions 2019-12-21 15:50:29 +08:00
Pig Fang
ab24dfe5bf Add tests for Filters API 2019-12-21 10:41:38 +08:00
Pig Fang
4c3b9f0cb6 Tiny refactor 2019-12-20 22:58:04 +08:00
Pig Fang
fa2048c7bd
New Crowdin translations (#114)
[skip ci]
2019-12-19 11:00:45 +08:00
Pig Fang
1e21f4508c Add grid for upload page 2019-12-16 11:02:39 +08:00
Pig Fang
6bf003e7dc Add grid for texture detail page 2019-12-16 10:49:09 +08:00
Pig Fang
a14688264b Support disable portal 2019-12-16 10:29:10 +08:00
Pig Fang
52cd75ca54 Update changelog 2019-12-16 10:09:00 +08:00
Pig Fang
60ccc1174a
New Crowdin translations (#113)
[skip ci]
2019-12-15 23:47:23 +08:00
Pig Fang
d61eb8a098 Fix tests 2019-12-15 23:44:39 +08:00
Pig Fang
cb3527cd35 Apply php-cs-fixer fixes 2019-12-15 23:16:55 +08:00
Pig Fang
ef1a092ca3 Clean up unused i18n strings 2019-12-15 23:07:23 +08:00
Pig Fang
703a760b24 Add grid for players list 2019-12-15 22:52:49 +08:00
Pig Fang
6b6cec7f43 Add grid for admin dashboard 2019-12-15 21:04:20 +08:00
Pig Fang
79a96ec6d8 Add grid for status page 2019-12-15 19:04:30 +08:00
Pig Fang
25f9eb7f22 Mark verified for users from external services 2019-12-15 17:58:38 +08:00
Pig Fang
0b5596ce33
New Crowdin translations (#112)
[skip ci]
2019-12-15 11:33:08 +08:00
Pig Fang
91fbb42431 Add OAuth client 2019-12-15 11:19:10 +08:00
Pig Fang
25a7134d63 Tiny tweak 2019-12-14 23:17:44 +08:00
Pig Fang
ff1dd4bacd Refactor 2019-12-14 15:45:44 +08:00
Pig Fang
810c8ec878 Upgrade dependencies 2019-12-14 15:17:13 +08:00
Pig Fang
ee4d0f6fea Update changelog 2019-12-14 15:04:32 +08:00
Pig Fang
c2b81efb4b Add FAQ link at error page 2019-12-14 14:52:28 +08:00
Pig Fang
a3e74065f9 Add grid for closet page 2019-12-14 14:30:38 +08:00
Pig Fang
6ead313999 Apply php-cs-fixer 2019-12-14 11:10:37 +08:00
Pig Fang
c6959ebc81 Lengthened ip field to support IPv6 2019-12-14 10:03:11 +08:00
Pig Fang
759ea01146 Remove codecov from dependencies 2019-12-14 09:39:47 +08:00
Pig Fang
37f8355dd4 Apply new ES syntax: Optional Chaining 2019-12-14 00:08:21 +08:00
Pig Fang
7b3b528e6c Fix test 2019-12-13 21:23:16 +08:00
Pig Fang
0eaae1387e Fix tests 2019-12-13 19:45:18 +08:00
Pig Fang
96fd445415 Add grid for user dashboard 2019-12-13 19:29:57 +08:00
Pig Fang
7950132954 Add grid for user profile page 2019-12-13 18:53:47 +08:00
Pig Fang
d5ffea34d9 Add gap between badges 2019-12-13 17:42:55 +08:00
Pig Fang
d5aad4375f
New Crowdin translations (#111) [skip ci] 2019-12-13 16:03:06 +08:00
Pig Fang
56bd71c063 Refactor user profile page
to be static
2019-12-13 15:47:07 +08:00
Pig Fang
4af30bdbac Fix changing password 2019-12-13 10:56:16 +08:00
Pig Fang
a697a9a5d3 Apply linter fixes 2019-12-13 10:55:57 +08:00
Pig Fang
920d45a723 Add "STAFF" badge for admin & show badges at texture detail page 2019-12-11 23:29:20 +08:00
Pig Fang
65d82fba64 Refactor 2019-12-10 23:40:32 +08:00
Pig Fang
6aa28f88e7 Update documentation 2019-12-10 23:29:15 +08:00
Pig Fang
dec36d0771 Fix CI 2019-12-10 18:38:10 +08:00
Pig Fang
4a6ad15217 Remove unnecessary step at CI 2019-12-10 18:33:52 +08:00
Pig Fang
1480815123 Display modals at center 2019-12-10 14:20:14 +08:00
Pig Fang
243a164063
New Crowdin translations (#110)
[skip ci]
2019-12-10 11:25:07 +08:00
Pig Fang
0958ab99ea Tweak CI 2019-12-10 11:09:08 +08:00
Pig Fang
cc3e5a9609 Fix tests 2019-12-10 10:57:03 +08:00
Pig Fang
f9b32c8e69 Check dependencies and conflicts before installing plugin
fixes #109
2019-12-09 23:30:49 +08:00
Pig Fang
eb62e04c1c
New Crowdin translations (#107) 2019-12-09 16:38:06 +08:00
Pig Fang
66becb27d0 Detect Readme of plugin automatically 2019-12-08 23:58:44 +08:00
Pig Fang
8a66a70ced Optimize table of UI text customization 2019-12-08 19:32:53 +08:00
Pig Fang
0b09be3e9c Fix home page at mobile 2019-12-08 10:56:55 +08:00
Pig Fang
ce5b343617 Fix for too long texture name 2019-12-08 10:29:49 +08:00
Pig Fang
e3a34a4013 Fix badges 2019-12-08 09:59:34 +08:00
Pig Fang
13d372411e Allow to skip the GitHub Actions 2019-12-07 23:54:06 +08:00
Steven Qiu
18f3cb8571
Update README.md (skip ci) 2019-12-07 20:26:30 +08:00
Pig Fang
6fc099bb34 Fix "*.master" templates 2019-12-07 16:39:04 +08:00
Pig Fang
61eea2b980 Add Telegram notification 2019-12-07 15:59:00 +08:00
Pig Fang
7e8929d34f Fix release script 2019-12-07 00:02:09 +08:00
Pig Fang
a70260ca41 New method addAlert on OptionForm 2019-12-05 23:42:51 +08:00
Pig Fang
ba93788fc9 Fix coverage 2019-12-05 22:35:19 +08:00
Pig Fang
551b1334fc Fix test 2019-12-05 19:42:48 +08:00
Pig Fang
776e8652a0 Support specifying enchants.config in plugin 2019-12-05 19:28:12 +08:00
Pig Fang
4cc7b4441f Tweak CI 2019-12-05 19:01:03 +08:00
Pig Fang
060578ca95 Fix AJAX error alert 2019-12-05 18:54:50 +08:00
Pig Fang
5f202c3cee Fix about Jest 2019-12-05 11:42:34 +08:00
Pig Fang
ed9d856c43 Add new color settings 2019-12-04 16:45:09 +08:00
Pig Fang
8aec8e5028 Add more tests 2019-12-03 17:47:06 +08:00
Pig Fang
322ef7cdeb Blade -> Twig (for forms) 2019-12-03 17:03:30 +08:00
Pig Fang
a9e11f7785 Update .gitignore 2019-12-03 16:54:06 +08:00
Pig Fang
e7be95d3e2 Refactor 2019-12-03 15:41:54 +08:00
Pig Fang
7e3b61be7a Simplify TypeScript configuration 2019-12-03 15:41:31 +08:00
Pig Fang
f306b4af9f Update badges 2019-12-03 12:57:28 +08:00
Pig Fang
c91919b6d9 Update changelog 2019-12-03 12:54:07 +08:00
Pig Fang
c5829ded76 CircleCI -> GitHub Actions 2019-12-03 11:40:06 +08:00
Pig Fang
f41b912e53 Fix type definitions 2019-12-01 19:05:02 +08:00
Pig Fang
ec42b4b4eb Remove Element UI 2019-12-01 18:08:21 +08:00
Pig Fang
264369699a Replace Element "Message" with Bootstrap "Alert" 2019-12-01 17:52:30 +08:00
Pig Fang
beec114717 Remove modal after closed 2019-12-01 14:45:33 +08:00
Pig Fang
6cd5e9a1e7 Tweak test 2019-12-01 00:00:44 +08:00
Pig Fang
1e4454cdc0 Rename test 2019-11-30 23:19:03 +08:00
Pig Fang
c858bbf5be Refactor 2019-11-30 23:11:12 +08:00
Pig Fang
cece411eae Dependencies tweak 2019-11-30 17:57:30 +08:00
Pig Fang
99461cabd0 Tweak ESLint config 2019-11-30 16:16:05 +08:00
Pig Fang
f414849051 Fix skin library page skeleton 2019-11-30 13:02:06 +08:00
Pig Fang
2da0a3576b Replace Element msgbox with Bootstrap modal 2019-11-30 12:01:17 +08:00
Pig Fang
b1ae902091 Update contributing guide [skip ci] 2019-11-29 22:38:11 +08:00
Pig Fang
92282daa9e Tweak code 2019-11-29 09:27:07 +08:00
Pig Fang
aada1148fb Reuse <Modal> component 2019-11-28 21:35:27 +08:00
Pig Fang
991475041b Fix <Modal> component 2019-11-28 17:04:37 +08:00
Pig Fang
a0a950089e Allow to specify id for modal 2019-11-28 16:31:39 +08:00
Pig Fang
e5b8a130a0 Rewrite showModal 2019-11-28 16:24:12 +08:00
Pig Fang
84afc32d84 Revert "Specify base URL at <base> element"
This reverts commit f8844cb549.
2019-11-27 23:57:28 +08:00
Pig Fang
c75f4429ac Use native controls 2019-11-27 17:21:48 +08:00
Pig Fang
2b538685ff Fix release script 2019-11-27 15:24:36 +08:00
Pig Fang
6aa458c95b New default home page background 2019-11-27 15:06:09 +08:00
Pig Fang
66c3c016f7 Fix button of clearing cache 2019-11-27 14:43:06 +08:00
Pig Fang
6321cea0da Add @types/bootstrap 2019-11-27 14:34:03 +08:00
Pig Fang
f8844cb549 Specify base URL at <base> element 2019-11-26 17:59:14 +08:00
Pig Fang
ff6277a0ca Read commit ID by executing Git at status page 2019-11-26 17:31:37 +08:00
Pig Fang
c665adf1c8 Fix detecting unknown locale 2019-11-26 16:53:19 +08:00
Pig Fang
0fbf16acad Tweak webpack config 2019-11-26 13:01:15 +08:00
Pig Fang
a724543dac Add some type annotations 2019-11-26 11:49:10 +08:00
Pig Fang
383e20acbd Tweak Jest setup file 2019-11-26 11:44:44 +08:00
Pig Fang
a43e8036c5 Use static Babel config file 2019-11-26 11:10:05 +08:00
Pig Fang
9871e2e484 Use Node.js 12 at CI 2019-11-26 11:03:55 +08:00
dependabot[bot]
6cb0747270 Bump js-yaml from 3.12.0 to 3.13.1 (#106) 2019-11-25 23:33:08 +08:00
Pig Fang
7235375581 Upgrade ESLint-related 2019-11-25 23:30:51 +08:00
Pig Fang
3d578963ea Allow simple build 2019-11-25 18:39:18 +08:00
Pig Fang
d2b8835c94 Rewrite scripts with PowerShell 2019-11-24 15:57:46 +08:00
Pig Fang
7aa044324c Update changelog 2019-11-24 14:42:15 +08:00
Pig Fang
b085698b01 Don't add commit at blessing global 2019-11-24 14:39:53 +08:00
Pig Fang
52dae783e8 Upgrade to AdminLTE v3 2019-11-24 14:32:58 +08:00
Pig Fang
5df36ae8ea Replace $nextTick with flushPromises 2019-11-21 09:33:28 +08:00
Pig Fang
96c22e20af Fix TypeScript errors 2019-11-21 09:23:50 +08:00
Pig Fang
eb6a012c72 Upgrade dependencies (Composer) 2019-11-20 18:54:52 +08:00
Pig Fang
a9372265d9 Upgrade dependencies (Yarn) 2019-11-20 17:48:24 +08:00
Pig Fang
e394e7491a Fix template of home page 2019-11-20 17:09:11 +08:00
Pig Fang
bf4623c6ef Add hooks for ReportController 2019-11-20 15:01:09 +08:00
Pig Fang
ee872104b0 Update Crowdin link [skip ci] 2019-11-13 15:02:20 +08:00
Pig Fang
1fc607a00b Add "Spanish" option 2019-11-13 14:51:10 +08:00
Pig Fang
200a5b2352 Fix translation service at setup 2019-11-13 14:27:22 +08:00
Pig Fang
8958cf489b Update contributing guide 2019-11-12 22:47:59 +08:00
Pig Fang
3cb6d09046
New Crowdin translations (#105) 2019-11-11 18:14:46 +08:00
Pig Fang
195c4e26aa
New Crowdin translations (#103) 2019-11-11 18:14:17 +08:00
Pig Fang
b21e1e5566
New Crowdin translations (#102) [skip ci] 2019-11-02 22:22:56 +08:00
Pig Fang
76a9ce6aab Remove unused l10n texts 2019-11-02 19:03:43 +08:00
Pig Fang
e9007c10a9
Update Crowdin config [skip ci] 2019-11-02 13:16:09 +08:00
Pig Fang
6d4d2ea62c Update Crowdin configuration file 2019-11-02 13:09:04 +08:00
Pig Fang
facc043df7 Upgrade dependencies 2019-10-07 22:40:48 +08:00
Pig Fang
c424465321 Fix locale detection 2019-10-07 19:37:38 +08:00
Pig Fang
55b9b5ad9e Replace node-sass with dart-sass 2019-09-21 19:43:49 +08:00
Pig Fang
4be0e0e4e1 Add notice about hot reload 2019-09-20 23:52:16 +08:00
Pig Fang
5b8e344ce9 Upgrade front-end building related dependencies 2019-09-20 20:12:59 +08:00
Pig Fang
c0d6256efd Fix webpack-dev-server 2019-09-20 19:43:51 +08:00
Pig Fang
74452a70de Fix loading style when development 2019-09-20 18:50:08 +08:00
Pig Fang
2a2491ac93 Do not extract Switch component 2019-09-19 23:19:17 +08:00
Pig Fang
bb898ea2e4 Use message to report plugin errors
Instead of `notification`
2019-09-19 23:09:53 +08:00
Pig Fang
d232bb4672 Remove unused code 2019-09-19 22:21:44 +08:00
Pig Fang
82140b6893 Blade -> Twig (almost finished) 2019-09-19 22:13:25 +08:00
Pig Fang
84f760d930 Remove unused code 2019-09-18 23:17:12 +08:00
Pig Fang
3b1866ffba Blade -> Twig 2019-09-18 23:06:48 +08:00
Pig Fang
146c12f26e Restructure tests 2019-09-17 23:57:29 +08:00
Pig Fang
c2f4d3a008 Fix PHP check 2019-09-17 23:17:56 +08:00
Pig Fang
9403ae356d Blade -> Twig (wip) 2019-09-17 23:10:44 +08:00
Pig Fang
19efd013f6 Tweak mocks 2019-09-16 12:49:33 +08:00
Pig Fang
f51e2d7b9d Tweak CI 2019-09-15 14:46:21 +08:00
Pig Fang
4a9af2d5df Refactor retrieving assets 2019-09-15 10:18:49 +08:00
Pig Fang
792062451a Remove priority due to changes from Laravel 5.4 2019-09-15 09:32:07 +08:00
Pig Fang
93a7bae30d Fix catching cipher exception 2019-09-14 12:28:22 +08:00
Pig Fang
acde755e43 Update release script 2019-09-13 09:52:34 +08:00
Pig Fang
5fc2b2f612 Fix release script 2019-09-13 09:36:11 +08:00
Pig Fang
2f774d9111 Bump version to 5.0.0-beta.1 2019-09-13 09:21:11 +08:00
Pig Fang
f2afe728e7 Update release script 2019-09-12 22:54:51 +08:00
Pig Fang
cbad417f03 Remove "pray for kyoani" text 2019-09-12 19:33:48 +08:00
Pig Fang
050fa45993 Preprocess PHP version 2019-09-12 19:31:48 +08:00
Pig Fang
d5205ede35 Put an HTML at root for guiding. 2019-09-12 19:17:54 +08:00
Pig Fang
a87320fe09 Clean up .env files 2019-09-12 19:06:18 +08:00
Pig Fang
8cb65dd846 Upgrade dependencies 2019-09-12 18:55:44 +08:00
Pig Fang
79307561c9 Use another JSON file for publishing preview 2019-09-12 18:55:18 +08:00
Pig Fang
62221c05a7 Do not generate random salt via CLI installation 2019-09-12 12:27:13 +08:00
Pig Fang
899a495f80 Fix YAML indentation 2019-09-11 23:34:42 +08:00
Pig Fang
e91185461a
Add GitHub Actions (#97)
* Add GitHub Actions

* Update branches trigger

* Fix .env file

* Fix default database connection

* Add test step

* Normalize PHP version

* Update main.yml

* Add more jobs

* Fix YAML syntax error

* Fix YAML syntax error

* Attempt to fix Windows job

* Update main.yml

* Update main.yml

* Update main.yml

* Attempt to use MySQL

* Update main.yml

* Fix possible error
2019-09-11 23:32:56 +08:00
Pig Fang
deab8be4a8 Upgrade to Laravel 6 2019-09-10 21:29:14 +08:00
Pig Fang
21c28c8b1c Update policy of checking environment 2019-09-10 21:10:27 +08:00
Pig Fang
e38d74455c Remove unused code 2019-09-10 20:01:15 +08:00
Pig Fang
06a43b5f72 Remove response macros 2019-09-10 19:52:17 +08:00
Pig Fang
65111d3609 Fix event of plugin.versionChanged 2019-09-09 23:08:03 +08:00
Pig Fang
a75e116510 Tweak env files header 2019-09-08 20:44:19 +08:00
Pig Fang
0d5864106d Tweak test 2019-09-08 19:39:32 +08:00
Pig Fang
7dd7bb0adc Tweak l10n 2019-09-08 19:39:26 +08:00
Pig Fang
54d3b76c13 Add support of customizing UI text 2019-09-08 18:57:19 +08:00
Pig Fang
a72d46d2f2 Add more methods on blessing.fetch 2019-09-08 15:20:49 +08:00
Pig Fang
b7d845ee51 Prevent warning 2019-09-08 11:43:03 +08:00
Pig Fang
bc0e830758 Simplify code 2019-09-08 09:44:00 +08:00
Pig Fang
99649ff9ea Tweak menu order 2019-09-08 09:22:51 +08:00
Pig Fang
21d416671a Tweak cache policy of parsing YAML 2019-09-08 09:19:32 +08:00
Pig Fang
5718567bea Load front end i18n of plugin automatically 2019-09-07 23:20:16 +08:00
Pig Fang
2b0eb3101c Remove redundant YAML parsing 2019-09-07 21:23:38 +08:00
Pig Fang
efd6f44aea Fix i18n file 2019-09-07 21:08:08 +08:00
Pig Fang
9ff8ea0893 Load front-end i18n text at back-end 2019-09-07 17:18:58 +08:00
Pig Fang
7c0bf46c3c Tweak config 2019-09-07 13:01:44 +08:00
Pig Fang
f9f2796529 Remove unused code 2019-09-07 11:15:23 +08:00
Pig Fang
98522a5cce
Apply fixes from StyleCI (#96)
[ci skip] [skip ci]
2019-09-07 11:00:35 +08:00
Pig Fang
9aaaa20d52 Add update script 2019-09-07 10:37:30 +08:00
Pig Fang
803ea2899d Rename changelogs 2019-09-07 10:34:57 +08:00
Pig Fang
5b5740b74b Remove unused code 2019-09-07 10:32:26 +08:00
Pig Fang
b99246234b Tweak tests and containers 2019-09-07 10:18:24 +08:00
Pig Fang
cac1c7eb31 Remove old update scripts 2019-09-07 08:44:58 +08:00
Pig Fang
13a2cd9b18 Refactor setup 2019-09-06 23:53:47 +08:00
Pig Fang
5d1dce347f Switch to another translations loader 2019-09-06 18:52:34 +08:00
Pig Fang
c567b12adc Remove unused service providers 2019-09-05 12:55:03 +08:00
Pig Fang
1d0ae52c7b Switch to another captcha library 2019-09-05 12:23:46 +08:00
Pig Fang
402eec0b3c Simplify syntax 2019-09-04 23:16:49 +08:00
Pig Fang
e4685ad649 Update changelogs 2019-09-04 23:00:07 +08:00
Pig Fang
e3483375e0 Remove package swiggles/memcache 2019-09-04 22:59:06 +08:00
Pig Fang
e48bd1f9c6 Tweak TestCase 2019-09-04 21:28:21 +08:00
Pig Fang
9402f5f83e Fix priority of Filters API 2019-09-04 19:33:39 +08:00
Pig Fang
3fc176e07a Add more events and filters 2019-09-04 19:31:44 +08:00
Pig Fang
9ccb620fe4 Add ignition 2019-09-03 23:45:02 +08:00
Pig Fang
1e625f75bf Tweak Filters API 2019-09-03 23:07:10 +08:00
Pig Fang
3264e376cb Simplify importing Auth 2019-09-03 18:44:21 +08:00
Pig Fang
be86f161a2 Reinvent wheel: Filters API 2019-09-03 18:41:19 +08:00
Pig Fang
df3c1687ad Add filter can_rename_player 2019-09-02 23:33:51 +08:00
Pig Fang
cdb7456ab2 Add IDE helper 2019-09-02 23:06:10 +08:00
Pig Fang
ed80b2373b Fix dispatching event 2019-09-02 20:42:26 +08:00
Pig Fang
3f7a4212d1 Update ignore 2019-09-02 20:30:18 +08:00
Pig Fang
8f350b206f Add new events for renaming player 2019-08-31 12:14:39 +08:00
Pig Fang
347399c944 Add commit SHA at status page 2019-08-31 09:42:29 +08:00
Pig Fang
cfa552157f Tweak listeners 2019-08-31 09:20:11 +08:00
Pig Fang
70280d0acc Fix lint 2019-08-31 09:15:20 +08:00
Pig Fang
c44ff192ba Catch plugin's bootstrapper exceptions 2019-08-31 09:12:51 +08:00
Pig Fang
016e11b40b Fix tests 2019-08-29 18:56:44 +08:00
Pig Fang
3d3e488443 Show error stack from plugins 2019-08-28 17:45:25 +08:00
Pig Fang
15c3c0423a Decrease PHP version requirement to 7.2.0 2019-08-28 17:36:20 +08:00
Pig Fang
c9cdc6640c Add more info at status page 2019-08-28 16:04:26 +08:00
Pig Fang
fb3f58856c Fix saving plugins option 2019-08-28 15:32:49 +08:00
Pig Fang
49bf12675d Add more info at status page 2019-08-28 14:52:51 +08:00
Pig Fang
8bb617623e Add environment status page 2019-08-28 11:39:00 +08:00
Pig Fang
048441071e Remove Laradock [skip ci] 2019-08-28 09:07:27 +08:00
Pig Fang
eb0818dc27 Fix cleaning options cache 2019-08-26 11:01:49 +08:00
Pig Fang
5465399eda Fix lint 2019-08-25 17:32:39 +08:00
Pig Fang
deb8c44e45 Improve text of plugins management 2019-08-25 15:54:29 +08:00
Pig Fang
c976a5c5f8 Load translations of plugins even disabled 2019-08-25 14:51:56 +08:00
Pig Fang
0c6fe77492 Update links [skip ci] 2019-08-24 12:08:58 +08:00
Pig Fang
63ac1c11dd Revert 2019-08-24 10:22:26 +08:00
Pig Fang
47ae815ce0 Update dependencies 2019-08-23 20:50:48 +08:00
Pig Fang
e68f54f655 Add tests 2019-08-23 17:21:49 +08:00
Pig Fang
ca4d1b5d04 Inject current plugin at bootstrapper 2019-08-23 14:20:04 +08:00
Pig Fang
602fde7227 Add tests 2019-08-23 10:59:44 +08:00
Pig Fang
567999909f Add tests 2019-08-22 22:48:51 +08:00
Pig Fang
c607990991 Add tests 2019-08-22 17:59:49 +08:00
Pig Fang
44fe418eee Clean up 2019-08-22 16:15:59 +08:00
Pig Fang
5d8814e900 Add test to cover 2019-08-22 11:44:51 +08:00
Pig Fang
7021ef49b4 Clean up 2019-08-22 11:29:30 +08:00
Pig Fang
17c267ea55 Tweak service container 2019-08-22 11:17:05 +08:00
Pig Fang
625cc08b81 Tweak service container 2019-08-22 10:49:05 +08:00
Pig Fang
28a4144ed1 Fix tests 2019-08-22 10:06:13 +08:00
Pig Fang
de49318bc6 Read options from cache if exists 2019-08-22 09:19:58 +08:00
Pig Fang
29eb0afa2c Tweak tests 2019-08-22 09:11:04 +08:00
Pig Fang
197c3d8333 Tweak options:cache command 2019-08-22 08:50:59 +08:00
Pig Fang
e01f034ffd Support caching options 2019-08-21 23:46:38 +08:00
Pig Fang
061c9d7f56 Disable plugins which have conflicts 2019-08-21 17:31:51 +08:00
Pig Fang
f7f0d9e3ec Add "test" script in composer.json 2019-08-21 17:31:32 +08:00
Pig Fang
937186e34b Plugin system: allow to define conflicts 2019-08-21 11:48:42 +08:00
Pig Fang
3481dc75fc Allow to pass single user to send notifications at hook 2019-08-21 11:11:44 +08:00
Pig Fang
cd9fa0b3d3 Update changelog [skip ci] 2019-08-20 21:58:11 +08:00
Pig Fang
70726a1c5a Tweak test 2019-08-20 11:50:07 +08:00
Pig Fang
3ee84f766d Revert "Tweak PluginServiceProvider"
This reverts commit f4be149bf3.
2019-08-20 11:26:21 +08:00
Pig Fang
f4be149bf3 Tweak PluginServiceProvider 2019-08-20 10:12:35 +08:00
Pig Fang
3b457ce329 Add a test to cover 2019-08-20 09:40:44 +08:00
Pig Fang
4fcdfc2b7e Support multiple plugins directories 2019-08-19 23:06:17 +08:00
Pig Fang
5fa956dfb6 Tweak booting plugins 2019-08-19 16:52:10 +08:00
Pig Fang
d51374fe99 Revert 2019-08-18 16:01:20 +08:00
Pig Fang
42f0135704 Check plugin dependencies at PluginManager 2019-08-17 10:57:38 +08:00
Pig Fang
eeec2e0435 Improve UX of plugin-related Artisan commands 2019-08-16 17:35:13 +08:00
Pig Fang
bf778e9405 Tweak 2019-08-16 17:09:40 +08:00
Pig Fang
eedcfdf957 Refactor booting plugin 2019-08-16 15:51:20 +08:00
Pig Fang
72aa2c39ac Register service providers of plugins 2019-08-16 14:56:47 +08:00
Pig Fang
43ede5b274 Ignore unreachable code 2019-08-16 14:48:38 +08:00
Pig Fang
857827bcdc Fix for historical reason 2019-08-16 14:46:55 +08:00
Pig Fang
372c7768d0
Apply fixes from StyleCI (#93)
[ci skip] [skip ci]
2019-08-15 23:27:29 +08:00
Pig Fang
e67df90978 Tiny tweaks 2019-08-15 17:21:55 +08:00
Pig Fang
f117a4f3c7 Add test 2019-08-15 17:08:25 +08:00
Pig Fang
560ed2c2fd Refactor plugin system (part 11) 2019-08-15 16:54:12 +08:00
Pig Fang
d871af1906 Tweak test 2019-08-15 15:03:53 +08:00
Pig Fang
eb836357b8 Refactor plugin system (part 10) 2019-08-15 11:57:55 +08:00
Pig Fang
f182f799f6 Refactor plugin system (part 9) 2019-08-13 23:06:28 +08:00
Pig Fang
3594b7abf8 Refactor plugin system (part 8) 2019-08-13 22:44:32 +08:00
Pig Fang
85a67a5332 Refactor plugin system (part 7) 2019-08-13 18:42:17 +08:00
Pig Fang
15f988f04d Fix test 2019-08-12 17:48:40 +08:00
Pig Fang
3071ece7ba Refactor plugin system (part 6) 2019-08-12 17:37:52 +08:00
Pig Fang
fb0dcd4ad3 Refactor plugin system (part 5) 2019-08-12 15:59:01 +08:00
Pig Fang
d15fd0b36d Refactor plugin system (part 4) 2019-08-12 15:21:50 +08:00
Pig Fang
18019d85e6 Refactor plugin system (part 3) 2019-08-12 14:45:07 +08:00
Pig Fang
d92e1738dc Refactor plugin system (part 2) 2019-08-12 10:52:40 +08:00
Pig Fang
93183debda Fix test 2019-08-12 10:03:39 +08:00
Pig Fang
197b61b9d6 Fix test 2019-08-12 09:56:51 +08:00
Pig Fang
b7ee522d86 Attempt to fix test 2019-08-11 19:10:27 +08:00
Pig Fang
8b7e63d237 Fix test 2019-08-11 18:59:32 +08:00
Pig Fang
5932f8984b Skip test 2019-08-11 18:56:29 +08:00
Pig Fang
2709d09823 Refactor booting plugins (part 1) 2019-08-11 18:00:00 +08:00
Pig Fang
a14ff87d0d Add helper functions for Filter API 2019-08-10 12:16:24 +08:00
Pig Fang
b0dbba1475 Update readme [skip ci] 2019-08-10 10:36:35 +08:00
Pig Fang
eeb75ed8e9 Remove Laradock from repository 2019-08-10 10:36:15 +08:00
Pig Fang
283ab51259 Drop support of IIS [skip ci] 2019-08-10 10:27:43 +08:00
Pig Fang
457594797c Increase PHP version requirement 2019-08-09 22:56:54 +08:00
Pig Fang
0651fdac67 Upgrade PHPUnit and other dependencies 2019-08-09 22:49:17 +08:00
Pig Fang
6003292d60 Update changelog [skip ci] 2019-08-09 17:22:23 +08:00
Pig Fang
c125696712 Tweak CI trigger 2019-08-09 16:29:00 +08:00
Pig Fang
562c3690a8 Add tests for artisan commands 2019-08-09 15:36:13 +08:00
Pig Fang
29ce9d3df1 Use built-in key:generate command 2019-08-09 11:20:36 +08:00
Pig Fang
eed205b7f9 Remove v4 migration commands 2019-08-09 10:54:42 +08:00
Pig Fang
fab3da8f7f Refactor 2019-08-09 10:13:55 +08:00
Pig Fang
3f42d9dfc9 Remove unused code 2019-08-09 08:53:29 +08:00
Pig Fang
bcc4adfae2 Add dependency Eventy 2019-08-08 23:04:16 +08:00
Pig Fang
c281a444f0 Allow to enable or disable a plugin via CLI 2019-08-08 23:03:48 +08:00
Pig Fang
aa635c16af Fix importing Illuminate\Support\Str 2019-08-08 22:27:16 +08:00
Pig Fang
2952d86c5e Tweak aliases 2019-08-08 18:00:11 +08:00
Pig Fang
28f80a2ef0 Tiny tweaks on codebase 2019-08-08 17:21:15 +08:00
Pig Fang
eae0c07ff6 Simplify code 2019-08-08 15:37:38 +08:00
Pig Fang
dcf7300499 Perform type cast before returning value 2019-08-08 15:23:37 +08:00
Pig Fang
b771134688 Fix test 2019-08-08 15:02:21 +08:00
Pig Fang
9209febd96 Don't convert remember_token field 2019-08-08 14:31:03 +08:00
Pig Fang
06b4ec0dbe Fix test 2019-08-08 13:55:41 +08:00
Pig Fang
55346ac4c0 Update changelogs 2019-08-08 11:55:38 +08:00
Pig Fang
d9262c055c Convert SQL query of user model
Automatically, for data integration.
2019-08-08 11:55:22 +08:00
Pig Fang
4de51a464a Fix that model was reset after resetting skin previewing 2019-08-08 11:29:42 +08:00
Pig Fang
bbdd75ad44 Remove deprecated assertArraySubset 2019-08-07 15:46:34 +08:00
Pig Fang
7443766f4c Tweak policy of retrieve CA cert for GuzzleHttp 2019-08-04 18:19:53 +08:00
Pig Fang
4c51924940 Resolve User class from service container 2019-08-04 10:56:15 +08:00
Pig Fang
abaa88444f Update notice of front end CDN 2019-08-03 22:49:12 +08:00
Pig Fang
7929de7891 Use lower case for hashing 2019-08-01 14:52:43 +08:00
Pig Fang
5fab376248 Update release script 2019-08-01 14:47:48 +08:00
Pig Fang
d8eb04dc18 Update release script 2019-08-01 14:40:27 +08:00
Pig Fang
c5da87b681 Update release script 2019-08-01 14:38:26 +08:00
Pig Fang
07d08c7ad8 Use Azure Pipelines 2019-08-01 11:44:59 +08:00
Pig Fang
744964424e Remove docker script 2019-07-31 16:47:07 +08:00
Pig Fang
2731225f4e Fix comment 2019-07-30 15:17:18 +08:00
Pig Fang
3f4837bb35 Refactor user model 2019-07-30 15:12:31 +08:00
Pig Fang
73beea6af4 Tweak 2019-07-30 14:37:31 +08:00
Pig Fang
67bcfc65a5 Refactor user model 2019-07-30 14:29:02 +08:00
Pig Fang
a0daad44d9 Update readme 2019-07-30 10:29:38 +08:00
dependabot[bot]
61d5ebe172 Bump lodash from 4.17.10 to 4.17.11 (#86)
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.11.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.10...4.17.11)

Signed-off-by: dependabot[bot] <support@github.com>
2019-07-30 10:21:43 +08:00
Pig Fang
160dc3e877 Update deps 2019-07-30 09:45:13 +08:00
Pig Fang
80cc47279f config.blade.php as default config view file name. 2019-07-26 16:26:50 +08:00
Pig Fang
d41bbe201c Don't log when testing 2019-07-26 15:58:13 +08:00
Pig Fang
9cd46fdbaf Add missing l10n text (fix #83) 2019-07-26 15:49:41 +08:00
Pig Fang
53781536e7 Some fields at admin panel shouldn't be sortable 2019-07-26 15:41:50 +08:00
Pig Fang
2d30deb279 Update sponsor 2019-07-25 14:40:35 +08:00
Pig Fang
88a8968490 Add dump server for development 2019-07-24 08:45:01 +08:00
Pig Fang
8552d2f7b5 Add a new env item for webpack 2019-07-23 17:34:04 +08:00
1014 changed files with 65914 additions and 44208 deletions

View File

@ -1,92 +0,0 @@
version: 2
jobs:
frontend:
working_directory: ~/repo
docker:
- image: circleci/node:10
steps:
- checkout
- restore_cache:
keys:
- v1-dependencies-{{ checksum "yarn.lock" }}
- v1-dependencies-
- run: yarn
- save_cache:
paths:
- node_modules
- ~/.yarn
key: v1-dependencies-{{ checksum "yarn.lock" }}
- run: yarn lint
- run: yarn test --coverage -w=2
- run: yarn codecov
composer:
working_directory: ~/repo
docker:
- image: blessingskin/ci:7.1
steps:
- checkout
- restore_cache:
keys:
- v1-dependencies-{{ checksum "composer.lock" }}
- v1-dependencies-
- run: composer install -n --prefer-dist
- save_cache:
paths:
- vendor
key: v1-dependencies-{{ checksum "composer.lock" }}
- run: cp .env.testing .env
- run: php artisan key:random
- run: php artisan salt:random
- persist_to_workspace:
root: ~/repo
paths:
- .
php7.1:
working_directory: ~/repo
docker:
- image: blessingskin/ci:7.1
steps:
- attach_workspace:
at: ~/repo
- run: touch storage/testing.sqlite
- run: ./vendor/bin/phpunit --coverage-clover=coverage.xml
- run: bash <(curl -s https://codecov.io/bash) -cF php
php7.2:
working_directory: ~/repo
docker:
- image: blessingskin/ci:7.2
steps:
- attach_workspace:
at: ~/repo
- run: touch storage/testing.sqlite
- run: ./vendor/bin/phpunit
php7.3:
working_directory: ~/repo
docker:
- image: blessingskin/ci:7.3
steps:
- attach_workspace:
at: ~/repo
- run: touch storage/testing.sqlite
- run: ./vendor/bin/phpunit
workflows:
version: 2
install_and_test:
jobs:
- frontend
- composer
- php7.1:
requires:
- composer
- php7.2:
requires:
- composer
- php7.3:
requires:
- composer

View File

@ -0,0 +1,45 @@
APP_DEBUG=true
APP_ENV=development
APP_FALLBACK_LOCALE=en
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=blessingskin
DB_USERNAME=username
DB_PASSWORD=secret
DB_PREFIX=
# Hash Algorithm for Passwords
#
# Available values:
# - BCRYPT, ARGON2I, PHP_PASSWORD_HASH
# - MD5, SALTED2MD5
# - SHA256, SALTED2SHA256
# - SHA512, SALTED2SHA512
#
# New sites are *highly* recommended to use BCRYPT.
#
PWD_METHOD=BCRYPT
APP_KEY=base64:JaytOHG/JlLgulTVAhiS0tRqnAfCkQydbdP6VRmoAMY=
MAIL_MAILER=smtp
MAIL_HOST=
MAIL_PORT=465
MAIL_USERNAME=
MAIL_PASSWORD=
MAIL_ENCRYPTION=
MAIL_FROM_ADDRESS=
MAIL_FROM_NAME=
CACHE_DRIVER=file
SESSION_DRIVER=file
QUEUE_CONNECTION=sync
REDIS_CLIENT=phpredis
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
PLUGINS_DIR=null
PLUGINS_URL=null

26
.devcontainer/Dockerfile Normal file
View File

@ -0,0 +1,26 @@
# [Choice] PHP version (use -bullseye variants on local arm64/Apple Silicon): 8, 8.1, 8.0, 7, 7.4, 7.3, 8-bullseye, 8.1-bullseye, 8.0-bullseye, 7-bullseye, 7.4-bullseye, 7.3-bullseye, 8-buster, 8.1-buster, 8.0-buster, 7-buster, 7.4-buster
ARG VARIANT=8-bullseye
FROM mcr.microsoft.com/vscode/devcontainers/php:0-${VARIANT}
# Install MariaDB client
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get install -y mariadb-client zlib1g-dev libpng-dev libzip-dev libwebp-dev \
&& apt-get clean -y && rm -rf /var/lib/apt/lists/*
# Install php-mysql driver
RUN docker-php-ext-install mysqli pdo pdo_mysql gd zip
# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
ARG NODE_VERSION="none"
RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
# Enable Apache rewrite module
RUN a2enmod rewrite
# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>
# [Optional] Uncomment this line to install global node packages.
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

View File

@ -0,0 +1,13 @@
Listen 8080
<Directory /workspace/public/>
Options Indexes FollowSymLinks
AllowOverride All
Require all granted
</Directory>
<VirtualHost *:8080>
DocumentRoot /workspace/public
ErrorLog /workspace/storage/logs/apache-error.log
CustomLog /workspace/storage/logs/apache-access.log combined
</VirtualHost>

View File

@ -0,0 +1,34 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.231.6/containers/php-mariadb
// Update the VARIANT arg in docker-compose.yml to pick a PHP version
{
"name": "PHP & MariaDB (Community)",
"dockerComposeFile": "docker-compose.yml",
"service": "app",
"workspaceFolder": "/workspace",
// Set *default* container specific settings.json values on container create.
"settings": {},
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"xdebug.php-debug",
"bmewburn.vscode-intelephense-client",
"mrmlnc.vscode-apache"
],
// For use with PHP or Apache (e.g.php -S localhost:8080 or apache2ctl start)
"forwardPorts": [8080, 3306],
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "sudo truncate -s 0 /etc/apache2/ports.conf && sudo rm -f /etc/apache2/sites-enabled/000-default.conf && sudo ln -sf /workspace/.devcontainer/blessing-skin.apache.conf /etc/apache2/sites-enabled/ && ln -sf .devcontainer/.env.devcontainer .env && composer install && yarn install",
// Start apache2 after the container is started
"postStartCommand": "apache2ctl start && echo '\\n👉 \\e[0;32mPlease run '\\'yarn build\\'' to build the frontend. Application is available on port 8080.\\e[0m 👈\\n'",
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode",
"features": {
"powershell": "latest"
}
}

View File

@ -0,0 +1,47 @@
version: '3.8'
services:
app:
build:
context: .
dockerfile: Dockerfile
args:
# Update 'VARIANT' to pick a version of PHP version: 8, 8.1, 8.0, 7, 7.4
# Append -bullseye or -buster to pin to an OS version.
# Use -bullseye variants on local arm64/Apple Silicon.
VARIANT: "8-bullseye"
# Optional Node.js version
NODE_VERSION: "lts/*"
volumes:
- ..:/workspace:cached
# Overrides default command so things don't shut down after the process ends.
command: sleep infinity
# Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
network_mode: service:db
# Uncomment the next line to use a non-root user for all processes.
# user: vscode
# Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
# (Adding the "ports" property to this file will not forward from a Codespace.)
db:
image: mariadb:10.4
restart: unless-stopped
volumes:
- mariadb-data:/var/lib/mysql
environment:
MYSQL_ROOT_PASSWORD: mariadb
MYSQL_DATABASE: blessingskin
MYSQL_USER: username
MYSQL_PASSWORD: secret
# Add "forwardPorts": ["3306"] to **devcontainer.json** to forward MariaDB locally.
# (Adding the "ports" property to this file will not forward from a Codespace.)
volumes:
mariadb-data:

59
.dockerignore Normal file
View File

@ -0,0 +1,59 @@
.git/
.github/
.vscode/
.idea/
.cache/
.cache-loader/
coverage/
node_modules/
plugins/**
public/app/*
public/lang/*
public/plugins/**
resources/assets/tests/
storage/*.db
storage/*.sqlite
storage/insane-profile-cache
storage/oauth-public.key
storage/oauth-private.key
storage/install.lock
storage/options.php
storage/debugbar
storage/framework/cache/**
storage/framework/sessions/**
storage/framework/testing/
storage/framework/views/**
storage/logs/**
storage/packages/**
storage/textures/*
storage/update_cache/*
target/
tests/
vendor/*
_ide_helper.php
.dockerignore
.editorconfig
.env
.env.testing
.eslintignore
.eslintrc.yml
.gitignore
.php_cs.*
.php-cs-fixer.cache
.php-cs-fixer.dist.php
.phpstorm.meta.php
.phpunit.result.cache
.sass-cache
.uini
azure-pipelines.yml
crowdin.yml
docker-compose.yml
Dockerfile*
index.html
junit.xml
phpunit.xml
README*.md
server.php
tsconfig.dev.json
tsconfig.eslint.json
yarn-error.log

View File

@ -9,5 +9,5 @@ indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
[*.{php,md,tpl,rs}]
[*.{php,md,ps1,Dockerfile}]
indent_size = 4

View File

@ -1,76 +1,45 @@
###################################
# Blessing Skin Server v4 #
# Configuration #
###################################
APP_DEBUG=false
APP_ENV=production
APP_FALLBACK_LOCALE=en
# 本文件中各个配置项的详细说明
# 请访问 http://t.cn/E9G4DTY 查看中文教程
# Be sure to disable debug at production environment!
APP_DEBUG = false
APP_ENV = production
# Database Configuration
DB_CONNECTION = dummy
DB_HOST = localhost
DB_PORT = 3306
DB_DATABASE = blessingskin
DB_USERNAME = username
DB_PASSWORD = secret
# =========================
# Table Prefix
#
# Change if you want to install multiple BS instances into one database.
# The prefix may only contain letters, numbers, and underscores.
#
DB_PREFIX = null
DB_CONNECTION=mysql
DB_HOST=localhost
DB_PORT=3306
DB_DATABASE=blessingskin
DB_USERNAME=username
DB_PASSWORD=secret
DB_PREFIX=
# Hash Algorithm for Passwords
#
# Available values:
# - BCRYPT, PHP_PASSWORD_HASH
# - BCRYPT, ARGON2I, PHP_PASSWORD_HASH
# - MD5, SALTED2MD5
# - SHA256, SALTED2SHA256
# - SHA512, SALTED2SHA512
#
# New sites are *highly* recommended to use BCRYPT.
#
PWD_METHOD = BCRYPT
PWD_METHOD=BCRYPT
APP_KEY=
# Salt
# Change it to any random string to secure your passwords & tokens.
#
# You can run [php artisan salt:random] to generate a new salt.
#
SALT = 2c5ca184f017a9a1ffbd198ef69b0c0e
MAIL_MAILER=smtp
MAIL_HOST=
MAIL_PORT=465
MAIL_USERNAME=
MAIL_PASSWORD=
MAIL_ENCRYPTION=
MAIL_FROM_ADDRESS=
MAIL_FROM_NAME=
# App Key should be setted to any random, *32 character* string,
# otherwise all the encrypted strings will not be safe.
#
# You can run [php artisan key:generate] to generate a new key.
#
APP_KEY = base64:gkb/zouNF6UOSfnr/o+izVMS57WQS3+62YqZBuDyBhU=
CACHE_DRIVER=file
SESSION_DRIVER=file
QUEUE_CONNECTION=sync
# Mail Configuration
#
# Leave MAIL_DRIVER empty to disable features involving sending emails.
#
MAIL_DRIVER = smtp
MAIL_HOST = null
MAIL_PORT = 465
MAIL_USERNAME = null
MAIL_PASSWORD = null
MAIL_ENCRYPTION = null
REDIS_CLIENT=phpredis
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
# Change below lines only if you know what they mean!
CACHE_DRIVER = file
SESSION_DRIVER = file
QUEUE_DRIVER = sync
REDIS_HOST = 127.0.0.1
REDIS_PASSWORD = null
REDIS_PORT = 6379
PLUGINS_DIR = null
PLUGINS_URL = null
PLUGINS_DIR=null
PLUGINS_URL=null

View File

@ -1,732 +0,0 @@
###########################################################
###################### General Setup ######################
###########################################################
### Paths #################################################
# Point to the path of your applications code on your host
APP_CODE_PATH_HOST=../
# Point to where the `APP_CODE_PATH_HOST` should be in the container
APP_CODE_PATH_CONTAINER=/var/www
# You may add flags to the path `:cached`, `:delegated`. When using Docker Sync add `:nocopy`
APP_CODE_CONTAINER_FLAG=:cached
# Choose storage path on your machine. For all storage systems
DATA_PATH_HOST=~/.laradock/data
### Drivers ################################################
# All volumes driver
VOLUMES_DRIVER=local
# All Networks driver
NETWORKS_DRIVER=bridge
### Docker compose files ##################################
# Select which docker-compose files to include. If using docker-sync append `:docker-compose.sync.yml` at the end
COMPOSE_FILE=docker-compose.yml
# Change the separator from : to ; on Windows
COMPOSE_PATH_SEPARATOR=:
# Define the prefix of container names. This is useful if you have multiple projects that use laradock to have seperate containers per project.
COMPOSE_PROJECT_NAME=laradock
### PHP Version ###########################################
# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 7.3 - 7.2 - 7.1 - 7.0 - 5.6
PHP_VERSION=7.3
### Phalcon Version ###########################################
# Select a Phalcon version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 3.4.0+
PHALCON_VERSION=3.4.1
### PHP Interpreter #######################################
# Select the PHP Interpreter. Accepted values: hhvm - php-fpm
PHP_INTERPRETER=php-fpm
### Docker Host IP ########################################
# Enter your Docker Host IP (will be appended to /etc/hosts). Default is `10.0.75.1`
DOCKER_HOST_IP=10.0.75.1
### Remote Interpreter ####################################
# Choose a Remote Interpreter entry matching name. Default is `laradock`
PHP_IDE_CONFIG=serverName=laradock
### Windows Path ##########################################
# A fix for Windows users, to ensure the application path works
COMPOSE_CONVERT_WINDOWS_PATHS=1
### Environment ###########################################
# If you need to change the sources (i.e. to China), set CHANGE_SOURCE to true
CHANGE_SOURCE=true
### Docker Sync ###########################################
# If you are using Docker Sync. For `osx` use 'native_osx', for `windows` use 'unison', for `linux` docker-sync is not required
DOCKER_SYNC_STRATEGY=native_osx
###########################################################
################ Containers Customization #################
###########################################################
### WORKSPACE #############################################
WORKSPACE_COMPOSER_GLOBAL_INSTALL=true
WORKSPACE_COMPOSER_AUTH=false
WORKSPACE_COMPOSER_REPO_PACKAGIST=
WORKSPACE_INSTALL_NODE=false
WORKSPACE_NODE_VERSION=node
WORKSPACE_NPM_REGISTRY=
WORKSPACE_INSTALL_YARN=false
WORKSPACE_YARN_VERSION=latest
WORKSPACE_INSTALL_NPM_GULP=false
WORKSPACE_INSTALL_NPM_BOWER=false
WORKSPACE_INSTALL_NPM_VUE_CLI=false
WORKSPACE_INSTALL_NPM_ANGULAR_CLI=false
WORKSPACE_INSTALL_PHPREDIS=true
WORKSPACE_INSTALL_WORKSPACE_SSH=false
WORKSPACE_INSTALL_SUBVERSION=false
WORKSPACE_INSTALL_XDEBUG=false
WORKSPACE_INSTALL_PHPDBG=false
WORKSPACE_INSTALL_SSH2=false
WORKSPACE_INSTALL_LDAP=false
WORKSPACE_INSTALL_GMP=false
WORKSPACE_INSTALL_SOAP=false
WORKSPACE_INSTALL_XSL=false
WORKSPACE_INSTALL_IMAP=false
WORKSPACE_INSTALL_MONGO=false
WORKSPACE_INSTALL_AMQP=false
WORKSPACE_INSTALL_MSSQL=false
WORKSPACE_INSTALL_DRUSH=false
WORKSPACE_DRUSH_VERSION=8.1.17
WORKSPACE_INSTALL_DRUPAL_CONSOLE=false
WORKSPACE_INSTALL_WP_CLI=false
WORKSPACE_INSTALL_AEROSPIKE=false
WORKSPACE_INSTALL_V8JS=false
WORKSPACE_INSTALL_LARAVEL_ENVOY=false
WORKSPACE_INSTALL_LARAVEL_INSTALLER=false
WORKSPACE_INSTALL_DEPLOYER=false
WORKSPACE_INSTALL_PRESTISSIMO=false
WORKSPACE_INSTALL_LINUXBREW=false
WORKSPACE_INSTALL_MC=false
WORKSPACE_INSTALL_SYMFONY=false
WORKSPACE_INSTALL_PYTHON=false
WORKSPACE_INSTALL_POWERLINE=false
WORKSPACE_INSTALL_IMAGE_OPTIMIZERS=false
WORKSPACE_INSTALL_IMAGEMAGICK=false
WORKSPACE_INSTALL_TERRAFORM=false
WORKSPACE_INSTALL_DUSK_DEPS=false
WORKSPACE_INSTALL_PG_CLIENT=false
WORKSPACE_INSTALL_PHALCON=false
WORKSPACE_INSTALL_SWOOLE=false
WORKSPACE_INSTALL_TAINT=false
WORKSPACE_INSTALL_LIBPNG=false
WORKSPACE_INSTALL_IONCUBE=false
WORKSPACE_INSTALL_MYSQL_CLIENT=false
WORKSPACE_INSTALL_PING=false
WORKSPACE_INSTALL_SSHPASS=false
WORKSPACE_INSTALL_INOTIFY=false
WORKSPACE_INSTALL_FSWATCH=false
WORKSPACE_PUID=1000
WORKSPACE_PGID=1000
WORKSPACE_CHROME_DRIVER_VERSION=2.42
WORKSPACE_TIMEZONE=UTC
WORKSPACE_SSH_PORT=2222
WORKSPACE_INSTALL_FFMPEG=false
WORKSPACE_INSTALL_GNU_PARALLEL=false
### PHP_FPM ###############################################
PHP_FPM_INSTALL_BCMATH=true
PHP_FPM_INSTALL_MYSQLI=true
PHP_FPM_INSTALL_INTL=true
PHP_FPM_INSTALL_IMAGEMAGICK=true
PHP_FPM_INSTALL_OPCACHE=true
PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=true
PHP_FPM_INSTALL_PHPREDIS=true
PHP_FPM_INSTALL_MEMCACHED=false
PHP_FPM_INSTALL_XDEBUG=false
PHP_FPM_INSTALL_XHPROF=false
PHP_FPM_INSTALL_PHPDBG=false
PHP_FPM_INSTALL_IMAP=false
PHP_FPM_INSTALL_MONGO=false
PHP_FPM_INSTALL_AMQP=false
PHP_FPM_INSTALL_MSSQL=false
PHP_FPM_INSTALL_SSH2=false
PHP_FPM_INSTALL_SOAP=false
PHP_FPM_INSTALL_XSL=false
PHP_FPM_INSTALL_GMP=false
PHP_FPM_INSTALL_EXIF=false
PHP_FPM_INSTALL_AEROSPIKE=false
PHP_FPM_INSTALL_PGSQL=false
PHP_FPM_INSTALL_GHOSTSCRIPT=false
PHP_FPM_INSTALL_LDAP=false
PHP_FPM_INSTALL_PHALCON=false
PHP_FPM_INSTALL_SWOOLE=false
PHP_FPM_INSTALL_TAINT=false
PHP_FPM_INSTALL_PG_CLIENT=false
PHP_FPM_INSTALL_POSTGIS=false
PHP_FPM_INSTALL_PCNTL=false
PHP_FPM_INSTALL_CALENDAR=false
PHP_FPM_INSTALL_FAKETIME=false
PHP_FPM_INSTALL_IONCUBE=false
PHP_FPM_INSTALL_RDKAFKA=false
PHP_FPM_FAKETIME=-0
PHP_FPM_INSTALL_APCU=false
PHP_FPM_INSTALL_YAML=false
PHP_FPM_INSTALL_ADDITIONAL_LOCALES=false
PHP_FPM_INSTALL_MYSQL_CLIENT=false
PHP_FPM_INSTALL_PING=false
PHP_FPM_INSTALL_SSHPASS=false
PHP_FPM_FFMPEG=false
PHP_FPM_ADDITIONAL_LOCALES="es_ES.UTF-8 fr_FR.UTF-8"
### PHP_WORKER ############################################
PHP_WORKER_INSTALL_PGSQL=false
PHP_WORKER_INSTALL_BCMATH=false
PHP_WORKER_INSTALL_PHALCON=false
PHP_WORKER_INSTALL_SOAP=false
PHP_WORKER_INSTALL_ZIP_ARCHIVE=false
PHP_WORKER_INSTALL_MYSQL_CLIENT=false
PHP_WORKER_INSTALL_AMQP=false
PHP_WORKER_INSTALL_GHOSTSCRIPT=false
PHP_WORKER_INSTALL_SWOOLE=false
PHP_WORKER_INSTALL_TAINT=false
PHP_WORKER_INSTALL_FFMPEG=false
PHP_WORKER_INSTALL_GMP=false
PHP_WORKER_PUID=1000
PHP_WORKER_PGID=1000
### NGINX #################################################
NGINX_HOST_HTTP_PORT=80
NGINX_HOST_HTTPS_PORT=443
NGINX_HOST_LOG_PATH=./logs/nginx/
NGINX_SITES_PATH=./nginx/sites/
NGINX_PHP_UPSTREAM_CONTAINER=php-fpm
NGINX_PHP_UPSTREAM_PORT=9000
NGINX_SSL_PATH=./nginx/ssl/
### APACHE ################################################
APACHE_HOST_HTTP_PORT=80
APACHE_HOST_HTTPS_PORT=443
APACHE_HOST_LOG_PATH=./logs/apache2
APACHE_SITES_PATH=./apache2/sites
APACHE_PHP_UPSTREAM_CONTAINER=php-fpm
APACHE_PHP_UPSTREAM_PORT=9000
APACHE_PHP_UPSTREAM_TIMEOUT=60
APACHE_DOCUMENT_ROOT=/var/www/
### MYSQL #################################################
MYSQL_VERSION=latest
MYSQL_DATABASE=default
MYSQL_USER=default
MYSQL_PASSWORD=secret
MYSQL_PORT=3306
MYSQL_ROOT_PASSWORD=root
MYSQL_ENTRYPOINT_INITDB=./mysql/docker-entrypoint-initdb.d
### REDIS #################################################
REDIS_PORT=6379
### REDIS CLUSTER #########################################
REDIS_CLUSTER_PORT_RANGE=7000-7005
### ZooKeeper #############################################
ZOOKEEPER_PORT=2181
### Percona ###############################################
PERCONA_DATABASE=homestead
PERCONA_USER=homestead
PERCONA_PASSWORD=secret
PERCONA_PORT=3306
PERCONA_ROOT_PASSWORD=root
PERCONA_ENTRYPOINT_INITDB=./percona/docker-entrypoint-initdb.d
### MSSQL #################################################
MSSQL_DATABASE=homestead
MSSQL_PASSWORD=yourStrong(!)Password
MSSQL_PORT=1433
### MARIADB ###############################################
MARIADB_DATABASE=default
MARIADB_USER=default
MARIADB_PASSWORD=secret
MARIADB_PORT=3306
MARIADB_ROOT_PASSWORD=root
MARIADB_ENTRYPOINT_INITDB=./mariadb/docker-entrypoint-initdb.d
### POSTGRES ##############################################
POSTGRES_DB=default
POSTGRES_USER=default
POSTGRES_PASSWORD=secret
POSTGRES_PORT=5432
POSTGRES_ENTRYPOINT_INITDB=./postgres/docker-entrypoint-initdb.d
### RABBITMQ ##############################################
RABBITMQ_NODE_HOST_PORT=5672
RABBITMQ_MANAGEMENT_HTTP_HOST_PORT=15672
RABBITMQ_MANAGEMENT_HTTPS_HOST_PORT=15671
RABBITMQ_DEFAULT_USER=guest
RABBITMQ_DEFAULT_PASS=guest
### ELASTICSEARCH #########################################
ELASTICSEARCH_HOST_HTTP_PORT=9200
ELASTICSEARCH_HOST_TRANSPORT_PORT=9300
### KIBANA ################################################
KIBANA_HTTP_PORT=5601
### MEMCACHED #############################################
MEMCACHED_HOST_PORT=11211
### BEANSTALKD CONSOLE ####################################
BEANSTALKD_CONSOLE_BUILD_PATH=./beanstalkd-console
BEANSTALKD_CONSOLE_CONTAINER_NAME=beanstalkd-console
BEANSTALKD_CONSOLE_HOST_PORT=2080
### BEANSTALKD ############################################
BEANSTALKD_HOST_PORT=11300
### SELENIUM ##############################################
SELENIUM_PORT=4444
### MINIO #################################################
MINIO_PORT=9000
### ADMINER ###############################################
ADM_PORT=8080
ADM_INSTALL_MSSQL=false
### PHP MY ADMIN ##########################################
# Accepted values: mariadb - mysql
PMA_DB_ENGINE=mariadb
# Credentials/Port:
PMA_USER=default
PMA_PASSWORD=secret
PMA_ROOT_PASSWORD=secret
PMA_PORT=8080
### MAILDEV ###############################################
MAILDEV_HTTP_PORT=1080
MAILDEV_SMTP_PORT=25
### VARNISH ###############################################
VARNISH_CONFIG=/etc/varnish/default.vcl
VARNISH_PORT=8080
VARNISH_BACKEND_PORT=8888
VARNISHD_PARAMS=-p default_ttl=3600 -p default_grace=3600
### Varnish ###############################################
# Proxy 1
VARNISH_PROXY1_CACHE_SIZE=128m
VARNISH_PROXY1_BACKEND_HOST=workspace
VARNISH_PROXY1_SERVER=SERVER1
# Proxy 2
VARNISH_PROXY2_CACHE_SIZE=128m
VARNISH_PROXY2_BACKEND_HOST=workspace
VARNISH_PROXY2_SERVER=SERVER2
### HAPROXY ###############################################
HAPROXY_HOST_HTTP_PORT=8085
### JENKINS ###############################################
JENKINS_HOST_HTTP_PORT=8090
JENKINS_HOST_SLAVE_AGENT_PORT=50000
JENKINS_HOME=./jenkins/jenkins_home
### CONFLUENCE ###############################################
CONFLUENCE_POSTGRES_INIT=true
CONFLUENCE_VERSION=6.13-ubuntu-18.04-adoptopenjdk8
CONFLUENCE_POSTGRES_DB=laradock_confluence
CONFLUENCE_POSTGRES_USER=laradock_confluence
CONFLUENCE_POSTGRES_PASSWORD=laradock_confluence
CONFLUENCE_HOST_HTTP_PORT=8090
### GRAFANA ###############################################
GRAFANA_PORT=3000
### GRAYLOG ###############################################
# password must be 16 characters long
GRAYLOG_PASSWORD=somesupersecretpassword
# sha256 representation of the password
GRAYLOG_SHA256_PASSWORD=b1cb6e31e172577918c9e7806c572b5ed8477d3f57aa737bee4b5b1db3696f09
GRAYLOG_PORT=9000
GRAYLOG_SYSLOG_TCP_PORT=514
GRAYLOG_SYSLOG_UDP_PORT=514
GRAYLOG_GELF_TCP_PORT=12201
GRAYLOG_GELF_UDP_PORT=12201
### BLACKFIRE #############################################
# Create an account on blackfire.io. Don't enable blackfire and xDebug at the same time. # visit https://blackfire.io/docs/24-days/06-installation#install-probe-debian for more info.
INSTALL_BLACKFIRE=false
BLACKFIRE_CLIENT_ID=<client_id>
BLACKFIRE_CLIENT_TOKEN=<client_token>
BLACKFIRE_SERVER_ID=<server_id>
BLACKFIRE_SERVER_TOKEN=<server_token>
### AEROSPIKE #############################################
AEROSPIKE_SERVICE_PORT=3000
AEROSPIKE_FABRIC_PORT=3001
AEROSPIKE_HEARTBEAT_PORT=3002
AEROSPIKE_INFO_PORT=3003
AEROSPIKE_STORAGE_GB=1
AEROSPIKE_MEM_GB=1
AEROSPIKE_NAMESPACE=test
### RETHINKDB #############################################
RETHINKDB_PORT=8090
### MONGODB ###############################################
MONGODB_PORT=27017
### CADDY #################################################
CADDY_HOST_HTTP_PORT=80
CADDY_HOST_HTTPS_PORT=443
CADDY_HOST_LOG_PATH=./logs/caddy
CADDY_CONFIG_PATH=./caddy/caddy
### LARAVEL ECHO SERVER ###################################
LARAVEL_ECHO_SERVER_PORT=6001
### THUMBOR ############################################################################################################
THUMBOR_PORT=8000
THUMBOR_LOG_FORMAT="%(asctime)s %(name)s:%(levelname)s %(message)s"
THUMBOR_LOG_DATE_FORMAT="%Y-%m-%d %H:%M:%S"
MAX_WIDTH=0
MAX_HEIGHT=0
MIN_WIDTH=1
MIN_HEIGHT=1
ALLOWED_SOURCES=[]
QUALITY=80
WEBP_QUALITY=None
PNG_COMPRESSION_LEVEL=6
AUTO_WEBP=False
MAX_AGE=86400
MAX_AGE_TEMP_IMAGE=0
RESPECT_ORIENTATION=False
IGNORE_SMART_ERRORS=False
PRESERVE_EXIF_INFO=False
ALLOW_ANIMATED_GIFS=True
USE_GIFSICLE_ENGINE=False
USE_BLACKLIST=False
LOADER=thumbor.loaders.http_loader
STORAGE=thumbor.storages.file_storage
AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
RESULT_STORAGE=thumbor.result_storages.file_storage
ENGINE=thumbor.engines.pil
SECURITY_KEY="MY_SECURE_KEY"
ALLOW_UNSAFE_URL=True
ALLOW_OLD_URLS=True
FILE_LOADER_ROOT_PATH=/data/loader
HTTP_LOADER_CONNECT_TIMEOUT=5
HTTP_LOADER_REQUEST_TIMEOUT=20
HTTP_LOADER_FOLLOW_REDIRECTS=True
HTTP_LOADER_MAX_REDIRECTS=5
HTTP_LOADER_FORWARD_USER_AGENT=False
HTTP_LOADER_DEFAULT_USER_AGENT="Thumbor/5.2.1"
HTTP_LOADER_PROXY_HOST=None
HTTP_LOADER_PROXY_PORT=None
HTTP_LOADER_PROXY_USERNAME=None
HTTP_LOADER_PROXY_PASSWORD=None
HTTP_LOADER_CA_CERTS=None
HTTP_LOADER_VALIDATE_CERTS=True
HTTP_LOADER_CLIENT_KEY=None
HTTP_LOADER_CLIENT_CERT=None
HTTP_LOADER_CURL_ASYNC_HTTP_CLIENT=False
STORAGE_EXPIRATION_SECONDS=2592000
STORES_CRYPTO_KEY_FOR_EACH_IMAGE=False
FILE_STORAGE_ROOT_PATH=/data/storage
UPLOAD_MAX_SIZE=0
UPLOAD_ENABLED=False
UPLOAD_PHOTO_STORAGE=thumbor.storages.file_storage
UPLOAD_DELETE_ALLOWED=False
UPLOAD_PUT_ALLOWED=False
UPLOAD_DEFAULT_FILENAME=image
MONGO_STORAGE_SERVER_HOST=mongo
MONGO_STORAGE_SERVER_PORT=27017
MONGO_STORAGE_SERVER_DB=thumbor
MONGO_STORAGE_SERVER_COLLECTION=images
REDIS_STORAGE_SERVER_HOST=redis
REDIS_STORAGE_SERVER_PORT=6379
REDIS_STORAGE_SERVER_DB=0
REDIS_STORAGE_SERVER_PASSWORD=None
REDIS_RESULT_STORAGE_SERVER_HOST=redis
REDIS_RESULT_STORAGE_SERVER_PORT=6379
REDIS_RESULT_STORAGE_SERVER_DB=0
REDIS_RESULT_STORAGE_SERVER_PASSWORD=None
MEMCACHE_STORAGE_SERVERS=["localhost:11211",]
MIXED_STORAGE_FILE_STORAGE=thumbor.storages.no_storage
MIXED_STORAGE_CRYPTO_STORAGE=thumbor.storages.no_storage
MIXED_STORAGE_DETECTOR_STORAGE=thumbor.storages.no_storage
META_CALLBACK_NAME=None
DETECTORS=[]
FACE_DETECTOR_CASCADE_FILE=haarcascade_frontalface_alt.xml
OPTIMIZERS=[]
JPEGTRAN_PATH=/usr/bin/jpegtran
PROGRESSIVE_JPEG=True
FILTERS=["thumbor.filters.brightness", "thumbor.filters.contrast", "thumbor.filters.rgb", "thumbor.filters.round_corner", "thumbor.filters.quality", "thumbor.filters.noise", "thumbor.filters.watermark", "thumbor.filters.equalize", "thumbor.filters.fill", "thumbor.filters.sharpen", "thumbor.filters.strip_icc", "thumbor.filters.frame", "thumbor.filters.grayscale", "thumbor.filters.rotate", "thumbor.filters.format", "thumbor.filters.max_bytes", "thumbor.filters.convolution", "thumbor.filters.blur", "thumbor.filters.extract_focal", "thumbor.filters.no_upscale"]
RESULT_STORAGE_EXPIRATION_SECONDS=0
RESULT_STORAGE_FILE_STORAGE_ROOT_PATH=/data/result_storage
RESULT_STORAGE_STORES_UNSAFE=False
REDIS_QUEUE_SERVER_HOST=redis
REDIS_QUEUE_SERVER_PORT=6379
REDIS_QUEUE_SERVER_DB="0"
REDIS_QUEUE_SERVER_PASSWORD=None
SQS_QUEUE_KEY_ID=None
SQS_QUEUE_KEY_SECRET=None
SQS_QUEUE_REGION=us-east-1
USE_CUSTOM_ERROR_HANDLING=False
ERROR_HANDLER_MODULE=thumbor.error_handlers.sentry
ERROR_FILE_LOGGER=None
ERROR_FILE_NAME_USE_CONTEXT="False"
SENTRY_DSN_URL=
TC_AWS_REGION=eu-west-1
TC_AWS_ENDPOINT=None
TC_AWS_STORAGE_BUCKET=
TC_AWS_STORAGE_ROOT_PATH=
TC_AWS_LOADER_BUCKET=
TC_AWS_LOADER_ROOT_PATH=
TC_AWS_RESULT_STORAGE_BUCKET=
TC_AWS_RESULT_STORAGE_ROOT_PATH=
TC_AWS_STORAGE_SSE=False
TC_AWS_STORAGE_RRS=False
TC_AWS_ENABLE_HTTP_LOADER=False
TC_AWS_ALLOWED_BUCKETS=False
TC_AWS_STORE_METADATA=False
### SOLR ##################################################
SOLR_VERSION=5.5
SOLR_PORT=8983
SOLR_DATAIMPORTHANDLER_MYSQL=false
SOLR_DATAIMPORTHANDLER_MSSQL=false
### GITLAB ###############################################
GITLAB_POSTGRES_INIT=true
GITLAB_HOST_HTTP_PORT=8989
GITLAB_HOST_HTTPS_PORT=9898
GITLAB_HOST_SSH_PORT=2289
GITLAB_DOMAIN_NAME=http://localhost
GITLAB_ROOT_PASSWORD=laradock
GITLAB_HOST_LOG_PATH=./logs/gitlab
GITLAB_POSTGRES_HOST=postgres
GITLAB_POSTGRES_USER=laradock_gitlab
GITLAB_POSTGRES_PASSWORD=laradock_gitlab
GITLAB_POSTGRES_DB=laradock_gitlab
### GITLAB-RUNNER ###############################################
GITLAB_CI_SERVER_URL=http://localhost:8989
GITLAB_RUNNER_REGISTRATION_TOKEN=<my-registration-token>
GITLAB_REGISTER_NON_INTERACTIVE=true
### JUPYTERHUB ###############################################
JUPYTERHUB_POSTGRES_INIT=true
JUPYTERHUB_POSTGRES_HOST=postgres
JUPYTERHUB_POSTGRES_USER=laradock_jupyterhub
JUPYTERHUB_POSTGRES_PASSWORD=laradock_jupyterhub
JUPYTERHUB_POSTGRES_DB=laradock_jupyterhub
JUPYTERHUB_PORT=9991
JUPYTERHUB_OAUTH_CALLBACK_URL=http://laradock:9991/hub/oauth_callback
JUPYTERHUB_OAUTH_CLIENT_ID={GITHUB_CLIENT_ID}
JUPYTERHUB_OAUTH_CLIENT_SECRET={GITHUB_CLIENT_SECRET}
JUPYTERHUB_CUSTOM_CONFIG=./jupyterhub/jupyterhub_config.py
JUPYTERHUB_USER_DATA=/jupyterhub
JUPYTERHUB_USER_LIST=./jupyterhub/userlist
JUPYTERHUB_ENABLE_NVIDIA=false
### IPYTHON ##################################################
LARADOCK_IPYTHON_CONTROLLER_IP=127.0.0.1
### NETDATA ###############################################
NETDATA_PORT=19999
### REDISWEBUI #########################################
REDIS_WEBUI_USERNAME=laradock
REDIS_WEBUI_PASSWORD=laradock
REDIS_WEBUI_CONNECT_HOST=redis
REDIS_WEBUI_CONNECT_PORT=6379
REDIS_WEBUI_PORT=9987
### MONGOWEBUI ###############################################
MONGO_WEBUI_PORT=3000
MONGO_WEBUI_ROOT_URL=http://localhost
MONGO_WEBUI_MONGO_URL=mongodb://mongo:27017/
MONGO_WEBUI_INSTALL_MONGO=false
### METABASE ###############################################
METABASE_PORT=3030
METABASE_DB_FILE=metabase.db
METABASE_JAVA_TIMEZONE=US/Pacific
### IDE ###############################################
IDE_THEIA_PORT=987
IDE_WEBIDE_PORT=984
IDE_CODIAD_PORT=985
IDE_ICECODER_PORT=986
### DOCKERREGISTRY ###############################################
DOCKER_REGISTRY_PORT=5000
### DOCKERWEBUI ###############################################
DOCKER_WEBUI_REGISTRY_HOST=docker-registry
DOCKER_WEBUI_REGISTRY_PORT=5000
# if have use https proxy please set to 1
DOCKER_REGISTRY_USE_SSL=0
DOCKER_REGISTRY_BROWSE_ONLY=false
DOCKER_WEBUI_PORT=8754
### MAILU ###############################################
MAILU_VERSION=latest
MAILU_RECAPTCHA_PUBLIC_KEY=<YOUR_RECAPTCHA_PUBLIC_KEY>
MAILU_RECAPTCHA_PRIVATE_KEY=<YOUR_RECAPTCHA_PRIVATE_KEY>
# Main mail domain
MAILU_HTTP_PORT=6080
MAILU_HTTPS_PORT=60443
MAILU_DOMAIN=example.com
MAILU_INIT_ADMIN_USERNAME=laradock
MAILU_INIT_ADMIN_PASSWORD=laradock
# Hostnames for this server, separated with comas
MAILU_HOSTNAMES=mail.example.com,alternative.example.com,yetanother.example.com
# Postmaster local part (will append the main mail domain)
MAILU_POSTMASTER=admin
# Set to a randomly generated 16 bytes string
MAILU_SECRET_KEY=ChangeMeChangeMe
# Choose how secure connections will behave (value: letsencrypt, cert, notls, mail)
MAILU_TLS_FLAVOR=cert
# Authentication rate limit (per source IP address)
MAILU_AUTH_RATELIMIT=10/minute;1000/hour
# Opt-out of statistics, replace with "True" to opt out
MAILU_DISABLE_STATISTICS=False
# Message size limit in bytes
# Default: accept messages up to 50MB
MAILU_MESSAGE_SIZE_LIMIT=50000000
# Will relay all outgoing mails if configured
MAILU_RELAYHOST=
# Networks granted relay permissions, make sure that you include your Docker
# internal network (default to 172.17.0.0/16)
MAILU_RELAYNETS=172.16.0.0/12
# Fetchmail delay
MAILU_FETCHMAIL_DELAY=600
# Recipient delimiter, character used to delimiter localpart from custom address part
# e.g. localpart+custom@domain;tld
MAILU_RECIPIENT_DELIMITER=+
# DMARC rua and ruf email
MAILU_DMARC_RUA=admin
MAILU_DMARC_RUF=admin
# Welcome email, enable and set a topic and body if you wish to send welcome
# emails to all users.
MAILU_WELCOME=True
MAILU_WELCOME_SUBJECT=Welcome to your new email account
MAILU_WELCOME_BODY=Welcome to your new email account, if you can read this, then it is configured properly!
# Path to the admin interface if enabled
MAILU_WEB_ADMIN=/admin
# Path to the webmail if enabled
MAILU_WEB_WEBMAIL=/webmail
# Website name
MAILU_SITENAME=Example Mail
# Linked Website URL
MAILU_WEBSITE=http://mail.example.com
# Default password scheme used for newly created accounts and changed passwords
# (value: SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT)
MAILU_PASSWORD_SCHEME=SHA512-CRYPT
# Expose the admin interface (value: true, false)
MAILU_ADMIN=true
# Choose which webmail to run if any (values: roundcube, rainloop, none)
MAILU_WEBMAIL=rainloop
# Dav server implementation (value: radicale, none)
MAILU_WEBDAV=radicale
### TRAEFIK #################################################
TRAEFIK_HOST_HTTP_PORT=80
TRAEFIK_HOST_HTTPS_PORT=443
### MOSQUITTO #################################################
MOSQUITTO_PORT=9001
### COUCHDB ###################################################
COUCHDB_PORT=5984
### Manticore Search ##########################################
MANTICORE_CONFIG_PATH=./manticore/config
MANTICORE_API_PORT=9312
MANTICORE_SPHINXQL_PORT=9306
MANTICORE_HTTP_PORT=9308
### pgadmin ##################################################
# use this address http://ip6-localhost:5050
PGADMIN_PORT=5050
PGADMIN_DEFAULT_EMAIL=pgadmin4@pgadmin.org
PGADMIN_DEFAULT_PASSWORD=admin
### SONARQUBE ################################################
## docker-compose up -d sonarqube
## (If you encounter a database error)
## docker-compose exec --user=root postgres
## source docker-entrypoint-initdb.d/init_sonarqube_db.sh
## (If you encounter logs error)
## docker-compose run --user=root --rm sonarqube chown sonarqube:sonarqube /opt/sonarqube/logs
SONARQUBE_HOSTNAME=sonar.example.com
SONARQUBE_PORT=9000
SONARQUBE_POSTGRES_INIT=true
SONARQUBE_POSTGRES_HOST=postgres
SONARQUBE_POSTGRES_DB=sonar
SONARQUBE_POSTGRES_USER=sonar
SONARQUBE_POSTGRES_PASSWORD=sonarPass

View File

@ -1,76 +0,0 @@
###################################
# Blessing Skin Server v4 #
# Configuration #
###################################
# 本文件中各个配置项的详细说明
# 请访问 http://t.cn/E9G4DTY 查看中文教程
# Be sure to disable debug at production environment!
APP_DEBUG = false
APP_ENV = production
# Database Configuration
DB_CONNECTION = mysql
DB_HOST = mariadb
DB_PORT = 3306
DB_DATABASE = default
DB_USERNAME = default
DB_PASSWORD = secret
# =========================
# Table Prefix
#
# Change if you want to install multiple BS instances into one database.
# The prefix may only contain letters, numbers, and underscores.
#
DB_PREFIX = null
# Hash Algorithm for Passwords
#
# Available values:
# - BCRYPT, PHP_PASSWORD_HASH
# - MD5, SALTED2MD5
# - SHA256, SALTED2SHA256
# - SHA512, SALTED2SHA512
#
# New sites are *highly* recommended to use BCRYPT.
#
PWD_METHOD = BCRYPT
# Salt
# Change it to any random string to secure your passwords & tokens.
#
# You can run [php artisan salt:random] to generate a new salt.
#
SALT = 2c5ca184f017a9a1ffbd198ef69b0c0e
# App Key should be setted to any random, *32 character* string,
# otherwise all the encrypted strings will not be safe.
#
# You can run [php artisan key:generate] to generate a new key.
#
APP_KEY = base64:gkb/zouNF6UOSfnr/o+izVMS57WQS3+62YqZBuDyBhU=
# Mail Configuration
#
# Leave MAIL_DRIVER empty to disable features involving sending emails.
#
MAIL_DRIVER = smtp
MAIL_HOST = null
MAIL_PORT = 465
MAIL_USERNAME = null
MAIL_PASSWORD = null
MAIL_ENCRYPTION = null
# Change below lines only if you know what they mean!
CACHE_DRIVER = file
SESSION_DRIVER = file
QUEUE_DRIVER = sync
REDIS_HOST = 127.0.0.1
REDIS_PASSWORD = null
REDIS_PORT = 6379
PLUGINS_DIR = null
PLUGINS_URL = null

View File

@ -1,39 +1,105 @@
###################################
# Blessing Skin Server v4 #
# Testing Configuration #
###################################
APP_DEBUG=false
APP_ENV=testing
APP_DEBUG = false
APP_ENV = testing
DB_CONNECTION=sqlite
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=:memory:
DB_USERNAME=root
DB_PASSWORD=root
DB_PREFIX=
DB_CONNECTION = mysql
DB_HOST = 127.0.0.1
DB_PORT = 3306
DB_DATABASE = test
DB_USERNAME = root
DB_PASSWORD = null
DB_PREFIX = null
PWD_METHOD=BCRYPT
BCRYPT_ROUNDS=4
APP_KEY=base64:eVX/xzF5NhpGB2luswliFx9XSBsbbAP21wOi68X/P34=
PWD_METHOD = BCRYPT
SALT = c67709dd8b7b733aca0d570681fe96cf
APP_KEY = base64:eVX/xzF5NhpGB2luswliFx9XSBsbbAP21wOi68X/P34=
MAIL_MAILER=array
MAIL_HOST=localhost
MAIL_PORT=465
MAIL_USERNAME=
MAIL_PASSWORD=
MAIL_ENCRYPTION=ssl
MAIL_DRIVER = smtp
MAIL_HOST = localhost
MAIL_PORT = 465
MAIL_USERNAME = null
MAIL_PASSWORD = null
MAIL_ENCRYPTION = ssl
CACHE_DRIVER=array
SESSION_DRIVER=array
QUEUE_CONNECTION=sync
LOG_CHANNEL=null
CACHE_DRIVER = array
SESSION_DRIVER = array
QUEUE_DRIVER = sync
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=
REDIS_PORT=6379
REDIS_HOST = 127.0.0.1
REDIS_PASSWORD = null
REDIS_PORT = 6379
PLUGINS_DIR=plugins
PLUGINS_URL=
PLUGINS_DIR = plugins
PLUGINS_URL = null
TEXTURES_DIR=
JWT_SECRET = 1tdM3gXarxYI4KlAHMBo238iC2tEb4I3EtBlZTQQXvInXIt7V2ix7hJ1KTvxCKZW
JWT_SECRET=1tdM3gXarxYI4KlAHMBo238iC2tEb4I3EtBlZTQQXvInXIt7V2ix7hJ1KTvxCKZW
PASSPORT_PRIVATE_KEY="-----BEGIN PRIVATE KEY-----
MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQC6q6SCprX3yfOE
DFBnfFk3R+33qvoe26nYQkavKfv7zA9KQxCBNHEsFKOQ6ui+ViebVHAIHBPm2518
REVMLN2JONvXbPETV6gJO/b6FFwo2Aow/GbTnesLhWEAPW11ei0/hBbjWF9hQZ/n
x3YsFk0xtml2iPDijfUohwp50iFyCQylw4S5Sy3vuVdM063dkxvECsU6wmHDev9C
PxFZGl3W2iLSwttYl7xmlwll8xuqxDQUJpJbOxrPeDKdDI1ikarSqA1c8bV1YLT+
CHxB7T5b1EPeaYRmeLl+wyd/ZxeBWWgDLBusi5wPFpSEIVxu1RzTYarOXEpD+XNV
Ohpb7LxpbJx8YRJru1B6CBouVO2pqoCEM21GtG7zSDNtaY+yVcj9Kf2SIbfz0e6a
SLAcyOT0q3aId4+z9q8TAfPVV7y0D7B3PaOz/3pMC+jHDjCRwQkN/DR7ODUKEjCd
UjsveGHtseBa3qBoKWcg39ZvwYeDF0P/cFa/yOqw5JxyWhbjk95YdPaSixdUyyMG
XkFTOrnBREVtBAfdTOG6WTFcIlyJK+ST0cJXVcrjFonbmJCCwTJqxz9t+935CfTt
CzLLPdONU16jZJ7j1cVoWb4L8o0OA+FBSawBxFOKyhFlh3+HKRnSCZSDqaSDsYUf
M3IupiGUcByhpZ9mNqhnLeivIXwapwIDAQABAoICAFu27F+S2DH0A9S7lh+aPV1H
VniKhVR2+aZ6va7fUmJ++n4yoB/TK82MIGcZu5uUyeXr4RVi8jZJbcF565BHNNtw
V7cq2/F0bmeHEkwBh9w7dRpnUIAlhS/GawfKpoaDLksYM4SkzUwECbQ/0GRN2sST
ipKGKtAtDihI3RFIeE1Ge/PPsdy2Ps4bAnUJRdHpLsmtvwSlL5JzUonyYawlI7jl
uRlTSqDnAFZpW+E+xjerKalC4EK5se0AceGuoqKszkCs98/UJCMVDigH9EER9sL4
chYLQtVz+DN7X+MdPDO9wThZygkHGPhi0DpxB7CevYhv4pN8TbLDE3Lq1ruWf2T3
7ts21ymjVIiOayBA9l86P0FSS/lP9KF53LyeNkOJKUy5On6xHoW5IKlrMJdmGwFH
B4yaR7bw5vxErhpMTzcYJVWqjCbo+PBJhdy7x+2XrrBLs9X0hfS/jeeAIuRlzju1
9xe3zO6U41sDjkCkrUavOn57DL6jh9LMgxT8cZkSdrP6rpawEyjPUi5kMbbQkv0j
eWiqz0vozJN5HcVpj36F5kqZyCnIojmeo4FCKdn7n/wvyGYQPSAekVpV80KzoJ2j
GQ440Q7Sgozj/Lw4cCPgG3/MA1Dwu+TUuaddFjBH2oqZ2X0bCqVCEVWhfmaD4z2R
I9C9nLvpxoMtcCHkG1VFAoIBAQDfawcBHMPxZQOy/qTqXZd7YR3bzGgd/SkLEWwg
PtDGKe36tDf3E/RGRij4HGl9v/fA7N/CufW0tJY7Ii/cn7yYdZg/dzaCoYIZbICl
CytWtsM0iH3XPuY3UpgsOwML0xK8hdD1U7qBKk5rnjF9Q9vKrB8ATR9hM0bPaGtr
Bqfx8A+kj6wqRpA8jbN0kZxJVv0/LgZSCrH3qUjHfXoYYtLhMBZd8UydyvyETo/1
Z44WS9oNqX8mBUvHjsuOQx3+eFPOr69QPIo06QMxytSEzMilgz40QUBWF68gKwGi
NYdUfR3IXVTmvJhYH2mQWqMKVk+KJFd2UanjKbBCOKrDSG4TAoIBAQDV5LMp/ztd
YQvMCWJzUrpazGqkoEGli/qxWb/pDpemgQT++lt6PBRQmmLKXZfNp9VJdZdP6+lF
ypGcA8tACY93m7Fk4wtewXG+0oTxmBkWqSiiO3ExoBQTxXLoZ9GwKt/exaM25QJ1
O2livxrYFFJbUe1YRqQENIURYk13RgeIaWS0gd9vp/yp0EhZAvGUPHFjKRsLjw7Y
gZDJ+lXj2pXg9THUzkhVDm+fM6blIsLcvf7qc8yKQI3nwZr00e/ba7xSNF8AhpdP
rxw59vm1RzsngZpZOK0Z1143gFRtGhhVWtvmhCvJo1EOssFu01ixE0bNq5nRIIJo
O/mY7NC9bCOdAoIBAEBfcyYz5pUwGM/DJTtN+i6XfeXt0HYLkn7Y50GnN7pRLHuW
36U2P6Tb5EQQ06hi3nzdA1/0+sG1Yq/pGsdD0zBOea6Xp8IdzQGMTMjBHhyfDkGd
rjyNqAF6r9PWsPsANx7Qo7N8C3nZ+bxyWSoRmkucKlaI4ii8gIOUP5cX1N4V4Dv3
FZEcwcRgw7srlU9gXBmPJk0PPdXxFcI8+if6mW4+z8MDmqLAcN+iT0JTMxJjipFz
K+qFjh8Smr4Dwqmme+dKoYXJ27yBAuWe3nrhElL2LL8bqfDkZBYtrgvRxotmfWVU
1vigkHibnGv2YZHB6qsP649w2jVUtq9t6m3X+bcCggEAEKDqCN7N17GewCsOm1aY
JEz2EXxf/iXGxJjsoYq/4XLwV35RNEyNa8LE4WSrU5KzszVQISd/CCz6av2khIL5
w1u4S9aW4LP7StGFAl9HvApEnXAvmaMPTIYyK70+gQqkQuZsjOz65vBKfiHLTXcu
++h/ojhDsgv/OF3DFf28wi8nZB0gqMaPjwghR8JB07trOUFN1/U0O0K/ZeRvXvp0
YnvNdvTejLZFmUPjuracHZsrwUBla24fWiAkEtprYkya5G0r4ZeVFd3QPPVlbmFu
SOD7heoxEuw6Z+gzKBQ6RhB9PguSd+eZeqINBbeqkoGkJIMtvyNe4AmhmvD2PXO1
xQKCAQAx12vD3q2+DHrpJ4fKGp1RbCxFIOYgXcBJ6zCozVZXpLUa54IBTLyQyDNF
D8+Wq5b1IbCnxBn55tsgq/CSLkVHigVfUDGnAt3lD+ggLdZmu7ayQY0BNe1quF5M
EgkOE0uYtq+2p+u4gxRB+gnQd1YIlPs0U0mrawbzV5ZX2vR5Ry1XpBno75JpnUbN
3D9DuIDVLuqsKJcx6KClWef2PzJB2uN7jDf4UnCtp5QCFB1GNt+5AzCNh9Bozas8
OflASrSn64AeyCZycCplmRY/F4BnH++7YI0Q/mjawByW7qYoHkFzmKuUcgakh200
y/ieeWy8Vunl0e4T4Bz/0zInBifn
-----END PRIVATE KEY-----"
PASSPORT_PUBLIC_KEY="-----BEGIN PUBLIC KEY-----
MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuqukgqa198nzhAxQZ3xZ
N0ft96r6Htup2EJGryn7+8wPSkMQgTRxLBSjkOrovlYnm1RwCBwT5tudfERFTCzd
iTjb12zxE1eoCTv2+hRcKNgKMPxm053rC4VhAD1tdXotP4QW41hfYUGf58d2LBZN
MbZpdojw4o31KIcKedIhcgkMpcOEuUst77lXTNOt3ZMbxArFOsJhw3r/Qj8RWRpd
1toi0sLbWJe8ZpcJZfMbqsQ0FCaSWzsaz3gynQyNYpGq0qgNXPG1dWC0/gh8Qe0+
W9RD3mmEZni5fsMnf2cXgVloAywbrIucDxaUhCFcbtUc02GqzlxKQ/lzVToaW+y8
aWycfGESa7tQeggaLlTtqaqAhDNtRrRu80gzbWmPslXI/Sn9kiG389HumkiwHMjk
9Kt2iHePs/avEwHz1Ve8tA+wdz2js/96TAvoxw4wkcEJDfw0ezg1ChIwnVI7L3hh
7bHgWt6gaClnIN/Wb8GHgxdD/3BWv8jqsOSccloW45PeWHT2kosXVMsjBl5BUzq5
wURFbQQH3UzhulkxXCJciSvkk9HCV1XK4xaJ25iQgsEyasc/bfvd+Qn07Qsyyz3T
jVNeo2Se49XFaFm+C/KNDgPhQUmsAcRTisoRZYd/hykZ0gmUg6mkg7GFHzNyLqYh
lHAcoaWfZjaoZy3oryF8GqcCAwEAAQ==
-----END PUBLIC KEY-----"

View File

@ -2,4 +2,8 @@ public/
vendor/
coverage/
plugins/
laradock/
node_modules/
*.d.ts
resources/assets/tests/__mocks__/
resources/assets/tests/ts-shims/
resources/assets/tests/*.ts

27
.eslintrc.yml Normal file
View File

@ -0,0 +1,27 @@
root: true
parser: '@typescript-eslint/parser'
parserOptions:
project: tsconfig.eslint.json
plugins:
- '@typescript-eslint/eslint-plugin'
extends:
- eslint:recommended
- plugin:@typescript-eslint/recommended
- plugin:@typescript-eslint/recommended-requiring-type-checking
- plugin:react-hooks/recommended
rules:
prefer-const: error
'@typescript-eslint/no-unsafe-assignment': off
'@typescript-eslint/no-unsafe-member-access': off
'@typescript-eslint/no-unsafe-return': off
'@typescript-eslint/no-unused-vars': off
'@typescript-eslint/explicit-module-boundary-types': off
'@typescript-eslint/no-explicit-any': off
'@typescript-eslint/ban-ts-comment': off
'@typescript-eslint/no-non-null-assertion': off
'@typescript-eslint/no-floating-promises': off
'@typescript-eslint/no-misused-promises':
- off
- checksVoidReturn: false
'@typescript-eslint/unbound-method': off
'@typescript-eslint/restrict-template-expressions': off

View File

@ -16,17 +16,20 @@
- [Node.js](https://nodejs.org)
- [Yarn](https://yarnpkg.com)
- [Composer](https://getcomposer.org)
- [PowerShell Core](https://github.com/PowerShell/PowerShell#get-powershell)
然后执行以下命令来拉取代码
然后执行以下命令:
```bash
git clone https://github.com/bs-community/blessing-skin-server.git
cd blessing-skin-server
composer install
cp .env.example .env
php artisan key:generate
yarn
```
然后执行 `cp .env.example .env`,并`.env` 中配置好您的环境信息。
然后在 `.env` 中配置好您的环境信息,务必设置好 `ASSET_URL`,否则无法编译前端资源
### 进行开发
@ -34,7 +37,18 @@ yarn
`.env` 中的 `APP_ENV``development` 时,您需要先执行 `yarn dev` 并保持此进程的运行。这样 Blessing Skin 的前端资源才能被正确加载,同时使页面带有热重载功能。(有时热重载可能会失效,此时需要您手动刷新页面)
`APP_ENV` 为其它值时,您需要事先执行 `yarn build`。此命令将构建并压缩前端资源。通常用于生产环境。
另外,在运行 `yarn dev` 即运行 `webpack-dev-server` 时,由于 `webpack-dev-server` 的端口往往与 Blessing Skin 的端口不同,因此有可能导致热重载失败。此时可以在 Nginx 中添加以下配置:
```
location ~* \w+\.hot-update\.json$ {
rewrite (\w+\.hot-update\.json)$ /$1 break;
proxy_pass http://$host:8080;
}
```
`APP_ENV` 为其它值时,您需要事先执行 `pwsh ./tools/build.ps1`。此命令将构建并压缩前端资源。通常用于生产环境。
> 如果传递 `-Simple` 参数给 `build.ps1` 脚本,则只会运行 webpack 来编译代码,而不会复制首页背景以及生成 commit 信息。
### 测试

View File

@ -1,28 +0,0 @@
<!-- 在提交一个新 issue 前,请先阅读以下内容: -->
<!-- Before opening a new issue, please make sure to READ the articles below: -->
<!-- * FAQ 常见问题: https://git.io/fjRtn -->
<!-- * 报告问题的正确姿势https://git.io/fjRtc -->
<!-- 把下面模板中的占位文字删除,并按照你的情况认真填写,谢谢 -->
<!-- Please remove the placeholders and fill in the template according to your situation. -->
## The Problem 问题描述
## Environment 运行环境
- Blessing Skin 版本 (Version of Blessing Skin):
- PHP 版本 (Version of PHP):
- 什么 Web 服务器Apache 还是 Nginx (Which web server and its version):
- 什么浏览器,出现错误时的地址栏 URL 是什么 (Which browser and URL):
## Error Message 错误信息
<!-- 出现错误时的提示,请把它贴上来(截图或文本) -->
<!-- Paste the error message or a screenshot here. -->
## Steps to Reproduce 重现步骤
<!-- Tell us how to reproduce this issue. -->
<!-- 详细描述你出错前的操作步骤 -->

View File

@ -0,0 +1,71 @@
name: Bug 报告
description: 发起 bug 报告
body:
- type: markdown
attributes:
value: |
在报告问题之前,请确保您已经 **认真** 阅读:
- [FAQ](https://blessing.netlify.app/en/faq.html)
- [报告问题的正确姿势](https://blessing.netlify.app/report.html)
- type: input
id: bs
attributes:
label: Blessing Skin 版本
validations:
required: true
- type: dropdown
id: php
attributes:
label: PHP 版本
options:
- '7.3'
- '7.4'
- '8.0'
- '8.1'
validations:
required: true
- type: dropdown
id: browsers
attributes:
label: 出现问题时所使用的浏览器
multiple: true
options:
- Firefox
- Chrome
- Safari
- Microsoft Edge
validations:
required: true
- type: dropdown
id: web-server
attributes:
label: 您正在使用的 Web Server
options:
- Nginx
- Apache
- type: checkboxes
id: baota
attributes:
label: 您正在使用宝塔吗?
options:
- label:
- type: textarea
id: what-happened
attributes:
label: 出现了什么问题?
description: 顺便告诉我们,您期望的行为是怎样的?
validations:
required: true
- type: textarea
id: logs
attributes:
label: 错误日志
description: 您可以粘贴 Blessing Skin 的日志或 Web Server 的日志。Blessing Skin 的日志位于 `storage/logs` 目录里。
render: text
- type: textarea
id: reproduction
attributes:
label: 重现步骤
description: 详细描述您出错前的操作步骤
validations:
required: true

64
.github/ISSUE_TEMPLATE/bug-report.yml vendored Normal file
View File

@ -0,0 +1,64 @@
name: Bug Report
description: File a bug report
body:
- type: markdown
attributes:
value: |
Please filing an issue, please make sure you've read:
- [FAQ](https://blessing.netlify.app/en/faq.html)
- type: input
id: bs
attributes:
label: Which version of Blessing Skin are you using?
validations:
required: true
- type: dropdown
id: php
attributes:
label: Which version of PHP are you using?
options:
- '7.3'
- '7.4'
- '8.0'
- '8.1'
validations:
required: true
- type: dropdown
id: browsers
attributes:
label: What browsers are you seeing the problem on?
multiple: true
options:
- Firefox
- Chrome
- Safari
- Microsoft Edge
validations:
required: true
- type: dropdown
id: web-server
attributes:
label: Which web server are you using?
options:
- Nginx
- Apache
- type: textarea
id: what-happened
attributes:
label: What happened?
description: Also tell us, what did you expect to happen?
validations:
required: true
- type: textarea
id: logs
attributes:
label: Error Logs
description: You can paste logs of Blessing Skin or your web server. Logs of Blessing Skin can be found at `storage/logs` directory.
render: text
- type: textarea
id: reproduction
attributes:
label: Steps to Reproduce
description: Tell us how to reproduce this issue.
validations:
required: true

20
.github/ISSUE_TEMPLATE/config.yml vendored Normal file
View File

@ -0,0 +1,20 @@
blank_issues_enabled: false
contact_links:
- name: Ask questions about using Blessing Skin
url: https://github.com/bs-community/blessing-skin-server/discussions
about: If you're not going to report a bug, please ask and answer questions there.
- name: Report Issue about Blessing Skin plugins
url: https://github.com/bs-community/blessing-skin-plugins/issues
about: Please ask and answer questions there.
- name: Report Issue about integrating with Flarum
url: https://github.com/bs-community/flarum-oauth-client/issues
about: Please ask and answer questions there.
- name: 询问关于使用 Blessing Skin 的问题
url: https://github.com/bs-community/blessing-skin-server/discussions
about: 如果您并不是要报告 bug请在那里进行讨论。
- name: 报告与 Blessing Skin 插件有关的问题
url: https://github.com/bs-community/blessing-skin-plugins/issues
about: 请在那里报告问题。
- name: 报告与 Flarum 对接有关的问题
url: https://github.com/bs-community/flarum-oauth-client/issues
about: 请在那里报告问题。

155
.github/workflows/CI.yml vendored Normal file
View File

@ -0,0 +1,155 @@
name: CI
on:
push:
branches:
- dev
paths-ignore:
- 'resources/lang/**'
- '**.md'
pull_request:
branches:
- dev
paths-ignore:
- 'resources/lang/**'
- '**.md'
jobs:
php-lint:
name: PHP Linting
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.3
coverage: none
extensions: mbstring, dom, fileinfo, gd, imagick
- name: Install dependencies
run: |
composer install --prefer-dist --no-progress
- name: Prepare
run: |
cp .env.example .env
mkdir -p resources/views/overrides
- name: Validate Twig templates
run: php artisan twig:lint -v
- name: Check coding style
run: ./vendor/bin/php-cs-fixer fix --dry-run --stop-on-violation --diff --format=txt
php:
name: PHP ${{ matrix.php }} Tests
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
php: ['8.2', '8.3']
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup PHP only
uses: shivammathur/setup-php@v2
if: matrix.php != '8.3'
with:
php-version: ${{ matrix.php }}
coverage: none
extensions: mbstring, dom, fileinfo, sqlite, gd, zip, imagick
- name: Setup PHP with Xdebug
uses: shivammathur/setup-php@v2
if: matrix.php == '8.3'
with:
php-version: ${{ matrix.php }}
coverage: xdebug
extensions: mbstring, dom, fileinfo, sqlite, gd, zip, imagick
- name: Cache Composer dependencies
uses: actions/cache@v3
with:
path: vendor
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
restore-keys: ${{ runner.os }}-composer-
- name: Install Composer dependencies
run: composer install --no-progress --prefer-dist --optimize-autoloader
- name: Run tests only
if: matrix.php != '8.3'
run: ./vendor/bin/phpunit
- name: Run tests with coverage report
if: matrix.php == '8.3'
run: ./vendor/bin/phpunit --coverage-clover=coverage.xml
- name: Upload coverage report
uses: codecov/codecov-action@v1
if: matrix.php == '8.3' && success()
with:
token: ${{ secrets.CODECOV_TOKEN }}
name: github-actions
lint:
name: Frontend Linting
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Install dependencies
run: yarn install --frozen-lockfile
- name: Run checks
run: |
yarn lint
yarn fmt:check
yarn type:check
jest:
name: Frontend Tests
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Install dependencies
run: yarn
- name: Run tests
run: yarn test --coverage
- name: Upload coverage report
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
name: github-actions
build:
name: Snapshot Build
runs-on: ubuntu-latest
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.2
coverage: none
extensions: mbstring, dom, fileinfo, sqlite, gd, zip, imagick
- name: Checkout code
uses: actions/checkout@v4
- name: Cache Node dependencies
uses: actions/cache@v3
with:
path: node_modules
key: ${{ runner.os }}-yarn-lock-${{ hashFiles('yarn.lock') }}
restore-keys: ${{ runner.os }}-yarn-lock-
- name: Cache Composer dependencies
uses: actions/cache@v3
with:
path: vendor
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
restore-keys: ${{ runner.os }}-composer-
- name: Install dependencies
run: |
composer install --prefer-dist --no-progress --no-dev
yarn install --frozen-lockfile
- name: Build frontend
run: |
yarn build
cp resources/assets/src/images/bg.webp public/app/
cp resources/assets/src/images/favicon.ico public/app/
- uses: benjlevesque/short-sha@v3.0
id: short-sha
- name: Archive release
run: zip -9 -r blessing-skin-server-${{ steps.short-sha.outputs.sha }}.zip app bootstrap config database plugins public resources/lang resources/views resources/misc/textures routes storage vendor .env.example artisan LICENSE README.md README-zh.md index.html
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
if-no-files-found: error
name: blessing-skin-server-${{ steps.short-sha.outputs.sha }}.zip
path: blessing-skin-server-${{ steps.short-sha.outputs.sha }}.zip

40
.github/workflows/Release.yml vendored Normal file
View File

@ -0,0 +1,40 @@
name: Release
on:
push:
tags:
- '*.*.*'
jobs:
release:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Build and create archive
run: ./tools/release.ps1
shell: pwsh
env:
AZURE_TOKEN: ${{ secrets.AZURE_TOKEN }}
- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: ${{ github.ref }}
prerelease: ${{ contains(github.ref, 'alpha') || contains(github.ref, 'beta') || contains(github.ref, 'rc') }}
- name: Get version
id: get_version
run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
- name: Upload release asset
id: upload_release_asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./blessing-skin-server-${{ steps.get_version.outputs.VERSION }}.zip
asset_name: blessing-skin-server-${{ steps.get_version.outputs.VERSION }}.zip
asset_content_type: application/zip

37
.github/workflows/Telegram.yml vendored Normal file
View File

@ -0,0 +1,37 @@
name: Telegram
on:
push:
branches:
- dev
paths:
- 'app/**'
- 'bootstrap/**'
- 'config/**'
- 'database/**'
- 'public/**'
- 'resources/**'
- 'routes/**'
- '*.lock'
- 'webpack.*'
workflow_dispatch:
jobs:
notification:
name: Send Message
runs-on: ubuntu-latest
steps:
- name: Download bot
run: |
$headers = @{ Authorization = 'Bearer ${{ secrets.GITHUB_TOKEN }}' }
$botRelease = (Invoke-WebRequest -Headers $headers 'https://api.github.com/repos/bs-community/telegram-bot/releases/latest').Content | ConvertFrom-Json
$botBinUrl = ((Invoke-WebRequest -Headers $headers $botRelease.assets_url).Content | ConvertFrom-Json).browser_download_url
bash -c "curl --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' -fSL $botBinUrl -o bot"
chmod +x ./bot
shell: pwsh
- name: Run bot
run: ./bot diff
shell: pwsh
env:
TELEGRAM_BOT_TOKEN: ${{ secrets.TELEGRAM_BOT_TOKEN }}
TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}

11
.gitignore vendored
View File

@ -1,4 +1,3 @@
.DS_Store
.env
.sass-cache
coverage
@ -6,6 +5,7 @@ coverage
.cache/
.cache-loader/
vendor/*
storage/textures
storage/textures/*
storage/update_cache/*
node_modules/*
@ -17,6 +17,13 @@ _ide_helper.php
junit.xml
storage/*.db
storage/*.sqlite
.vscode
storage/insane-profile-cache
storage/oauth-public.key
storage/oauth-private.key
storage/install.lock
storage/options.php
.phpunit.result.cache
.php-cs-fixer.cache
resources/views/overrides
.DS_Store
*/.DS_Store

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "laradock"]
path = laradock
url = https://github.com/Laradock/laradock.git

41
.gitpod.yml Normal file
View File

@ -0,0 +1,41 @@
tasks:
- init: yarn install
command: yarn dev
- init: composer install
command: |
cp .env.example .env
mkdir public/app/
cp resources/assets/src/images/bg.webp resources/assets/src/images/favicon.ico public/app
touch storage/database.db
sed 's/DB_CONNECTION=mysql/DB_CONNECTION=sqlite/' -i .env
sed 's/DB_DATABASE=blessingskin/DB_DATABASE=\/workspace\/blessing-skin-server\/storage\/database\.db/' -i .env
php artisan key:generate
php artisan serve --host=0.0.0.0
- command: gp ports await 8080 && gp preview $(gp url 8000)
github:
prebuilds:
# enable for the master/default branch (defaults to true)
master: true
# enable for all branches in this repo (defaults to false)
branches: false
# enable for pull requests coming from this repo (defaults to true)
pullRequests: true
# add a check to pull requests (defaults to true)
addCheck: true
# add a "Review in Gitpod" button as a comment to pull requests (defaults to false)
addComment: false
vscode:
extensions:
- 'editorconfig.editorconfig'
- 'eamodio.gitlens'
- 'bmewburn.vscode-intelephense-client'
- 'esbenp.prettier-vscode'
- 'jpoissonnier.vscode-styled-components'
- 'mblode.twig-language-2'
- 'felixfbecker.php-debug'
ports:
- port: 8080
visibility: public

4
.husky/pre-commit Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"
yarn pretty-quick --staged

23
.php-cs-fixer.dist.php Normal file
View File

@ -0,0 +1,23 @@
<?php
$finder = PhpCsFixer\Finder::create()
->in('app')
->in('database')
->in('routes')
->in('tests');
$config = new PhpCsFixer\Config();
return $config->setRules([
'@Symfony' => true,
'align_multiline_comment' => true,
'array_syntax' => ['syntax' => 'short'],
'increment_style' => ['style' => 'post'],
'list_syntax' => ['syntax' => 'short'],
'yoda_style' => false,
'global_namespace_import' => [
'import_constants' => true,
'import_functions' => true,
'import_classes' => null,
],
])
->setFinder($finder);

View File

@ -1,26 +0,0 @@
language: php
php: 7.3
install: true
script: true
before_deploy:
- nvm install 10
- node -v
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.15.2
- export PATH="$HOME/.yarn/bin:$PATH"
- RELEASE_TAG=$TRAVIS_TAG ./scripts/release.sh
deploy:
provider: releases
api_key: $GITHUB_TOKEN
file: blessing-skin-server-$TRAVIS_TAG.zip
name: $TRAVIS_TAG
skip_cleanup: true
on:
tags: true
after_deploy:
- curl -s -o github-release.tar.bz2 -L https://github.com/aktau/github-release/releases/download/v0.7.2/linux-amd64-github-release.tar.bz2
- tar -xf github-release.tar.bz2
- ./bin/linux/amd64/github-release -v edit -u bs-community -r blessing-skin-server -t $TRAVIS_TAG -d "$(cat resources/misc/changelogs/en/$TRAVIS_TAG.md && echo -e '\n---\n' && cat resources/misc/changelogs/zh_CN/$TRAVIS_TAG.md)"

7
.vscode/extensions.json vendored Normal file
View File

@ -0,0 +1,7 @@
{
"recommendations": [
"editorconfig.editorconfig",
"bmewburn.vscode-intelephense-client",
"esbenp.prettier-vscode"
]
}

34
.vscode/launch.json vendored Normal file
View File

@ -0,0 +1,34 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Launch Jest Tests",
"program": "${workspaceFolder}/node_modules/.bin/jest",
"args": ["${file}"],
"internalConsoleOptions": "openOnSessionStart",
"skipFiles": ["<node_internals>/**"]
},
{
"type": "php",
"request": "launch",
"name": "Launch with XDebug",
"ignore": ["**/vendor/**/*.php"]
},
{
"type": "firefox",
"request": "launch",
"reAttach": true,
"name": "Launch with Firefox Debugger",
"url": "http://localhost/",
"webRoot": "${workspaceFolder}",
"pathMappings": [
{
"url": "webpack:///",
"path": "${workspaceFolder}/"
}
]
}
]
}

3
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,3 @@
{
"typescript.tsdk": "node_modules/typescript/lib"
}

82
Dockerfile Normal file
View File

@ -0,0 +1,82 @@
FROM composer:latest as vendor
WORKDIR /app
COPY composer.json composer.lock ./
RUN composer install \
--prefer-dist \
--no-dev \
--no-suggest \
--no-progress \
--no-autoloader \
--no-scripts \
--no-interaction \
--ignore-platform-reqs
FROM node:alpine as frontend
WORKDIR /app
COPY package.json yarn.lock ./
RUN yarn install --frozen-lockfile
COPY postcss.config.js tsconfig.build.json tsconfig.json webpack.config.ts ./
COPY tools/*Plugin.ts ./tools/
COPY resources ./resources
RUN yarn build && \
cp resources/assets/src/images/bg.webp public/app/ && \
cp resources/assets/src/images/favicon.ico public/app/ && \
# Strip unused files
rm -rf *.config.js *.config.ts tsconfig.* \
package.json yarn.lock node_modules/ \
resources/assets/ resources/lang resources/misc resources/misc/backgrounds/ \
tools/
FROM composer:latest as builder
WORKDIR /app
COPY . ./
COPY --from=vendor /app ./
COPY --from=frontend /app/public ./public
COPY --from=frontend /app/resources/views/assets ./resources/views/assets
RUN composer dump-autoload -o --no-dev -n && \
rm -rf *.config.js *.config.ts tsconfig.* \
package.json yarn.lock node_modules/ \
resources/assets/ resources/misc resources/misc/backgrounds/ \
tools/ && \
mv .env.example .env && \
php artisan key:generate && \
mv .env storage/ && \
ln -s storage/.env .env && \
touch storage/database.db && \
mkdir storage/plugins && \
sed 's/PLUGINS_DIR=null/PLUGINS_DIR=\/app\/storage\/plugins/' -i storage/.env && \
sed 's/DB_CONNECTION=mysql/DB_CONNECTION=sqlite/' -i storage/.env && \
sed 's/DB_DATABASE=blessingskin/DB_DATABASE=\/app\/storage\/database\.db/' -i storage/.env
FROM php:8-apache
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
RUN chmod +x /usr/local/bin/install-php-extensions && \
install-php-extensions gd zip
WORKDIR /app
COPY --from=builder /app ./
ENV APACHE_DOCUMENT_ROOT /app/public
RUN chown -R www-data:www-data . && \
sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf && \
sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf && \
a2enmod rewrite headers
EXPOSE 80
VOLUME ["/app/storage"]

View File

@ -1,6 +1,6 @@
MIT License
Copyright (c) 2016-present The Blessing Skin Community
Copyright (c) 2016-present The Blessing Skin Team
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

92
README-zh.md Normal file
View File

@ -0,0 +1,92 @@
- **简体中文**
- [English](./README.md)
<p align="center"><img src="https://media.githubusercontent.com/media/bs-community/logo/main/logo.png"></p>
<p align="center">
<a href="https://github.com/bs-community/blessing-skin-server/actions"><img alt="GitHub Workflow Status" src="https://img.shields.io/github/workflow/status/bs-community/blessing-skin-server/CI?style=flat-square"></a>
<a href="https://codecov.io/gh/bs-community/blessing-skin-server"><img alt="Codecov" src="https://img.shields.io/codecov/c/github/bs-community/blessing-skin-server?style=flat-square"></a>
<a href="https://github.com/bs-community/blessing-skin-server/releases"><img alt="GitHub release (latest SemVer including pre-releases)" src="https://img.shields.io/github/v/release/bs-community/blessing-skin-server?include_prereleases&style=flat-square"></a>
<a href="https://github.com/bs-community/blessing-skin-server/blob/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/bs-community/blessing-skin-server?style=flat-square"></a>
<a href="https://discord.com/invite/QAsyEyt"><img alt="Discord" src="https://discord.com/api/guilds/761226550921658380/widget.png"></a>
</p>
优雅的开源 Minecraft 皮肤站,现在,回应您的等待。
Blessing Skin 是一款能让您上传、管理和分享您的 Minecraft 皮肤和披风的 Web 应用程序。与修改游戏材质包不同的是,所有人都能在游戏中看到各自的皮肤和披风(当然,前提是玩家们要使用同一个皮肤站)。
Blessing Skin 是一个开源的 PHP 项目,这意味着您可以自由地在您的服务器上部署它。
## 特性
- 完整实现了一个皮肤站该有的功能
- 支持单用户多个角色
- 通过皮肤库来分享您的皮肤和披风!
- 易于使用
- 可视化的用户、角色、材质管理页面
- 详细的站点配置页面
- 多处 UI/UX 优化只为更好的用户体验
- 安全
- 支持多种安全密码 Hash 算法
- 注册可要求 Email 验证
- 防止恶意请求的积分系统
- 强大的可扩展性
- 多种多样的插件
- 支持与 Authme/Discuz 等程序的用户数据对接(插件)
- 支持自定义 Yggdrasil API 外置登录系统(插件)
## 环境要求
Blessing Skin 对您的服务器有一定的要求。在大多数情况下,下列所需的 PHP 扩展已经开启。
- 一台支持 URL 重写的主机Nginx 或 Apache
- PHP >= 8.1.0
- 安装并启用如下 PHP 扩展:
- OpenSSL >= 1.1.1 (TLS 1.3)
- PDO
- Mbstring
- Tokenizer
- GD
- XML
- Ctype
- JSON
- fileinfo
- zip
- Imagick
## 快速使用
请参阅 [安装指南](https://blessing.netlify.app/setup.html)。
## 插件系统
Blessing Skin 提供了强大的插件系统,您可以通过添加多种多样的插件来为您的皮肤站添加功能。
## 自行构建
详情可阅读 [这里](https://blessing.netlify.app/build.html)。
> 您可以订阅我们的 Telegram 频道 [Blessing Skin News](https://t.me/blessing_skin_news) 来获取最新开发动态。当有新的 Commit 被推送时,我们的机器人将会在频道内发送一条消息来提示您能否拉取最新代码,以及拉取后应该做什么。
## 国际化i18n
Blessing Skin 可支持多种语言,当前支持英语、简体中文和西班牙语。
如果您愿意将您的翻译贡献出来,欢迎参与 [我们的 Crowdin 项目](https://crowdin.com/project/blessing-skin)。
## 问题报告
请参阅 [报告问题的正确姿势](https://blessing.netlify.app/report.html)。
## 相关链接
- [用户手册](https://blessing.netlify.app/)
- [插件开发文档](https://bs-plugin.netlify.app/)
## 版权
MIT License
Copyright (c) 2016-present The Blessing Skin Team
程序原作者为 [@printempw](https://printempw.github.io/),转载请注明。

239
README.md
View File

@ -1,209 +1,90 @@
- <b>简体中文</b>
- [English](./README_EN.md)
- [简体中文](./README-zh.md)
- **English**
<p align="center"><img src="https://img.blessing.studio/images/2017/01/01/bs-logo.png"></p>
<p align="center"><img src="https://media.githubusercontent.com/media/bs-community/logo/main/logo.png"></p>
<p align="center">
<a href="https://circleci.com/gh/bs-community/blessing-skin-server"><img src="https://flat.badgen.net/circleci/github/bs-community/blessing-skin-server" alt="Circle CI Status"></a>
<a href="https://codecov.io/gh/bs-community/blessing-skin-server/branch"><img src="https://flat.badgen.net/codecov/c/github/bs-community/blessing-skin-server" alt="Codecov" /></a>
<a href="https://github.com/bs-community/blessing-skin-server/releases"><img src="https://flat.badgen.net/github/release/bs-community/blessing-skin-server" alt="Latest Stable Version"></a>
<img src="https://flat.badgen.net/badge/PHP/7.1.8+/orange" alt="PHP 7.1.8+">
<img src="https://flat.badgen.net/github/license/bs-community/blessing-skin-server" alt="License">
<a href="https://github.com/bs-community/blessing-skin-server/actions"><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/bs-community/blessing-skin-server/CI.yml?branch=dev&style=flat-square"></a>
<a href="https://codecov.io/gh/bs-community/blessing-skin-server"><img alt="Codecov" src="https://img.shields.io/codecov/c/github/bs-community/blessing-skin-server?style=flat-square"></a>
<a href="https://github.com/bs-community/blessing-skin-server/releases"><img alt="GitHub release (latest SemVer including pre-releases)" src="https://img.shields.io/github/v/release/bs-community/blessing-skin-server?include_prereleases&style=flat-square"></a>
<a href="https://github.com/bs-community/blessing-skin-server/blob/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/bs-community/blessing-skin-server?style=flat-square"></a>
<a href="https://discord.com/invite/QAsyEyt"><img alt="Discord" src="https://discord.com/api/guilds/761226550921658380/widget.png"></a>
</p>
优雅的开源 Minecraft 皮肤站,现在,回应您的等待。
Puzzled by losing your custom skins in Minecraft servers runing in offline mode? Now you can easily get them back with the help of Blessing Skin!
Blessing Skin 是一款能让您上传、管理和分享您的 Minecraft 皮肤和披风的 Web 应用程序。与修改游戏材质包不同的是,所有人都能在游戏中看到各自的皮肤和披风(当然,前提是玩家们要使用同一个皮肤站)。
Blessing Skin is a web application where you can upload, manage and share your custom skins & capes! Unlike modifying a resource pack, everyone in the game will see the different skins of each other (of course they should register at the same website too).
Blessing Skin 是一个开源的 PHP 项目,这意味着您可以自由地在您的服务器上部署它。
Blessing Skin is an open-source project written in PHP, which means you can deploy it freely on your own web server!
## 特性
## Features
- 完整实现了一个皮肤站该有的功能
- 支持单用户多个角色
- 通过皮肤库来分享您的皮肤和披风!
- 易于使用
- 可视化的用户、角色、材质管理页面
- 详细的站点配置页面
- 多处 UI/UX 优化只为更好的用户体验
- 安全
- 支持多种安全密码 Hash 算法
- 注册可要求 Email 验证
- 防止恶意请求的积分系统
- 强大的可扩展性
- 多种多样的插件
- 支持与 Authme/Discuz 等程序的用户数据对接(插件)
- 支持自定义 Yggdrasil API 外置登录系统(插件)
- A fully functional skin hosting service
- Multiple player names can be owned by one user on the website
- Share your skins and capes online with skin library!
- Easy-to-use
- Visual page for user/player/texture management
- Detailed option pages
- Many tweaks for a better UI/UX
- Security
- Support many secure password hash algorithms
- Email verification for registration
- Score system for preventing evil requests
- Incredibly extensible
- Plenty of plugins available
- Integration with Authme/Discuz (available as plugin)
- Support custom Yggdrasil API authentication (available as plugin)
## 环境要求
## Requirements
Blessing Skin 对您的服务器有一定的要求。_在大多数情况下下列所需的 PHP 扩展已经开启。_
Blessing Skin has only a few system requirements. In most cases, these PHP extensions are already enabled.
- 一台支持 URL 重写的主机Nginx、Apache 或 IIS
- **PHP >= 7.1.8** [(服务器不支持?)](https://github.com/bs-community/blessing-skin-server/wiki/%E7%89%88%E6%9C%AC%E8%AF%B4%E6%98%8E)
- 安装并启用如下 PHP 扩展:
- OpenSSL
- PDO
- Mbstring
- Tokenizer
- GD
- XML
- Ctype
- JSON
- fileinfo
- Web server with URL rewriting enabled (Nginx or Apache)
- PHP >= 8.1.0
- PHP Extensions
- OpenSSL >= 1.1.1 (TLS 1.3)
- PDO
- Mbstring
- Tokenizer
- GD
- XML
- Ctype
- JSON
- fileinfo
- zip
- Imagick
## 快速使用
## Quick Install
请参阅 [Wiki - 快速安装向导](https://github.com/bs-community/blessing-skin-server/wiki/%E5%BF%AB%E9%80%9F%E5%AE%89%E8%A3%85%E5%90%91%E5%AF%BC)。
Please read [Installation Guide](https://blessing.netlify.app/en/setup.html).
![screenshot](https://img.blessing.studio/images/2017/07/29/2017-06-16_15.54.16.png)
## Plugin System
## 插件系统
Blessing Skin provides an elegant and powerful plugin system, and you can attach plenty of functions and customization to your site via installing plugins.
Blessing Skin 提供了强大的插件系统,您可以通过添加多种多样的插件来为您的皮肤站添加功能。
## Build From Source
详情请参阅 [Wiki - 插件系统介绍](https://github.com/bs-community/blessing-skin-server/wiki/%E6%8F%92%E4%BB%B6%E7%B3%BB%E7%BB%9F%E4%BB%8B%E7%BB%8D)。
Please refer to [Manual Build](https://blessing.netlify.app/build.html).
## 支持并赞助 Blessing Skin
## Internationalization
如果您觉得这个软件对您很有帮助,欢迎通过赞助来支持开发!
Blessing Skin supports multiple languages, while currently supporting English, Simplified Chinese and Spanish.
目前可在 [爱发电](https://afdian.net/@blessing-skin) 上赞助。
If you are willing to contribute your translation, welcome to join [our Crowdin project](https://crowdin.com/project/blessing-skin).
### Sponsors
## Report Bugs
<table>
<tbody>
<tr>
<td align=center>
<a href="https://afdian.net/@hyx5020">
<img src="https://pic.afdiancdn.com/user/ff73629a6fa811e9abe252540025c377/avatar/b6c5f51467a2036d80d8103840aea9d4_w3264_h1836_s635.jpeg?imageView2/1/w/120/h/120">
<br>
hyx5020
</a>
</td>
<td align=center>
<a href="https://afdian.net/u/68d07bf851fc11e98e5652540025c377">
<img src="https://pic.afdiancdn.com/user/68d07bf851fc11e98e5652540025c377/avatar/59b21c3d053a595086d4b6cf88877bfa_w640_h640_s57.jpg?imageView2/1/w/120/h/120">
<br>
dz_paji
</a>
</td>
<td align=center>
<a href="https://afdian.net/@ExDragine">
<img src="https://pic.afdiancdn.com/user/ad213afe31b311e991c252540025c377/avatar/33d21c924f446a41073caa5d88be69b8_w200_h200_s36.jpg?imageView2/1/w/120/h/120">
<br>
ExDragine
</a>
</td>
<td align=center>
<a href="https://afdian.net/@akkariin">
<img src="https://pic.afdiancdn.com/user/f3f747da859011e98ebe52540025c377/avatar/14752883229fa9f346884dec196a4b8a_w256_h256_s35.jpg?imageView2/1/w/120/h/120">
<br>
Akkariin
</a>
</td>
</tr>
</tbody>
</table>
Read [FAQ](https://blessing.netlify.app/faq.html) and double check if your situation doesn't suit any case mentioned there before reporting.
### Backers
When reporting a problem, please attach your log file (located at `storage/logs/laravel.log`) and the information of your server where the error occured on. You should also read this [guide](https://blessing.netlify.app/report.html) before reporting a problem.
<table>
<tbody>
<tr>
<td align=center>
<a href="https://afdian.net/u/4d9a803ea8a211e9ba9052540025c377">
<img src="https://pic.afdiancdn.com/default/avatar/default-avatar@2x.png?imageView2/1/w/75/h/75">
<br>
爱发电用户_4ft3
</a>
</td>
<td align=center>
<a href="https://afdian.net/u/a08078a051fc11e9ab4c52540025c377">
<img src="https://pic.afdiancdn.com/user/a08078a051fc11e9ab4c52540025c377/avatar/9e25e37208832a1a41893ad1bd30a398_w628_h626_s39.jpg?imageView2/1/w/75/h/75">
<br>
pppwaw
</a>
</td>
<td align=center>
<a href="https://afdian.net/@tnqzh123">
<img src="https://pic.afdiancdn.com/user/97a0416ca47211e8849452540025c377/avatar/d2f6d8d489cb952ff29740e715b067c0_w768_h768_s211.jpg?imageView2/1/w/75/h/75">
<br>
Little_Qiu
</a>
</td>
<td align=center>
<a href="https://afdian.net/@hempflower">
<img src="https://pic.afdiancdn.com/user/0f396eb2a37c11e8b93452540025c377/avatar/bee35eb0f5cd2a506eb34c6e13de1154_w160_h160_s0.jpg?imageView2/1/w/75/h/75">
<br>
麻花
</a>
</td>
<td align=center>
<a href="https://afdian.net/@mgcraft">
<img src="https://pic.afdiancdn.com/user/de46a20a56f111e981a452540025c377/avatar/ab13b606230af1b5f5879538d9e37c43_w640_h640_s22.jpeg?imageView2/1/w/75/h/75">
<br>
Mangocraft
</a>
</td>
<td align=center>
<a href="https://afdian.net/@acilicraft">
<img src="https://pic.afdiancdn.com/user/63d4adac633311e98d9d52540025c377/avatar/50c279016873b7907ce7b901de1f560c_w577_h525_s248.jpg?imageView2/1/w/75/h/75">
<br>
Andy_Chuck
</a>
</td>
</tr>
</tbody>
</table>
## Related Links
## 自行构建
- [User Manual](https://blessing.netlify.app/en/)
- [Plugins Development Documentation](https://bs-plugin.netlify.app/)
如果你想为此项目作贡献,或者抢先尝试未发布的新功能,你应该先用 GitHub 上的代码部署。
**不推荐不熟悉 shell 操作以及不想折腾的用户使用。**
请先确保您安装好以下工具:
- [Git](https://git-scm.org)
- [Node.js](https://nodejs.org)
- [Yarn](https://yarnpkg.com)
- [Composer](https://getcomposer.org)
从 GitHub 上 clone 源码并安装依赖:
```bash
git clone https://github.com/bs-community/blessing-skin-server.git
cd blessing-skin-server
composer install
yarn
```
构建前端代码!
```bash
yarn build
```
接下来请参考「快速安装向导」进行后续安装。
## 国际化i18n
Blessing Skin 可支持多种语言,当前支持英语(`en`)和简体中文(`zh_CN`)。
当然,您也可以添加您自己的语言。请参阅 [Wiki - 添加其它语言 [i18n]](https://github.com/bs-community/blessing-skin-server/wiki/%E6%B7%BB%E5%8A%A0%E5%85%B6%E4%BB%96%E8%AF%AD%E8%A8%80-%5Bi18n%5D)
如果您愿意将您的翻译贡献出来,欢迎参与 [我们的 Crowdin 项目](https://crowdin.com/project/bs-i18n)。
## 问题报告
请参阅 [Wiki - 报告问题的正确姿势](https://github.com/bs-community/blessing-skin-server/wiki/%E6%8A%A5%E5%91%8A%E9%97%AE%E9%A2%98%E7%9A%84%E6%AD%A3%E7%A1%AE%E5%A7%BF%E5%8A%BF)。
## 版权
## Copyright & License
MIT License
Copyright (c) 2016-present The Blessing Skin Community
程序原作者为 [@printempw](https://blessing.studio/),转载请注明。
Copyright (c) 2016-present The Blessing Skin Team

View File

@ -1,232 +0,0 @@
- [简体中文](./README.md)
- <b>English</b>
<p align="center"><img src="https://img.blessing.studio/images/2017/01/01/bs-logo.png"></p>
<p align="center">
<a href="https://circleci.com/gh/bs-community/blessing-skin-server"><img src="https://flat.badgen.net/circleci/github/bs-community/blessing-skin-server" alt="Circle CI Status"></a>
<a href="https://codecov.io/gh/bs-community/blessing-skin-server/branch"><img src="https://flat.badgen.net/codecov/c/github/bs-community/blessing-skin-server" alt="Codecov" /></a>
<a href="https://github.com/bs-community/blessing-skin-server/releases"><img src="https://flat.badgen.net/github/release/bs-community/blessing-skin-server" alt="Latest Stable Version"></a>
<img src="https://flat.badgen.net/badge/PHP/7.1.8+/orange" alt="PHP 7.1.8+">
<img src="https://flat.badgen.net/github/license/bs-community/blessing-skin-server" alt="License">
</p>
Are you puzzled by losing your custom skins in Minecraft servers runing in offline mode? Now you can easily get them back with the help of Blessing Skin!
Blessing Skin is a web application where you can upload, manage and share your custom skins & capes! Unlike modifying a resource pack, everyone in the game will see the different skins of each other (of course they should register at the same website too).
Blessing Skin is an open-source project written in PHP, which means you can deploy it freely on your own web server!
## Features
- A fully functional skin hosting service
- Multiple player names can be owned by one user on the website
- Share your skins and capes online with skin library!
- Easy-to-use
- Visual page for user/player/texture management
- Detailed option pages
- Many tweaks for a better UI/UX
- Security
- Support many secure password hash algorithms
- Email verification for registration
- Score system for preventing evil requests
- Incredibly extensible
- Plenty of plugins available
- Integration with Authme/CrazyLogin/Discuz (available as plugin)
- Support custom Yggdrasil API authentication (available as plugin)
## Requirements
Blessing Skin has only a few system requirements. _In most cases, these PHP extensions are already enabled._
- Web server with URL rewriting enabled
- **PHP >= 7.1.8** (use v2.x branch if your server doesn't meet the requirements)
- OpenSSL PHP Extension
- PDO PHP Extension
- Mbstring PHP Extension
- Tokenizer PHP Extension
- GD PHP Extension
- XML PHP Extension
- Ctype PHP Extension
- JSON PHP Extension
- fileinfo PHP Extension
## Quick Install
1. Download our [latest release](https://github.com/bs-community/blessing-skin-server/releases), extract to where you like to installed on.
2. Rename `.env.example` to `.env` and configure your database information. (For windows users, just rename it to `.env.`, and the last dot will be removed automatically)
3. For Nginx users, add [rewrite rules](#configure-the-web-server) to your Nginx configuration
4. Navigate to `http://your-domain.com/setup` in your browser. If 404 is returned, please check whether the rewrite rules works correctly.
5. Follow the setup wizard and your website is ready-to-go.
## Plugin System
Blessing Skin provides an elegant and powerful plugin system, and you can attach plenty of functions and customization to your site via installing plugins.
For more information, please refer to [Wiki - Introducing plugin system](https://github.com/bs-community/blessing-skin-server/wiki/%E6%8F%92%E4%BB%B6%E7%B3%BB%E7%BB%9F%E4%BB%8B%E7%BB%8D).
## Supporting Blessing Skin
Welcome to sponsoring Blessing Skin if this software is useful for you!
Currently you can sponsor us via [爱发电](https://afdian.net/@blessing-skin).
### Sponsors
<table>
<tbody>
<tr>
<td align=center>
<a href="https://afdian.net/@hyx5020">
<img src="https://pic.afdiancdn.com/user/ff73629a6fa811e9abe252540025c377/avatar/b6c5f51467a2036d80d8103840aea9d4_w3264_h1836_s635.jpeg?imageView2/1/w/120/h/120">
<br>
hyx5020
</a>
</td>
<td align=center>
<a href="https://afdian.net/u/68d07bf851fc11e98e5652540025c377">
<img src="https://pic.afdiancdn.com/user/68d07bf851fc11e98e5652540025c377/avatar/59b21c3d053a595086d4b6cf88877bfa_w640_h640_s57.jpg?imageView2/1/w/120/h/120">
<br>
dz_paji
</a>
</td>
<td align=center>
<a href="https://afdian.net/@ExDragine">
<img src="https://pic.afdiancdn.com/user/ad213afe31b311e991c252540025c377/avatar/33d21c924f446a41073caa5d88be69b8_w200_h200_s36.jpg?imageView2/1/w/120/h/120">
<br>
ExDragine
</a>
</td>
<td align=center>
<a href="https://afdian.net/@akkariin">
<img src="https://pic.afdiancdn.com/user/f3f747da859011e98ebe52540025c377/avatar/14752883229fa9f346884dec196a4b8a_w256_h256_s35.jpg?imageView2/1/w/120/h/120">
<br>
Akkariin
</a>
</td>
</tr>
</tbody>
</table>
### Backers
<table>
<tbody>
<tr>
<td align=center>
<a href="https://afdian.net/u/4d9a803ea8a211e9ba9052540025c377">
<img src="https://pic.afdiancdn.com/default/avatar/default-avatar@2x.png?imageView2/1/w/75/h/75">
<br>
爱发电用户_4ft3
</a>
</td>
<td align=center>
<a href="https://afdian.net/u/a08078a051fc11e9ab4c52540025c377">
<img src="https://pic.afdiancdn.com/user/a08078a051fc11e9ab4c52540025c377/avatar/9e25e37208832a1a41893ad1bd30a398_w628_h626_s39.jpg?imageView2/1/w/75/h/75">
<br>
pppwaw
</a>
</td>
<td align=center>
<a href="https://afdian.net/@tnqzh123">
<img src="https://pic.afdiancdn.com/user/97a0416ca47211e8849452540025c377/avatar/d2f6d8d489cb952ff29740e715b067c0_w768_h768_s211.jpg?imageView2/1/w/75/h/75">
<br>
Little_Qiu
</a>
</td>
<td align=center>
<a href="https://afdian.net/@hempflower">
<img src="https://pic.afdiancdn.com/user/0f396eb2a37c11e8b93452540025c377/avatar/bee35eb0f5cd2a506eb34c6e13de1154_w160_h160_s0.jpg?imageView2/1/w/75/h/75">
<br>
麻花
</a>
</td>
<td align=center>
<a href="https://afdian.net/@mgcraft">
<img src="https://pic.afdiancdn.com/user/de46a20a56f111e981a452540025c377/avatar/ab13b606230af1b5f5879538d9e37c43_w640_h640_s22.jpeg?imageView2/1/w/75/h/75">
<br>
Mangocraft
</a>
</td>
<td align=center>
<a href="https://afdian.net/@acilicraft">
<img src="https://pic.afdiancdn.com/user/63d4adac633311e98d9d52540025c377/avatar/50c279016873b7907ce7b901de1f560c_w577_h525_s248.jpg?imageView2/1/w/75/h/75">
<br>
Andy_Chuck
</a>
</td>
</tr>
</tbody>
</table>
## Developer Install
If you'd like make some contribution on the project, please deploy it from GitHub first.
**You'd better have some experience on shell operations to continue.**
Please make sure you have installed the tools below:
- [Git](https://git-scm.org)
- [Node.js](https://nodejs.org)
- [Yarn](https://yarnpkg.com)
- [Composer](https://getcomposer.org)
Clone the code from GitHub and install dependencies:
```bash
git clone https://github.com/bs-community/blessing-skin-server.git
cd blessing-skin-server
composer install
yarn
```
Build the things!
```bash
yarn build
```
Congrats! You made it. Next, please refer to No.2 of **Quick Install** section.
## Configure the Web Server
For Apache (most of the virtual hosts) and IIS users, there is already a pre-configured file for you. What you need is just to enjoy!
For Nginx users, **please add the following rules** to your Nginx configuration file:
```
location / {
try_files $uri $uri/ /index.php?$query_string;
}
location ~ /\.env {
deny all;
}
```
## Mod Configuration
Please refer to [Wiki - Mod Configuration](https://github.com/bs-community/blessing-skin-server/wiki/%E5%A6%82%E4%BD%95%E9%85%8D%E7%BD%AE%E7%9A%AE%E8%82%A4-Mod).
![screenshot](https://img.blessing.studio/images/2017/07/29/2017-06-16_15.54.16.png)
## Internationalization
Blessing Skin supports multiple languages, while currently supporting English (`en`) and Simplified Chinese (`zh_CN`).
Of course, you can add your own language. Please check [Wiki - Add other language [i18n]](https://github.com/bs-community/blessing-skin-server/wiki/%E6%B7%BB%E5%8A%A0%E5%85%B6%E4%BB%96%E8%AF%AD%E8%A8%80-%5Bi18n%5D) (Simplified Chinese only).
If you are willing to contribute your translation, welcome to join [our Crowdin project](https://crowdin.com/project/bs-i18n).
## Report Bugs
Read [Wiki - FAQ](https://github.com/bs-community/blessing-skin-server/wiki/FAQ) and double check if your situation doesn't suit any case mentioned there before reporting.
When reporting a problem, please attach your log file (located at `storage/logs/laravel.log`) and the information of your server where the error occured on. You should also read this [guide](https://github.com/bs-community/blessing-skin-server/wiki/%E6%8A%A5%E5%91%8A%E9%97%AE%E9%A2%98%E7%9A%84%E6%AD%A3%E7%A1%AE%E5%A7%BF%E5%8A%BF) before reporting a problem.
## Copyright & License
MIT License
Copyright (c) 2016-present The Blessing Skin Community

View File

@ -3,37 +3,35 @@
namespace App\Console\Commands;
use App\Models\User;
use Carbon\Carbon;
use Illuminate\Console\Command;
use Illuminate\Filesystem\Filesystem;
class ExecuteInstallation extends Command
class BsInstallCommand extends Command
{
protected $signature = 'bs:install {email} {password} {nickname}';
protected $description = 'Execute installation and create a super administrator.';
public function handle()
public function handle(Filesystem $filesystem)
{
if (\App\Http\Controllers\SetupController::checkTablesExist()) {
if ($filesystem->exists(storage_path('install.lock'))) {
$this->info('You have installed Blessing Skin Server. Nothing to do.');
return;
}
if (config('app.env') != 'testing') {
$this->call('key:random');
}
$this->call('salt:random');
$this->call('migrate', ['--force' => true]);
$this->call('jwt:secret', ['--no-interaction' => true]);
$this->call('passport:keys', ['--no-interaction' => true]);
$siteUrl = url('/');
if (ends_with($siteUrl, '/index.php')) {
$siteUrl = substr($siteUrl, 0, -10);
if (!$this->getLaravel()->runningUnitTests()) {
// @codeCoverageIgnoreStart
$this->call('key:generate');
$this->call('passport:keys', ['--no-interaction' => true]);
// @codeCoverageIgnoreEnd
}
option(['site_url' => $siteUrl]);
$admin = new User;
option(['site_url' => url('/')]);
$admin = new User();
$admin->email = $this->argument('email');
$admin->nickname = $this->argument('nickname');
$admin->score = option('user_initial_score');
@ -41,11 +39,13 @@ class ExecuteInstallation extends Command
$admin->password = app('cipher')->hash($this->argument('password'), config('secure.salt'));
$admin->ip = '127.0.0.1';
$admin->permission = User::SUPER_ADMIN;
$admin->register_at = get_datetime_string();
$admin->last_sign_at = get_datetime_string(time() - 86400);
$admin->register_at = Carbon::now();
$admin->last_sign_at = Carbon::now()->subDay();
$admin->verified = true;
$admin->save();
$filesystem->put(storage_path('install.lock'), '');
$this->info('Installation completed!');
$this->info('We recommend to modify your "Site URL" option if incorrect.');
}

View File

@ -1,74 +0,0 @@
<?php
namespace App\Console\Commands;
use Illuminate\Console\Command;
class KeyRandomCommand extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'key:random {--show : Display the key instead of modifying files}';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Set the application key';
/**
* Execute the console command.
*
* @return void
*/
public function handle()
{
$key = $this->generateRandomKey();
if ($this->option('show')) {
return $this->line('<comment>'.$key.'</comment>');
}
// Next, we will replace the application key in the environment file so it is
// automatically setup for this developer. This key gets generated using a
// secure random byte generator and is later base64 encoded for storage.
$this->setKeyInEnvironmentFile($key);
$this->laravel['config']['app.key'] = $key;
$this->info("Application key [$key] set successfully.");
}
/**
* Set the application key in the environment file.
*
* @param string $key
* @return void
*/
protected function setKeyInEnvironmentFile($key)
{
// Unlike Illuminate\Foundation\Console\KeyGenerateCommand,
// I add some spaces to the replace pattern.
file_put_contents($this->laravel->environmentFilePath(), str_replace(
'APP_KEY = '.$this->laravel['config']['app.key'],
'APP_KEY = '.$key,
file_get_contents($this->laravel->environmentFilePath())
));
}
/**
* Generate a random key for the application.
*
* @return string
*/
protected function generateRandomKey()
{
return 'base64:'.base64_encode(random_bytes(
$this->laravel['config']['app.cipher'] == 'AES-128-CBC' ? 16 : 32
));
}
}

View File

@ -1,66 +0,0 @@
<?php
namespace App\Console\Commands;
use DB;
use Schema;
use App\Models\User;
use Illuminate\Console\Command;
class MigrateCloset extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'bs:migrate-v4:closet';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Migrate the closet for v4';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
if (! Schema::hasTable('closets')) {
$this->info('Nothing to do.');
return;
}
$this->info('We will migrate all closets data. Please wait...');
$rows = DB::table('closets')->select('*')->get();
$bar = $this->output->createProgressBar($rows->count());
$rows->map(function ($row) use ($bar) {
$closet = User::find($row->uid)->closet();
collect(json_decode($row->textures, true))->each(function ($item) use ($closet) {
$closet->attach($item['tid'], ['item_name' => $item['name']]);
});
$bar->advance();
});
Schema::drop('closets');
$bar->finish();
$this->info("\nCongrats! Everything are done.");
}
}

View File

@ -1,84 +0,0 @@
<?php
namespace App\Console\Commands;
use Schema;
use App\Models\Player;
use Illuminate\Console\Command;
use Illuminate\Database\Schema\Blueprint;
class MigratePlayersTable extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'bs:migrate-v4:players-table';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Migrate the players table for v4';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
if (! Schema::hasColumn('players', 'tid_steve')) {
$this->info('No need to update.');
return;
}
$players = Player::where('tid_skin', -1)->get();
$count = $players->count();
if ($count == 0) {
$this->dropColumn();
$this->info('No need to update.');
return;
}
$this->info('We are going to update your `players` table. Please wait...');
$bar = $this->output->createProgressBar($count);
$players->each(function ($player) use ($bar) {
$player->tid_skin = $player->preference == 'default'
? $player->tid_steve
: $player->tid_alex;
$player->save();
$bar->advance();
});
$this->dropColumn();
$bar->finish();
$this->info("\nCongratulations! We've updated $count rows.");
}
private function dropColumn()
{
Schema::table('players', function (Blueprint $table) {
$table->dropColumn(['tid_steve', 'tid_alex', 'preference']);
});
}
}

View File

@ -0,0 +1,28 @@
<?php
namespace App\Console\Commands;
use App\Services\Option;
use Illuminate\Console\Command;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Foundation\Application;
class OptionsCacheCommand extends Command
{
protected $signature = 'options:cache';
protected $description = 'Cache Blessing Skin options';
public function handle(Filesystem $filesystem, Application $app)
{
$path = storage_path('options.php');
$filesystem->delete($path);
$app->forgetInstance(Option::class);
$content = var_export(resolve(Option::class)->all(), true);
$notice = '// This is auto-generated. DO NOT edit manually.'.PHP_EOL;
$content = '<?php'.PHP_EOL.$notice.'return '.$content.';';
$filesystem->put($path, $content);
$this->info('Options cached successfully.');
}
}

View File

@ -0,0 +1,25 @@
<?php
namespace App\Console\Commands;
use App\Services\PluginManager;
use Illuminate\Console\Command;
class PluginDisableCommand extends Command
{
protected $signature = 'plugin:disable {name}';
protected $description = 'Disable a plugin';
public function handle(PluginManager $plugins)
{
$plugin = $plugins->get($this->argument('name'));
if ($plugin) {
$plugins->disable($this->argument('name'));
$title = trans($plugin->title);
$this->info(trans('admin.plugins.operations.disabled', ['plugin' => $title]));
} else {
$this->warn(trans('admin.plugins.operations.not-found'));
}
}
}

View File

@ -0,0 +1,26 @@
<?php
namespace App\Console\Commands;
use App\Services\PluginManager;
use Illuminate\Console\Command;
class PluginEnableCommand extends Command
{
protected $signature = 'plugin:enable {name}';
protected $description = 'Enable a plugin';
public function handle(PluginManager $plugins)
{
$name = $this->argument('name');
$result = $plugins->enable($name);
if ($result === true) {
$plugin = $plugins->get($name);
$title = trans($plugin->title);
$this->info(trans('admin.plugins.operations.enabled', ['plugin' => $title]));
} elseif ($result === false) {
$this->warn(trans('admin.plugins.operations.not-found'));
}
}
}

View File

@ -1,44 +0,0 @@
<?php
namespace App\Console\Commands;
use App\Models\Texture;
use Illuminate\Console\Command;
class RegressLikesField extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'bs:migrate-v4:likes';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Apply fixes for `likes` field of `textures` table.';
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
$this->info('We are going to update your `textures` table. Please wait...');
$textures = Texture::all();
$bar = $this->output->createProgressBar($textures->count());
$textures->each(function ($texture) use ($bar) {
$texture->likes = $texture->likers->count();
$texture->save();
$bar->advance();
});
$bar->finish();
$this->info("\nCongratulations! Table was updated successfully.");
}
}

View File

@ -6,25 +6,10 @@ use Illuminate\Console\Command;
class SaltRandomCommand extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'salt:random {--show : Display the salt instead of modifying files}';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Set the application salt';
/**
* Execute the console command.
*
* @return void
*/
public function handle()
{
$salt = $this->generateRandomSalt();
@ -43,13 +28,7 @@ class SaltRandomCommand extends Command
$this->info("Application salt [$salt] set successfully.");
}
/**
* Set the application salt in the environment file.
*
* @param string $salt
* @return void
*/
protected function setKeyInEnvironmentFile($salt)
protected function setKeyInEnvironmentFile(string $salt)
{
file_put_contents($this->laravel->environmentFilePath(), str_replace(
'SALT = '.$this->laravel['config']['secure.salt'],
@ -58,13 +37,8 @@ class SaltRandomCommand extends Command
));
}
/**
* Generate a random salt for the application.
*
* @return string
*/
protected function generateRandomSalt()
protected function generateRandomSalt(): string
{
return bin2hex(random_bytes(16));
return bin2hex(resolve(\Illuminate\Contracts\Encryption\Encrypter::class)->generateKey('AES-128-CBC'));
}
}

View File

@ -0,0 +1,49 @@
<?php
namespace App\Console\Commands;
use Composer\Semver\Comparator;
use Illuminate\Console\Command;
use Illuminate\Contracts\Console\Kernel as Artisan;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Support\Facades\Cache;
class UpdateCommand extends Command
{
protected $signature = 'update';
protected $description = 'Execute update.';
public function handle(Artisan $artisan, Filesystem $filesystem)
{
$this->procedures()->each(function ($procedure, $version) {
if (Comparator::lessThan(option('version'), $version)) {
$procedure();
}
});
option(['version' => config('app.version')]);
$artisan->call('migrate', ['--force' => true]);
$artisan->call('view:clear');
$filesystem->put(storage_path('install.lock'), '');
Cache::flush();
$this->info(trans('setup.updates.success.title'));
}
/**
* @codeCoverageIgnore
*/
protected function procedures()
{
return collect([
// this is just for testing
'0.0.1' => fn () => event('__0.0.1'),
'5.0.0' => function () {
if (option('home_pic_url') === './app/bg.jpg') {
option(['home_pic_url' => './app/bg.webp']);
}
},
]);
}
}

View File

@ -6,18 +6,13 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
class Kernel extends ConsoleKernel
{
/**
* The Artisan commands provided by your application.
*
* @var array
*/
protected $commands = [
\Laravel\Passport\Console\KeysCommand::class,
Commands\KeyRandomCommand::class,
Commands\BsInstallCommand::class,
Commands\OptionsCacheCommand::class,
Commands\PluginDisableCommand::class,
Commands\PluginEnableCommand::class,
Commands\SaltRandomCommand::class,
Commands\MigratePlayersTable::class,
Commands\MigrateCloset::class,
Commands\ExecuteInstallation::class,
Commands\RegressLikesField::class,
Commands\UpdateCommand::class,
];
}

View File

@ -1,19 +0,0 @@
<?php
namespace App\Events;
class CheckPlayerExists extends Event
{
public $playerName;
/**
* Create a new event instance.
*
* @param string $playerName
* @return void
*/
public function __construct($playerName)
{
$this->playerName = $playerName;
}
}

View File

@ -6,12 +6,6 @@ class ConfigureAdminMenu extends Event
{
public $menu;
/**
* Create a new event instance.
*
* @param array $menu
* @return void
*/
public function __construct(array &$menu)
{
// Pass array by reference

View File

@ -6,12 +6,6 @@ class ConfigureExploreMenu extends Event
{
public $menu;
/**
* Create a new event instance.
*
* @param array $menu
* @return void
*/
public function __construct(array &$menu)
{
// Pass array by reference

View File

@ -8,12 +8,6 @@ class ConfigureRoutes extends Event
{
public $router;
/**
* Create a new event instance.
*
* @param Router $router
* @return void
*/
public function __construct(Router $router)
{
$this->router = $router;

View File

@ -6,15 +6,8 @@ class ConfigureUserMenu extends Event
{
public $menu;
/**
* Create a new event instance.
*
* @param array $menu
* @return void
*/
public function __construct(array &$menu)
{
// Pass array by reference
$this->menu = &$menu;
}
}

View File

@ -1,25 +0,0 @@
<?php
namespace App\Events;
use App\Models\User;
class EncryptUserPassword extends Event
{
public $user;
public $raw;
/**
* Create a new event instance.
*
* @param string $raw The raw password before encrypted.
* @param User $user
* @return void
*/
public function __construct($raw, User $user)
{
$this->raw = $raw;
$this->user = $user;
}
}

View File

@ -4,5 +4,4 @@ namespace App\Events;
abstract class Event
{
//
}

View File

@ -1,25 +0,0 @@
<?php
namespace App\Events;
use App\Models\Texture;
class GetAvatarPreview extends Event
{
public $size;
public $texture;
/**
* Create a new event instance.
*
* @param Texture $texture
* @param int $size
* @return void
*/
public function __construct(Texture $texture, $size)
{
$this->texture = $texture;
$this->size = $size;
}
}

View File

@ -1,31 +0,0 @@
<?php
namespace App\Events;
use App\Models\Player;
class GetPlayerJson extends Event
{
public $player;
/**
* CSL_API = 0
* USM_API = 1.
*
* @var int
*/
public $apiType;
/**
* Create a new event instance.
*
* @param Player $player
* @param int $apiType
* @return void
*/
public function __construct(Player $player, $apiType)
{
$this->player = $player;
$this->apiType = $apiType;
}
}

View File

@ -1,25 +0,0 @@
<?php
namespace App\Events;
use App\Models\Texture;
class GetSkinPreview extends Event
{
public $size;
public $texture;
/**
* Create a new event instance.
*
* @param Texture $texture
* @param int $size
* @return void
*/
public function __construct(Texture $texture, $size)
{
$this->texture = $texture;
$this->size = $size;
}
}

View File

@ -1,21 +0,0 @@
<?php
namespace App\Events;
use Illuminate\Http\UploadedFile;
class HashingFile extends Event
{
public $file;
/**
* Create a new event instance.
*
* @param UploadedFile $file
* @return void
*/
public function __construct(UploadedFile $file)
{
$this->file = $file;
}
}

View File

@ -8,12 +8,6 @@ class PlayerProfileUpdated extends Event
{
public $player;
/**
* Create a new event instance.
*
* @param Player $player
* @return void
*/
public function __construct(Player $player)
{
$this->player = $player;

View File

@ -8,12 +8,6 @@ class PlayerWasAdded extends Event
{
public $player;
/**
* Create a new event instance.
*
* @param Player $player
* @return void
*/
public function __construct(Player $player)
{
$this->player = $player;

View File

@ -6,12 +6,6 @@ class PlayerWasDeleted extends Event
{
public $playerName;
/**
* Create a new event instance.
*
* @param string $playerName
* @return void
*/
public function __construct($playerName)
{
$this->playerName = $playerName;

View File

@ -6,12 +6,6 @@ class PlayerWillBeAdded extends Event
{
public $playerName;
/**
* Create a new event instance.
*
* @param string $playerName
* @return void
*/
public function __construct($playerName)
{
$this->playerName = $playerName;

View File

@ -8,12 +8,6 @@ class PlayerWillBeDeleted extends Event
{
public $player;
/**
* Create a new event instance.
*
* @param Player $player
* @return void
*/
public function __construct(Player $player)
{
$this->player = $player;

View File

@ -0,0 +1,15 @@
<?php
namespace App\Events;
use App\Services\Plugin;
class PluginBootFailed extends Event
{
public Plugin $plugin;
public function __construct(Plugin $plugin)
{
$this->plugin = $plugin;
}
}

View File

@ -8,12 +8,6 @@ class PluginWasDeleted extends Event
{
public $plugin;
/**
* Create a new event instance.
*
* @param Plugin $plugin
* @return void
*/
public function __construct(Plugin $plugin)
{
$this->plugin = $plugin;

View File

@ -8,12 +8,6 @@ class PluginWasDisabled extends Event
{
public $plugin;
/**
* Create a new event instance.
*
* @param Plugin $plugin
* @return void
*/
public function __construct(Plugin $plugin)
{
$this->plugin = $plugin;

View File

@ -8,12 +8,6 @@ class PluginWasEnabled extends Event
{
public $plugin;
/**
* Create a new event instance.
*
* @param Plugin $plugin
* @return void
*/
public function __construct(Plugin $plugin)
{
$this->plugin = $plugin;

View File

@ -6,32 +6,13 @@ class RenderingFooter extends Event
{
public $contents;
/**
* Create a new event instance.
*
* @param array $contents
* @return void
*/
public function __construct(array &$contents)
{
// Pass array by reference
$this->contents = &$contents;
}
/**
* Add content to page footer.
*
* @param string $content
* @return void
*/
public function addContent($content)
public function addContent(string $content)
{
if ($content) {
if (! is_string($content)) {
throw new \Exception('Can not add non-string content', 1);
}
$this->contents[] = $content;
}
$this->contents[] = $content;
}
}

View File

@ -6,32 +6,13 @@ class RenderingHeader extends Event
{
public $contents;
/**
* Create a new event instance.
*
* @param array $contents
* @return void
*/
public function __construct(array &$contents)
{
// Pass array by reference
$this->contents = &$contents;
}
/**
* Add content to page footer.
*
* @param string $content
* @return void
*/
public function addContent($content)
public function addContent(string $content)
{
if ($content) {
if (! is_string($content)) {
throw new \Exception('Can not add non-string content', 1);
}
$this->contents[] = $content;
}
$this->contents[] = $content;
}
}

View File

@ -8,12 +8,6 @@ class UserAuthenticated extends Event
{
public $user;
/**
* Create a new event instance.
*
* @param User $user
* @return void
*/
public function __construct(User $user)
{
$this->user = $user;

View File

@ -8,12 +8,6 @@ class UserLoggedIn extends Event
{
public $user;
/**
* Create a new event instance.
*
* @param User $user
* @return void
*/
public function __construct(User $user)
{
$this->user = $user;

View File

@ -9,13 +9,6 @@ class UserProfileUpdated extends Event
public $type;
public $user;
/**
* Create a new event instance.
*
* @param string $type Which type of user profile was updated.
* @param User $user
* @return void
*/
public function __construct($type, User $user)
{
$this->type = $type;

View File

@ -8,12 +8,6 @@ class UserRegistered extends Event
{
public $user;
/**
* Create a new event instance.
*
* @param User $user
* @return void
*/
public function __construct(User $user)
{
$this->user = $user;

View File

@ -8,13 +8,6 @@ class UserTryToLogin extends Event
public $authType;
/**
* Create a new event instance.
*
* @param string $identification Email or username of the user.
* @param string $authType "email" or "username".
* @return void
*/
public function __construct($identification, $authType)
{
$this->identification = $identification;

View File

@ -2,9 +2,12 @@
namespace App\Exceptions;
use Exception;
use Illuminate\Support\Arr;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use Laravel\Passport\Exceptions\MissingScopeException;
use Throwable;
class Handler extends ExceptionHandler
{
@ -15,29 +18,46 @@ class Handler extends ExceptionHandler
\Illuminate\Auth\AuthenticationException::class,
\Illuminate\Auth\Access\AuthorizationException::class,
\Symfony\Component\HttpKernel\Exception\HttpException::class,
\Illuminate\Database\Eloquent\ModelNotFoundException::class,
\Illuminate\Validation\ValidationException::class,
\Illuminate\Session\TokenMismatchException::class,
ModelNotFoundException::class,
PrettyPageException::class,
];
protected function convertExceptionToArray(Exception $e)
public function render($request, Throwable $exception)
{
if ($exception instanceof ModelNotFoundException) {
$model = $exception->getModel();
if (Str::endsWith($model, 'Texture')) {
$exception = new ModelNotFoundException(trans('skinlib.non-existent'));
}
} elseif ($exception instanceof MissingScopeException) {
return json($exception->getMessage(), 403);
}
return parent::render($request, $exception);
}
protected function convertExceptionToArray(Throwable $e)
{
return [
'message' => $e->getMessage(),
'exception' => true,
'trace' => collect($e->getTrace())
->map(function ($trace) {
return Arr::only($trace, ['file', 'line']);
})
->filter(function ($trace) {
return Arr::has($trace, 'file');
})
->map(fn ($trace) => Arr::only($trace, ['file', 'line']))
->filter(fn ($trace) => Arr::has($trace, 'file'))
->map(function ($trace) {
$trace['file'] = str_replace(base_path().DIRECTORY_SEPARATOR, '', $trace['file']);
return $trace;
})
->filter(function ($trace) {
return \Illuminate\Support\Str::startsWith($trace['file'], 'app');
// @codeCoverageIgnoreStart
$isFromPlugins = !app()->runningUnitTests()
&& Str::contains($trace['file'], resolve('plugins')->getPluginsDirs()->all());
// @codeCoverageIgnoreEnd
return Str::startsWith($trace['file'], 'app') || $isFromPlugins;
})
->values(),
];

View File

@ -2,55 +2,67 @@
namespace App\Http\Controllers;
use Cache;
use Option;
use Notification;
use Carbon\Carbon;
use App\Models\User;
use App\Notifications;
use App\Models\Player;
use App\Models\Texture;
use Illuminate\Support\Str;
use App\Services\OptionForm;
use App\Models\User;
use App\Services\PluginManager;
use Blessing\Filter;
use Carbon\Carbon;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Redis;
use Illuminate\Support\Str;
class AdminController extends Controller
{
public function index(Filter $filter)
{
$grid = [
'layout' => [
['md-6', 'md-6'],
],
'widgets' => [
[
[
'admin.widgets.dashboard.usage',
'admin.widgets.dashboard.notification',
],
['admin.widgets.dashboard.chart'],
],
],
];
$grid = $filter->apply('grid:admin.index', $grid);
return view('admin.index', [
'grid' => $grid,
'sum' => [
'users' => User::count(),
'players' => Player::count(),
'textures' => Texture::count(),
'storage' => Texture::select('size')->sum('size'),
],
]);
}
public function chartData()
{
$today = Carbon::today()->timestamp;
$xAxis = Collection::times(31, fn ($i) => Carbon::today()->subDays(31 - $i)->isoFormat('l'));
$xAxis = Collection::times(31, function ($number) use ($today) {
$time = Carbon::createFromTimestamp($today - (31 - $number) * 86400);
$oneMonthAgo = Carbon::today()->subMonth();
return $time->format('m-d');
});
$oneMonthAgo = Carbon::createFromTimestamp($today - 30 * 86400);
$grouping = function ($field) {
return function ($item) use ($field) {
return substr($item->$field, 5, 5);
};
};
$mapping = function ($item) {
return count($item);
};
$aligning = function ($data) {
return function ($day) use ($data) {
return $data->get($day) ?? 0;
};
};
$grouping = fn ($field) => fn ($item) => Carbon::parse($item->$field)->isoFormat('l');
$mapping = fn ($item) => count($item);
$aligning = fn ($data) => fn ($day) => $data->get($day) ?? 0;
/** @var Collection */
$userRegistration = User::where('register_at', '>=', $oneMonthAgo)
->select('register_at')
->get()
->groupBy($grouping('register_at'))
->map($mapping);
/** @var Collection */
$textureUploads = Texture::where('upload_at', '>=', $oneMonthAgo)
->select('upload_at')
->get()
@ -70,512 +82,68 @@ class AdminController extends Controller
];
}
public function sendNotification(Request $request)
{
$data = $this->validate($request, [
'receiver' => 'required|in:all,normal,uid,email',
'uid' => 'required_if:receiver,uid|nullable|integer|exists:users',
'email' => 'required_if:receiver,email|nullable|email|exists:users',
'title' => 'required|max:20',
'content' => 'string|nullable',
public function status(
Request $request,
PluginManager $plugins,
Filesystem $filesystem,
Filter $filter,
) {
$db = config('database.connections.'.config('database.default'));
$dbType = Arr::get([
'mysql' => 'MySQL/MariaDB',
'sqlite' => 'SQLite',
'pgsql' => 'PostgreSQL',
], config('database.default'), '');
$enabledPlugins = $plugins->getEnabledPlugins()->map(fn ($plugin) => [
'title' => trans($plugin->title), 'version' => $plugin->version,
]);
$notification = new Notifications\SiteMessage($data['title'], $data['content']);
switch ($data['receiver']) {
case 'all':
$users = User::all();
break;
case 'normal':
$users = User::where('permission', User::NORMAL)->get();
break;
case 'uid':
$users = User::where('uid', $data['uid'])->get();
break;
case 'email':
$users = User::where('email', $data['email'])->get();
break;
}
Notification::send($users, $notification);
session(['sentResult' => trans('admin.notifications.send.success')]);
return redirect('/admin');
}
public function customize(Request $request)
{
$homepage = Option::form('homepage', OptionForm::AUTO_DETECT, function ($form) {
$form->text('home_pic_url')->hint();
$form->text('favicon_url')->hint()->description();
$form->checkbox('transparent_navbar')->label();
$form->checkbox('hide_intro')->label();
$form->checkbox('fixed_bg')->label();
$form->checkbox('hide_pray_for_kyoto_animation')->label();
$form->select('copyright_prefer')
->option('0', 'Powered with ❤ by Blessing Skin Server.')
->option('1', 'Powered by Blessing Skin Server.')
->option('2', 'Proudly powered by Blessing Skin Server.')
->option('3', '由 Blessing Skin Server 强力驱动。')
->option('4', '自豪地采用 Blessing Skin Server。')
->description();
$form->textarea('copyright_text')->rows(6)->description();
})->handle(function () {
Option::set('copyright_prefer_'.config('app.locale'), request('copyright_prefer'));
Option::set('copyright_text_'.config('app.locale'), request('copyright_text'));
});
$customJsCss = Option::form('customJsCss', OptionForm::AUTO_DETECT, function ($form) {
$form->textarea('custom_css', 'CSS')->rows(6);
$form->textarea('custom_js', 'JavaScript')->rows(6);
})->addMessage()->handle();
if ($request->isMethod('post') && $request->input('action') == 'color') {
$color = $this->validate($request, ['color' => 'required'])['color'];
option(['color_scheme' => $color]);
if ($filesystem->exists(base_path('.git'))) {
$process = new \Symfony\Component\Process\Process(
['git', 'log', '--pretty=%H', '-1']
);
$process->run();
$commit = $process->isSuccessful() ? trim($process->getOutput()) : '';
}
return view('admin.customize', ['forms' => compact('homepage', 'customJsCss')]);
}
$grid = [
'layout' => [
['md-6', 'md-6'],
],
'widgets' => [
[
['admin.widgets.status.info'],
['admin.widgets.status.plugins'],
],
],
];
$grid = $filter->apply('grid:admin.status', $grid);
public function score()
{
$rate = Option::form('rate', OptionForm::AUTO_DETECT, function ($form) {
$form->group('score_per_storage')->text('score_per_storage')->addon();
$form->group('private_score_per_storage')
->text('private_score_per_storage')->addon()->hint();
$form->group('score_per_closet_item')
->text('score_per_closet_item')->addon();
$form->checkbox('return_score')->label();
$form->group('score_per_player')->text('score_per_player')->addon();
$form->text('user_initial_score');
})->handle();
$report = Option::form('report', OptionForm::AUTO_DETECT, function ($form) {
$form->text('reporter_score_modification')->description();
$form->text('reporter_reward_score');
})->handle();
$sign = Option::form('sign', OptionForm::AUTO_DETECT, function ($form) {
$form->group('sign_score')
->text('sign_score_from')->addon(trans('options.sign.sign_score.addon1'))
->text('sign_score_to')->addon(trans('options.sign.sign_score.addon2'));
$form->group('sign_gap_time')->text('sign_gap_time')->addon();
$form->checkbox('sign_after_zero')->label()->hint();
})->after(function () {
$sign_score = request('sign_score_from').','.request('sign_score_to');
Option::set('sign_score', $sign_score);
})->with([
'sign_score_from' => @explode(',', option('sign_score'))[0],
'sign_score_to' => @explode(',', option('sign_score'))[1],
])->handle();
$sharing = Option::form('sharing', OptionForm::AUTO_DETECT, function ($form) {
$form->group('score_award_per_texture')
->text('score_award_per_texture')
->addon(trans('general.user.score'));
$form->checkbox('take_back_scores_after_deletion')->label();
$form->group('score_award_per_like')
->text('score_award_per_like')
->addon(trans('general.user.score'));
})->handle();
return view('admin.score', ['forms' => compact('rate', 'report', 'sign', 'sharing')]);
}
public function options()
{
$general = Option::form('general', OptionForm::AUTO_DETECT, function ($form) {
$form->text('site_name');
$form->text('site_description')->description();
$form->text('site_url')
->hint()
->format(function ($url) {
if (ends_with($url, '/')) {
$url = substr($url, 0, -1);
}
if (ends_with($url, '/index.php')) {
$url = substr($url, 0, -10);
}
return $url;
});
$form->checkbox('user_can_register')->label();
$form->checkbox('register_with_player_name')->label();
$form->checkbox('require_verification')->label();
$form->text('regs_per_ip');
$form->select('ip_get_method')
->option('0', trans('options.general.ip_get_method.HTTP_X_FORWARDED_FOR'))
->option('1', trans('options.general.ip_get_method.REMOTE_ADDR'))
->hint();
$form->group('max_upload_file_size')
->text('max_upload_file_size')->addon('KB')
->hint(trans('options.general.max_upload_file_size.hint', ['size' => ini_get('upload_max_filesize')]));
$form->select('player_name_rule')
->option('official', trans('options.general.player_name_rule.official'))
->option('cjk', trans('options.general.player_name_rule.cjk'))
->option('custom', trans('options.general.player_name_rule.custom'));
$form->text('custom_player_name_regexp')->hint()->placeholder();
$form->group('player_name_length')
->text('player_name_length_min')
->addon('~')
->text('player_name_length_max')
->addon(trans('options.general.player_name_length.suffix'));
$form->select('api_type')
->option('0', 'CustomSkinLoader API')
->option('1', 'UniversalSkinAPI');
$form->checkbox('auto_del_invalid_texture')->label()->hint();
$form->checkbox('allow_downloading_texture')->label();
$form->select('status_code_for_private')
->option('403', '403 Forbidden')
->option('404', '404 Not Found');
$form->text('texture_name_regexp')->hint()->placeholder();
$form->textarea('content_policy')->rows(3)->description();
$form->textarea('comment_script')->rows(6)->description();
})->handle(function () {
Option::set('site_name_'.config('app.locale'), request('site_name'));
Option::set('site_description_'.config('app.locale'), request('site_description'));
Option::set('content_policy_'.config('app.locale'), request('content_policy'));
});
$announ = Option::form('announ', OptionForm::AUTO_DETECT, function ($form) {
$form->textarea('announcement')->rows(10)->description();
})->renderWithOutTable()->handle(function () {
Option::set('announcement_'.config('app.locale'), request('announcement'));
});
$meta = Option::form('meta', OptionForm::AUTO_DETECT, function ($form) {
$form->text('meta_keywords')->hint();
$form->text('meta_description')->hint();
$form->textarea('meta_extras')->rows(6);
})->handle();
$recaptcha = Option::form('recaptcha', 'reCAPTCHA', function ($form) {
$form->text('recaptcha_sitekey', 'sitekey');
$form->text('recaptcha_secretkey', 'secretkey');
$form->checkbox('recaptcha_invisible')->label();
})->handle();
return view('admin.options')
->with('forms', compact('general', 'announ', 'meta', 'recaptcha'));
}
public function resource(Request $request)
{
$resources = Option::form('resources', OptionForm::AUTO_DETECT, function ($form) {
$form->checkbox('force_ssl')->label()->hint();
$form->checkbox('auto_detect_asset_url')->label()->description();
$form->checkbox('return_204_when_notfound')->label()->description();
$form->text('cache_expire_time')->hint(OptionForm::AUTO_DETECT);
$form->text('cdn_address')
->hint(OptionForm::AUTO_DETECT)
->description(OptionForm::AUTO_DETECT);
})
->type('primary')
->hint(OptionForm::AUTO_DETECT)
->after(function () {
$cdnAddress = request('cdn_address');
if ($cdnAddress == null) {
$cdnAddress = '';
}
if (Str::endsWith($cdnAddress, '/')) {
$cdnAddress = substr($cdnAddress, 0, -1);
}
Option::set('cdn_address', $cdnAddress);
})
->handle();
$redis = Option::form('redis', 'Redis', function ($form) {
$form->checkbox('enable_redis')->label()->description();
});
if (option('enable_redis')) {
try {
Redis::ping();
$redis->addMessage(trans('options.redis.connect.success'), 'success');
} catch (\Exception $e) {
$redis->addMessage(
trans('options.redis.connect.failed', ['msg' => $e->getMessage()]),
'danger'
);
}
}
$redis->handle();
$cache = Option::form('cache', OptionForm::AUTO_DETECT, function ($form) {
$form->checkbox('enable_avatar_cache')->label();
$form->checkbox('enable_preview_cache')->label();
$form->checkbox('enable_json_cache', 'JSON Profile')->label();
$form->checkbox('enable_notfound_cache', '404')->label();
})
->type('warning')
->addButton([
'text' => trans('options.cache.clear'),
'type' => 'a',
'class' => 'pull-right',
'style' => 'warning',
'href' => '?clear-cache',
return view('admin.status')
->with('grid', $grid)
->with('detail', [
'bs' => [
'version' => config('app.version'),
'env' => config('app.env'),
'debug' => config('app.debug') ? trans('general.yes') : trans('general.no'),
'commit' => Str::limit($commit ?? '', 16, ''),
'laravel' => app()->version(),
],
'server' => [
'php' => PHP_VERSION,
'web' => $request->server('SERVER_SOFTWARE', trans('general.unknown')),
'os' => sprintf('%s %s %s', php_uname('s'), php_uname('r'), php_uname('m')),
],
'db' => [
'type' => $dbType,
'host' => Arr::get($db, 'host', ''),
'port' => Arr::get($db, 'port', ''),
'username' => Arr::get($db, 'username'),
'database' => Arr::get($db, 'database'),
'prefix' => Arr::get($db, 'prefix'),
],
])
->addMessage(trans('options.cache.driver', ['driver' => config('cache.default')]), 'info');
if ($request->has('clear-cache')) {
Cache::flush();
$cache->addMessage(trans('options.cache.cleared'), 'success');
}
$cache->handle();
return view('admin.resource')
->with('forms', compact('resources', 'redis', 'cache'));
}
public function getUserData(Request $request)
{
$isSingleUser = $request->has('uid');
if ($isSingleUser) {
$users = User::select(['uid', 'email', 'nickname', 'score', 'permission', 'register_at', 'verified'])
->where('uid', intval($request->input('uid')))
->get();
} else {
$search = $request->input('search', '');
$sortField = $request->input('sortField', 'uid');
$sortType = $request->input('sortType', 'asc');
$page = $request->input('page', 1);
$perPage = $request->input('perPage', 10);
$users = User::select(['uid', 'email', 'nickname', 'score', 'permission', 'register_at', 'verified'])
->where('uid', 'like', '%'.$search.'%')
->orWhere('email', 'like', '%'.$search.'%')
->orWhere('nickname', 'like', '%'.$search.'%')
->orWhere('score', 'like', '%'.$search.'%')
->orderBy($sortField, $sortType)
->offset(($page - 1) * $perPage)
->limit($perPage)
->get();
}
$users->transform(function ($user) {
$user->operations = auth()->user()->permission;
$user->players_count = $user->players->count();
return $user;
});
return [
'totalRecords' => $isSingleUser ? 1 : User::count(),
'data' => $users,
];
}
public function getPlayerData(Request $request)
{
$isSpecifiedUser = $request->has('uid');
if ($isSpecifiedUser) {
$players = Player::select(['pid', 'uid', 'name', 'tid_skin', 'tid_cape', 'last_modified'])
->where('uid', intval($request->input('uid')))
->get();
} else {
$search = $request->input('search', '');
$sortField = $request->input('sortField', 'pid');
$sortType = $request->input('sortType', 'asc');
$page = $request->input('page', 1);
$perPage = $request->input('perPage', 10);
$players = Player::select(['pid', 'uid', 'name', 'tid_skin', 'tid_cape', 'last_modified'])
->where('pid', 'like', '%'.$search.'%')
->orWhere('uid', 'like', '%'.$search.'%')
->orWhere('name', 'like', '%'.$search.'%')
->orderBy($sortField, $sortType)
->offset(($page - 1) * $perPage)
->limit($perPage)
->get();
}
return [
'totalRecords' => $isSpecifiedUser ? 1 : Player::count(),
'data' => $players,
];
}
public function userAjaxHandler(Request $request)
{
$action = $request->input('action');
$user = User::find($request->uid);
$currentUser = Auth::user();
if (! $user) {
return json(trans('admin.users.operations.non-existent'), 1);
}
if ($user->uid !== $currentUser->uid && $user->permission >= $currentUser->permission) {
return json(trans('admin.users.operations.no-permission'), 1);
}
if ($action == 'email') {
$this->validate($request, [
'email' => 'required|email',
]);
if (User::where('email', $request->email)->count() != 0) {
return json(trans('admin.users.operations.email.existed', ['email' => $request->input('email')]), 1);
}
$user->email = $request->input('email');
$user->save();
return json(trans('admin.users.operations.email.success'), 0);
} elseif ($action == 'verification') {
$user->verified = ! $user->verified;
$user->save();
return json(trans('admin.users.operations.verification.success'), 0);
} elseif ($action == 'nickname') {
$this->validate($request, [
'nickname' => 'required|no_special_chars',
]);
$user->nickname = $request->input('nickname');
$user->save();
return json(trans('admin.users.operations.nickname.success', [
'new' => $request->input('nickname'),
]), 0);
} elseif ($action == 'password') {
$this->validate($request, [
'password' => 'required|min:8|max:16',
]);
$user->changePassword($request->input('password'));
return json(trans('admin.users.operations.password.success'), 0);
} elseif ($action == 'score') {
$this->validate($request, [
'score' => 'required|integer',
]);
$user->setScore($request->input('score'));
return json(trans('admin.users.operations.score.success'), 0);
} elseif ($action == 'permission') {
$user->permission = $this->validate($request, [
'permission' => 'required|in:-1,0,1',
])['permission'];
$user->save();
return json([
'code' => 0,
'message' => trans('admin.users.operations.permission'),
]);
} elseif ($action == 'delete') {
$user->delete();
return json(trans('admin.users.operations.delete.success'), 0);
} else {
return json(trans('admin.users.operations.invalid'), 1);
}
}
public function playerAjaxHandler(Request $request)
{
$action = $request->input('action');
$currentUser = Auth::user();
$player = Player::find($request->input('pid'));
if (! $player) {
return json(trans('general.unexistent-player'), 1);
}
$owner = $player->user;
if (
$owner && $owner->uid !== $currentUser->uid &&
$owner->permission >= $currentUser->permission
) {
return json(trans('admin.players.no-permission'), 1);
}
if ($action == 'texture') {
$this->validate($request, [
'type' => 'required',
'tid' => 'required|integer',
]);
if (! Texture::find($request->tid) && $request->tid != 0) {
return json(trans('admin.players.textures.non-existent', ['tid' => $request->tid]), 1);
}
$field = 'tid_'.$request->type;
$player->$field = $request->tid;
$player->save();
return json(trans('admin.players.textures.success', ['player' => $player->name]), 0);
} elseif ($action == 'owner') {
$this->validate($request, [
'uid' => 'required|integer',
]);
$user = User::find($request->uid);
if (! $user) {
return json(trans('admin.users.operations.non-existent'), 1);
}
$player->uid = $request->input('uid');
$player->save();
return json(trans('admin.players.owner.success', ['player' => $player->name, 'user' => $user->nickname]), 0);
} elseif ($action == 'delete') {
$player->delete();
return json(trans('admin.players.delete.success'), 0);
} elseif ($action == 'name') {
$name = $this->validate($request, [
'name' => 'required|player_name|min:'.option('player_name_length_min').'|max:'.option('player_name_length_max'),
])['name'];
$player->name = $name;
$player->save();
if (option('single_player', false) && $owner) {
$owner->nickname = $name;
$owner->save();
}
return json(trans('admin.players.name.success', ['player' => $player->name]), 0);
} else {
return json(trans('admin.users.operations.invalid'), 1);
}
->with('plugins', $enabledPlugins);
}
}

View File

@ -2,166 +2,237 @@
namespace App\Http\Controllers;
use URL;
use Mail;
use View;
use Cache;
use Session;
use App\Events;
use App\Models\User;
use App\Models\Player;
use App\Rules\Captcha;
use App\Exceptions\PrettyPageException;
use App\Mail\ForgotPassword;
use App\Models\Player;
use App\Models\User;
use App\Rules;
use Blessing\Filter;
use Blessing\Rejection;
use Carbon\Carbon;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Exceptions\PrettyPageException;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\URL;
use Vectorface\Whip\Whip;
class AuthController extends Controller
{
public function handleLogin(Request $request, Captcha $captcha)
public function login(Filter $filter)
{
$this->validate($request, [
'identification' => 'required',
'password' => 'required|min:6|max:32',
]);
$whip = new Whip();
$ip = $whip->getValidIpAddress();
$ip = $filter->apply('client_ip', $ip);
$identification = $request->input('identification');
$rows = [
'auth.rows.login.notice',
'auth.rows.login.message',
'auth.rows.login.form',
'auth.rows.login.registration-link',
];
$rows = $filter->apply('auth_page_rows:login', $rows);
return view('auth.login', [
'rows' => $rows,
'extra' => [
'tooManyFails' => cache(sha1('login_fails_'.$ip)) > 3,
'recaptcha' => option('recaptcha_sitekey'),
'invisible' => (bool) option('recaptcha_invisible'),
],
]);
}
public function handleLogin(
Request $request,
Rules\Captcha $captcha,
Dispatcher $dispatcher,
Filter $filter,
) {
$data = $request->validate([
'identification' => 'required',
'password' => 'required|min:6|max:32',
]);
$identification = $data['identification'];
$password = $data['password'];
$can = $filter->apply('can_login', null, [$identification, $password]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
// Guess type of identification
$authType = filter_var($identification, FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
$dispatcher->dispatch('auth.login.attempt', [$identification, $password, $authType]);
event(new Events\UserTryToLogin($identification, $authType));
if ($authType == 'email') {
$user = User::where('email', $identification)->first();
} else {
$player = Player::where('name', $identification)->first();
$user = $player ? $player->user : null;
$user = optional($player)->user;
}
// Require CAPTCHA if user fails to login more than 3 times
$loginFailsCacheKey = sha1('login_fails_'.get_client_ip());
$whip = new Whip();
$ip = $whip->getValidIpAddress();
$ip = $filter->apply('client_ip', $ip);
$loginFailsCacheKey = sha1('login_fails_'.$ip);
$loginFails = (int) Cache::get($loginFailsCacheKey, 0);
if ($loginFails > 3) {
$this->validate($request, ['captcha' => ['required', $captcha]]);
$request->validate(['captcha' => ['required', $captcha]]);
}
if (! $user) {
if (!$user) {
return json(trans('auth.validation.user'), 2);
} else {
if ($user->verifyPassword($request->input('password'))) {
Session::forget('login_fails');
Auth::login($user, $request->input('keep'));
event(new Events\UserLoggedIn($user));
Cache::forget($loginFailsCacheKey);
return json(trans('auth.login.success'), 0, [
'redirectTo' => $request->session()->pull('last_requested_path', url('/user')),
]);
} else {
// Increase the counter
Cache::put($loginFailsCacheKey, ++$loginFails, 3600);
return json(trans('auth.validation.password'), 1, [
'login_fails' => $loginFails,
]);
}
}
}
public function logout()
{
if (Auth::check()) {
Auth::logout();
$dispatcher->dispatch('auth.login.ready', [$user]);
return json(trans('auth.logout.success'), 0);
} else {
return json(trans('auth.logout.fail'), 1);
}
}
if ($user->verifyPassword($request->input('password'))) {
Session::forget('login_fails');
Cache::forget($loginFailsCacheKey);
public function register()
{
if (option('user_can_register')) {
return view('auth.register', [
'extra' => [
'player' => (bool) option('register_with_player_name'),
'recaptcha' => option('recaptcha_sitekey'),
'invisible' => (bool) option('recaptcha_invisible'),
],
Auth::login($user, $request->input('keep'));
$dispatcher->dispatch('auth.login.succeeded', [$user]);
event(new Events\UserLoggedIn($user));
return json(trans('auth.login.success'), 0, [
'redirectTo' => $request->session()->pull('last_requested_path', url('/user')),
]);
} else {
throw new PrettyPageException(trans('auth.register.close'), 7);
$loginFails++;
Cache::put($loginFailsCacheKey, $loginFails, 3600);
$dispatcher->dispatch('auth.login.failed', [$user, $loginFails]);
return json(trans('auth.validation.password'), 1, [
'login_fails' => $loginFails,
]);
}
}
public function handleRegister(Request $request, Captcha $captcha)
public function logout(Dispatcher $dispatcher)
{
if (! option('user_can_register')) {
return json(trans('auth.register.close'), 7);
$user = Auth::user();
$dispatcher->dispatch('auth.logout.before', [$user]);
Auth::logout();
$dispatcher->dispatch('auth.logout.after', [$user]);
return json(trans('auth.logout.success'), 0);
}
public function register(Filter $filter)
{
$rows = [
'auth.rows.register.notice',
'auth.rows.register.form',
];
$rows = $filter->apply('auth_page_rows:register', $rows);
return view('auth.register', [
'site_name' => option_localized('site_name'),
'rows' => $rows,
'extra' => [
'player' => (bool) option('register_with_player_name'),
'recaptcha' => option('recaptcha_sitekey'),
'invisible' => (bool) option('recaptcha_invisible'),
],
]);
}
public function handleRegister(
Request $request,
Rules\Captcha $captcha,
Dispatcher $dispatcher,
Filter $filter,
) {
$can = $filter->apply('can_register', null);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
$rule = option('register_with_player_name') ?
['player_name' => 'required|player_name|min:'.option('player_name_length_min').'|max:'.option('player_name_length_max')] :
['nickname' => 'required|no_special_chars|max:255'];
$data = $this->validate($request, array_merge([
'email' => 'required|email|unique:users',
['player_name' => [
'required',
new Rules\PlayerName(),
'min:'.option('player_name_length_min'),
'max:'.option('player_name_length_max'),
]] :
['nickname' => 'required|max:255'];
$data = $request->validate(array_merge([
'email' => 'required|email|unique:users',
'password' => 'required|min:8|max:32',
'captcha' => ['required', $captcha],
'captcha' => ['required', $captcha],
], $rule));
$playerName = $request->input('player_name');
if (option('register_with_player_name')) {
event(new Events\CheckPlayerExists($request->get('player_name')));
$dispatcher->dispatch('auth.registration.attempt', [$data]);
if (Player::where('name', $request->get('player_name'))->first()) {
return json(trans('user.player.add.repeated'), 2);
}
if (
option('register_with_player_name')
&& Player::where('name', $playerName)->count() > 0
) {
return json(trans('user.player.add.repeated'), 1);
}
// If amount of registered accounts of IP is more than allowed amounts,
// then reject the register.
if (User::where('ip', get_client_ip())->count() >= option('regs_per_ip')) {
return json(trans('auth.register.max', ['regs' => option('regs_per_ip')]), 7);
// If amount of registered accounts of IP is more than allowed amount,
// reject this registration.
$whip = new Whip();
$ip = $whip->getValidIpAddress();
$ip = $filter->apply('client_ip', $ip);
if (User::where('ip', $ip)->count() >= option('regs_per_ip')) {
return json(trans('auth.register.max', ['regs' => option('regs_per_ip')]), 1);
}
$user = new User;
$dispatcher->dispatch('auth.registration.ready', [$data]);
$user = new User();
$user->email = $data['email'];
$user->nickname = $data[option('register_with_player_name') ? 'player_name' : 'nickname'];
$user->score = option('user_initial_score');
$user->avatar = 0;
$user->password = User::getEncryptedPwdFromEvent($data['password'], $user)
?: app('cipher')->hash($data['password'], config('secure.salt'));
$user->ip = get_client_ip();
$password = app('cipher')->hash($data['password'], config('secure.salt'));
$password = $filter->apply('user_password', $password);
$user->password = $password;
$user->ip = $ip;
$user->permission = User::NORMAL;
$user->register_at = get_datetime_string();
$user->last_sign_at = get_datetime_string(time() - 86400);
$user->register_at = Carbon::now();
$user->last_sign_at = Carbon::now()->subDay();
$user->save();
$dispatcher->dispatch('auth.registration.completed', [$user]);
event(new Events\UserRegistered($user));
if (option('register_with_player_name')) {
$player = new Player;
$dispatcher->dispatch('player.adding', [$playerName, $user]);
$player = new Player();
$player->uid = $user->uid;
$player->name = $request->get('player_name');
$player->name = $playerName;
$player->tid_skin = 0;
$player->save();
$dispatcher->dispatch('player.added', [$player, $user]);
event(new Events\PlayerWasAdded($player));
}
$dispatcher->dispatch('auth.login.ready', [$user]);
Auth::login($user);
$dispatcher->dispatch('auth.login.succeeded', [$user]);
return json(trans('auth.register.success'), 0);
}
public function forgot()
{
if (config('mail.driver') != '') {
if (config('mail.default') != '') {
return view('auth.forgot', [
'extra' => [
'recaptcha' => option('recaptcha_sitekey'),
@ -173,65 +244,99 @@ class AuthController extends Controller
}
}
public function handleForgot(Request $request, Captcha $captcha)
{
$this->validate($request, [
public function handleForgot(
Request $request,
Rules\Captcha $captcha,
Dispatcher $dispatcher,
Filter $filter,
) {
$data = $request->validate([
'email' => 'required|email',
'captcha' => ['required', $captcha],
]);
if (! config('mail.driver')) {
if (!config('mail.default')) {
return json(trans('auth.forgot.disabled'), 1);
}
$rateLimit = 180;
$lastMailCacheKey = sha1('last_mail_'.get_client_ip());
$remain = $rateLimit + Cache::get($lastMailCacheKey, 0) - time();
$email = $data['email'];
$dispatcher->dispatch('auth.forgot.attempt', [$email]);
// Rate limit
$rateLimit = 180;
$whip = new Whip();
$ip = $whip->getValidIpAddress();
$ip = $filter->apply('client_ip', $ip);
$lastMailCacheKey = sha1('last_mail_'.$ip);
$remain = $rateLimit + Cache::get($lastMailCacheKey, 0) - time();
if ($remain > 0) {
return json(trans('auth.forgot.frequent-mail'), 2);
}
$user = User::where('email', $request->email)->first();
if (! $user) {
$user = User::where('email', $email)->first();
if (!$user) {
return json(trans('auth.forgot.unregistered'), 1);
}
$url = URL::temporarySignedRoute('auth.reset', now()->addHour(), ['uid' => $user->uid]);
$dispatcher->dispatch('auth.forgot.ready', [$user]);
$url = URL::temporarySignedRoute(
'auth.reset',
Carbon::now()->addHour(),
['uid' => $user->uid],
false
);
try {
Mail::to($request->input('email'))->send(new ForgotPassword($url));
Mail::to($email)->send(new ForgotPassword(url($url)));
} catch (\Exception $e) {
report($e);
$dispatcher->dispatch('auth.forgot.failed', [$user, $url]);
return json(trans('auth.forgot.failed', ['msg' => $e->getMessage()]), 2);
}
$dispatcher->dispatch('auth.forgot.sent', [$user, $url]);
Cache::put($lastMailCacheKey, time(), 3600);
return json(trans('auth.forgot.success'), 0);
}
public function reset($uid)
public function reset(Request $request, $uid)
{
abort_unless($request->hasValidSignature(false), 403, trans('auth.reset.invalid'));
return view('auth.reset')->with('user', User::find($uid));
}
public function handleReset($uid, Request $request)
public function handleReset(Dispatcher $dispatcher, Request $request, $uid)
{
$validated = $this->validate($request, [
abort_unless($request->hasValidSignature(false), 403, trans('auth.reset.invalid'));
['password' => $password] = $request->validate([
'password' => 'required|min:8|max:32',
]);
$user = User::find($uid);
User::find($uid)->changePassword($validated['password']);
$dispatcher->dispatch('auth.reset.before', [$user, $password]);
$user->changePassword($password);
$dispatcher->dispatch('auth.reset.after', [$user, $password]);
return json(trans('auth.reset.success'), 0);
}
public function captcha(\Gregwar\Captcha\CaptchaBuilder $builder)
{
$builder->build(100, 34);
session(['captcha' => $builder->getPhrase()]);
return response($builder->output(), 200, [
'Content-Type' => 'image/jpeg',
'Cache-Control' => 'no-store',
]);
}
public function fillEmail(Request $request)
{
$email = $this->validate($request, ['email' => 'required|email|unique:users'])['email'];
$email = $request->validate(['email' => 'required|email|unique:users'])['email'];
$user = $request->user();
$user->email = $email;
$user->save();
@ -239,43 +344,30 @@ class AuthController extends Controller
return redirect('/user');
}
public function verify($uid)
public function verify(Request $request)
{
if (! option('require_verification')) {
if (!option('require_verification')) {
throw new PrettyPageException(trans('user.verification.disabled'), 1);
}
$user = User::find($uid);
abort_unless($request->hasValidSignature(false), 403, trans('auth.verify.invalid'));
if (! $user || $user->verified) {
throw new PrettyPageException(trans('auth.verify.invalid'), 1);
return view('auth.verify');
}
public function handleVerify(Request $request, User $user)
{
abort_unless($request->hasValidSignature(false), 403, trans('auth.verify.invalid'));
['email' => $email] = $request->validate(['email' => 'required|email']);
if ($user->email !== $email) {
return back()->with('errorMessage', trans('auth.verify.not-matched'));
}
$user->verified = true;
$user->save();
return view('auth.verify');
}
public function jwtLogin(Request $request)
{
$token = Auth::guard('jwt')->attempt([
'email' => $request->email,
'password' => $request->password,
]) ?: '';
return json(compact('token'));
}
public function jwtLogout()
{
Auth::guard('jwt')->logout();
return response('', 204);
}
public function jwtRefresh()
{
return json(['token' => Auth::guard('jwt')->refresh()]);
return redirect()->route('user.home');
}
}

View File

@ -2,20 +2,39 @@
namespace App\Http\Controllers;
use View;
use Option;
use App\Models\User;
use App\Models\Texture;
use App\Models\User;
use Blessing\Filter;
use Blessing\Rejection;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class ClosetController extends Controller
{
public function index()
public function index(Filter $filter)
{
$grid = [
'layout' => [
['md-8', 'md-4'],
],
'widgets' => [
[
[
'user.widgets.email-verification',
'user.widgets.closet.list',
],
['shared.previewer'],
],
],
];
$grid = $filter->apply('grid:user.closet', $grid);
return view('user.closet')
->with('grid', $grid)
->with('extra', [
'unverified' => option('require_verification') && ! auth()->user()->verified,
'unverified' => option('require_verification') && !auth()->user()->verified,
'rule' => trans('user.player.player-name-rule.'.option('player_name_rule')),
'length' => trans(
'user.player.player-name-length',
@ -27,64 +46,63 @@ class ClosetController extends Controller
public function getClosetData(Request $request)
{
$category = $request->input('category', 'skin');
$page = abs($request->input('page', 1));
$perPage = (int) $request->input('perPage', 6);
$q = $request->input('q', null);
$perPage = $perPage > 0 ? $perPage : 6;
/** @var User */
$user = auth()->user();
$closet = $user->closet();
if ($category == 'cape') {
$closet = $closet->where('type', 'cape');
} else {
$closet = $closet->where(function ($query) {
return $query->where('type', 'steve')->orWhere('type', 'alex');
});
}
if ($q) {
$closet = $closet->where('item_name', 'like', "%$q%");
}
$total = $closet->count();
$closet->offset(($page - 1) * $perPage)->limit($perPage);
$totalPages = ceil($total / $perPage);
$items = $closet->get()->map(function ($t) {
$t->name = $t->pivot->item_name;
return $t;
});
return json('', 0, [
'category' => $category,
'items' => $items,
'total_pages' => $totalPages,
]);
return $user
->closet()
->when(
$category === 'cape',
fn (Builder $query) => $query->where('type', 'cape'),
fn (Builder $query) => $query->whereIn('type', ['steve', 'alex']),
)
->when(
$request->input('q'),
fn (Builder $query, $search) => $query->like('item_name', $search)
)
->orderBy('texture_tid', 'DESC')
->paginate((int) $request->input('perPage', 6));
}
public function add(Request $request)
public function allIds()
{
$this->validate($request, [
'tid' => 'required|integer',
'name' => 'required|no_special_chars',
/** @var User */
$user = auth()->user();
return $user->closet()->pluck('texture_tid');
}
public function add(
Request $request,
Dispatcher $dispatcher,
Filter $filter,
) {
['tid' => $tid, 'name' => $name] = $request->validate([
'tid' => 'required|integer',
'name' => 'required',
]);
/** @var User */
$user = Auth::user();
$name = $filter->apply('add_closet_item_name', $name, [$tid]);
$dispatcher->dispatch('closet.adding', [$tid, $name, $user]);
$can = $filter->apply('can_add_closet_item', true, [$tid, $name]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
if ($user->score < option('score_per_closet_item')) {
return json(trans('user.closet.add.lack-score'), 7);
return json(trans('user.closet.add.lack-score'), 1);
}
$tid = $request->tid;
$texture = Texture::find($tid);
if (! $texture) {
if (!$texture) {
return json(trans('user.closet.add.not-found'), 1);
}
if (! $texture->public && $texture->uploader != $user->uid) {
if (!$texture->public && ($texture->uploader != $user->uid && !$user->isAdmin())) {
return json(trans('skinlib.show.private'), 1);
}
@ -93,11 +111,14 @@ class ClosetController extends Controller
}
$user->closet()->attach($tid, ['item_name' => $request->name]);
$user->setScore(option('score_per_closet_item'), 'minus');
$user->score -= option('score_per_closet_item');
$user->save();
$texture->likes++;
$texture->save();
$dispatcher->dispatch('closet.added', [$texture, $name, $user]);
$uploader = User::find($texture->uploader);
if ($uploader && $uploader->uid != $user->uid) {
$uploader->score += option('score_award_per_like', 0);
@ -107,38 +128,67 @@ class ClosetController extends Controller
return json(trans('user.closet.add.success', ['name' => $request->input('name')]), 0);
}
public function rename(Request $request, $tid)
{
$this->validate($request, ['name' => 'required|no_special_chars']);
public function rename(
Request $request,
Dispatcher $dispatcher,
Filter $filter,
$tid,
) {
['name' => $name] = $request->validate(['name' => 'required']);
/** @var User */
$user = auth()->user();
if ($user->closet()->where('tid', $request->tid)->count() == 0) {
$name = $filter->apply('rename_closet_item_name', $name, [$tid]);
$dispatcher->dispatch('closet.renaming', [$tid, $name, $user]);
$item = $user->closet()->find($tid);
if (empty($item)) {
return json(trans('user.closet.remove.non-existent'), 1);
}
$previousName = $item->pivot->item_name;
$can = $filter->apply('can_rename_closet_item', true, [$item, $name]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
$user->closet()->updateExistingPivot($tid, ['item_name' => $name]);
$dispatcher->dispatch('closet.renamed', [$item, $previousName, $user]);
return json(trans('user.closet.rename.success', ['name' => $name]), 0);
}
public function remove(Dispatcher $dispatcher, Filter $filter, $tid)
{
/** @var User */
$user = auth()->user();
$dispatcher->dispatch('closet.removing', [$tid, $user]);
$item = $user->closet()->find($tid);
if (empty($item)) {
return json(trans('user.closet.remove.non-existent'), 1);
}
$user->closet()->updateExistingPivot($request->tid, ['item_name' => $request->name]);
return json(trans('user.closet.rename.success', ['name' => $request->name]), 0);
}
public function remove($tid)
{
$user = auth()->user();
if ($user->closet()->where('tid', $tid)->count() == 0) {
return json(trans('user.closet.remove.non-existent'), 1);
$can = $filter->apply('can_remove_closet_item', true, [$item]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
$user->closet()->detach($tid);
if (option('return_score')) {
$user->setScore(option('score_per_closet_item'), 'plus');
$user->score += option('score_per_closet_item');
$user->save();
}
$texture = Texture::find($tid);
$texture->likes--;
$texture->save();
$dispatcher->dispatch('closet.removed', [$texture, $user]);
$uploader = User::find($texture->uploader);
$uploader->score -= option('score_award_per_like', 0);
$uploader->save();

View File

@ -0,0 +1,58 @@
<?php
namespace App\Http\Controllers;
use App\Models\Texture;
use App\Models\User;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Http\Request;
class ClosetManagementController extends Controller
{
public function list(User $user)
{
return $user->closet;
}
public function add(Request $request, Dispatcher $dispatcher, User $user)
{
$tid = $request->input('tid');
$texture = Texture::find($tid);
if (!$texture) {
return json(trans('user.closet.add.not-found'), 1);
}
if ($user->closet()->where('tid', $request->tid)->count() > 0) {
return json(trans('user.closet.add.repeated'), 1);
}
$name = $texture->name;
$dispatcher->dispatch('closet.adding', [$tid, $name, $user]);
$user->closet()->attach($texture->tid, ['item_name' => $name]);
$dispatcher->dispatch('closet.added', [$texture, $name, $user]);
return json('', 0, compact('user', 'texture'));
}
public function remove(Request $request, Dispatcher $dispatcher, User $user)
{
$tid = $request->input('tid');
$dispatcher->dispatch('closet.removing', [$tid, $user]);
$item = $user->closet()->find($tid);
if (empty($item)) {
return json(trans('user.closet.remove.non-existent'), 1);
}
$user->closet()->detach($tid);
$texture = Texture::find($tid);
$dispatcher->dispatch('closet.removed', [$texture, $user]);
return json('', 0, compact('user', 'texture'));
}
}

View File

@ -3,10 +3,11 @@
namespace App\Http\Controllers;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
class Controller extends BaseController
{
use DispatchesJobs, ValidatesRequests;
use DispatchesJobs;
use ValidatesRequests;
}

View File

@ -2,21 +2,40 @@
namespace App\Http\Controllers;
use Illuminate\Support\Arr;
class HomeController extends Controller
{
public function index()
{
return view('index')->with('user', auth()->user())
->with('transparent_navbar', option('transparent_navbar', false))
return view('home')
->with('user', auth()->user())
->with('site_description', option_localized('site_description'))
->with('transparent_navbar', (bool) option('transparent_navbar', false))
->with('fixed_bg', option('fixed_bg'))
->with('hide_intro', option('hide_intro'))
->with('home_pic_url', option('home_pic_url') ?: config('options.home_pic_url'));
}
public function apiRoot()
{
$copyright = Arr::get(
[
'Powered with ❤ by Blessing Skin Server.',
'Powered by Blessing Skin Server.',
'Proudly powered by Blessing Skin Server.',
'由 Blessing Skin Server 强力驱动。',
'采用 Blessing Skin Server 搭建。',
'使用 Blessing Skin Server 稳定运行。',
'自豪地采用 Blessing Skin Server。',
],
option_localized('copyright_prefer', 0)
);
return response()->json([
'blessing_skin' => config('app.version'),
'spec' => 0,
'copyright' => bs_copyright(),
'copyright' => $copyright,
'site_name' => option('site_name'),
]);
}

View File

@ -2,55 +2,36 @@
namespace App\Http\Controllers;
use Exception;
use Illuminate\Support\Arr;
use Illuminate\Http\Request;
use App\Services\Plugin;
use App\Services\PluginManager;
use App\Services\Unzip;
use Composer\CaBundle\CaBundle;
use Composer\Semver\Comparator;
use App\Services\PackageManager;
use Exception;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Http;
class MarketController extends Controller
{
/**
* Guzzle HTTP client.
*
* @var \GuzzleHttp\Client
*/
protected $guzzle;
/**
* Cache for plugins registry.
*
* @var array
*/
protected $registryCache;
public function __construct(\GuzzleHttp\Client $guzzle)
public function marketData(PluginManager $manager)
{
$this->guzzle = $guzzle;
}
public function marketData()
{
$plugins = collect($this->getAllAvailablePlugins())->map(function ($item) {
$plugin = plugin($item['name']);
$manager = app('plugins');
$plugins = $this->fetch()->map(function ($item) use ($manager) {
$plugin = $manager->get($item['name']);
if ($plugin) {
$item['enabled'] = $plugin->isEnabled();
$item['installed'] = $plugin->version;
$item['update_available'] = Comparator::greaterThan($item['version'], $item['installed']);
$item['can_update'] = Comparator::greaterThan($item['version'], $item['installed']);
} else {
$item['installed'] = false;
}
$requirements = Arr::get($item, 'require', []);
unset($item['require']);
$item['dependencies'] = [
'isRequirementsSatisfied' => $manager->isRequirementsSatisfied($requirements),
'requirements' => $requirements,
'unsatisfiedRequirements' => $manager->getUnsatisfiedRequirements($requirements),
'all' => $requirements,
'unsatisfied' => $manager->getUnsatisfied(new Plugin('', $item)),
];
return $item;
@ -59,78 +40,61 @@ class MarketController extends Controller
return $plugins;
}
public function checkUpdates()
public function download(Request $request, PluginManager $manager, Unzip $unzip)
{
$pluginsHaveUpdate = collect($this->getAllAvailablePlugins())->filter(function ($item) {
$plugin = plugin($item['name']);
$name = $request->input('name');
$plugins = $this->fetch();
$metadata = $plugins->firstWhere('name', $name);
return $plugin && Comparator::greaterThan($item['version'], $plugin->version);
});
return json([
'available' => $pluginsHaveUpdate->isNotEmpty(),
'plugins' => $pluginsHaveUpdate->values()->all(),
]);
}
public function download(Request $request, PluginManager $manager, PackageManager $package)
{
$name = $request->get('name');
$metadata = $this->getPluginMetadata($name);
if (! $metadata) {
if (!$metadata) {
return json(trans('admin.plugins.market.non-existent', ['plugin' => $name]), 1);
}
$url = $metadata['dist']['url'];
$filename = Arr::last(explode('/', $url));
$pluginsDir = $manager->getPluginsDir();
$path = storage_path("packages/$name".'_'.$metadata['version'].'.zip');
$fakePlugin = new Plugin('', $metadata);
$unsatisfied = $manager->getUnsatisfied($fakePlugin);
$conflicts = $manager->getConflicts($fakePlugin);
if ($unsatisfied->isNotEmpty() || $conflicts->isNotEmpty()) {
$reason = $manager->formatUnresolved($unsatisfied, $conflicts);
try {
$package->download($url, $path, $metadata['dist']['shasum'])->extract($pluginsDir);
} catch (Exception $e) {
return json($e->getMessage(), 1);
return json(trans('admin.plugins.market.unresolved'), 1, compact('reason'));
}
return json(trans('admin.plugins.market.install-success'), 0);
$path = tempnam(sys_get_temp_dir(), $name);
$response = Http::withOptions([
'sink' => $path,
'verify' => CaBundle::getSystemCaRootBundlePath(),
])->get($metadata['dist']['url']);
if ($response->ok()) {
$unzip->extract($path, $manager->getPluginsDirs()->first());
return json(trans('admin.plugins.market.install-success'), 0);
} else {
return json(trans('admin.download.errors.download', ['error' => $response->status()]), 1);
}
}
protected function getPluginMetadata($name)
protected function fetch(): Collection
{
return collect($this->getAllAvailablePlugins())->where('name', $name)->first();
}
$lang = in_array(app()->getLocale(), config('plugins.locales'))
? app()->getLocale()
: config('app.fallback_locale');
protected function getAllAvailablePlugins()
{
$registryVersion = 1;
if (app()->runningUnitTests() || ! $this->registryCache) {
$registries = collect(explode(',', config('plugins.registry')));
$this->registryCache = $registries->map(function ($registry) use ($registryVersion) {
try {
$pluginsJson = $this->guzzle->request(
'GET',
trim($registry),
['verify' => resource_path('misc/ca-bundle.crt')]
)->getBody();
} catch (Exception $e) {
throw new Exception(trans('admin.plugins.market.connection-error', [
'error' => htmlentities($e->getMessage()),
]));
$plugins = collect(explode(',', config('plugins.registry')))
->map(function ($registry) use ($lang) {
$registry = str_replace('{lang}', $lang, $registry);
$response = Http::withOptions([
'verify' => CaBundle::getSystemCaRootBundlePath(),
])->get(trim($registry));
if ($response->ok()) {
return $response->json()['packages'];
} else {
throw new Exception(trans('admin.plugins.market.connection-error', ['error' => $response->status()]));
}
})
->flatten(1);
$registryData = json_decode($pluginsJson, true);
$received = Arr::get($registryData, 'version');
abort_if(
is_int($received) && $received != $registryVersion,
500,
"Only version $registryVersion of market registry is accepted."
);
return Arr::get($registryData, 'packages', []);
})->flatten(1);
}
return $this->registryCache;
return $plugins;
}
}

View File

@ -0,0 +1,72 @@
<?php
namespace App\Http\Controllers;
use App\Models\User;
use App\Notifications;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Notification;
use League\CommonMark\GithubFlavoredMarkdownConverter;
class NotificationsController extends Controller
{
public function send(Request $request)
{
$data = $request->validate([
'receiver' => 'required|in:all,normal,uid,email',
'uid' => 'required_if:receiver,uid|nullable|integer|exists:users',
'email' => 'required_if:receiver,email|nullable|email|exists:users',
'title' => 'required|max:20',
'content' => 'string|nullable',
]);
$notification = new Notifications\SiteMessage($data['title'], $data['content']);
switch ($data['receiver']) {
case 'all':
$users = User::all();
break;
case 'normal':
$users = User::where('permission', User::NORMAL)->get();
break;
case 'uid':
$users = User::where('uid', $data['uid'])->get();
break;
case 'email':
$users = User::where('email', $data['email'])->get();
break;
}
Notification::send($users, $notification);
session(['sentResult' => trans('admin.notifications.send.success')]);
return redirect('/admin');
}
public function all()
{
return auth()->user()
->unreadNotifications
->map(fn ($notification) => [
'id' => $notification->id,
'title' => $notification->data['title'],
]);
}
public function read($id)
{
$notification = auth()
->user()
->unreadNotifications
->first(fn ($notification) => $notification->id === $id);
$notification->markAsRead();
$converter = new GithubFlavoredMarkdownConverter();
return [
'title' => $notification->data['title'],
'content' => $converter->convertToHtml($notification->data['content'] ?? '')->getContent(),
'time' => $notification->created_at->toDateTimeString(),
];
}
}

View File

@ -0,0 +1,270 @@
<?php
namespace App\Http\Controllers;
use App\Services\Facades\Option;
use App\Services\OptionForm;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Str;
class OptionsController extends Controller
{
public function customize(Request $request)
{
$homepage = Option::form('homepage', OptionForm::AUTO_DETECT, function ($form) {
$form->text('home_pic_url')->hint();
$form->text('favicon_url')->hint()->description();
$form->checkbox('transparent_navbar')->label();
$form->checkbox('hide_intro')->label();
$form->checkbox('fixed_bg')->label();
$form->select('copyright_prefer')
->option('0', 'Powered with ❤ by Blessing Skin Server.')
->option('1', 'Powered by Blessing Skin Server.')
->option('2', 'Proudly powered by Blessing Skin Server.')
->option('3', '由 Blessing Skin Server 强力驱动。')
->option('4', '采用 Blessing Skin Server 搭建。')
->option('5', '使用 Blessing Skin Server 稳定运行。')
->option('6', '自豪地采用 Blessing Skin Server。')
->description();
$form->textarea('copyright_text')->rows(6)->description();
})->handle(function () {
Option::set('copyright_prefer_'.config('app.locale'), request('copyright_prefer'));
Option::set('copyright_text_'.config('app.locale'), request('copyright_text'));
});
$customJsCss = Option::form('customJsCss', OptionForm::AUTO_DETECT, function ($form) {
$form->textarea('custom_css', 'CSS')->rows(6);
$form->textarea('custom_js', 'JavaScript')->rows(6);
})->addMessage()->handle();
if ($request->isMethod('post') && $request->input('action') === 'color') {
$navbar = $request->input('navbar');
if ($navbar) {
option(['navbar_color' => $navbar]);
}
$sidebar = $request->input('sidebar');
if ($sidebar) {
option(['sidebar_color' => $sidebar]);
}
}
return view('admin.customize', [
'colors' => [
'navbar' => [
'primary', 'secondary', 'success', 'danger', 'indigo',
'purple', 'pink', 'teal', 'cyan', 'dark', 'gray',
'fuchsia', 'maroon', 'olive', 'navy',
'lime', 'light', 'warning', 'white', 'orange',
],
'sidebar' => [
'primary', 'warning', 'info', 'danger', 'success', 'indigo',
'navy', 'purple', 'fuchsia', 'pink', 'maroon', 'orange',
'lime', 'teal', 'olive',
],
],
'forms' => [
'homepage' => $homepage,
'custom_js_css' => $customJsCss,
],
'extra' => [
'navbar' => option('navbar_color'),
'sidebar' => option('sidebar_color'),
],
]);
}
public function score()
{
$rate = Option::form('rate', OptionForm::AUTO_DETECT, function ($form) {
$form->group('score_per_storage')->text('score_per_storage')->addon();
$form->group('private_score_per_storage')
->text('private_score_per_storage')->addon()->hint();
$form->group('score_per_closet_item')
->text('score_per_closet_item')->addon();
$form->checkbox('return_score')->label();
$form->group('score_per_player')->text('score_per_player')->addon();
$form->text('user_initial_score');
})->handle();
$report = Option::form('report', OptionForm::AUTO_DETECT, function ($form) {
$form->text('reporter_score_modification')->description();
$form->text('reporter_reward_score');
})->handle();
$sign = Option::form('sign', OptionForm::AUTO_DETECT, function ($form) {
$form->group('sign_score')
->text('sign_score_from')->addon(trans('options.sign.sign_score.addon1'))
->text('sign_score_to')->addon(trans('options.sign.sign_score.addon2'));
$form->group('sign_gap_time')->text('sign_gap_time')->addon();
$form->checkbox('sign_after_zero')->label()->hint();
})->after(function () {
$sign_score = request('sign_score_from').','.request('sign_score_to');
Option::set('sign_score', $sign_score);
})->with([
'sign_score_from' => @explode(',', option('sign_score'))[0],
'sign_score_to' => @explode(',', option('sign_score'))[1],
])->handle();
$sharing = Option::form('sharing', OptionForm::AUTO_DETECT, function ($form) {
$form->group('score_award_per_texture')
->text('score_award_per_texture')
->addon(trans('general.user.score'));
$form->checkbox('take_back_scores_after_deletion')->label();
$form->group('score_award_per_like')
->text('score_award_per_like')
->addon(trans('general.user.score'));
})->handle();
return view('admin.score', ['forms' => compact('rate', 'report', 'sign', 'sharing')]);
}
public function options()
{
$general = Option::form('general', OptionForm::AUTO_DETECT, function ($form) {
$form->text('site_name');
$form->text('site_description')->description();
$form->text('site_url')
->hint()
->format(function ($url) {
if (Str::endsWith($url, '/')) {
$url = substr($url, 0, -1);
}
if (Str::endsWith($url, '/index.php')) {
$url = substr($url, 0, -10);
}
return $url;
});
$form->checkbox('register_with_player_name')->label();
$form->checkbox('require_verification')->label();
$form->text('regs_per_ip');
$form->group('max_upload_file_size')
->text('max_upload_file_size')->addon('KB')
->hint(trans('options.general.max_upload_file_size.hint', ['size' => ini_get('upload_max_filesize')]));
$form->group('max_texture_width')
->text('max_texture_width')->addon('px')
->hint(trans('options.general.max_texture_width.hint'));
$form->select('player_name_rule')
->option('official', trans('options.general.player_name_rule.official'))
->option('cjk', trans('options.general.player_name_rule.cjk'))
->option('utf8', trans('options.general.player_name_rule.utf8'))
->option('custom', trans('options.general.player_name_rule.custom'));
$form->text('custom_player_name_regexp')->hint()->placeholder();
$form->group('player_name_length')
->text('player_name_length_min')
->addon('~')
->text('player_name_length_max')
->addon(trans('options.general.player_name_length.suffix'));
$form->checkbox('auto_del_invalid_texture')->label()->hint();
$form->checkbox('allow_downloading_texture')->label();
$form->select('status_code_for_private')
->option('403', '403 Forbidden')
->option('404', '404 Not Found');
$form->text('texture_name_regexp')->hint()->placeholder();
$form->textarea('content_policy')->rows(3)->description();
})->handle(function () {
Option::set('site_name_'.config('app.locale'), request('site_name'));
Option::set('site_description_'.config('app.locale'), request('site_description'));
Option::set('content_policy_'.config('app.locale'), request('content_policy'));
});
$announ = Option::form('announ', OptionForm::AUTO_DETECT, function ($form) {
$form->textarea('announcement')->rows(10)->description();
})->renderWithoutTable()->handle(function () {
Option::set('announcement_'.config('app.locale'), request('announcement'));
});
$meta = Option::form('meta', OptionForm::AUTO_DETECT, function ($form) {
$form->text('meta_keywords')->hint();
$form->text('meta_description')->hint();
$form->textarea('meta_extras')->rows(6);
})->handle();
$recaptcha = Option::form('recaptcha', 'reCAPTCHA', function ($form) {
$form->text('recaptcha_sitekey', 'sitekey');
$form->text('recaptcha_secretkey', 'secretkey');
$form->checkbox('recaptcha_invisible')->label();
})->handle();
return view('admin.options')
->with('forms', compact('general', 'announ', 'meta', 'recaptcha'));
}
public function resource(Request $request)
{
$resources = Option::form('resources', OptionForm::AUTO_DETECT, function ($form) {
$form->checkbox('force_ssl')->label()->hint();
$form->checkbox('auto_detect_asset_url')->label()->description();
$form->text('cache_expire_time')->hint(OptionForm::AUTO_DETECT);
$form->text('cdn_address')
->hint(OptionForm::AUTO_DETECT)
->description(OptionForm::AUTO_DETECT);
})
->type('primary')
->hint(OptionForm::AUTO_DETECT)
->after(function () {
$cdnAddress = request('cdn_address');
if ($cdnAddress == null) {
$cdnAddress = '';
}
if (Str::endsWith($cdnAddress, '/')) {
$cdnAddress = substr($cdnAddress, 0, -1);
}
Option::set('cdn_address', $cdnAddress);
})
->handle();
$cache = Option::form('cache', OptionForm::AUTO_DETECT, function ($form) {
$form->checkbox('enable_avatar_cache')->label();
$form->checkbox('enable_preview_cache')->label();
})
->type('warning')
->addButton([
'text' => trans('options.cache.clear'),
'type' => 'a',
'class' => 'float-right',
'style' => 'warning',
'href' => '?clear-cache',
])
->addMessage(trans('options.cache.driver', ['driver' => config('cache.default')]), 'info');
if ($request->has('clear-cache')) {
Cache::flush();
$cache->addMessage(trans('options.cache.cleared'), 'success');
}
$cache->handle();
return view('admin.resource')->with('forms', compact('resources', 'cache'));
}
}

View File

@ -2,204 +2,259 @@
namespace App\Http\Controllers;
use View;
use Event;
use Option;
use App\Models\User;
use App\Models\Player;
use App\Models\Texture;
use Illuminate\Http\Request;
use App\Events\PlayerWasAdded;
use App\Events\PlayerWasDeleted;
use App\Events\CheckPlayerExists;
use App\Events\PlayerWillBeAdded;
use App\Events\PlayerWillBeDeleted;
use App\Models\Player;
use App\Models\Texture;
use App\Models\User;
use App\Rules;
use Blessing\Filter;
use Blessing\Rejection;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Http\Middleware\CheckPlayerExist;
use App\Http\Middleware\CheckPlayerOwner;
use Illuminate\Validation\Rule;
class PlayerController extends Controller
{
public function __construct()
{
$this->middleware([CheckPlayerExist::class, CheckPlayerOwner::class], [
$this->middleware(function (Request $request, $next) {
/** @var Player */
$player = $request->route('player');
if ($player->user->isNot($request->user())) {
return json(trans('admin.players.no-permission'), 1)
->setStatusCode(403);
}
return $next($request);
}, [
'only' => ['delete', 'rename', 'setTexture', 'clearTexture'],
]);
}
public function index()
public function index(Filter $filter)
{
$grid = [
'layout' => [
['md-6', 'md-6'],
],
'widgets' => [
[
[
'user.widgets.players.list',
'user.widgets.players.notice',
],
['shared.previewer'],
],
],
];
$grid = $filter->apply('grid:user.player', $grid);
/** @var User */
$user = auth()->user();
return view('user.player')
->with('grid', $grid)
->with('extra', [
'count' => $user->players()->count(),
'rule' => trans('user.player.player-name-rule.'.option('player_name_rule')),
'length' => trans(
'user.player.player-name-length',
['min' => option('player_name_length_min'), 'max' => option('player_name_length_max')]
),
'score' => auth()->user()->score,
'cost' => (int) option('score_per_player'),
]);
}
public function listAll()
public function list()
{
return json(
'',
0,
Auth::user()
->players()
->select('pid', 'name', 'tid_skin', 'tid_cape')
->get()
->toArray()
);
return Auth::user()->players;
}
public function add(Request $request)
public function add(Request $request, Dispatcher $dispatcher, Filter $filter)
{
/** @var User */
$user = Auth::user();
if (option('single_player', false)) {
return json(trans('user.player.add.single'), 1);
}
$name = $this->validate($request, [
'name' => 'required|player_name|min:'.option('player_name_length_min').'|max:'.option('player_name_length_max'),
$name = $request->validate([
'name' => [
'required',
new Rules\PlayerName(),
'min:'.option('player_name_length_min'),
'max:'.option('player_name_length_max'),
'unique:players',
],
])['name'];
$name = $filter->apply('new_player_name', $name);
event(new CheckPlayerExists($name));
$dispatcher->dispatch('player.add.attempt', [$name, $user]);
if (! Player::where('name', $name)->get()->isEmpty()) {
return json(trans('user.player.add.repeated'), 6);
$can = $filter->apply('can_add_player', true, [$name]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
if ($user->score < Option::get('score_per_player')) {
if ($user->score < (int) option('score_per_player')) {
return json(trans('user.player.add.lack-score'), 7);
}
$dispatcher->dispatch('player.adding', [$name, $user]);
event(new PlayerWillBeAdded($name));
$player = new Player;
$player = new Player();
$player->uid = $user->uid;
$player->name = $name;
$player->tid_skin = 0;
$player->tid_cape = 0;
$player->save();
event(new PlayerWasAdded($player));
$user->score -= (int) option('score_per_player');
$user->save();
$user->setScore(option('score_per_player'), 'minus');
$dispatcher->dispatch('player.added', [$player, $user]);
event(new PlayerWasAdded($player));
return json(trans('user.player.add.success', ['name' => $name]), 0, $player->toArray());
}
public function delete($pid)
{
$player = Player::find($pid);
public function delete(
Dispatcher $dispatcher,
Filter $filter,
Player $player,
) {
/** @var User */
$user = auth()->user();
$playerName = $player->name;
if (option('single_player', false)) {
return json(trans('user.player.delete.single'), 1);
$dispatcher->dispatch('player.delete.attempt', [$player, $user]);
$can = $filter->apply('can_delete_player', true, [$player]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
$dispatcher->dispatch('player.deleting', [$player, $user]);
event(new PlayerWillBeDeleted($player));
$player->delete();
if (option('return_score')) {
Auth::user()->setScore(Option::get('score_per_player'), 'plus');
$user->score += (int) option('score_per_player');
$user->save();
}
$dispatcher->dispatch('player.deleted', [$player, $user]);
event(new PlayerWasDeleted($playerName));
return json(trans('user.player.delete.success', ['name' => $playerName]), 0);
}
public function rename(Request $request, $pid)
{
$newName = $this->validate($request, [
'name' => 'required|player_name|min:'.option('player_name_length_min').'|max:'.option('player_name_length_max'),
public function rename(
Request $request,
Dispatcher $dispatcher,
Filter $filter,
Player $player,
) {
$name = $request->validate([
'name' => [
'required',
new Rules\PlayerName(),
'min:'.option('player_name_length_min'),
'max:'.option('player_name_length_max'),
Rule::unique('players')->ignoreModel($player),
],
])['name'];
$player = Player::find($pid);
$name = $filter->apply('new_player_name', $name);
if (! Player::where('name', $newName)->get()->isEmpty()) {
return json(trans('user.player.rename.repeated'), 6);
$dispatcher->dispatch('player.renaming', [$player, $name]);
$can = $filter->apply('can_rename_player', true, [$player, $name]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
$oldName = $player->name;
$player->name = $newName;
$old = $player->replicate();
$player->name = $name;
$player->save();
if (option('single_player', false)) {
$user = auth()->user();
$user->nickname = $newName;
$user->save();
}
$dispatcher->dispatch('player.renamed', [$player, $old]);
return json(trans('user.player.rename.success', ['old' => $oldName, 'new' => $newName]), 0, $player->toArray());
return json(
trans('user.player.rename.success', ['old' => $old->name, 'new' => $name]),
0,
$player->toArray()
);
}
public function setTexture(Request $request, $pid)
{
$player = Player::find($pid);
public function setTexture(
Request $request,
Dispatcher $dispatcher,
Filter $filter,
Player $player,
) {
/** @var User */
$user = auth()->user();
foreach (['skin', 'cape'] as $type) {
if ($tid = $request->input($type)) {
$tid = $request->input($type);
$can = $filter->apply('can_set_texture', true, [$player, $type, $tid]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
if ($tid) {
$texture = Texture::find($tid);
if (! $texture) {
if (empty($texture)) {
return json(trans('skinlib.non-existent'), 1);
}
if ($user->closet()->where('texture_tid', $tid)->doesntExist()) {
return json(trans('user.closet.remove.non-existent'), 1);
}
$dispatcher->dispatch('player.texture.updating', [$player, $texture]);
$field = "tid_$type";
$player->$field = $tid;
$player->save();
$dispatcher->dispatch('player.texture.updated', [$player, $texture]);
}
}
return json(trans('user.player.set.success', ['name' => $player->name]), 0, $player->toArray());
}
public function clearTexture(Request $request, $pid)
{
$player = Player::find($pid);
array_map(function ($type) use ($request, $player) {
if (
$request->has($type) ||
($request->has('type') && in_array($type, $request->input('type')))
) {
public function clearTexture(
Request $request,
Dispatcher $dispatcher,
Filter $filter,
Player $player,
) {
$types = $request->input('type', []);
foreach (['skin', 'cape'] as $type) {
$can = $filter->apply('can_clear_texture', true, [$player, $type]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
if ($request->has($type) || in_array($type, $types)) {
$dispatcher->dispatch('player.texture.resetting', [$player, $type]);
$field = "tid_$type";
$player->$field = 0;
$player->save();
$dispatcher->dispatch('player.texture.reset', [$player, $type]);
}
}, ['skin', 'cape']);
$player->save();
}
return json(trans('user.player.clear.success', ['name' => $player->name]), 0, $player->toArray());
}
public function bind(Request $request)
{
$name = $this->validate($request, [
'player' => 'required|player_name|min:'.option('player_name_length_min').'|max:'.option('player_name_length_max'),
])['player'];
$user = Auth::user();
event(new CheckPlayerExists($name));
$player = Player::where('name', $name)->first();
if (! $player) {
event(new PlayerWillBeAdded($name));
$player = new Player;
$player->uid = $user->uid;
$player->name = $name;
$player->tid_skin = 0;
$player->save();
event(new PlayerWasAdded($player));
} elseif ($player->uid != $user->uid) {
return json(trans('user.player.rename.repeated'), 1);
}
$user->players()->where('name', '<>', $name)->delete();
$user->nickname = $name;
$user->save();
return json(trans('user.player.bind.success'), 0);
}
}

View File

@ -0,0 +1,136 @@
<?php
namespace App\Http\Controllers;
use App\Models\Player;
use App\Models\Texture;
use App\Models\User;
use App\Rules;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
class PlayersManagementController extends Controller
{
public function __construct()
{
$this->middleware(function (Request $request, $next) {
/** @var Player */
$player = $request->route('player');
$owner = $player->user;
/** @var User */
$currentUser = $request->user();
if (
$owner->uid !== $currentUser->uid
&& $owner->permission >= $currentUser->permission
) {
return json(trans('admin.players.no-permission'), 1)
->setStatusCode(403);
}
return $next($request);
})->except(['list']);
}
public function list(Request $request)
{
$query = $request->query('q');
return Player::usingSearchString($query)->paginate(10);
}
public function name(
Player $player,
Request $request,
Dispatcher $dispatcher,
) {
$name = $request->validate([
'player_name' => [
'required',
new Rules\PlayerName(),
'min:'.option('player_name_length_min'),
'max:'.option('player_name_length_max'),
'unique:players,name',
],
])['player_name'];
$dispatcher->dispatch('player.renaming', [$player, $name]);
$oldName = $player->name;
$player->name = $name;
$player->save();
$dispatcher->dispatch('player.renamed', [$player, $oldName]);
return json(trans('admin.players.name.success', ['player' => $player->name]), 0);
}
public function owner(
Player $player,
Request $request,
Dispatcher $dispatcher,
) {
$uid = $request->validate(['uid' => 'required|integer'])['uid'];
$dispatcher->dispatch('player.owner.updating', [$player, $uid]);
/** @var User */
$user = User::find($request->uid);
if (empty($user)) {
return json(trans('admin.users.operations.non-existent'), 1);
}
$player->uid = $uid;
$player->save();
$dispatcher->dispatch('player.owner.updated', [$player, $user]);
return json(trans('admin.players.owner.success', [
'player' => $player->name,
'user' => $user->nickname,
]), 0);
}
public function texture(
Player $player,
Request $request,
Dispatcher $dispatcher,
) {
$data = $request->validate([
'tid' => 'required|integer',
'type' => ['required', Rule::in(['skin', 'cape'])],
]);
$tid = (int) $data['tid'];
$type = $data['type'];
$dispatcher->dispatch('player.texture.updating', [$player, $type, $tid]);
if (Texture::where('tid', $tid)->doesntExist() && $tid !== 0) {
return json(trans('admin.players.textures.non-existent', ['tid' => $tid]), 1);
}
$field = 'tid_'.$type;
$previousTid = $player->$field;
$player->$field = $tid;
$player->save();
$dispatcher->dispatch('player.texture.updated', [$player, $type, $previousTid]);
return json(trans('admin.players.textures.success', ['player' => $player->name]), 0);
}
public function delete(
Player $player,
Dispatcher $dispatcher,
) {
$dispatcher->dispatch('player.deleting', [$player]);
$player->delete();
$dispatcher->dispatch('player.deleted', [$player]);
return json(trans('admin.players.delete.success'), 0);
}
}

View File

@ -3,25 +3,55 @@
namespace App\Http\Controllers;
use App\Services\Plugin;
use Illuminate\Http\Request;
use App\Services\PluginManager;
use App\Services\Unzip;
use Composer\CaBundle\CaBundle;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use League\CommonMark\GithubFlavoredMarkdownConverter;
class PluginController extends Controller
{
public function config($name)
public function config(PluginManager $plugins, $name)
{
$plugin = plugin($name);
if ($plugin && $plugin->isEnabled() && $plugin->hasConfigView()) {
return $plugin->getConfigView();
$plugin = $plugins->get($name);
if ($plugin && $plugin->isEnabled()) {
if ($plugin->hasConfigClass()) {
return app()->call($plugin->getConfigClass().'@render');
} elseif ($plugin->hasConfigView()) {
return $plugin->getConfigView();
} else {
return abort(404, trans('admin.plugins.operations.no-config-notice'));
}
} else {
return abort(404, trans('admin.plugins.operations.no-config-notice'));
}
}
public function readme(PluginManager $plugins, $name)
{
$plugin = $plugins->get($name);
if (empty($plugin)) {
return abort(404, trans('admin.plugins.operations.no-readme-notice'));
}
$readmePath = $plugin->getReadme();
if (empty($readmePath)) {
return abort(404, trans('admin.plugins.operations.no-readme-notice'));
}
$title = trans($plugin->title);
$path = $plugin->getPath().'/'.$readmePath;
$converter = new GithubFlavoredMarkdownConverter();
$content = $converter->convertToHtml(file_get_contents($path));
return view('admin.plugin.readme', compact('content', 'title'));
}
public function manage(Request $request, PluginManager $plugins)
{
$plugin = plugin($name = $request->get('name'));
$name = $request->input('name');
$plugin = $plugins->get($name);
if ($plugin) {
// Pass the plugin title through the translator.
@ -29,33 +59,24 @@ class PluginController extends Controller
switch ($request->get('action')) {
case 'enable':
if (! $plugins->isRequirementsSatisfied($plugin)) {
$reason = [];
$result = $plugins->enable($name);
foreach ($plugins->getUnsatisfiedRequirements($plugin) as $name => $detail) {
$constraint = $detail['constraint'];
if (! $detail['version']) {
$reason[] = trans('admin.plugins.operations.unsatisfied.disabled', compact('name'));
} else {
$reason[] = trans('admin.plugins.operations.unsatisfied.version', compact('name', 'constraint'));
}
}
if ($result === true) {
return json(trans('admin.plugins.operations.enabled', ['plugin' => $plugin->title]), 0);
} else {
$reason = $plugins->formatUnresolved($result['unsatisfied'], $result['conflicts']);
return json(trans('admin.plugins.operations.unsatisfied.notice'), 1, compact('reason'));
}
$plugins->enable($name);
return json(trans('admin.plugins.operations.enabled', ['plugin' => $plugin->title]), 0);
// no break
case 'disable':
$plugins->disable($name);
return json(trans('admin.plugins.operations.disabled', ['plugin' => $plugin->title]), 0);
case 'delete':
$plugins->uninstall($name);
$plugins->delete($name);
return json(trans('admin.plugins.operations.deleted'), 0);
@ -69,31 +90,51 @@ class PluginController extends Controller
public function getPluginData(PluginManager $plugins)
{
return $plugins->getPlugins()
->map(function ($plugin) {
return $plugins->all()
->map(function (Plugin $plugin) {
return [
'name' => $plugin->name,
'title' => trans($plugin->title ?: 'EMPTY'),
'author' => $plugin->author,
'description' => trans($plugin->description ?: 'EMPTY'),
'title' => trans($plugin->title),
'description' => trans($plugin->description ?? ''),
'version' => $plugin->version,
'url' => $plugin->url,
'enabled' => $plugin->isEnabled(),
'config' => $plugin->hasConfigView(),
'dependencies' => $this->getPluginDependencies($plugin),
'readme' => (bool) $plugin->getReadme(),
'config' => $plugin->hasConfig(),
'icon' => array_merge(
['fa' => 'plug', 'faType' => 'fas', 'bg' => 'navy'],
$plugin->getManifestAttr('enchants.icon', [])
),
];
})
->values();
}
protected function getPluginDependencies(Plugin $plugin)
public function upload(Request $request, PluginManager $manager, Unzip $unzip)
{
$plugins = app('plugins');
$request->validate(['file' => 'required|file|mimetypes:application/zip']);
return [
'isRequirementsSatisfied' => $plugins->isRequirementsSatisfied($plugin),
'requirements' => $plugin->getRequirements(),
'unsatisfiedRequirements' => $plugins->getUnsatisfiedRequirements($plugin),
];
$path = $request->file('file')->getPathname();
$unzip->extract($path, $manager->getPluginsDirs()->first());
return json(trans('admin.plugins.market.install-success'), 0);
}
public function wget(Request $request, PluginManager $manager, Unzip $unzip)
{
$data = $request->validate(['url' => 'required|url']);
$path = tempnam(sys_get_temp_dir(), 'wget-plugin');
$response = Http::withOptions([
'sink' => $path,
'verify' => CaBundle::getSystemCaRootBundlePath(),
])->get($data['url']);
if ($response->ok()) {
$unzip->extract($path, $manager->getPluginsDirs()->first());
return json(trans('admin.plugins.market.install-success'), 0);
} else {
return json(trans('admin.download.errors.download', ['error' => $response->status()]), 1);
}
}
}

View File

@ -2,23 +2,37 @@
namespace App\Http\Controllers;
use App\Models\User;
use App\Models\Report;
use App\Models\Texture;
use App\Models\User;
use Blessing\Filter;
use Blessing\Rejection;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
use Illuminate\Validation\Rule;
class ReportController extends Controller
{
public function submit(Request $request)
public function submit(Request $request, Dispatcher $dispatcher, Filter $filter)
{
$data = $this->validate($request, [
$data = $request->validate([
'tid' => 'required|exists:textures',
'reason' => 'required',
]);
/** @var User */
$reporter = auth()->user();
$tid = $data['tid'];
$reason = $data['reason'];
if (Report::where('reporter', $reporter->uid)->where('tid', $data['tid'])->count() > 0) {
$can = $filter->apply('user_can_report', true, [$tid, $reason, $reporter]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
$dispatcher->dispatch('report.submitting', [$tid, $reason, $reporter]);
if (Report::where('reporter', $reporter->uid)->where('tid', $tid)->count() > 0) {
return json(trans('skinlib.report.duplicate'), 1);
}
@ -29,71 +43,54 @@ class ReportController extends Controller
$reporter->score += $score;
$reporter->save();
$report = new Report;
$report->tid = $data['tid'];
$report->uploader = Texture::find($data['tid'])->uploader;
$report = new Report();
$report->tid = $tid;
$report->uploader = Texture::find($tid)->uploader;
$report->reporter = $reporter->uid;
$report->reason = $data['reason'];
$report->reason = $reason;
$report->status = Report::PENDING;
$report->save();
$dispatcher->dispatch('report.submitted', [$report]);
return json(trans('skinlib.report.success'), 0);
}
public function track()
{
return Report::where('reporter', auth()->id())
$reports = Report::where('reporter', auth()->id())
->orderBy('report_at', 'desc')
->get();
->paginate(10);
return view('user.report', ['reports' => $reports]);
}
public function manage(Request $request)
{
$search = $request->input('search', '');
$sortField = $request->input('sortField', 'report_at');
$sortType = $request->input('sortType', 'desc');
$page = $request->input('page', 1);
$perPage = $request->input('perPage', 10);
$q = $request->input('q');
$reports = Report::where('tid', 'like', '%'.$search.'%')
->orWhere('reporter', 'like', '%'.$search.'%')
->orWhere('reason', 'like', '%'.$search.'%')
->orderBy($sortField, $sortType)
->offset(($page - 1) * $perPage)
->limit($perPage)
->get()
->makeHidden(['informer'])
->map(function ($report) {
$uploader = User::find($report->uploader);
if ($uploader) {
$report->uploaderName = $uploader->nickname;
}
if ($report->informer) {
$report->reporterName = $report->informer->nickname;
}
return $report;
});
return [
'totalRecords' => Report::count(),
'data' => $reports,
];
return Report::usingSearchString($q)
->with(['texture', 'textureUploader', 'informer'])
->paginate(9);
}
public function review(Request $request)
{
$data = $this->validate($request, [
'id' => 'required|exists:reports',
public function review(
Report $report,
Request $request,
Dispatcher $dispatcher,
) {
$data = $request->validate([
'action' => ['required', Rule::in(['delete', 'ban', 'reject'])],
]);
$report = Report::find($data['id']);
$action = $data['action'];
if ($data['action'] == 'reject') {
$dispatcher->dispatch('report.reviewing', [$report, $action]);
if ($action == 'reject') {
if (
$report->informer &&
($score = option('reporter_score_modification', 0)) > 0 &&
$report->status == Report::PENDING
$report->informer
&& ($score = option('reporter_score_modification', 0)) > 0
&& $report->status == Report::PENDING
) {
$report->informer->score -= $score;
$report->informer->save();
@ -101,25 +98,35 @@ class ReportController extends Controller
$report->status = Report::REJECTED;
$report->save();
$dispatcher->dispatch('report.rejected', [$report]);
return json(trans('general.op-success'), 0, ['status' => Report::REJECTED]);
}
switch ($data['action']) {
switch ($action) {
case 'delete':
if ($report->texture) {
$report->texture->delete();
/** @var Texture */
$texture = $report->texture;
if ($texture) {
$dispatcher->dispatch('texture.deleting', [$texture]);
Storage::disk('textures')->delete($texture->hash);
$texture->delete();
$dispatcher->dispatch('texture.deleted', [$texture]);
} else {
// The texture has been deleted by its uploader
// We will return the score, but will not give the informer any reward
self::returnScore($report);
$report->status = Report::RESOLVED;
$report->save();
$dispatcher->dispatch('report.resolved', [$report, $action]);
return json(trans('general.texture-deleted'), 0, ['status' => Report::RESOLVED]);
}
break;
case 'ban':
$uploader = User::find($report->uploader);
if (! $uploader) {
if (!$uploader) {
return json(trans('admin.users.operations.non-existent'), 1);
}
if (auth()->user()->permission <= $uploader->permission) {
@ -127,6 +134,7 @@ class ReportController extends Controller
}
$uploader->permission = User::BANNED;
$uploader->save();
$dispatcher->dispatch('user.banned', [$uploader]);
break;
}
@ -135,17 +143,26 @@ class ReportController extends Controller
$report->status = Report::RESOLVED;
$report->save();
$dispatcher->dispatch('report.resolved', [$report, $action]);
return json(trans('general.op-success'), 0, ['status' => Report::RESOLVED]);
}
static function returnScore($report) {
if ($report->status == Report::PENDING && ($score = option('reporter_score_modification', 0)) < 0) {
public static function returnScore($report)
{
if (
$report->status == Report::PENDING
&& ($score = option('reporter_score_modification', 0)) < 0
&& $report->informer
) {
$report->informer->score -= $score;
$report->informer->save();
}
}
static function giveAward($report) {
if ($report->status == Report::PENDING) {
public static function giveAward($report)
{
if ($report->status == Report::PENDING && $report->informer) {
$report->informer->score += option('reporter_reward_score', 0);
$report->informer->save();
}

View File

@ -2,42 +2,40 @@
namespace App\Http\Controllers;
use DB;
use Log;
use File;
use Option;
use Schema;
use Artisan;
use Storage;
use App\Models\User;
use Illuminate\Http\Request;
use Composer\Semver\Comparator;
use App\Exceptions\PrettyPageException;
use App\Models\User;
use Carbon\Carbon;
use Illuminate\Contracts\Console\Kernel as Artisan;
use Illuminate\Database\Connection;
use Illuminate\Database\DatabaseManager;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
use Vectorface\Whip\Whip;
class SetupController extends Controller
{
public function welcome()
{
// @codeCoverageIgnoreStart
if (! File::exists(base_path('.env'))) {
File::copy(base_path('.env.example'), base_path('.env'));
}
// @codeCoverageIgnoreEnd
return view('setup.wizard.welcome');
}
public function database(Request $request)
{
public function database(
Request $request,
Filesystem $filesystem,
Connection $connection,
DatabaseManager $manager,
) {
if ($request->isMethod('get')) {
try {
DB::getPdo();
$connection->getPdo();
return redirect('setup/info');
// @codeCoverageIgnoreStart
} catch (\Exception $e) {
return view('setup.wizard.database');
// @codeCoverageIgnoreEnd
return view('setup.wizard.database', [
'host' => env('DB_HOST'),
'port' => env('DB_PORT'),
'username' => env('DB_USERNAME'),
'password' => env('DB_PASSWORD'),
'database' => env('DB_DATABASE'),
'prefix' => env('DB_PREFIX'),
]);
}
}
@ -52,239 +50,108 @@ class SetupController extends Controller
]);
try {
DB::connection('temp')->getPdo();
$manager->connection('temp')->getPdo();
} catch (\Exception $e) {
$msg = iconv('gbk', 'utf-8', $e->getMessage());
$type = humanize_db_type($request->input('type'));
$msg = $e->getMessage();
$type = Arr::get([
'mysql' => 'MySQL/MariaDB',
'sqlite' => 'SQLite',
'pgsql' => 'PostgreSQL',
], $request->input('type'), '');
throw new PrettyPageException(
trans('setup.database.connection-error', compact('msg', 'type')),
$e->getCode()
);
throw new PrettyPageException(trans('setup.database.connection-error', compact('msg', 'type')), $e->getCode());
}
$content = File::get(base_path('.env'));
$content = $filesystem->get(base_path('.env'));
$content = preg_replace(
'/DB_CONNECTION.+/',
'DB_CONNECTION = '.$request->input('type'),
'DB_CONNECTION='.$request->input('type', ''),
$content
);
$content = preg_replace(
'/DB_HOST.+/',
'DB_HOST = '.$request->input('host'),
'DB_HOST='.$request->input('host', ''),
$content
);
$content = preg_replace(
'/DB_PORT.+/',
'DB_PORT = '.$request->input('port'),
'DB_PORT='.$request->input('port', ''),
$content
);
$content = preg_replace(
'/DB_DATABASE.+/',
'DB_DATABASE = '.$request->input('db'),
'DB_DATABASE='.$request->input('db', ''),
$content
);
$content = preg_replace(
'/DB_USERNAME.+/',
'DB_USERNAME = '.$request->input('username'),
'DB_USERNAME='.$request->input('username', ''),
$content
);
$content = preg_replace(
'/DB_PASSWORD.+/',
'DB_PASSWORD = '.$request->input('password'),
'DB_PASSWORD='.$request->input('password', ''),
$content
);
$content = preg_replace(
'/DB_PREFIX.+/',
'DB_PREFIX = '.$request->input('prefix'),
'DB_PREFIX='.$request->input('prefix', ''),
$content
);
File::put(base_path('.env'), $content);
$filesystem->put(base_path('.env'), $content);
return redirect('setup/info');
}
public function info()
public function finish(Request $request, Filesystem $filesystem, Artisan $artisan)
{
$existingTables = static::checkTablesExist([], true);
// Not installed completely
if (count($existingTables) > 0) {
Log::info('Remaining tables detected, exit setup wizard now', [$existingTables]);
$existingTables = array_map(function ($item) {
return get_db_config()['prefix'].$item;
}, $existingTables);
throw new PrettyPageException(trans('setup.database.table-already-exists', ['tables' => json_encode($existingTables)]), 1);
}
// @codeCoverageIgnoreStart
if (! function_exists('escapeshellarg')) {
throw new PrettyPageException(trans('setup.disabled-functions.escapeshellarg'), 1);
}
// @codeCoverageIgnoreEnd
return view('setup.wizard.info');
}
public function finish(Request $request)
{
$data = $this->validate($request, [
'email' => 'required|email',
'nickname' => 'required|no_special_chars|max:255',
'password' => 'required|min:8|max:32|confirmed',
$data = $request->validate([
'email' => 'required|email',
'nickname' => 'required',
'password' => 'required|min:8|max:32|confirmed',
'site_name' => 'required',
]);
if ($request->has('generate_random')) {
Artisan::call('key:random');
Artisan::call('salt:random');
}
Artisan::call('jwt:secret', ['--no-interaction' => true]);
Artisan::call('passport:keys', ['--no-interaction' => true]);
$artisan->call('passport:keys', ['--no-interaction' => true]);
// Create tables
Artisan::call('migrate', [
$artisan->call('migrate', [
'--force' => true,
'--path' => [
'database/migrations',
'vendor/laravel/passport/database/migrations'
]
]);
Log::info('[SetupWizard] Tables migrated.');
Option::set('site_name', $request->input('site_name'));
'vendor/laravel/passport/database/migrations',
],
]);
$siteUrl = url('/');
if (ends_with($siteUrl, '/index.php')) {
if (Str::endsWith($siteUrl, '/index.php')) {
$siteUrl = substr($siteUrl, 0, -10); // @codeCoverageIgnore
}
option([
'site_name' => $request->input('site_name'),
'site_url' => $siteUrl,
]);
Option::set('site_url', $siteUrl);
$whip = new Whip();
$ip = $whip->getValidIpAddress();
// Register super admin
$user = new User;
$user = new User();
$user->email = $data['email'];
$user->nickname = $data['nickname'];
$user->score = option('user_initial_score');
$user->avatar = 0;
$user->password = User::getEncryptedPwdFromEvent($data['password'], $user)
?: app('cipher')->hash($data['password'], config('secure.salt'));
$user->ip = get_client_ip();
$user->password = app('cipher')->hash($data['password'], config('secure.salt'));
$user->ip = $ip;
$user->permission = User::SUPER_ADMIN;
$user->register_at = get_datetime_string();
$user->last_sign_at = get_datetime_string(time() - 86400);
$user->register_at = Carbon::now();
$user->last_sign_at = Carbon::now()->subDay();
$user->verified = true;
$user->save();
$this->createDirectories();
$filesystem->put(storage_path('install.lock'), '');
return view('setup.wizard.finish')->with([
'email' => $request->input('email'),
'password' => $request->input('password'),
]);
}
public function update()
{
if (Comparator::lessThanOrEqualTo(config('app.version'), option('version'))) {
// No updates available
return view('setup.locked');
}
return view('setup.updates.welcome');
}
public function doUpdate()
{
$resource = opendir(database_path('update_scripts'));
$updateScriptExist = false;
while ($filename = @readdir($resource)) {
if ($filename != '.' && $filename != '..') {
preg_match('/update-(.*)-to-(.*).php/', $filename, $matches);
// Skip if the file is not valid or expired
if (! isset($matches[2]) ||
Comparator::lessThan($matches[2], config('app.version'))) {
continue;
}
$tips = require database_path('update_scripts')."/$filename";
$updateScriptExist = true;
}
}
closedir($resource);
foreach (config('options') as $key => $value) {
if (! Option::has($key)) {
Option::set($key, $value);
}
}
Option::set('version', config('app.version'));
Artisan::call('view:clear');
return view('setup.updates.success', ['tips' => $tips ?? []]);
}
/**
* Check if the given tables exist in current database.
*
* @param array $tables
* @param bool $returnExisting
* @return bool|array
*/
public static function checkTablesExist($tables = [], $returnExistingTables = false)
{
$existingTables = [];
$tables = $tables ?: [
'users',
'user_closet',
'players',
'textures',
'options',
'reports',
];
foreach ($tables as $tableName) {
if (Schema::hasTable($tableName)) {
$existingTables[] = $tableName;
}
}
if (count($existingTables) == count($tables)) {
return $returnExistingTables ? $existingTables : true;
} else {
return $returnExistingTables ? $existingTables : false;
}
}
public static function checkDirectories()
{
$directories = ['storage/textures', 'plugins'];
try {
foreach ($directories as $dir) {
if (! Storage::disk('root')->has($dir)) {
// Try to mkdir
if (! Storage::disk('root')->makeDirectory($dir)) {
return false;
}
}
}
return true;
} catch (\Exception $e) {
return false;
}
}
protected function createDirectories()
{
return self::checkDirectories();
return view('setup.wizard.finish');
}
}

View File

@ -2,169 +2,174 @@
namespace App\Http\Controllers;
use View;
use Option;
use Session;
use Storage;
use App\Models\User;
use App\Models\Player;
use App\Models\Texture;
use App\Models\User;
use Blessing\Filter;
use Blessing\Rejection;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Filesystem\FilesystemAdapter;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use Illuminate\Validation\Rule;
use Intervention\Image\Facades\Image;
use League\CommonMark\GithubFlavoredMarkdownConverter;
class SkinlibController extends Controller
{
/**
* Map error code of file uploading to human-readable text.
*
* @see http://php.net/manual/en/features.file-upload.errors.php
* @var array
*/
public static $phpFileUploadErrors = [
0 => 'There is no error, the file uploaded with success',
1 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini',
2 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form',
3 => 'The uploaded file was only partially uploaded',
4 => 'No file was uploaded',
6 => 'Missing a temporary folder',
7 => 'Failed to write file to disk.',
8 => 'A PHP extension stopped the file upload.',
];
public function index()
public function __construct()
{
return view('skinlib.index', ['user' => Auth::user()]);
$this->middleware(function (Request $request, $next) {
/** @var User */
$user = $request->user();
/** @var Texture */
$texture = $request->route('texture');
if ($texture->uploader != $user->uid && !$user->isAdmin()) {
return json(trans('skinlib.no-permission'), 1)
->setStatusCode(403);
}
return $next($request);
})->only(['rename', 'privacy', 'type', 'delete']);
$this->middleware(function (Request $request, $next) {
/** @var User */
$user = $request->user();
/** @var Texture */
$texture = $request->route('texture');
if (!$texture->public) {
if (!Auth::check() || ($user->uid != $texture->uploader && !$user->isAdmin())) {
$statusCode = (int) option('status_code_for_private');
if ($statusCode === 404) {
abort($statusCode, trans('skinlib.show.deleted'));
} else {
abort(403, trans('skinlib.show.private'));
}
}
}
return $next($request);
})->only(['show', 'info']);
}
/**
* Get skin library data filtered.
* Available Query String: filter, uploader, page, sort, keyword, items_per_page.
*
* @param Request $request [description]
* @return JsonResponse
*/
public function getSkinlibFiltered(Request $request)
public function library(Request $request)
{
$user = Auth::user();
// Available filters: skin, steve, alex, cape
$filter = $request->input('filter', 'skin');
// Filter result by uploader's uid
$uploader = intval($request->input('uploader', 0));
// Current page
$page = $request->input('page', 1);
$currentPage = ($page <= 0) ? 1 : $page;
// How many items to show in one page
$itemsPerPage = $request->input('items_per_page', 20);
$itemsPerPage = $itemsPerPage <= 0 ? 20 : $itemsPerPage;
// Keyword to search
$keyword = $request->input('keyword', '');
if ($filter == 'skin') {
$query = Texture::where(function ($innerQuery) {
// Nested condition, DO NOT MODIFY
$innerQuery->where('type', 'steve')->orWhere('type', 'alex');
});
} else {
$query = Texture::where('type', $filter);
}
if ($keyword !== '') {
$query = $query->like('name', $keyword);
}
if ($uploader !== 0) {
$query = $query->where('uploader', $uploader);
}
if (! $user) {
// Show public textures only to anonymous visitors
$query = $query->where('public', true);
} else {
// Show private textures when show uploaded textures of current user
if ($uploader != $user->uid && ! $user->isAdmin()) {
$query = $query->where(function ($innerQuery) use ($user) {
$innerQuery->where('public', true)->orWhere('uploader', '=', $user->uid);
});
}
}
$totalPages = ceil($query->count() / $itemsPerPage);
$type = $request->input('filter', 'skin');
$uploader = $request->input('uploader');
$keyword = $request->input('keyword');
$sort = $request->input('sort', 'time');
$sortBy = $sort == 'time' ? 'upload_at' : $sort;
$query = $query->orderBy($sortBy, 'desc');
$textures = $query->skip(($currentPage - 1) * $itemsPerPage)->take($itemsPerPage)->get();
if ($user) {
$closet = $user->closet()->get();
foreach ($textures as $item) {
$item->liked = $closet->contains('tid', $item->tid);
}
}
return json('', 0, [
'items' => $textures,
'current_uid' => $user ? $user->uid : 0,
'total_pages' => $totalPages,
]);
return Texture::orderBy($sortBy, 'desc')
->when(
$type === 'skin',
fn (Builder $query) => $query->whereIn('type', ['steve', 'alex']),
fn (Builder $query) => $query->where('type', $type),
)
->when($keyword, fn (Builder $query, $keyword) => $query->like('name', $keyword))
->when($uploader, fn (Builder $query, $uploader) => $query->where('uploader', $uploader))
->when($user, function (Builder $query, User $user) {
if (!$user->isAdmin()) {
// use closure-style `where` clause to lift up SQL priority
return $query->where(function (Builder $query) use ($user) {
$query
->where('public', true)
->orWhere('uploader', $user->uid);
});
}
}, function (Builder $query) {
// show public textures only to anonymous visitors
return $query->where('public', true);
})
->join('users', 'uid', 'uploader')
->select(['tid', 'name', 'type', 'uploader', 'public', 'likes', 'nickname'])
->paginate(20);
}
public function show($tid)
public function show(Filter $filter, Texture $texture)
{
$texture = Texture::find($tid);
/** @var User */
$user = Auth::user();
/** @var FilesystemAdapter */
$disk = Storage::disk('textures');
if (! $texture || $texture && ! Storage::disk('textures')->has($texture->hash)) {
if ($disk->missing($texture->hash)) {
if (option('auto_del_invalid_texture')) {
if ($texture) {
$texture->delete();
}
abort(404, trans('skinlib.show.deleted'));
$texture->delete();
}
abort(404, trans('skinlib.show.deleted').trans('skinlib.show.contact-admin'));
abort(404, trans('skinlib.show.deleted'));
}
if (! $texture->public) {
if (! Auth::check() || ($user->uid != $texture->uploader && ! $user->isAdmin())) {
abort(option('status_code_for_private'), trans('skinlib.show.private'));
$badges = [];
$uploader = $texture->owner;
if ($uploader) {
if ($uploader->isAdmin()) {
$badges[] = ['text' => 'STAFF', 'color' => 'primary'];
}
$badges = $filter->apply('user_badges', $badges, [$uploader]);
}
$grid = [
'layout' => [
['md-8', 'md-4'],
],
'widgets' => [
[
['shared.previewer'],
['skinlib.widgets.show.side'],
],
],
];
$grid = $filter->apply('grid:skinlib.show', $grid);
return view('skinlib.show')
->with('texture', $texture)
->with('with_out_filter', true)
->with('user', $user)
->with('grid', $grid)
->with('extra', [
'download' => option('allow_downloading_texture'),
'download' => (bool) option('allow_downloading_texture'),
'currentUid' => $user ? $user->uid : 0,
'admin' => $user && $user->isAdmin(),
'inCloset' => $user && $user->closet()->where('tid', $texture->tid)->count() > 0,
'nickname' => ($up = User::find($texture->uploader)) ? $up->nickname : null,
'uploaderExists' => (bool) $uploader,
'nickname' => optional($uploader)->nickname ?? trans('general.unexistent-user'),
'report' => intval(option('reporter_score_modification', 0)),
'badges' => $badges,
]);
}
public function info($tid)
public function info(Texture $texture)
{
if ($t = Texture::find($tid)) {
return json('', 0, $t->toArray());
} else {
return abort(404);
}
return $texture;
}
public function upload()
public function upload(Filter $filter)
{
$grid = [
'layout' => [
['md-6', 'md-6'],
],
'widgets' => [
[
['skinlib.widgets.upload.input'],
['shared.previewer'],
],
],
];
$grid = $filter->apply('grid:skinlib.upload', $grid);
$converter = new GithubFlavoredMarkdownConverter();
return view('skinlib.upload')
->with('user', Auth::user())
->with('grid', $grid)
->with('extra', [
'rule' => ($regexp = option('texture_name_regexp'))
? trans('skinlib.upload.name-rule-regexp', compact('regexp'))
@ -173,247 +178,284 @@ class SkinlibController extends Controller
'skinlib.upload.private-score-notice',
['score' => option('private_score_per_storage')]
),
'scorePublic' => intval(option('score_per_storage')),
'scorePrivate' => intval(option('private_score_per_storage')),
'award' => intval(option('score_award_per_texture')),
'contentPolicy' => app('parsedown')->text(option_localized('content_policy')),
])
->with('with_out_filter', true);
'score' => (int) auth()->user()->score,
'scorePublic' => (int) option('score_per_storage'),
'scorePrivate' => (int) option('private_score_per_storage'),
'closetItemCost' => (int) option('score_per_closet_item'),
'award' => (int) option('score_award_per_texture'),
'contentPolicy' => $converter->convertToHtml(option_localized('content_policy'))->getContent(),
]);
}
public function handleUpload(Request $request)
{
$user = Auth::user();
if (($response = $this->checkUpload($request)) instanceof JsonResponse) {
return $response;
}
public function handleUpload(
Request $request,
Filter $filter,
Dispatcher $dispatcher,
) {
$file = $request->file('file');
$responses = event(new \App\Events\HashingFile($file));
if (isset($responses[0]) && is_string($responses[0])) {
return $responses[0]; // @codeCoverageIgnore
if ($file && !$file->isValid()) {
Log::error($file->getErrorMessage());
}
$t = new Texture();
$t->name = $request->input('name');
$t->type = $request->input('type');
$t->hash = hash_file('sha256', $file);
$t->size = ceil($request->file('file')->getSize() / 1024);
$t->public = $request->input('public') == 'true';
$t->uploader = $user->uid;
$data = $request->validate([
'name' => [
'required',
option('texture_name_regexp') ? 'regex:'.option('texture_name_regexp') : 'string',
],
'file' => 'required|mimes:png|max:'.option('max_upload_file_size'),
'type' => ['required', Rule::in(['steve', 'alex', 'cape'])],
'public' => 'required|boolean',
]);
$cost = $t->size * ($t->public ? Option::get('score_per_storage') : Option::get('private_score_per_storage'));
$cost += option('score_per_closet_item');
$cost -= option('score_award_per_texture', 0);
/** @var UploadedFile */
$file = $filter->apply('uploaded_texture_file', $file);
if ($user->score < $cost) {
return json(trans('skinlib.upload.lack-score'), 7);
$name = $data['name'];
$name = $filter->apply('uploaded_texture_name', $name, [$file]);
$can = $filter->apply('can_upload_texture', true, [$file, $name]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
$results = Texture::where('hash', $t->hash)->get();
$type = $data['type'];
$size = getimagesize($file);
if (! $results->isEmpty()) {
foreach ($results as $result) {
// if the texture already uploaded was set to private,
// then allow to re-upload it.
if ($result->type == $t->type && $result->public) {
return json(trans('skinlib.upload.repeated'), 0, ['tid' => $result->tid]);
}
$maxWidth = option('max_texture_width', 8192);
if ($size[0] > $maxWidth) {
$message = trans('skinlib.upload.too-wide', [
'width' => $size[0],
'maxWidth' => $maxWidth,
]);
return json($message, 1);
}
if ($size[0] % 64 != 0 || $size[1] % 32 != 0) {
$message = trans('skinlib.upload.invalid-size', [
'type' => $type === 'cape' ? trans('general.cape') : trans('general.skin'),
'width' => $size[0],
'height' => $size[1],
]);
return json($message, 1);
}
$ratio = $size[0] / $size[1];
if ($type == 'steve' || $type == 'alex') {
if ($ratio != 2 && $ratio != 1 || $type === 'alex' && $ratio === 2) {
$message = trans('skinlib.upload.invalid-size', [
'type' => trans('general.skin'),
'width' => $size[0],
'height' => $size[1],
]);
return json($message, 1);
}
} elseif ($type == 'cape') {
if ($ratio != 2) {
$message = trans('skinlib.upload.invalid-size', [
'type' => trans('general.cape'),
'width' => $size[0],
'height' => $size[1],
]);
return json($message, 1);
}
}
if (! Storage::disk('textures')->exists($t->hash)) {
Storage::disk('textures')->put($t->hash, file_get_contents($request->file('file')));
$image = Image::make($file);
$imagick = $image->getCore();
$imagick->setOption('png:compression-filter', '0');
$imagick->setOption('png:compression-level', '9');
$imagick->setOption('png:compression-strategy', '0');
$imagick->setOption('png:exclude-chunk', 'all');
$imagick->stripImage();
$sanitized = $image->encode('png')->getEncoded();
$hash = hash('sha256', $image->encoded);
$hash = $filter->apply('uploaded_texture_hash', $hash, [$image]);
/** @var User */
$user = Auth::user();
$duplicated = Texture::where('hash', $hash)
->where(
fn (Builder $query) => $query->where('public', true)->orWhere('uploader', $user->uid)
)
->first();
if ($duplicated) {
// if the texture already uploaded was set to private,
// then allow to re-upload it.
return json(trans('skinlib.upload.repeated'), 2, ['tid' => $duplicated->tid]);
}
$t->likes++;
$t->save();
$fileSize = ceil(strlen($sanitized) / 1024);
$isPublic = is_string($data['public'])
? $data['public'] === '1'
: $data['public'];
$cost = $fileSize * (
$isPublic
? option('score_per_storage')
: option('private_score_per_storage')
);
$cost += option('score_per_closet_item');
$cost -= option('score_award_per_texture', 0);
if ($user->score < $cost) {
return json(trans('skinlib.upload.lack-score'), 1);
}
$user->setScore($cost, 'minus');
$user->closet()->attach($t->tid, ['item_name' => $t->name]);
$dispatcher->dispatch('texture.uploading', [$image, $name, $hash]);
return json(trans('skinlib.upload.success', ['name' => $request->input('name')]), 0, [
'tid' => $t->tid,
$texture = new Texture();
$texture->name = $name;
$texture->type = $type;
$texture->hash = $hash;
$texture->size = $fileSize;
$texture->public = $isPublic;
$texture->uploader = $user->uid;
$texture->likes = 1;
$texture->save();
/** @var FilesystemAdapter */
$disk = Storage::disk('textures');
if ($disk->missing($hash)) {
$disk->put($hash, $sanitized);
}
$user->score -= $cost;
$user->closet()->attach($texture->tid, ['item_name' => $name]);
$user->save();
$dispatcher->dispatch('texture.uploaded', [$texture, $image]);
return json(trans('skinlib.upload.success', ['name' => $name]), 0, [
'tid' => $texture->tid,
]);
}
// @codeCoverageIgnore
public function delete(Request $request)
public function delete(Texture $texture, Dispatcher $dispatcher, Filter $filter)
{
$texture = Texture::find($request->tid);
$user = Auth::user();
if (! $texture) {
return json(trans('skinlib.non-existent'), 1);
$can = $filter->apply('can_delete_texture', true, [$texture]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
if ($texture->uploader != $user->uid && ! $user->isAdmin()) {
return json(trans('skinlib.no-permission'), 1);
}
$dispatcher->dispatch('texture.deleting', [$texture]);
// check if file occupied
if (Texture::where('hash', $texture->hash)->count() == 1) {
if (Texture::where('hash', $texture->hash)->count() === 1) {
Storage::disk('textures')->delete($texture->hash);
}
$texture->delete();
$dispatcher->dispatch('texture.deleted', [$texture]);
return json(trans('skinlib.delete.success'), 0);
}
public function privacy(Request $request)
public function privacy(Texture $texture, Dispatcher $dispatcher, Filter $filter)
{
$t = Texture::find($request->input('tid'));
$user = Auth::user();
if (! $t) {
return json(trans('skinlib.non-existent'), 1);
$can = $filter->apply('can_update_texture_privacy', true, [$texture]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
if ($t->uploader != $user->uid && ! $user->isAdmin()) {
return json(trans('skinlib.no-permission'), 1);
}
$uploader = User::find($t->uploader);
$score_diff = $t->size * (option('private_score_per_storage') - option('score_per_storage')) * ($t->public ? -1 : 1);
if ($t->public && option('take_back_scores_after_deletion', true)) {
$uploader = $texture->owner;
$score_diff = $texture->size
* (option('private_score_per_storage') - option('score_per_storage'))
* ($texture->public ? -1 : 1);
if ($texture->public && option('take_back_scores_after_deletion', true)) {
$score_diff -= option('score_award_per_texture', 0);
}
if ($uploader->score + $score_diff < 0) {
return json(trans('skinlib.upload.lack-score'), 1);
}
$type = $t->type == 'cape' ? 'cape' : 'skin';
Player::where("tid_$type", $t->tid)
->where('uid', '<>', session('uid'))
->update(["tid_$type" => 0]);
$t->likers()->get()->each(function ($user) use ($t) {
$user->closet()->detach($t->tid);
if (option('return_score')) {
$user->setScore(option('score_per_closet_item'), 'plus');
if (!$texture->public) {
$duplicated = Texture::where('hash', $texture->hash)
->where('public', true)
->first();
if ($duplicated) {
return json(trans('skinlib.upload.repeated'), 2, ['tid' => $duplicated->tid]);
}
$t->likes--;
});
@$uploader->setScore($score_diff, 'plus');
$t->public = ! $t->public;
$t->save();
return json(
trans('skinlib.privacy.success', ['privacy' => (! $t->public ? trans('general.private') : trans('general.public'))]),
0
);
}
public function rename(Request $request)
{
$this->validate($request, [
'tid' => 'required|integer',
'new_name' => 'required|no_special_chars',
]);
$user = Auth::user();
$t = Texture::find($request->input('tid'));
if (! $t) {
return json(trans('skinlib.non-existent'), 1);
}
if ($t->uploader != $user->uid && ! $user->isAdmin()) {
return json(trans('skinlib.no-permission'), 1);
}
$dispatcher->dispatch('texture.privacy.updating', [$texture]);
$t->name = $request->input('new_name');
$uploader->score += $score_diff;
$uploader->save();
if ($t->save()) {
return json(trans('skinlib.rename.success', ['name' => $request->input('new_name')]), 0);
}
}
$texture->public = !$texture->public;
$texture->save();
// @codeCoverageIgnore
$dispatcher->dispatch('texture.privacy.updated', [$texture]);
public function model(Request $request)
{
$user = Auth::user();
$data = $this->validate($request, [
'tid' => 'required|integer',
'model' => 'required|in:steve,alex,cape',
$message = trans('skinlib.privacy.success', [
'privacy' => (
$texture->public
? trans('general.public')
: trans('general.private')),
]);
$t = Texture::find($request->input('tid'));
if (! $t) {
return json(trans('skinlib.non-existent'), 1);
}
if ($t->uploader != $user->uid && ! $user->isAdmin()) {
return json(trans('skinlib.no-permission'), 1);
}
$duplicate = Texture::where('hash', $t->hash)
->where('type', $request->input('model'))
->where('tid', '<>', $t->tid)
->first();
if ($duplicate && $duplicate->public) {
return json(trans('skinlib.model.duplicate', ['name' => $duplicate->name]), 1);
}
$t->type = $request->input('model');
$t->save();
return json(trans('skinlib.model.success', ['model' => $data['model']]), 0);
return json($message, 0);
}
/**
* Check Uploaded Files.
*
* @param Request $request
* @return JsonResponse
*/
protected function checkUpload(Request $request)
{
if ($file = $request->files->get('file')) {
if ($file->getError() !== UPLOAD_ERR_OK) {
return json(static::$phpFileUploadErrors[$file->getError()], $file->getError());
}
public function rename(
Request $request,
Dispatcher $dispatcher,
Filter $filter,
Texture $texture,
) {
$data = $request->validate(['name' => [
'required',
option('texture_name_regexp')
? 'regex:'.option('texture_name_regexp')
: 'string',
]]);
$name = $data['name'];
$can = $filter->apply('can_update_texture_name', true, [$texture, $name]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
$this->validate($request, [
'name' => [
'required',
option('texture_name_regexp') ? 'regex:'.option('texture_name_regexp') : 'no_special_chars',
],
'file' => 'required|max:'.option('max_upload_file_size'),
'public' => 'required',
$dispatcher->dispatch('texture.name.updating', [$texture, $name]);
$old = $texture->replicate();
$texture->name = $name;
$texture->save();
$dispatcher->dispatch('texture.name.updated', [$texture, $old]);
return json(trans('skinlib.rename.success', ['name' => $name]), 0);
}
public function type(
Request $request,
Dispatcher $dispatcher,
Filter $filter,
Texture $texture,
) {
$data = $request->validate([
'type' => ['required', Rule::in(['steve', 'alex', 'cape'])],
]);
$type = $data['type'];
$mime = $request->file('file')->getMimeType();
if ($mime != 'image/png' && $mime != 'image/x-png') {
return json(trans('skinlib.upload.type-error'), 1);
$can = $filter->apply('can_update_texture_type', true, [$texture, $type]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
$type = $request->input('type');
$size = getimagesize($request->file('file'));
$ratio = $size[0] / $size[1];
$dispatcher->dispatch('texture.type.updating', [$texture, $type]);
if ($type == 'steve' || $type == 'alex') {
if ($ratio != 2 && $ratio != 1) {
return json(trans('skinlib.upload.invalid-size', ['type' => trans('general.skin'), 'width' => $size[0], 'height' => $size[1]]), 1);
}
if ($size[0] % 64 != 0 || $size[1] % 32 != 0) {
return json(trans('skinlib.upload.invalid-hd-skin', ['type' => trans('general.skin'), 'width' => $size[0], 'height' => $size[1]]), 1);
}
} elseif ($type == 'cape') {
if ($ratio != 2) {
return json(trans('skinlib.upload.invalid-size', ['type' => trans('general.cape'), 'width' => $size[0], 'height' => $size[1]]), 1);
}
} else {
return json(trans('general.illegal-parameters'), 1);
}
$old = $texture->replicate();
$texture->type = $type;
$texture->save();
$dispatcher->dispatch('texture.type.updated', [$texture, $old]);
return json(trans('skinlib.model.success', ['model' => $type]), 0);
}
// @codeCoverageIgnore
}

View File

@ -2,226 +2,179 @@
namespace App\Http\Controllers;
use Event;
use Option;
use Storage;
use Response;
use Exception;
use Minecraft;
use App\Models\User;
use App\Models\Player;
use App\Models\Texture;
use App\Events\GetSkinPreview;
use App\Events\GetAvatarPreview;
use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
use App\Models\User;
use Blessing\Minecraft;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Storage;
use Intervention\Image\Facades\Image;
class TextureController extends Controller
{
/**
* Return Player Profile formatted in JSON.
*
* @param string $player_name
* @param string $api
* @return \Illuminate\Http\Response
*/
public function json($player_name, $api = '')
public function __construct()
{
$player = $this->getPlayerInstance($player_name);
$this->middleware('cache.headers:public;max_age='.option('cache_expire_time'))
->only(['json']);
if ($api == 'csl') {
$content = $player->getJsonProfile(Player::CSL_API);
} elseif ($api == 'usm') {
$content = $player->getJsonProfile(Player::USM_API);
} else {
$content = $player->getJsonProfile(Option::get('api_type'));
}
return Response::jsonProfile($content, 200, [
'Last-Modified' => strtotime($player->last_modified),
]);
$this->middleware('cache.headers:etag;public;max_age='.option('cache_expire_time'))
->only([
'preview',
'raw',
'texture',
'avatarByPlayer',
'avatarByUser',
'avatarByTexture',
]);
}
public function jsonWithApi($api, $player_name)
public function json($player)
{
return $this->json($player_name, $api);
$player = Player::where('name', $player)->firstOrFail();
$isBanned = $player->user->permission === User::BANNED;
abort_if($isBanned, 403, trans('general.player-banned'));
return response()->json($player)->setLastModified($player->last_modified);
}
public function texture($hash, $headers = [], $message = '')
public function previewByHash(Minecraft $minecraft, Request $request, $hash)
{
try {
if (Storage::disk('textures')->has($hash)) {
return Response::png(Storage::disk('textures')->get($hash), 200, array_merge([
'Last-Modified' => Storage::disk('textures')->lastModified($hash),
'Accept-Ranges' => 'bytes',
'Content-Length' => Storage::disk('textures')->size($hash),
], $headers));
}
} catch (Exception $e) {
report($e);
}
$texture = Texture::where('hash', $hash)->firstOrFail();
return abort(404, $message);
return $this->preview($minecraft, $request, $texture);
}
public function textureWithApi($api, $hash)
public function preview(Minecraft $minecraft, Request $request, Texture $texture)
{
return $this->texture($hash);
}
$tid = $texture->tid;
$hash = $texture->hash;
$usePNG = $request->has('png') || !(imagetypes() & IMG_WEBP);
$format = $usePNG ? 'png' : 'webp';
public function skin($player_name)
{
return $this->getBinaryTextureFromPlayer($player_name, 'skin');
}
$disk = Storage::disk('textures');
abort_if($disk->missing($hash), 404);
public function cape($player_name)
{
return $this->getBinaryTextureFromPlayer($player_name, 'cape');
}
/**
* Get the texture image of given type and player.
*
* @param string $player_name
* @param string $type "steve" or "alex" or "cape".
* @return Response
*/
protected function getBinaryTextureFromPlayer($player_name, $type)
{
$player = $this->getPlayerInstance($player_name);
if ($hash = $player->getTexture($type)) {
return $this->texture($hash, [
'Last-Modified' => strtotime($player->last_modified),
], trans('general.texture-deleted'));
} else {
abort(404, trans('general.texture-not-uploaded', ['type' => $type]));
}
}
// @codeCoverageIgnore
public function avatarByTid($tid, $size = 128)
{
if ($t = Texture::find($tid)) {
try {
if (Storage::disk('textures')->has($t->hash)) {
$responses = event(new GetAvatarPreview($t, $size));
if (isset($responses[0]) && $responses[0] instanceof SymfonyResponse) {
return $responses[0]; // @codeCoverageIgnore
} else {
$png = Minecraft::generateAvatarFromSkin(Storage::disk('textures')->read($t->hash), $size);
return Response::png(png($png));
}
$height = (int) $request->query('height', 200);
$now = Carbon::now();
$response = Cache::remember(
'preview-t'.$tid."-$format",
option('enable_preview_cache') ? $now->addYear() : $now->addMinute(),
function () use ($minecraft, $disk, $texture, $hash, $height, $usePNG) {
$file = $disk->get($hash);
if ($texture->type === 'cape') {
$image = $minecraft->renderCape($file, $height);
} else {
$image = $minecraft->renderSkin($file, 12, $texture->type === 'alex');
}
} catch (Exception $e) {
report($e);
$lastModified = $disk->lastModified($hash);
// TODO: refactor
return \Intervention\Image\ImageManagerStatic::configure(['driver' => 'gd'])->make($image)
->response($usePNG ? 'png' : 'webp', 100)
->setLastModified(Carbon::createFromTimestamp($lastModified));
}
}
);
return response()->file(storage_path('static_textures/avatar.png'));
}
public function avatarByTidWithSize($size, $tid)
{
return $this->avatarByTid($tid, $size);
}
public function avatar($base64_email, $size = 128)
{
$user = User::where('email', base64_decode($base64_email))->first();
if ($user) {
return $this->avatarByTid($user->avatar, $size);
}
return response()->file(storage_path('static_textures/avatar.png'));
}
public function avatarWithSize($size, $base64_email)
{
return $this->avatar($base64_email, $size);
}
public function preview($tid, $size = 250)
{
if ($t = Texture::find($tid)) {
try {
if (Storage::disk('textures')->has($t->hash)) {
$responses = event(new GetSkinPreview($t, $size));
if (isset($responses[0]) && $responses[0] instanceof \Symfony\Component\HttpFoundation\Response) {
return $responses[0]; // @codeCoverageIgnore
} else {
$binary = Storage::disk('textures')->read($t->hash);
if ($t->type == 'cape') {
$png = Minecraft::generatePreviewFromCape($binary, $size * 0.8, $size * 1.125, $size);
} else {
$png = Minecraft::generatePreviewFromSkin($binary, $size, ($t->type == 'alex'), 'both', 4);
}
return Response::png(png($png));
}
}
} catch (Exception $e) {
report($e);
}
}
// Show this if given texture is invalid.
return response()->file(storage_path('static_textures/broken.png'));
}
public function previewWithSize($size, $tid)
{
return $this->preview($tid, $size);
return $response;
}
public function raw($tid)
{
abort_unless(option('allow_downloading_texture'), 404);
abort_unless(option('allow_downloading_texture'), 403);
return ($t = Texture::find($tid))
? $this->texture($t->hash)
: abort(404, trans('skinlib.non-existent'));
$texture = Texture::findOrFail($tid);
return $this->texture($texture->hash);
}
public function avatarByPlayer($size, $name)
public function texture(string $hash)
{
$player = Player::where('name', $name)->first();
abort_unless($player, 404);
$disk = Storage::disk('textures');
abort_if($disk->missing($hash), 404);
$hash = $player->getTexture('skin');
if (Storage::disk('textures')->has($hash)) {
$png = Minecraft::generateAvatarFromSkin(
Storage::disk('textures')->read($hash),
$size
);
$lastModified = Carbon::createFromTimestamp($disk->lastModified($hash));
return Response::png(png($png));
return response($disk->get($hash))
->withHeaders([
'Content-Type' => 'image/png',
'Content-Length' => $disk->size($hash),
])
->setLastModified($lastModified);
}
public function avatarByPlayer(Minecraft $minecraft, Request $request, $name)
{
$player = Player::where('name', $name)->firstOrFail();
return $this->avatar($minecraft, $request, $player->skin);
}
public function avatarByUser(Minecraft $minecraft, Request $request, $uid)
{
$texture = Texture::find(optional(User::find($uid))->avatar);
return $this->avatar($minecraft, $request, $texture);
}
public function avatarByHash(Minecraft $minecraft, Request $request, $hash)
{
$texture = Texture::where('hash', $hash)->first();
return $this->avatar($minecraft, $request, $texture);
}
public function avatarByTexture(Minecraft $minecraft, Request $request, $tid)
{
$texture = Texture::find($tid);
return $this->avatar($minecraft, $request, $texture);
}
protected function avatar(Minecraft $minecraft, Request $request, ?Texture $texture)
{
if (!empty($texture) && $texture->type !== 'steve' && $texture->type !== 'alex') {
return abort(422);
}
return abort(404);
}
$size = (int) $request->query('size', 100);
$mode = $request->has('3d') ? '3d' : '2d';
$usePNG = $request->has('png') || !(imagetypes() & IMG_WEBP);
$format = $usePNG ? 'png' : 'webp';
protected function getPlayerInstance($player_name)
{
$player = Player::where('name', $player_name)->first();
abort_if($player->isBanned(), 403, trans('general.player-banned'));
$disk = Storage::disk('textures');
if (is_null($texture) || $disk->missing($texture->hash)) {
// TODO: refactor
return \Intervention\Image\ImageManagerStatic::configure(['driver' => 'gd'])->make(resource_path("misc/textures/avatar$mode.png"))
->resize($size, $size)
->response($usePNG ? 'png' : 'webp', 100);
}
return $player;
}
$hash = $texture->hash;
$now = Carbon::now();
$response = Cache::remember(
'avatar-'.$mode.'-t'.$texture->tid.'-s'.$size."-$format",
option('enable_avatar_cache') ? $now->addYear() : $now->addMinute(),
function () use ($minecraft, $disk, $hash, $size, $mode, $usePNG) {
$file = $disk->get($hash);
if ($mode === '3d') {
$image = $minecraft->render3dAvatar($file, 25);
} else {
$image = $minecraft->render2dAvatar($file, 25);
}
/**
* Default steve skin, base64 encoded.
*
* @see https://minecraft.gamepedia.com/File:Steve_skin.png
* @return string
*/
public static function getDefaultSteveSkin()
{
return 'iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAFDUlEQVR42u2a20sUURzH97G0LKMotPuWbVpslj1olJXdjCgyisowsSjzgrB0gSKyC5UF1ZNQWEEQSBQ9dHsIe+zJ/+nXfM/sb/rN4ZwZ96LOrnPgyxzP/M7Z+X7OZc96JpEISfWrFhK0YcU8knlozeJKunE4HahEqSc2nF6zSEkCgGCyb+82enyqybtCZQWAzdfVVFgBJJNJn1BWFgC49/VpwGVlD0CaxQiA5HSYEwBM5sMAdKTqygcAG9+8coHKY/XXAZhUNgDYuBSPjJL/GkzVVhAEU5tqK5XZ7cnFtHWtq/TahdSw2l0HUisr1UKIWJQBAMehDuqiDdzndsP2EZECAG1ZXaWMwOCODdXqysLf++uXUGv9MhUHIByDOijjdiSAoH3ErANQD73C7TXXuGOsFj1d4YH4OTJAEy8y9Hd0mCaeZ5z8dfp88zw1bVyiYhCLOg1ZeAqC0ybaDttHRGME1DhDeVWV26u17lRAPr2+mj7dvULfHw2q65fhQRrLXKDfIxkau3ZMCTGIRR3URR5toU38HbaPiMwUcKfBAkoun09PzrbQ2KWD1JJaqswjdeweoR93rirzyCMBCmIQizqoizZkm2H7iOgAcHrMHbbV9KijkUYv7qOn55sdc4fo250e+vUg4329/Xk6QB/6DtOws+dHDGJRB3XRBve+XARt+4hIrAF4UAzbnrY0ve07QW8uHfB+0LzqanMM7qVb+3f69LJrD90/1axiEIs6qIs21BTIToewfcSsA+Bfb2x67OoR1aPPzu2i60fSNHRwCw221Suz0O3jO+jh6V1KyCMGse9721XdN5ePutdsewxS30cwuMjtC860T5JUKpXyKbSByUn7psi5l+juDlZYGh9324GcPKbkycaN3jUSAGxb46IAYPNZzW0AzgiQ5tVnzLUpUDCAbakMQXXrOtX1UMtHn+Q9/X5L4wgl7t37r85OSrx+TYl379SCia9KXjxRpiTjIZTBFOvrV1f8ty2eY/T7XJ81FQAwmA8ASH1ob68r5PnBsxA88/xAMh6SpqW4HRnLBrkOA9Xv5wPAZjAUgOkB+SHxgBgR0qSMh0zmZRsmwDJm1gFg2PMDIC8/nAHIMls8x8GgzOsG5WiaqREgYzDvpTwjLDy8NM15LpexDEA3LepjU8Z64my+8PtDCmUyRr+fFwA2J0eAFYA0AxgSgMmYBMZTwFQnO9RNAEaHOj2DXF5UADmvAToA2ftyxZYA5BqgmZZApDkdAK4mAKo8GzPlr8G8AehzMAyA/i1girUA0HtYB2CaIkUBEHQ/cBHSvwF0AKZFS5M0ZwMQtEaEAmhtbSUoDADH9ff3++QZ4o0I957e+zYAMt6wHkhzpjkuAcgpwNcpA7AZDLsvpwiuOkBvxygA6Bsvb0HlaeKIF2EbADZpGiGzBsA0gnwQHGOhW2snRpbpPexbAB2Z1oicAMQpTnGKU5ziFKc4xSlOcYpTnOIUpzgVmgo+XC324WfJAdDO/+ceADkCpuMFiFKbApEHkOv7BfzfXt+5gpT8V7rpfYJcDz+jAsB233r6yyBsJ0mlBCDofuBJkel4vOwBFPv8fyYAFPJ+wbSf/88UANNRVy4Awo6+Ig2gkCmgA5DHWjoA+X7AlM//owLANkX0w0359od++pvX8fdMAcj3/QJ9iJsAFPQCxHSnQt8vMJ3v2wCYpkhkAOR7vG7q4aCXoMoSgG8hFAuc/grMdAD4B/kHl9da7Ne9AAAAAElFTkSuQmCC';
$lastModified = Carbon::createFromTimestamp($disk->lastModified($hash));
// TODO: refactor
return \Intervention\Image\ImageManagerStatic::configure(['driver' => 'gd'])->make($image)
->resize($size, $size)
->response($usePNG ? 'png' : 'webp', 100)
->setLastModified($lastModified);
}
);
return $response;
}
}

View File

@ -0,0 +1,70 @@
<?php
namespace App\Http\Controllers;
use App\Services\Translations\JavaScript;
use Illuminate\Foundation\Application;
use Illuminate\Http\Request;
use Spatie\TranslationLoader\LanguageLine;
class TranslationsController extends Controller
{
public function list()
{
return LanguageLine::paginate(10);
}
public function create(Request $request, Application $app, JavaScript $js)
{
$data = $request->validate([
'group' => 'required|string',
'key' => 'required|string',
'text' => 'required|string',
]);
$line = new LanguageLine();
$line->group = $data['group'];
$line->key = $data['key'];
$line->setTranslation($app->getLocale(), $data['text']);
$line->save();
if ($data['group'] === 'front-end') {
$js->resetTime($app->getLocale());
}
$request->session()->put('success', true);
return redirect('/admin/i18n');
}
public function update(
Request $request,
Application $app,
JavaScript $js,
LanguageLine $line,
) {
$data = $request->validate(['text' => 'required|string']);
$line->setTranslation($app->getLocale(), $data['text']);
$line->save();
if ($line->group === 'front-end') {
$js->resetTime($app->getLocale());
}
return json(trans('admin.i18n.updated'), 0);
}
public function delete(
Application $app,
JavaScript $js,
LanguageLine $line,
) {
$line->delete();
if ($line->group === 'front-end') {
$js->resetTime($app->getLocale());
}
return json(trans('admin.i18n.deleted'), 0);
}
}

View File

@ -2,103 +2,92 @@
namespace App\Http\Controllers;
use Exception;
use Illuminate\Support\Arr;
use Illuminate\Http\Request;
use App\Services\Unzip;
use Cache;
use Composer\CaBundle\CaBundle;
use Composer\Semver\Comparator;
use App\Services\PackageManager;
use Illuminate\Filesystem\Filesystem;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Http;
class UpdateController extends Controller
{
protected $currentVersion;
protected $updateSource;
protected $guzzle;
protected $error;
protected $info = [];
public function __construct(\GuzzleHttp\Client $guzzle)
{
$this->updateSource = config('app.update_source');
$this->currentVersion = config('app.version');
$this->guzzle = $guzzle;
}
public const SPEC = 2;
public function showUpdatePage()
{
$info = [
'latest' => Arr::get($this->getUpdateInfo(), 'latest'),
'current' => $this->currentVersion,
];
$error = $this->error;
$extra = ['canUpdate' => $this->canUpdate()];
$info = $this->getUpdateInfo();
$canUpdate = $this->canUpdate(Arr::get($info, 'info'));
return view('admin.update', compact('info', 'error', 'extra'));
return view('admin.update', [
'info' => [
'latest' => Arr::get($info, 'info.latest'),
'current' => config('app.version'),
],
'error' => Arr::get($info, 'error', $canUpdate['reason']),
'can_update' => $canUpdate['can'],
]);
}
public function checkUpdates()
public function download(Unzip $unzip, Filesystem $filesystem)
{
return json(['available' => $this->canUpdate()]);
}
public function download(Request $request, PackageManager $package)
{
if (! $this->canUpdate()) {
return json([]);
$info = $this->getUpdateInfo();
if (!$info['ok'] || !$this->canUpdate($info['info'])['can']) {
return json(trans('admin.update.info.up-to-date'), 1);
}
$path = storage_path('packages/bs_'.$this->info['latest'].'.zip');
switch ($request->get('action')) {
case 'download':
try {
$package->download($this->info['url'], $path)->extract(base_path());
$info = $info['info'];
$path = tempnam(sys_get_temp_dir(), 'bs');
return json(trans('admin.update.complete'), 0);
} catch (Exception $e) {
report($e);
$response = Http::withOptions([
'sink' => $path,
'verify' => CaBundle::getSystemCaRootBundlePath(),
])->get($info['url']);
return json($e->getMessage(), 1);
}
case 'progress':
return $package->progress();
default:
return json(trans('general.illegal-parameters'), 1);
if ($response->ok()) {
$unzip->extract($path, base_path());
// Delete options cache. This allows us to update the version.
$filesystem->delete(storage_path('options.php'));
return json(trans('admin.update.complete'), 0);
} else {
return json(trans('admin.download.errors.download', ['error' => $response->status()]), 1);
}
}
protected function getUpdateInfo()
{
$acceptableSpec = 2;
if (app()->runningUnitTests() || ! $this->info) {
try {
$json = $this->guzzle->request(
'GET',
$this->updateSource,
['verify' => resource_path('misc/ca-bundle.crt')]
)->getBody();
$info = json_decode($json, true);
if (Arr::get($info, 'spec') == $acceptableSpec) {
$this->info = $info;
} else {
$this->error = trans('admin.update.errors.spec');
}
} catch (Exception $e) {
$this->error = $e->getMessage();
}
}
$response = Http::withOptions([
'verify' => CaBundle::getSystemCaRootBundlePath(),
])->get(config('app.update_source'));
return $this->info;
if ($response->ok()) {
$info = $response->json();
if (Arr::get($info, 'spec') === self::SPEC) {
return ['ok' => true, 'info' => $info];
} else {
return ['ok' => false, 'error' => trans('admin.update.errors.spec')];
}
} else {
return ['ok' => false, 'error' => 'HTTP status code: '.$response->status()];
}
}
protected function canUpdate()
protected function canUpdate($info = [])
{
$this->getUpdateInfo();
$php = Arr::get($this->info, 'php');
if (Comparator::lessThan(PHP_VERSION, $php)) {
$this->error = trans('admin.update.errors.php', ['version' => $php]);
return false;
$php = Arr::get($info, 'php');
preg_match('/(\d+\.\d+\.\d+)/', PHP_VERSION, $matches);
$version = $matches[1];
if (Comparator::lessThan($version, $php)) {
return [
'can' => false,
'reason' => trans('admin.update.errors.php', ['version' => $php]),
];
}
return Comparator::greaterThan(Arr::get($this->info, 'latest'), $this->currentVersion);
$can = Comparator::greaterThan(Arr::get($info, 'latest'), config('app.version'));
return ['can' => $can, 'reason' => ''];
}
}

View File

@ -2,130 +2,145 @@
namespace App\Http\Controllers;
use App;
use URL;
use Mail;
use View;
use Session;
use App\Models\User;
use App\Models\Texture;
use Illuminate\Http\Request;
use App\Mail\EmailVerification;
use App\Events\UserProfileUpdated;
use App\Mail\EmailVerification;
use App\Models\Texture;
use App\Models\User;
use Blessing\Filter;
use Blessing\Rejection;
use Carbon\Carbon;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\URL;
use League\CommonMark\GithubFlavoredMarkdownConverter;
class UserController extends Controller
{
public function __construct()
{
$this->middleware(function ($request, $next) {
if (! Auth::user()->verified) {
$this->sendVerificationEmail();
}
return $next($request);
})->only(['index', 'profile']);
}
public function user()
{
return json('', 0, auth()->user()->makeHidden(['password', 'ip', 'remember_token'])->toArray());
/** @var User */
$user = auth()->user();
return $user
->makeHidden(['password', 'ip', 'remember_token', 'verification_token']);
}
public function index()
public function index(Filter $filter)
{
$user = Auth::user();
return view('user.index')->with([
'statistics' => [
'players' => $this->calculatePercentageUsed($user->players->count(), option('score_per_player')),
'storage' => $this->calculatePercentageUsed($user->getStorageUsed(), option('score_per_storage')),
[$min, $max] = explode(',', option('sign_score'));
$scoreIntro = trans('user.score-intro.introduction', [
'initial_score' => option('user_initial_score'),
'score-from' => $min,
'score-to' => $max,
'return-score' => option('return_score')
? trans('user.score-intro.will-return-score')
: trans('user.score-intro.no-return-score'),
]);
$grid = [
'layout' => [
['md-7', 'md-5'],
],
'announcement' => app('parsedown')->text(option_localized('announcement')),
'extra' => ['unverified' => option('require_verification') && ! $user->verified],
'widgets' => [
[
[
'user.widgets.email-verification',
'user.widgets.dashboard.usage',
],
['user.widgets.dashboard.announcement'],
],
],
];
$grid = $filter->apply('grid:user.index', $grid);
$converter = new GithubFlavoredMarkdownConverter();
return view('user.index')->with([
'score_intro' => $scoreIntro,
'rates' => [
'storage' => option('score_per_storage'),
'player' => option('score_per_player'),
'closet' => option('score_per_closet_item'),
],
'announcement' => $converter->convertToHtml(option_localized('announcement')),
'grid' => $grid,
'extra' => ['unverified' => option('require_verification') && !$user->verified],
]);
}
public function scoreInfo()
{
/** @var User */
$user = Auth::user();
return json('', 0, [
return response()->json([
'user' => [
'score' => $user->score,
'lastSignAt' => $user->last_sign_at,
],
'stats' => [
'players' => $this->calculatePercentageUsed($user->players->count(), option('score_per_player')),
'storage' => $this->calculatePercentageUsed($user->getStorageUsed(), option('score_per_storage')),
'rate' => [
'storage' => (int) option('score_per_storage'),
'players' => (int) option('score_per_player'),
],
'signAfterZero' => option('sign_after_zero'),
'signGapTime' => option('sign_gap_time'),
'usage' => [
'players' => $user->players()->count(),
'storage' => (int) Texture::where('uploader', $user->uid)->sum('size'),
],
'signAfterZero' => (bool) option('sign_after_zero'),
'signGapTime' => (int) option('sign_gap_time'),
]);
}
/**
* Calculate percentage of resources used by user.
*
* @param int $used
* @param int $rate
* @return array
*/
protected function calculatePercentageUsed($used, $rate)
public function sign(Dispatcher $dispatcher, Filter $filter)
{
/** @var User */
$user = Auth::user();
// Initialize default value to avoid division by zero.
$result['used'] = $used;
$result['total'] = 'UNLIMITED';
$result['percentage'] = 0;
if ($rate != 0) {
$result['total'] = $used + floor($user->score / $rate);
$result['percentage'] = $result['total'] ? $used / $result['total'] * 100 : 100;
$can = $filter->apply('can_sign', true);
if ($can instanceof Rejection) {
return json($can->getReason(), 2);
}
return $result;
}
$lastSignTime = Carbon::parse($user->last_sign_at);
$remainingTime = option('sign_after_zero')
? Carbon::now()->diffInSeconds(
$lastSignTime <= Carbon::today() ? $lastSignTime : Carbon::tomorrow(),
false
)
: Carbon::now()->diffInSeconds(
$lastSignTime->addHours((int) option('sign_gap_time')),
false
);
/**
* Handle user signing.
*
* @return \Illuminate\Http\JsonResponse
*/
public function sign()
{
$user = Auth::user();
if ($user->canSign()) {
$acquiredScore = $user->sign();
$gap = option('sign_gap_time');
if ($remainingTime <= 0) {
[$min, $max] = explode(',', option('sign_score'));
$acquiredScore = rand((int) $min, (int) $max);
$acquiredScore = $filter->apply('sign_score', $acquiredScore);
$dispatcher->dispatch('user.sign.before', [$acquiredScore]);
$user->score += $acquiredScore;
$user->last_sign_at = Carbon::now();
$user->save();
$dispatcher->dispatch('user.sign.after', [$acquiredScore]);
return json(trans('user.sign-success', ['score' => $acquiredScore]), 0, [
'score' => $user->score,
'storage' => $this->calculatePercentageUsed($user->getStorageUsed(), option('score_per_storage')),
'remaining_time' => $gap > 1 ? round($gap) : $gap,
]);
} else {
$remaining_time = $this->getUserSignRemainingTimeWithPrecision();
return json(trans('user.cant-sign-until', [
'time' => $remaining_time >= 1
? $remaining_time : round($remaining_time * 60),
'unit' => $remaining_time >= 1
? trans('user.time-unit-hour') : trans('user.time-unit-min'),
]), 1);
return json('', 1);
}
}
public function getUserSignRemainingTimeWithPrecision($user = null)
{
$hours = ($user ?? Auth::user())->getSignRemainingTime() / 3600;
return $hours > 1 ? round($hours) : $hours;
}
public function sendVerificationEmail()
{
if (! option('require_verification')) {
if (!option('require_verification')) {
return json(trans('user.verification.disabled'), 1);
}
@ -142,12 +157,11 @@ class UserController extends Controller
return json(trans('user.verification.verified'), 1);
}
$url = URL::signedRoute('auth.verify', ['uid' => $user->uid]);
$url = URL::signedRoute('auth.verify', ['user' => $user], null, false);
try {
Mail::to($user->email)->send(new EmailVerification($url));
Mail::to($user->email)->send(new EmailVerification(url($url)));
} catch (\Exception $e) {
// Write the exception to log
report($e);
return json(trans('user.verification.failed', ['msg' => $e->getMessage()]), 2);
@ -158,77 +172,100 @@ class UserController extends Controller
return json(trans('user.verification.success'), 0);
}
public function profile()
public function profile(Filter $filter)
{
$user = Auth::user();
$grid = [
'layout' => [
['md-6', 'md-6'],
],
'widgets' => [
[
[
'user.widgets.profile.avatar',
'user.widgets.profile.password',
],
[
'user.widgets.profile.nickname',
'user.widgets.profile.email',
'user.widgets.profile.delete-account',
],
],
],
];
$grid = $filter->apply('grid:user.profile', $grid);
return view('user.profile')
->with('extra', [
'unverified' => option('require_verification') && ! $user->verified,
'admin' => $user->isAdmin(),
]);
->with('user', $user)
->with('grid', $grid)
->with('site_name', option_localized('site_name'));
}
public function handleProfile(Request $request)
public function handleProfile(Request $request, Filter $filter, Dispatcher $dispatcher)
{
$action = $request->input('action', '');
/** @var User */
$user = Auth::user();
$addition = $request->except('action');
$can = $filter->apply('user_can_edit_profile', true, [$action, $addition]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
$dispatcher->dispatch('user.profile.updating', [$user, $action, $addition]);
switch ($action) {
case 'nickname':
if (option('single_player', false)) {
return json(trans('user.profile.nickname.single'), 1);
}
$this->validate($request, [
'new_nickname' => 'required|no_special_chars|max:255',
]);
$request->validate(['new_nickname' => 'required']);
$nickname = $request->input('new_nickname');
$user->nickname = $nickname;
$user->save();
$dispatcher->dispatch('user.profile.updated', [$user, $action, $addition]);
event(new UserProfileUpdated($action, $user));
return json(trans('user.profile.nickname.success', ['nickname' => $nickname]), 0);
case 'password':
$this->validate($request, [
$request->validate([
'current_password' => 'required|min:6|max:32',
'new_password' => 'required|min:8|max:32',
'new_password' => 'required|min:8|max:32',
]);
if (! $user->verifyPassword($request->input('current_password'))) {
if (!$user->verifyPassword($request->input('current_password'))) {
return json(trans('user.profile.password.wrong-password'), 1);
}
if ($user->changePassword($request->input('new_password'))) {
event(new UserProfileUpdated($action, $user));
$user->changePassword($request->input('new_password'));
$dispatcher->dispatch('user.profile.updated', [$user, $action, $addition]);
event(new UserProfileUpdated($action, $user));
Auth::logout();
Auth::logout();
return json(trans('user.profile.password.success'), 0);
}
break; // @codeCoverageIgnore
return json(trans('user.profile.password.success'), 0);
case 'email':
$this->validate($request, [
'new_email' => 'required|email',
'password' => 'required|min:6|max:32',
$data = $request->validate([
'email' => 'required|email',
'password' => 'required|min:6|max:32',
]);
if (User::where('email', $request->new_email)->count() > 0) {
if (User::where('email', $data['email'])->count() > 0) {
return json(trans('user.profile.email.existed'), 1);
}
if (! $user->verifyPassword($request->input('password'))) {
if (!$user->verifyPassword($data['password'])) {
return json(trans('user.profile.email.wrong-password'), 1);
}
$user->email = $request->input('new_email');
$user->email = $data['email'];
$user->verified = false;
$user->save();
$dispatcher->dispatch('user.profile.updated', [$user, $action, $addition]);
event(new UserProfileUpdated($action, $user));
Auth::logout();
@ -236,7 +273,7 @@ class UserController extends Controller
return json(trans('user.profile.email.success'), 0);
case 'delete':
$this->validate($request, [
$request->validate([
'password' => 'required|min:6|max:32',
]);
@ -244,77 +281,80 @@ class UserController extends Controller
return json(trans('user.profile.delete.admin'), 1);
}
if (! $user->verifyPassword($request->input('password'))) {
if (!$user->verifyPassword($request->input('password'))) {
return json(trans('user.profile.delete.wrong-password'), 1);
}
Auth::logout();
if ($user->delete()) {
session()->flush();
$dispatcher->dispatch('user.deleting', [$user]);
return json(trans('user.profile.delete.success'), 0);
}
$user->delete();
$dispatcher->dispatch('user.deleted', [$user]);
session()->flush();
break; // @codeCoverageIgnore
return json(trans('user.profile.delete.success'), 0);
default:
return json(trans('general.illegal-parameters'), 1);
break;
}
}
// @codeCoverageIgnore
/**
* Set user avatar.
*
* @param Request $request
*/
public function setAvatar(Request $request)
public function setAvatar(Request $request, Filter $filter, Dispatcher $dispatcher)
{
$this->validate($request, [
'tid' => 'required|integer',
]);
$request->validate(['tid' => 'required|integer']);
$tid = $request->input('tid');
/** @var User */
$user = auth()->user();
$can = $filter->apply('user_can_update_avatar', true, [$user, $tid]);
if ($can instanceof Rejection) {
return json($can->getReason(), 1);
}
$dispatcher->dispatch('user.avatar.updating', [$user, $tid]);
if ($tid == 0) {
$user->avatar = 0;
$user->save();
$dispatcher->dispatch('user.avatar.updated', [$user, $tid]);
return json(trans('user.profile.avatar.success'), 0);
}
$result = Texture::find($tid);
if ($result) {
if ($result->type == 'cape') {
$texture = Texture::find($tid);
if ($texture) {
if ($texture->type == 'cape') {
return json(trans('user.profile.avatar.wrong-type'), 1);
}
if (
!$texture->public
&& $user->uid !== $texture->uploader
&& !$user->isAdmin()
) {
return json(trans('skinlib.show.private'), 1);
}
$user->avatar = $tid;
$user->save();
$dispatcher->dispatch('user.avatar.updated', [$user, $tid]);
return json(trans('user.profile.avatar.success'), 0);
} else {
return json(trans('skinlib.non-existent'), 1);
}
}
public function readNotification($id)
public function toggleDarkMode()
{
$notification = auth()
->user()
->unreadNotifications
->first(function ($notification) use ($id) {
return $notification->id === $id;
});
$notification->markAsRead();
/** @var User */
$user = auth()->user();
$user->is_dark_mode = !$user->is_dark_mode;
$user->save();
return [
'title' => $notification->data['title'],
'content' => app('parsedown')->text($notification->data['content']),
'time' => $notification->created_at->toDateTimeString(),
];
return response()->noContent();
}
}

View File

@ -0,0 +1,174 @@
<?php
namespace App\Http\Controllers;
use App\Models\User;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
class UsersManagementController extends Controller
{
public function __construct()
{
$this->middleware(function (Request $request, $next) {
/** @var User */
$targetUser = $request->route('user');
/** @var User */
$authUser = $request->user();
if (
$targetUser->isNot($authUser)
&& $targetUser->permission >= $authUser->permission
) {
return json(trans('admin.users.operations.no-permission'), 1)
->setStatusCode(403);
}
return $next($request);
})->except(['list']);
}
public function list(Request $request)
{
$q = $request->input('q');
return User::usingSearchString($q)->paginate(10);
}
public function email(User $user, Request $request, Dispatcher $dispatcher)
{
$data = $request->validate([
'email' => [
'required', 'email', Rule::unique('users')->ignore($user),
],
]);
$email = $data['email'];
$dispatcher->dispatch('user.email.updating', [$user, $email]);
$old = $user->replicate();
$user->email = $email;
$user->save();
$dispatcher->dispatch('user.email.updated', [$user, $old]);
return json(trans('admin.users.operations.email.success'), 0);
}
public function verification(User $user, Dispatcher $dispatcher)
{
$dispatcher->dispatch('user.verification.updating', [$user]);
$user->verified = !$user->verified;
$user->save();
$dispatcher->dispatch('user.verification.updated', [$user]);
return json(trans('admin.users.operations.verification.success'), 0);
}
public function nickname(User $user, Request $request, Dispatcher $dispatcher)
{
$data = $request->validate([
'nickname' => 'required|string',
]);
$nickname = $data['nickname'];
$dispatcher->dispatch('user.nickname.updating', [$user, $nickname]);
$old = $user->replicate();
$user->nickname = $nickname;
$user->save();
$dispatcher->dispatch('user.nickname.updated', [$user, $old]);
return json(trans('admin.users.operations.nickname.success', [
'new' => $request->input('nickname'),
]), 0);
}
public function password(User $user, Request $request, Dispatcher $dispatcher)
{
$data = $request->validate([
'password' => 'required|string|min:8|max:16',
]);
$password = $data['password'];
$dispatcher->dispatch('user.password.updating', [$user, $password]);
$user->changePassword($password);
$user->save();
$dispatcher->dispatch('user.password.updated', [$user]);
return json(trans('admin.users.operations.password.success'), 0);
}
public function score(User $user, Request $request, Dispatcher $dispatcher)
{
$data = $request->validate([
'score' => 'required|integer',
]);
$score = (int) $data['score'];
$dispatcher->dispatch('user.score.updating', [$user, $score]);
$old = $user->replicate();
$user->score = $score;
$user->save();
$dispatcher->dispatch('user.score.updated', [$user, $old]);
return json(trans('admin.users.operations.score.success'), 0);
}
public function permission(User $user, Request $request, Dispatcher $dispatcher)
{
$data = $request->validate([
'permission' => [
'required',
Rule::in([User::BANNED, User::NORMAL, User::ADMIN]),
],
]);
$permission = (int) $data['permission'];
if (
$permission === User::ADMIN
&& $request->user()->permission < User::SUPER_ADMIN
) {
return json(trans('admin.users.operations.no-permission'), 1)
->setStatusCode(403);
}
if ($user->is($request->user())) {
return json(trans('admin.users.operations.no-permission'), 1)
->setStatusCode(403);
}
$dispatcher->dispatch('user.permission.updating', [$user, $permission]);
$old = $user->replicate();
$user->permission = $permission;
$user->save();
if ($permission === User::BANNED) {
$dispatcher->dispatch('user.banned', [$user]);
}
$dispatcher->dispatch('user.permission.updated', [$user, $old]);
return json(trans('admin.users.operations.permission'), 0);
}
public function delete(User $user, Dispatcher $dispatcher)
{
$dispatcher->dispatch('user.deleting', [$user]);
$user->delete();
$dispatcher->dispatch('user.deleted', [$user]);
return json(trans('admin.users.operations.delete.success'), 0);
}
}

View File

@ -11,59 +11,61 @@ class Kernel extends HttpKernel
*
* These middleware are run during every request to your application.
*
* @var array
* @var array<int, class-string|string>
*/
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
\Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\Illuminate\Foundation\Http\Middleware\TrimStrings::class,
\App\Http\Middleware\ConvertEmptyStringsToNull::class,
\App\Http\Middleware\DetectLanguagePrefer::class,
Middleware\ConvertEmptyStringsToNull::class,
Middleware\DetectLanguagePrefer::class,
];
/**
* The application's route middleware groups.
*
* @var array
* @var array<string, array<int, class-string|string>>
*/
protected $middlewareGroups = [
'web' => [
\App\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\ForbiddenIE::class,
\Illuminate\Foundation\Http\Middleware\VerifyCsrfToken::class,
Middleware\EnforceEverGreen::class,
Middleware\RedirectToSetup::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
],
'api' => [
'bindings',
\Illuminate\Routing\Middleware\SubstituteBindings::class,
],
'authorize' => [
'auth:web',
\App\Http\Middleware\RejectBannedUser::class,
\App\Http\Middleware\EnsureEmailFilled::class,
\App\Http\Middleware\FireUserAuthenticated::class,
Middleware\RejectBannedUser::class,
Middleware\EnsureEmailFilled::class,
Middleware\FireUserAuthenticated::class,
],
];
/**
* The application's route middleware.
* The application's middleware aliases.
*
* These middleware may be assigned to groups or used individually.
* Aliases may be used instead of class names to conveniently assign middleware to routes and groups.
*
* @var array
* @var array<string, class-string|string>
*/
protected $routeMiddleware = [
'auth' => \App\Http\Middleware\Authenticate::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'verified' => \App\Http\Middleware\CheckUserVerified::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'admin' => \App\Http\Middleware\CheckAdministrator::class,
'super-admin' => \App\Http\Middleware\CheckSuperAdmin::class,
'player' => \App\Http\Middleware\CheckPlayerExist::class,
'setup' => \App\Http\Middleware\CheckInstallation::class,
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
protected $middlewareAliases = [
'auth' => Middleware\Authenticate::class,
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'guest' => Middleware\RedirectIfAuthenticated::class,
'role' => Middleware\CheckRole::class,
'setup' => Middleware\CheckInstallation::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => Middleware\CheckUserVerified::class,
'scope' => \Laravel\Passport\Http\Middleware\CheckForAnyScope::class,
'scopes' => \Laravel\Passport\Http\Middleware\CheckScopes::class,
];
}

View File

@ -8,13 +8,13 @@ class Authenticate extends Middleware
{
protected function redirectTo($request)
{
if (! $request->expectsJson()) {
if (!$request->expectsJson()) {
session([
'last_requested_path' => $request->fullUrl(),
'msg' => trans('auth.check.anonymous'),
]);
return '/auth/login';
return route('auth.login');
}
}
}

View File

@ -1,13 +0,0 @@
<?php
namespace App\Http\Middleware;
class CheckAdministrator
{
public function handle($request, \Closure $next)
{
abort_unless(auth()->user()->isAdmin(), 403, trans('auth.check.admin'));
return $next($request);
}
}

View File

@ -2,17 +2,14 @@
namespace App\Http\Middleware;
use App\Http\Controllers\SetupController;
use Illuminate\Filesystem\Filesystem;
class CheckInstallation
{
public function handle($request, \Closure $next)
{
if (config('database.default') == 'dummy') {
return $next($request); // @codeCoverageIgnore
}
if (SetupController::checkTablesExist()) {
$hasLock = resolve(Filesystem::class)->exists(storage_path('install.lock'));
if ($hasLock) {
return response()->view('setup.locked');
}

View File

@ -1,55 +0,0 @@
<?php
namespace App\Http\Middleware;
use Event;
use App\Models\Player;
use Illuminate\Support\Arr;
use App\Events\CheckPlayerExists;
class CheckPlayerExist
{
public function handle($request, \Closure $next)
{
$pid = Arr::get($request->route()->parameters, 'pid') ?? $request->input('pid');
if (! $request->isMethod('get') && ! is_null($pid)) {
if (is_null(Player::find($pid))) {
return json(trans('general.unexistent-player'), 1);
} else {
return $next($request);
}
}
if (stripos($request->getUri(), '.json') != false) {
preg_match('/\/([^\/]*)\.json/', $request->getUri(), $matches);
} else {
preg_match('/\/([^\/]*)\.png/', $request->getUri(), $matches);
}
$player_name = urldecode($matches[1]);
$responses = event(new CheckPlayerExists($player_name));
if (is_array($responses)) {
// @codeCoverageIgnoreStart
foreach ($responses as $r) {
if ($r) {
return $next($request);
}
}
// @codeCoverageIgnoreEnd
}
if (! Player::where('name', $player_name)->get()->isEmpty()) {
return $next($request);
}
if (option('return_204_when_notfound')) {
return response('', 204, [
'Cache-Control' => 'public, max-age='.option('cache_expire_time'),
]);
} else {
return abort(404, trans('general.unexistent-player'));
}
}
}

Some files were not shown because too many files have changed in this diff Show More