From bc5a923ef84be46687f6abe74d3fa51c3d869e4b Mon Sep 17 00:00:00 2001 From: Monet Lee Date: Thu, 25 Jul 2024 16:08:20 +0800 Subject: [PATCH 1/2] feat: dump sdk-core version to v3.8.0-rc14 --- go/export.go | 50 ++++++++++++++++++++++++++------------------------ go/go.mod | 5 +++-- go/go.sum | 10 ++++++---- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/go/export.go b/go/export.go index ce685a2..a6f06b9 100644 --- a/go/export.go +++ b/go/export.go @@ -907,30 +907,6 @@ func update_msg_sender_info(cCallback C.CB_S_I_S_S, operationID *C.char, nicknam open_im_sdk.UpdateMsgSenderInfo(baseCallback, C.GoString(operationID), C.GoString(nickname), C.GoString(faceURL)) } -//export subscribe_users_status -func subscribe_users_status(cCallback C.CB_S_I_S_S, operationID *C.char, userIDs *C.char) { - baseCallback := NewBaseCallback(cCallback, operationID) - open_im_sdk.SubscribeUsersStatus(baseCallback, C.GoString(operationID), C.GoString(userIDs)) -} - -//export unsubscribe_users_status -func unsubscribe_users_status(cCallback C.CB_S_I_S_S, operationID *C.char, userIDs *C.char) { - baseCallback := NewBaseCallback(cCallback, operationID) - open_im_sdk.UnsubscribeUsersStatus(baseCallback, C.GoString(operationID), C.GoString(userIDs)) -} - -//export get_subscribe_users_status -func get_subscribe_users_status(cCallback C.CB_S_I_S_S, operationID *C.char) { - baseCallback := NewBaseCallback(cCallback, operationID) - open_im_sdk.GetSubscribeUsersStatus(baseCallback, C.GoString(operationID)) -} - -//export get_user_status -func get_user_status(cCallback C.CB_S_I_S_S, operationID *C.char, userIDs *C.char) { - baseCallback := NewBaseCallback(cCallback, operationID) - open_im_sdk.GetUserStatus(baseCallback, C.GoString(operationID), C.GoString(userIDs)) -} - // =====================================================file=============================================== // @@ -1301,6 +1277,32 @@ func get_users_in_group(cCallback C.CB_S_I_S_S, operationID, cGroupID, userIDLis open_im_sdk.GetUsersInGroup(baseCallback, C.GoString(operationID), C.GoString(cGroupID), C.GoString(userIDList)) } +//export subscribe_users_status +func subscribe_users_status(cCallback C.CB_S_I_S_S, operationID *C.char, userIDs *C.char) { + baseCallback := NewBaseCallback(cCallback, operationID) + open_im_sdk.SubscribeUsersStatus(baseCallback, C.GoString(operationID), C.GoString(userIDs)) +} + +// =====================================================online=============================================== + +//export unsubscribe_users_status +func unsubscribe_users_status(cCallback C.CB_S_I_S_S, operationID *C.char, userIDs *C.char) { + baseCallback := NewBaseCallback(cCallback, operationID) + open_im_sdk.UnsubscribeUsersStatus(baseCallback, C.GoString(operationID), C.GoString(userIDs)) +} + +//export get_subscribe_users_status +func get_subscribe_users_status(cCallback C.CB_S_I_S_S, operationID *C.char) { + baseCallback := NewBaseCallback(cCallback, operationID) + open_im_sdk.GetSubscribeUsersStatus(baseCallback, C.GoString(operationID)) +} + +//export get_user_status +func get_user_status(cCallback C.CB_S_I_S_S, operationID *C.char, userIDs *C.char) { + baseCallback := NewBaseCallback(cCallback, operationID) + open_im_sdk.GetUserStatus(baseCallback, C.GoString(operationID), C.GoString(userIDs)) +} + func main() { } diff --git a/go/go.mod b/go/go.mod index ca34115..3da0c76 100644 --- a/go/go.mod +++ b/go/go.mod @@ -2,7 +2,7 @@ module github.com/openimsdk/openim-sdk-cpp go 1.21 -require github.com/openimsdk/openim-sdk-core/v3 v3.8.0-rc.9 +require github.com/openimsdk/openim-sdk-core/v3 v3.8.0-rc.14 require ( github.com/golang/protobuf v1.5.4 // indirect @@ -14,7 +14,7 @@ require ( github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible // indirect github.com/lestrrat-go/strftime v1.0.6 // indirect github.com/mattn/go-sqlite3 v1.14.22 // indirect - github.com/openimsdk/protocol v0.0.69-alpha.30 // indirect + github.com/openimsdk/protocol v0.0.69-alpha.37 // indirect github.com/openimsdk/tools v0.0.49-alpha.44 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect @@ -23,6 +23,7 @@ require ( go.uber.org/zap v1.24.0 // indirect golang.org/x/image v0.15.0 // indirect golang.org/x/net v0.22.0 // indirect + golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect diff --git a/go/go.sum b/go/go.sum index 9c6b8a3..9f5545d 100644 --- a/go/go.sum +++ b/go/go.sum @@ -25,10 +25,10 @@ github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205Ah github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw= github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/openimsdk/openim-sdk-core/v3 v3.8.0-rc.9 h1:bNK6wT2D+sSCly2nLTrl42SiEKJ0TnaE0S3CP0x48AY= -github.com/openimsdk/openim-sdk-core/v3 v3.8.0-rc.9/go.mod h1:1rkj0KD/MM83d/osgFyNEFfqca48zPp/sT/D2lOxUVY= -github.com/openimsdk/protocol v0.0.69-alpha.30 h1:OXzCIpDpIY/GI6h1SDYWN51OS9Xv/BcHaOwq8whPKqI= -github.com/openimsdk/protocol v0.0.69-alpha.30/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8= +github.com/openimsdk/openim-sdk-core/v3 v3.8.0-rc.14 h1:XKLN8hwFlvkxoaSq+TBXPjvJaIvQZPE2SRM1AO0jNkM= +github.com/openimsdk/openim-sdk-core/v3 v3.8.0-rc.14/go.mod h1:xTxXhe8I/8O6+barMoFVHKdjpuENioBcw2E9GCEmhrI= +github.com/openimsdk/protocol v0.0.69-alpha.37 h1:2gtDkippSBfbXIP++BEQsz4e+qjk86ddnh4b7p40/HY= +github.com/openimsdk/protocol v0.0.69-alpha.37/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8= github.com/openimsdk/tools v0.0.49-alpha.44 h1:anefO8hvQwJrYL+V4ifSge/CveZHIpjPeik6BgETuG8= github.com/openimsdk/tools v0.0.49-alpha.44/go.mod h1:zc0maZ2ohXlHd0ylY5JnCE8uqq/hslhcfcKa6iO5PCU= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= @@ -53,6 +53,8 @@ golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8= golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= From 50af49952d427ea075315a7c51cd1c792e4be0e8 Mon Sep 17 00:00:00 2001 From: Monet Lee Date: Thu, 25 Jul 2024 16:20:31 +0800 Subject: [PATCH 2/2] fix uncorrect comment location. --- go/export.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go/export.go b/go/export.go index a6f06b9..960b46d 100644 --- a/go/export.go +++ b/go/export.go @@ -1277,14 +1277,14 @@ func get_users_in_group(cCallback C.CB_S_I_S_S, operationID, cGroupID, userIDLis open_im_sdk.GetUsersInGroup(baseCallback, C.GoString(operationID), C.GoString(cGroupID), C.GoString(userIDList)) } +// =====================================================online=============================================== + //export subscribe_users_status func subscribe_users_status(cCallback C.CB_S_I_S_S, operationID *C.char, userIDs *C.char) { baseCallback := NewBaseCallback(cCallback, operationID) open_im_sdk.SubscribeUsersStatus(baseCallback, C.GoString(operationID), C.GoString(userIDs)) } -// =====================================================online=============================================== - //export unsubscribe_users_status func unsubscribe_users_status(cCallback C.CB_S_I_S_S, operationID *C.char, userIDs *C.char) { baseCallback := NewBaseCallback(cCallback, operationID)