From 91d7eb612e41237fdbd32b1436ba229e31de3a79 Mon Sep 17 00:00:00 2001
From: mountain <mountain@action2quare.com>
Date: Wed, 15 Nov 2023 16:02:22 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=ED=8B=B0=20=EC=B0=B8=EA=B0=80=20?=
 =?UTF-8?q?=EA=B2=B0=EA=B3=BC=EB=A1=9C=20=ED=8C=8C=ED=8B=B0=20=EC=95=84?=
 =?UTF-8?q?=EC=9D=B4=EB=94=94=EB=A5=BC=20=EB=82=B4=EB=A0=A4=EB=B3=B4?=
 =?UTF-8?q?=EB=83=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/group_party.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/group_party.go b/core/group_party.go
index 99d0120..1097759 100644
--- a/core/group_party.go
+++ b/core/group_party.go
@@ -304,8 +304,8 @@ func (gp *groupParty) JoinParty(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if gd == nil {
-		// 그룹이 없다. 실패
-		w.WriteHeader(http.StatusBadRequest)
+		// 그룹이 없다. 없을 수도 있지
+		gocommon.MakeEncoder(w, r).Encode("")
 		return
 	}
 
@@ -314,9 +314,8 @@ func (gp *groupParty) JoinParty(w http.ResponseWriter, r *http.Request) {
 		// 이미 멤버여야 재입장 가능
 		path := "$._members." + gd.tid(mid) + "._body"
 		if _, err := gd.rh.JSONSet(gd.strid(), path, character, gocommon.RedisonSetOptionXX); err != nil {
-			// 멤버가 아니네? 그새 파티장이 쫓아냈나보다
-			logger.Println("JoinParty failed. maybe kicked by party owner :", err)
-			w.WriteHeader(http.StatusInternalServerError)
+			// 멤버가 아니네? 그새 파티장이 쫓아냈을 수도 있다.
+			gocommon.MakeEncoder(w, r).Encode("")
 			return
 		}
 	}
@@ -345,6 +344,8 @@ func (gp *groupParty) JoinParty(w http.ResponseWriter, r *http.Request) {
 		Body:   gd.loadFull(),
 		Tag:    []string{"GroupDocFull"},
 	})
+
+	gocommon.MakeEncoder(w, r).Encode(gd.strid())
 }
 
 func (gp *groupParty) ConditionalClearPartyMember(w http.ResponseWriter, r *http.Request) {