Code cleanup

Signed-off-by: Yuan Si <do4suki@gmail.com>

handler/event.go

@@ -4,73 +4,24 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"honoka-chan/config"
-	"honoka-chan/database"
 	"honoka-chan/encrypt"
-	"honoka-chan/utils"
+	"honoka-chan/model"
 	"net/http"
 	"time"
 
 	"github.com/gin-gonic/gin"
 )
 
-type EventsResp struct {
-	ResponseData EventsData    `json:"response_data"`
-	ReleaseInfo  []interface{} `json:"release_info"`
-	StatusCode   int           `json:"status_code"`
-}
-
-type TargetList struct {
-	Position      int  `json:"position"`
-	IsDisplayable bool `json:"is_displayable"`
-}
-
-type EventsData struct {
-	TargetList      []TargetList `json:"target_list"`
-	ServerTimestamp int64        `json:"server_timestamp"`
-}
-
 func EventListHandler(ctx *gin.Context) {
-	reqTime := time.Now().Unix()
-
-	authorizeStr := ctx.Request.Header["Authorize"]
-	authToken, err := utils.GetAuthorizeToken(authorizeStr)
-	if err != nil {
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-	userId := ctx.Request.Header[http.CanonicalHeaderKey("User-ID")]
-	if len(userId) == 0 {
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-
-	if !database.MatchTokenUid(authToken, userId[0]) {
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-
-	nonce, err := utils.GetAuthorizeNonce(authorizeStr)
-	if err != nil {
-		fmt.Println(err)
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-	nonce++
-
-	respTime := time.Now().Unix()
-	newAuthorizeStr := fmt.Sprintf("consumerKey=lovelive_test&timeStamp=%d&version=1.1&token=%s&nonce=%d&user_id=%s&requestTimeStamp=%d", respTime, authToken, nonce, userId[0], reqTime)
-	// fmt.Println(newAuthorizeStr)
-
-	targets := []TargetList{}
+	targets := []model.TargetList{}
 	for i := 0; i < 6; i++ {
-		targets = append(targets, TargetList{
+		targets = append(targets, model.TargetList{
 			Position:      i + 1,
 			IsDisplayable: false,
 		})
 	}
-	eventsResp := EventsResp{
-		ResponseData: EventsData{
+	eventsResp := model.EventsResp{
+		ResponseData: model.EventsRes{
 			TargetList:      targets,
 			ServerTimestamp: time.Now().Unix(),
 		},
@@ -79,12 +30,13 @@ func EventListHandler(ctx *gin.Context) {
 	}
 	resp, err := json.Marshal(eventsResp)
 	CheckErr(err)
-	xms := encrypt.RSA_Sign_SHA1(resp, "privatekey.pem")
-	xms64 := base64.RawStdEncoding.EncodeToString(xms)
 
-	ctx.Header("Server-Version", config.Conf.Server.VersionNumber)
-	ctx.Header("user_id", userId[0])
-	ctx.Header("authorize", newAuthorizeStr)
-	ctx.Header("X-Message-Sign", xms64)
+	nonce := ctx.GetInt("nonce")
+	nonce++
+
+	ctx.Header("user_id", ctx.GetString("userid"))
+	ctx.Header("authorize", fmt.Sprintf("consumerKey=lovelive_test&timeStamp=%d&version=1.1&token=%s&nonce=%d&user_id=%s&requestTimeStamp=%d", time.Now().Unix(), ctx.GetString("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time")))
+	ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem")))
+
 	ctx.String(http.StatusOK, string(resp))
 }