X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/8a1512f9d2c16c8d811099fbb3a168cc2d7ec074..edcafb1c0673218fb7c17d96c81bb9db4f806e58:/hotline/transaction_handlers.go?ds=sidebyside diff --git a/hotline/transaction_handlers.go b/hotline/transaction_handlers.go index 3ecb6bd..2dc5e06 100644 --- a/hotline/transaction_handlers.go +++ b/hotline/transaction_handlers.go @@ -462,7 +462,7 @@ func HandleSetFileInfo(cc *ClientConn, t *Transaction) (res []Transaction, err e return res, err } if err != nil { - panic(err) + return res, err } } } @@ -1704,15 +1704,35 @@ func HandleInviteNewChat(cc *ClientConn, t *Transaction) (res []Transaction, err targetID := t.GetField(fieldUserID).Data newChatID := cc.Server.NewPrivateChat(cc) - res = append(res, - *NewTransaction( - tranInviteToChat, - &targetID, - NewField(fieldChatID, newChatID), - NewField(fieldUserName, cc.UserName), - NewField(fieldUserID, *cc.ID), - ), - ) + // Halcyon does not accept private chats. + + // Check if target user has "Refuse private chat" flag + binary.BigEndian.Uint16(targetID) + targetClient := cc.Server.Clients[binary.BigEndian.Uint16(targetID)] + + flagBitmap := big.NewInt(int64(binary.BigEndian.Uint16(targetClient.Flags))) + if flagBitmap.Bit(userFLagRefusePChat) == 1 { + res = append(res, + *NewTransaction( + tranServerMsg, + cc.ID, + NewField(fieldData, []byte(string(targetClient.UserName)+" does not accept private messages.")), + NewField(fieldUserName, targetClient.UserName), + NewField(fieldUserID, *targetClient.ID), + NewField(fieldOptions, []byte{0, 2}), + ), + ) + } else { + res = append(res, + *NewTransaction( + tranInviteToChat, + &targetID, + NewField(fieldChatID, newChatID), + NewField(fieldUserName, cc.UserName), + NewField(fieldUserID, *cc.ID), + ), + ) + } res = append(res, cc.NewReply(t,