synced/tinode-chat
1
0
Fork 0
mirror of https://github.com/tinode/chat.git synced 2025-03-14 10:05:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes for handling nil private & public

Browse Source
This commit is contained in:
Gene Sokolov
2015-11-13 11:51:58 -08:00
parent 8884e648a2
commit 26409b1391
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/datamodel.go
View File

@ -291,7 +291,7 @@ type ClientComMessage struct {
timestamp time.Time
}
// *********************************************************
/////////////////////////////////////////////////////////////
// Server to client messages
type MsgLastSeenInfo struct {

12
server/hub.go
View File

@ -305,8 +305,9 @@ func topicInit(sreg *sessionJoin, h *Hub) {
var userData perUserData
if sreg.pkt.Init != nil {
if sreg.pkt.Init != nil && !isNullValue(sreg.pkt.Init.Private) {
// t.public is not used for p2p topics since each user get a different public
userData.private = sreg.pkt.Init.Private
// Init.DefaultAcs and Init.Public are ignored for p2p topics
}
@ -365,7 +366,6 @@ func topicInit(sreg *sessionJoin, h *Hub) {
Private: nil}
user2.SetPublic(users[u2].Public)
// CreateP2P will set user.Public
err = store.Topics.CreateP2P(t.appid, user1, user2)
if err != nil {
log.Println("hub: databse error in creating subscriptions '" + t.name + "' (" + err.Error() + ")")
@ -462,8 +462,12 @@ func topicInit(sreg *sessionJoin, h *Hub) {
// User sent initialization parameters
if sreg.pkt.Init != nil {
t.public = sreg.pkt.Init.Public
userData.private = sreg.pkt.Init.Private
if !isNullValue(sreg.pkt.Init.Public) {
t.public = sreg.pkt.Init.Public
}
if !isNullValue(sreg.pkt.Init.Private) {
userData.private = sreg.pkt.Init.Private
}
// set default access
if sreg.pkt.Init.DefaultAcs != nil {

2
server/topic.go
View File

@ -352,7 +352,7 @@ func (t *Topic) subCommonReply(h *Hub, sess *Session, pkt *MsgClientSub, sendInf
mode = pkt.Sub.Mode
}
if pkt.Init != nil {
if pkt.Init != nil && !isNullValue(pkt.Init.Private) {
private = pkt.Init.Private
}