X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/3326539367dfa85cb2b0455d5b1c67eaaf59cf8e..5853654f0a618dc89f893992a7f0d211456483f8:/hotline/transaction_handlers.go

diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go
index 12b1d41..d3238f4 100644
--- a/hotline/transaction_handlers.go
+++ b/hotline/transaction_handlers.go
@@ -933,8 +933,6 @@ func HandleGetUserNameList(cc *ClientConn, t *Transaction) (res []Transaction, e
 }
 
 func HandleTranAgreed(cc *ClientConn, t *Transaction) (res []Transaction, err error) {
-	cc.Agreed = true
-
 	if t.GetField(fieldUserName).Data != nil {
 		if cc.Authorize(accessAnyName) {
 			cc.UserName = t.GetField(fieldUserName).Data
@@ -1321,7 +1319,10 @@ func HandleDelNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err er
 	// 326	News article ID
 	// 337	News article – recursive delete	Delete child articles (1) or not (0)
 	pathStrs := ReadNewsPath(t.GetField(fieldNewsPath).Data)
-	ID := binary.BigEndian.Uint16(t.GetField(fieldNewsArtID).Data)
+	ID, err := byteToInt(t.GetField(fieldNewsArtID).Data)
+	if err != nil {
+		return res, err
+	}
 
 	// TODO: Delete recursive
 	cats := cc.Server.GetNewsCatByPath(pathStrs[:len(pathStrs)-1])
@@ -1359,13 +1360,21 @@ func HandlePostNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err e
 	catName := pathStrs[len(pathStrs)-1]
 	cat := cats[catName]
 
+	artID, err := byteToInt(t.GetField(fieldNewsArtID).Data)
+	if err != nil {
+		return res, err
+	}
+	convertedArtID := uint32(artID)
+	bs := make([]byte, 4)
+	binary.LittleEndian.PutUint32(bs, convertedArtID)
+
 	newArt := NewsArtData{
 		Title:         string(t.GetField(fieldNewsArtTitle).Data),
 		Poster:        string(cc.UserName),
 		Date:          toHotlineTime(time.Now()),
 		PrevArt:       []byte{0, 0, 0, 0},
 		NextArt:       []byte{0, 0, 0, 0},
-		ParentArt:     append([]byte{0, 0}, t.GetField(fieldNewsArtID).Data...),
+		ParentArt:     bs,
 		FirstChildArt: []byte{0, 0, 0, 0},
 		DataFlav:      []byte("text/plain"),
 		Data:          string(t.GetField(fieldNewsArtData).Data),
@@ -1389,9 +1398,9 @@ func HandlePostNewsArt(cc *ClientConn, t *Transaction) (res []Transaction, err e
 	}
 
 	// Update parent article with first child reply
-	parentID := binary.BigEndian.Uint16(t.GetField(fieldNewsArtID).Data)
+	parentID := convertedArtID
 	if parentID != 0 {
-		parentArt := cat.Articles[uint32(parentID)]
+		parentArt := cat.Articles[parentID]
 
 		if bytes.Equal(parentArt.FirstChildArt, []byte{0, 0, 0, 0}) {
 			binary.BigEndian.PutUint32(parentArt.FirstChildArt, nextID)