Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-14 16:04:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/gacha-enum

Browse Source
This commit is contained in:
wish
2023-02-16 23:45:08 +11:00
parent 036c4adba1 cc76e689f6
commit 6791740a76
2 changed files with 55 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
server/channelserver/handlers_guild.go
View File

@@ -1819,59 +1819,51 @@ func handleMsgMhfGuildHuntdata(s *Session, p mhfpacket.MHFPacket) {
} }
type MessageBoardPost struct { type MessageBoardPost struct {
Type uint32 `db:"post_type"` ID uint32 `db:"id"`
StampID uint32 `db:"stamp_id"` StampID uint32 `db:"stamp_id"`
Title string `db:"title"` Title string `db:"title"`
Body string `db:"body"` Body string `db:"body"`
AuthorID uint32 `db:"author_id"` AuthorID uint32 `db:"author_id"`
Timestamp uint64 `db:"created_at"` Timestamp time.Time `db:"created_at"`
LikedBy string `db:"liked_by"` LikedBy string `db:"liked_by"`
} }
func handleMsgMhfEnumerateGuildMessageBoard(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfEnumerateGuildMessageBoard(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfEnumerateGuildMessageBoard) pkt := p.(*mhfpacket.MsgMhfEnumerateGuildMessageBoard)
guild, _ := GetGuildInfoByCharacterId(s, s.charID) guild, _ := GetGuildInfoByCharacterId(s, s.charID)
if pkt.BoardType == 1 {
msgs, err := s.server.db.Queryx("SELECT post_type, stamp_id, title, body, author_id, (EXTRACT(epoch FROM created_at)::int) as created_at, liked_by FROM guild_posts WHERE guild_id = $1 AND post_type = $2 ORDER BY created_at DESC", guild.ID, int(pkt.BoardType)) pkt.MaxPosts = 4
}
msgs, err := s.server.db.Queryx("SELECT id, stamp_id, title, body, author_id, created_at, liked_by FROM guild_posts WHERE guild_id = $1 AND post_type = $2 ORDER BY created_at DESC", guild.ID, int(pkt.BoardType))
if err != nil { if err != nil {
s.logger.Error("Failed to get guild messages from db", zap.Error(err)) s.logger.Error("Failed to get guild messages from db", zap.Error(err))
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4))
return return
} }
s.server.db.Exec("UPDATE characters SET guild_post_checked = $1 WHERE id = $2", time.Now(), s.charID)
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
noMsgs := true var postCount uint32
postCount := 0
for msgs.Next() { for msgs.Next() {
noMsgs = false
postCount++
postData := &MessageBoardPost{} postData := &MessageBoardPost{}
msgs.StructScan(&postData) err = msgs.StructScan(&postData)
if err != nil { if err != nil {
continue continue
} }
bf.WriteUint32(postData.Type) postCount++
bf.WriteUint32(postData.ID)
bf.WriteUint32(postData.AuthorID) bf.WriteUint32(postData.AuthorID)
bf.WriteUint64(postData.Timestamp) bf.WriteUint32(0)
likedBySlice := strings.Split(postData.LikedBy, ",") bf.WriteUint32(uint32(postData.Timestamp.Unix()))
if likedBySlice[0] == "" { bf.WriteUint32(uint32(stringsupport.CSVLength(postData.LikedBy)))
bf.WriteUint32(0)
} else {
bf.WriteUint32(uint32(len(likedBySlice)))
}
bf.WriteBool(stringsupport.CSVContains(postData.LikedBy, int(s.charID))) bf.WriteBool(stringsupport.CSVContains(postData.LikedBy, int(s.charID)))
bf.WriteUint32(postData.StampID) bf.WriteUint32(postData.StampID)
ps.Uint32(bf, postData.Title, true) ps.Uint32(bf, postData.Title, true)
ps.Uint32(bf, postData.Body, true) ps.Uint32(bf, postData.Body, true)
} }
if noMsgs { data := byteframe.NewByteFrame()
doAckBufSucceed(s, pkt.AckHandle, make([]byte, 4)) data.WriteUint32(postCount)
} else { data.WriteBytes(bf.Data())
data := byteframe.NewByteFrame() doAckBufSucceed(s, pkt.AckHandle, data.Data())
data.WriteUint32(uint32(postCount))
data.WriteBytes(bf.Data())
doAckBufSucceed(s, pkt.AckHandle, data.Data())
}
} }
func handleMsgMhfUpdateGuildMessageBoard(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfUpdateGuildMessageBoard(s *Session, p mhfpacket.MHFPacket) {
@@ -1886,98 +1878,58 @@ func handleMsgMhfUpdateGuildMessageBoard(s *Session, p mhfpacket.MHFPacket) {
doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleFail(s, pkt.AckHandle, make([]byte, 4))
return return
} }
var titleConv, bodyConv string
switch pkt.MessageOp { switch pkt.MessageOp {
case 0: // Create message case 0: // Create message
postType := bf.ReadUint32() // 0 = message, 1 = news postType := bf.ReadUint32() // 0 = message, 1 = news
stampId := bf.ReadUint32() stampID := bf.ReadUint32()
titleLength := bf.ReadUint32() titleLength := bf.ReadUint32()
bodyLength := bf.ReadUint32() bodyLength := bf.ReadUint32()
title := bf.ReadBytes(uint(titleLength)) title := stringsupport.SJISToUTF8(bf.ReadBytes(uint(titleLength)))
body := bf.ReadBytes(uint(bodyLength)) body := stringsupport.SJISToUTF8(bf.ReadBytes(uint(bodyLength)))
titleConv = stringsupport.SJISToUTF8(title) s.server.db.Exec("INSERT INTO guild_posts (guild_id, author_id, stamp_id, post_type, title, body) VALUES ($1, $2, $3, $4, $5, $6)", guild.ID, s.charID, stampID, postType, title, body)
bodyConv = stringsupport.SJISToUTF8(body) // TODO: if there are too many messages, purge excess
_, err := s.server.db.Exec("INSERT INTO guild_posts (guild_id, author_id, stamp_id, post_type, title, body) VALUES ($1, $2, $3, $4, $5, $6)", guild.ID, s.charID, int(stampId), int(postType), titleConv, bodyConv)
if err != nil {
s.logger.Error("Failed to add new guild message to db", zap.Error(err))
}
/* TODO: if there are too many messages, purge excess
_, err = s.server.db.Exec("")
if err != nil {
s.logger.Fatal("Failed to remove excess guild messages from db", zap.Error(err))
}
*/
case 1: // Delete message case 1: // Delete message
postType := bf.ReadUint32() postID := bf.ReadUint32()
timestamp := bf.ReadUint64() s.server.db.Exec("DELETE FROM guild_posts WHERE id = $1", postID)
_, err := s.server.db.Exec("DELETE FROM guild_posts WHERE post_type = $1 AND (EXTRACT(epoch FROM created_at)::int) = $2 AND guild_id = $3", int(postType), int(timestamp), guild.ID)
if err != nil {
s.logger.Error("Failed to delete guild message from db", zap.Error(err))
}
case 2: // Update message case 2: // Update message
postType := bf.ReadUint32() postID := bf.ReadUint32()
timestamp := bf.ReadUint64() bf.ReadBytes(8)
titleLength := bf.ReadUint32() titleLength := bf.ReadUint32()
bodyLength := bf.ReadUint32() bodyLength := bf.ReadUint32()
title := bf.ReadBytes(uint(titleLength)) title := stringsupport.SJISToUTF8(bf.ReadBytes(uint(titleLength)))
body := bf.ReadBytes(uint(bodyLength)) body := stringsupport.SJISToUTF8(bf.ReadBytes(uint(bodyLength)))
titleConv = stringsupport.SJISToUTF8(title) s.server.db.Exec("UPDATE guild_posts SET title = $1, body = $2 WHERE id = $3", title, body, postID)
bodyConv = stringsupport.SJISToUTF8(body)
_, err := s.server.db.Exec("UPDATE guild_posts SET title = $1, body = $2 WHERE post_type = $3 AND (EXTRACT(epoch FROM created_at)::int) = $4 AND guild_id = $5", titleConv, bodyConv, int(postType), int(timestamp), guild.ID)
if err != nil {
s.logger.Error("Failed to update guild message in db", zap.Error(err))
}
case 3: // Update stamp case 3: // Update stamp
postType := bf.ReadUint32() postID := bf.ReadUint32()
timestamp := bf.ReadUint64() bf.ReadBytes(8)
stampId := bf.ReadUint32() stampID := bf.ReadUint32()
_, err := s.server.db.Exec("UPDATE guild_posts SET stamp_id = $1 WHERE post_type = $2 AND (EXTRACT(epoch FROM created_at)::int) = $3 AND guild_id = $4", int(stampId), int(postType), int(timestamp), guild.ID) s.server.db.Exec("UPDATE guild_posts SET stamp_id = $1 WHERE id = $2", stampID, postID)
if err != nil {
s.logger.Error("Failed to update guild message stamp in db", zap.Error(err))
}
case 4: // Like message case 4: // Like message
postType := bf.ReadUint32() postID := bf.ReadUint32()
timestamp := bf.ReadUint64() bf.ReadBytes(8)
likeState := bf.ReadBool() likeState := bf.ReadBool()
var likedBy string var likedBy string
err := s.server.db.QueryRow("SELECT liked_by FROM guild_posts WHERE post_type = $1 AND (EXTRACT(epoch FROM created_at)::int) = $2 AND guild_id = $3", int(postType), int(timestamp), guild.ID).Scan(&likedBy) err := s.server.db.QueryRow("SELECT liked_by FROM guild_posts WHERE id = $1", postID).Scan(&likedBy)
if err != nil { if err != nil {
s.logger.Error("Failed to get guild message like data from db", zap.Error(err)) s.logger.Error("Failed to get guild message like data from db", zap.Error(err))
} else { } else {
if likeState { if likeState {
likedBy = stringsupport.CSVAdd(likedBy, int(s.charID)) likedBy = stringsupport.CSVAdd(likedBy, int(s.charID))
_, err := s.server.db.Exec("UPDATE guild_posts SET liked_by = $1 WHERE post_type = $2 AND (EXTRACT(epoch FROM created_at)::int) = $3 AND guild_id = $4", likedBy, int(postType), int(timestamp), guild.ID) s.server.db.Exec("UPDATE guild_posts SET liked_by = $1 WHERE id = $2", likedBy, postID)
if err != nil {
s.logger.Error("Failed to like guild message in db", zap.Error(err))
}
} else { } else {
likedBy = stringsupport.CSVRemove(likedBy, int(s.charID)) likedBy = stringsupport.CSVRemove(likedBy, int(s.charID))
_, err := s.server.db.Exec("UPDATE guild_posts SET liked_by = $1 WHERE post_type = $2 AND (EXTRACT(epoch FROM created_at)::int) = $3 AND guild_id = $4", likedBy, int(postType), int(timestamp), guild.ID) s.server.db.Exec("UPDATE guild_posts SET liked_by = $1 WHERE id = $2", likedBy, postID)
if err != nil {
s.logger.Error("Failed to unlike guild message in db", zap.Error(err))
}
} }
} }
case 5: // Check for new messages case 5: // Check for new messages
var timeChecked int var timeChecked time.Time
var newPosts int var newPosts int
err := s.server.db.QueryRow("SELECT (EXTRACT(epoch FROM guild_post_checked)::int) FROM characters WHERE id = $1", s.charID).Scan(&timeChecked) err := s.server.db.QueryRow("SELECT guild_post_checked FROM characters WHERE id = $1", s.charID).Scan(&timeChecked)
if err != nil { if err == nil {
s.logger.Error("Failed to get last guild post check timestamp from db", zap.Error(err)) s.server.db.QueryRow("SELECT COUNT(*) FROM guild_posts WHERE guild_id = $1 AND (EXTRACT(epoch FROM created_at)::int) > $2", guild.ID, timeChecked.Unix()).Scan(&newPosts)
} else { if newPosts > 0 {
_, err = s.server.db.Exec("UPDATE characters SET guild_post_checked = $1 WHERE id = $2", time.Now(), s.charID) doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x01})
if err != nil { return
s.logger.Error("Failed to update guild post check timestamp in db", zap.Error(err))
} else {
err = s.server.db.QueryRow("SELECT COUNT(*) FROM guild_posts WHERE guild_id = $1 AND (EXTRACT(epoch FROM created_at)::int) > $2 AND author_id != $3", guild.ID, timeChecked, s.charID).Scan(&newPosts)
if err != nil {
s.logger.Error("Failed to check for new guild posts in db", zap.Error(err))
} else {
if newPosts > 0 {
doAckSimpleSucceed(s, pkt.AckHandle, []byte{0x00, 0x00, 0x00, 0x01})
return
}
}
} }
} }
} }

5
server/channelserver/handlers_guild_tresure.go
View File

@@ -124,7 +124,10 @@ func treasureHuntUnregister(s *Session) {
} }
var huntID int var huntID int
var hunters string var hunters string
rows, _ := s.server.db.Queryx("SELECT id, hunters FROM guild_hunts WHERE guild_id=$1", guild.ID) rows, err := s.server.db.Queryx("SELECT id, hunters FROM guild_hunts WHERE guild_id=$1", guild.ID)
if err != nil {
return
}
for rows.Next() { for rows.Next() {
rows.Scan(&huntID, &hunters) rows.Scan(&huntID, &hunters)
hunters = stringsupport.CSVRemove(hunters, int(s.charID)) hunters = stringsupport.CSVRemove(hunters, int(s.charID))