From cc7b679dd3e5e46b460eba042c1ef193037e2c3f Mon Sep 17 00:00:00 2001
From: Dom Eori <4j6dq2zi8@relay.firefox.com>
Date: Mon, 12 Dec 2022 00:31:41 +0900
Subject: [PATCH] [maimai2] Improve UserPortrait exception handling Added
 default value for parameter and fix file read ordering

---
 .../handler/impl/GetUserPortraitHandler.java       | 14 ++++++++------
 .../handler/impl/UploadUserPortraitHandler.java    |  4 +++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPortraitHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPortraitHandler.java
index d4928da1..8f6df9bc 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPortraitHandler.java
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/GetUserPortraitHandler.java
@@ -32,7 +32,9 @@ public class GetUserPortraitHandler implements BaseHandler {
     private final String picSavePath;
     private final boolean enable;
 
-    public GetUserPortraitHandler(BasicMapper mapper, @Value("${game.maimai2.userPhoto.enable:}") boolean enable, @Value("${game.maimai2.userPhoto.picSavePath:}") String picSavePath) {
+    public GetUserPortraitHandler(BasicMapper mapper,
+    @Value("${game.maimai2.userPhoto.enable:true}") boolean enable,
+    @Value("${game.maimai2.userPhoto.picSavePath:data/userPhoto}") String picSavePath) {
         this.mapper = mapper;
         this.picSavePath = picSavePath;
         this.enable = enable;
@@ -54,12 +56,12 @@ public class GetUserPortraitHandler implements BaseHandler {
             try {
                 var filePath = Paths.get(picSavePath, userId + "-up.jpg");
 
-                var templateJsonStr = Files.readString(Paths.get(picSavePath, userId + "-up.json"));
-                var templateUserPortrait = mapper.read(templateJsonStr, UserPortrait.class);
-
-                var buffer = new byte[10240];
-
                 if (Files.exists(filePath)) {
+                    var templateJsonStr = Files.readString(Paths.get(picSavePath, userId + "-up.json"));
+                    var templateUserPortrait = mapper.read(templateJsonStr, UserPortrait.class);
+
+                    var buffer = new byte[10240];
+
                     var stream = new FileInputStream(filePath.toFile());
                     while (stream.available() > 0) {
                         var read = stream.read(buffer, 0, 10240);
diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPortraitHandler.java b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPortraitHandler.java
index 8239ec93..9b0074e4 100644
--- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPortraitHandler.java
+++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/impl/UploadUserPortraitHandler.java
@@ -28,7 +28,9 @@ public class UploadUserPortraitHandler implements BaseHandler {
     private final String picSavePath;
     private final boolean enable;
 
-    public UploadUserPortraitHandler(BasicMapper mapper, @Value("${game.maimai2.userPhoto.enable:}") boolean enable, @Value("${game.maimai2.userPhoto.picSavePath:}") String picSavePath) {
+    public UploadUserPortraitHandler(BasicMapper mapper,
+    @Value("${game.maimai2.userPhoto.enable:true}") boolean enable,
+    @Value("${game.maimai2.userPhoto.picSavePath:data/userPhoto}") String picSavePath) {
         this.mapper = mapper;
         this.picSavePath = picSavePath;
         this.enable = enable;