Skip to content

Add support for clientLibVersion >= 194 for message sending in match #602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luskaner merged 1 commit into from
Aug 9, 2026
Merged

Add support for clientLibVersion >= 194 for message sending in match #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions server/internal/models/advertisement.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ type Advertisement interface {
GetIp() string
UnsafeGetHostId() int32
GetPeers() *i.SafeOrderedMap[int32, Peer]
MakeMessage(broadcast bool, content string, typeId uint8, sender User, receivers []User) Message
MakeMessage(broadcast bool, content string, typeId uint8, metadata string, sender User, receivers []User) Message
StartObserving(userId int32)
StopObserving(userId int32)
EncodePeers() []i.A
Expand Down Expand Up @@ -327,7 +327,7 @@ func (advs *MainAdvertisements) Store(advFrom *shared.AdvertisementHostRequest,
return storedAdv
}

func (adv *MainAdvertisement) MakeMessage(broadcast bool, content string, typeId uint8, sender User, receivers []User) Message {
func (adv *MainAdvertisement) MakeMessage(broadcast bool, content string, typeId uint8, metadata string, sender User, receivers []User) Message {
return &MainMessage{
advertisementId: adv.GetId(),
time: time.Now().UTC().Unix(),
Expand All @@ -336,6 +336,7 @@ func (adv *MainAdvertisement) MakeMessage(broadcast bool, content string, typeId
typ: typeId,
sender: sender,
receivers: receivers,
metadata: metadata,
}
}

Expand Down
23 changes: 17 additions & 6 deletions server/internal/models/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,20 @@ type Message interface {
GetSender() User
GetReceivers() []User
GetAdvertisementId() int32
Encode() i.A
GetMetadata() string
Encode(clientLibVersion uint16) i.A
}

type MainMessage struct {
advertisementId int32
time int64
broadcast bool
content string
typ uint8
sender User
receivers []User
// Only used for clientLibVersion >= 194, json encoded
metadata string
typ uint8
sender User
receivers []User
}

func (message *MainMessage) GetTime() int64 {
Expand Down Expand Up @@ -53,12 +56,20 @@ func (message *MainMessage) GetAdvertisementId() int32 {
return message.advertisementId
}

func (message *MainMessage) Encode() i.A {
return i.A{
func (message *MainMessage) GetMetadata() string {
return message.metadata
}

func (message *MainMessage) Encode(clientLibVersion uint16) i.A {
msg := i.A{
message.sender.GetId(),
message.content,
message.content,
message.typ,
message.advertisementId,
}
if clientLibVersion >= 194 {
msg = append(msg, message.metadata)
}
return msg
}
5 changes: 3 additions & 2 deletions server/internal/routes/game/party/sendMatchChat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ type request struct {
MatchID int32 `schema:"match_id"`
Broadcast bool `schema:"broadcast"`
Message string `schema:"message"`
Metadata string `schema:"metadata"`
}

type profileIds struct {
Expand Down Expand Up @@ -86,11 +87,11 @@ func SendMatchChat(w http.ResponseWriter, r *http.Request) {
req.Broadcast,
req.Message,
req.MessageTypeID,
req.Metadata,
currentUser,
receivers,
)

messageEncoded := message.Encode()
sessions := g.Sessions()
var receiverSession models.Session
for _, receiver := range receivers {
Expand All @@ -101,7 +102,7 @@ func SendMatchChat(w http.ResponseWriter, r *http.Request) {
wss.SendOrStoreMessage(
receiverSession,
"MatchReceivedChatMessage",
messageEncoded,
message.Encode(receiverSession.GetClientLibVersion()),
)
}
i.JSON(&w, i.A{0})
Expand Down
Loading