Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-15 08:25:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

implement blacklist

Browse Source
This commit is contained in:
wish
2022-07-26 22:09:29 +10:00
parent 7155f2f336
commit 3ff2a5fa87
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Erupe/server/channelserver/handlers_clients.go
View File

@@ -51,9 +51,28 @@ func handleMsgSysEnumerateClient(s *Session, p mhfpacket.MHFPacket) {
func handleMsgMhfListMember(s *Session, p mhfpacket.MHFPacket) { func handleMsgMhfListMember(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfListMember) pkt := p.(*mhfpacket.MsgMhfListMember)
var csv string
var count uint32
resp := byteframe.NewByteFrame() resp := byteframe.NewByteFrame()
resp.WriteUint32(0) // Members count. (Unsure of what kind of members these actually are, guild, party, COG subscribers, etc.) resp.WriteUint32(0) // Blacklist count
err := s.server.db.QueryRow("SELECT blocked FROM characters WHERE id=$1", s.charID).Scan(&csv)
if err != nil {
panic(err)
}
cids := stringsupport.CSVElems(csv)
for _, cid := range cids {
var name string
err = s.server.db.QueryRow("SELECT name FROM characters WHERE id=$1", cid).Scan(&name)
if err != nil {
continue
}
count++
resp.WriteUint32(uint32(cid))
resp.WriteUint32(16)
resp.WriteBytes(stringsupport.PaddedString(name, 16, true))
}
resp.Seek(0, 0)
resp.WriteUint32(count)
doAckBufSucceed(s, pkt.AckHandle, resp.Data()) doAckBufSucceed(s, pkt.AckHandle, resp.Data())
} }
@@ -61,11 +80,16 @@ func handleMsgMhfOprMember(s *Session, p mhfpacket.MHFPacket) {
pkt := p.(*mhfpacket.MsgMhfOprMember) pkt := p.(*mhfpacket.MsgMhfOprMember)
var csv string var csv string
if pkt.Blacklist { if pkt.Blacklist {
if pkt.Operation { err := s.server.db.QueryRow("SELECT blocked FROM characters WHERE id=$1", s.charID).Scan(&csv)
// remove from blacklist if err != nil {
} else { panic(err)
// add to blacklist
} }
if pkt.Operation {
csv = stringsupport.CSVRemove(csv, int(pkt.CharID))
} else {
csv = stringsupport.CSVAdd(csv, int(pkt.CharID))
}
s.server.db.Exec("UPDATE characters SET blocked=$1 WHERE id=$2", csv, s.charID)
} else { // Friendlist } else { // Friendlist
err := s.server.db.QueryRow("SELECT friends FROM characters WHERE id=$1", s.charID).Scan(&csv) err := s.server.db.QueryRow("SELECT friends FROM characters WHERE id=$1", s.charID).Scan(&csv)
if err != nil { if err != nil {
@@ -76,7 +100,7 @@ func handleMsgMhfOprMember(s *Session, p mhfpacket.MHFPacket) {
} else { } else {
csv = stringsupport.CSVAdd(csv, int(pkt.CharID)) csv = stringsupport.CSVAdd(csv, int(pkt.CharID))
} }
_, _ = s.server.db.Exec("UPDATE characters SET friends=$1 WHERE id=$2", csv, s.charID) s.server.db.Exec("UPDATE characters SET friends=$1 WHERE id=$2", csv, s.charID)
} }
doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4)) doAckSimpleSucceed(s, pkt.AckHandle, make([]byte, 4))
} }

3
Erupe/tokensessions.sql
View File

@@ -23,6 +23,9 @@ ALTER TABLE IF EXISTS public.characters
ALTER TABLE IF EXISTS public.characters ALTER TABLE IF EXISTS public.characters
ADD COLUMN IF NOT EXISTS friends text NOT NULL DEFAULT ''; ADD COLUMN IF NOT EXISTS friends text NOT NULL DEFAULT '';
ALTER TABLE IF EXISTS public.characters
ADD COLUMN IF NOT EXISTS blocked text NOT NULL DEFAULT '';
ALTER TABLE IF EXISTS public.users ALTER TABLE IF EXISTS public.users
ADD COLUMN IF NOT EXISTS last_character int DEFAULT 0; ADD COLUMN IF NOT EXISTS last_character int DEFAULT 0;