X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/043c00da52efd5b7d9ef15750945ee55e6f78e7a..9c44621ee1ca9abfca79c593e80193afd9204c83:/hotline/transaction.go diff --git a/hotline/transaction.go b/hotline/transaction.go index 8d7d9ed..d9bbc22 100644 --- a/hotline/transaction.go +++ b/hotline/transaction.go @@ -5,69 +5,69 @@ import ( "encoding/binary" "errors" "fmt" - "github.com/jhalter/mobius/concat" "math/rand" + "slices" ) const ( - tranError = 0 - tranGetMsgs = 101 - tranNewMsg = 102 - tranOldPostNews = 103 - tranServerMsg = 104 - tranChatSend = 105 - tranChatMsg = 106 - tranLogin = 107 - tranSendInstantMsg = 108 - tranShowAgreement = 109 - tranDisconnectUser = 110 - // tranDisconnectMsg = 111 TODO: implement friendly disconnect - tranInviteNewChat = 112 - tranInviteToChat = 113 - tranRejectChatInvite = 114 - tranJoinChat = 115 - tranLeaveChat = 116 - tranNotifyChatChangeUser = 117 - tranNotifyChatDeleteUser = 118 - tranNotifyChatSubject = 119 - tranSetChatSubject = 120 - tranAgreed = 121 - tranServerBanner = 122 - tranGetFileNameList = 200 - tranDownloadFile = 202 - tranUploadFile = 203 - tranNewFolder = 205 - tranDeleteFile = 204 - tranGetFileInfo = 206 - tranSetFileInfo = 207 - tranMoveFile = 208 - tranMakeFileAlias = 209 - tranDownloadFldr = 210 - // tranDownloadInfo = 211 TODO: implement file transfer queue - tranDownloadBanner = 212 - tranUploadFldr = 213 - tranGetUserNameList = 300 - tranNotifyChangeUser = 301 - tranNotifyDeleteUser = 302 - tranGetClientInfoText = 303 - tranSetClientUserInfo = 304 - tranListUsers = 348 - tranUpdateUser = 349 - tranNewUser = 350 - tranDeleteUser = 351 - tranGetUser = 352 - tranSetUser = 353 - tranUserAccess = 354 - tranUserBroadcast = 355 - tranGetNewsCatNameList = 370 - tranGetNewsArtNameList = 371 - tranDelNewsItem = 380 - tranNewNewsFldr = 381 - tranNewNewsCat = 382 - tranGetNewsArtData = 400 - tranPostNewsArt = 410 - tranDelNewsArt = 411 - tranKeepAlive = 500 + TranError = 0 + TranGetMsgs = 101 + TranNewMsg = 102 + TranOldPostNews = 103 + TranServerMsg = 104 + TranChatSend = 105 + TranChatMsg = 106 + TranLogin = 107 + TranSendInstantMsg = 108 + TranShowAgreement = 109 + TranDisconnectUser = 110 + TranDisconnectMsg = 111 // TODO: implement server initiated friendly disconnect + TranInviteNewChat = 112 + TranInviteToChat = 113 + TranRejectChatInvite = 114 + TranJoinChat = 115 + TranLeaveChat = 116 + TranNotifyChatChangeUser = 117 + TranNotifyChatDeleteUser = 118 + TranNotifyChatSubject = 119 + TranSetChatSubject = 120 + TranAgreed = 121 + TranServerBanner = 122 + TranGetFileNameList = 200 + TranDownloadFile = 202 + TranUploadFile = 203 + TranNewFolder = 205 + TranDeleteFile = 204 + TranGetFileInfo = 206 + TranSetFileInfo = 207 + TranMoveFile = 208 + TranMakeFileAlias = 209 + TranDownloadFldr = 210 + TranDownloadInfo = 211 // TODO: implement file transfer queue + TranDownloadBanner = 212 + TranUploadFldr = 213 + TranGetUserNameList = 300 + TranNotifyChangeUser = 301 + TranNotifyDeleteUser = 302 + TranGetClientInfoText = 303 + TranSetClientUserInfo = 304 + TranListUsers = 348 + TranUpdateUser = 349 + TranNewUser = 350 + TranDeleteUser = 351 + TranGetUser = 352 + TranSetUser = 353 + TranUserAccess = 354 + TranUserBroadcast = 355 + TranGetNewsCatNameList = 370 + TranGetNewsArtNameList = 371 + TranDelNewsItem = 380 + TranNewNewsFldr = 381 + TranNewNewsCat = 382 + TranGetNewsArtData = 400 + TranPostNewsArt = 410 + TranDelNewsArt = 411 + TranKeepAlive = 500 ) type Transaction struct { @@ -203,7 +203,7 @@ func (t *Transaction) MarshalBinary() (data []byte, err error) { fieldPayload = append(fieldPayload, field.Payload()...) } - return concat.Slices( + return slices.Concat( []byte{t.Flags, t.IsReply}, t.Type, t.ID,