Skip to content

Commit

Permalink
Adapt go-toxcore-c to new conferences state change callback.
Browse files Browse the repository at this point in the history
  • Loading branch information
iphydf committed Feb 9, 2018
1 parent 178bb61 commit 719ec67
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 17 deletions.
12 changes: 3 additions & 9 deletions const.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,20 +54,14 @@ const (
type GroupchatType int

const (
GROUPCHAT_TYPE_TEXT = uint8(C.TOX_CONFERENCE_TYPE_TEXT)
GROUPCHAT_TYPE_AV = uint8(C.TOX_CONFERENCE_TYPE_AV)
CONFERENCE_TYPE_TEXT = int(C.TOX_CONFERENCE_TYPE_TEXT)
CONFERENCE_TYPE_AV = int(C.TOX_CONFERENCE_TYPE_AV)
CONFERENCE_TYPE_TEXT = uint8(C.TOX_CONFERENCE_TYPE_TEXT)
CONFERENCE_TYPE_AV = uint8(C.TOX_CONFERENCE_TYPE_AV)
)

type ChatChangeType int

const (
CHAT_CHANGE_PEER_ADD = uint8(C.TOX_CONFERENCE_STATE_CHANGE_PEER_JOIN)
CHAT_CHANGE_PEER_DEL = uint8(C.TOX_CONFERENCE_STATE_CHANGE_PEER_EXIT)
CHAT_CHANGE_PEER_NAME = uint8(C.TOX_CONFERENCE_STATE_CHANGE_PEER_NAME_CHANGE)
CONFERENCE_STATE_CHANGE_PEER_JOIN = int(C.TOX_CONFERENCE_STATE_CHANGE_PEER_JOIN)
CONFERENCE_STATE_CHANGE_PEER_EXIT = int(C.TOX_CONFERENCE_STATE_CHANGE_PEER_EXIT)
CONFERENCE_STATE_CHANGE_LIST_CHANGED = int(C.TOX_CONFERENCE_STATE_CHANGE_LIST_CHANGED)
CONFERENCE_STATE_CHANGE_PEER_NAME_CHANGE = int(C.TOX_CONFERENCE_STATE_CHANGE_PEER_NAME_CHANGE)
)

Expand Down
16 changes: 8 additions & 8 deletions tox_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -623,8 +623,8 @@ func TestGroup(t *testing.T) {
if err != nil {
t.Error(err)
}
if uint8(gtype) != GROUPCHAT_TYPE_TEXT {
t.Error(gtype, GROUPCHAT_TYPE_TEXT)
if uint8(gtype) != CONFERENCE_TYPE_TEXT {
t.Error(gtype, CONFERENCE_TYPE_TEXT)
}
if t1.t.GroupNumberPeers(gn) != 1 {
t.Error(1)
Expand Down Expand Up @@ -693,14 +693,14 @@ func TestGroup(t *testing.T) {
t1.t.FriendAddNorequest(friendId)
}, nil)

t1.t.CallbackGroupInvite(func(_ *Tox, friendNumber uint32, itype uint8, data string, ud interface{}) {
t1.t.CallbackConferenceInvite(func(_ *Tox, friendNumber uint32, itype uint8, data string, ud interface{}) {
switch itype {
case GROUPCHAT_TYPE_TEXT:
case CONFERENCE_TYPE_TEXT:
_, err := t1.t.JoinGroupChat(friendNumber, data)
if err != nil {
t.Error(err)
}
case GROUPCHAT_TYPE_AV:
case CONFERENCE_TYPE_AV:
_, err := t1.t.JoinAVGroupChat(friendNumber, data)
if err != nil {
t.Error(err)
Expand Down Expand Up @@ -778,11 +778,11 @@ func TestGroup(t *testing.T) {
t1.t.FriendAddNorequest(friendId)
}, nil)

t1.t.CallbackGroupInvite(func(_ *Tox, friendNumber uint32, itype uint8, data string, ud interface{}) {
t1.t.CallbackConferenceInvite(func(_ *Tox, friendNumber uint32, itype uint8, data string, ud interface{}) {
switch itype {
case GROUPCHAT_TYPE_TEXT:
case CONFERENCE_TYPE_TEXT:
t1.t.JoinGroupChat(friendNumber, data)
case GROUPCHAT_TYPE_AV:
case CONFERENCE_TYPE_AV:
t1.t.JoinAVGroupChat(friendNumber, data)
}
}, nil)
Expand Down

0 comments on commit 719ec67

Please sign in to comment.