Updated with upstream

1 files changed, 9 insertions, 8 deletions

diff --git a/testing/irc_syncbot.c b/testing/irc_syncbot.c
index f7486115..b879e4eb 100644
--- a/testing/irc_syncbot.c
+++ b/testing/irc_syncbot.c
@@ -89,7 +89,8 @@ static void callback_group_invite(Tox *tox, int fid, uint8_t type, const uint8_t
         current_group = tox_join_groupchat(tox, fid, data, length);
 }
 
-void callback_friend_message(Tox *tox, int fid, const uint8_t *message, uint16_t length, void *userdata)
+void callback_friend_message(Tox *tox, uint32_t fid, TOX_MESSAGE_TYPE type, const uint8_t *message, size_t length,
+                             void *userdata)
 {
     if (length == 1 && *message == 'c') {
         if (tox_del_groupchat(tox, current_group) == 0)
@@ -203,7 +204,7 @@ void send_irc_group(Tox *tox, uint8_t *msg, uint16_t len)
 
 Tox *init_tox(int argc, char *argv[])
 {
-    uint8_t ipv6enabled = TOX_ENABLE_IPV6_DEFAULT; /* x */
+    uint8_t ipv6enabled = 1; /* x */
     int argvoffset = cmdline_parsefor_ipv46(argc, argv, &ipv6enabled);
 
     if (argvoffset < 0)
@@ -215,12 +216,12 @@ Tox *init_tox(int argc, char *argv[])
         exit(0);
     }
 
-    Tox *tox = tox_new(0);
+    Tox *tox = tox_new(0, 0, 0, 0);
 
     if (!tox)
         exit(1);
 
-    tox_set_name(tox, (uint8_t *)IRC_NAME, sizeof(IRC_NAME) - 1);
+    tox_self_set_name(tox, (uint8_t *)IRC_NAME, sizeof(IRC_NAME) - 1, 0);
     tox_callback_friend_message(tox, &callback_friend_message, 0);
     tox_callback_group_invite(tox, &callback_group_invite, 0);
     tox_callback_group_message(tox, &copy_groupmessage, 0);
@@ -228,7 +229,7 @@ Tox *init_tox(int argc, char *argv[])
 
     uint16_t port = atoi(argv[argvoffset + 2]);
     unsigned char *binary_string = hex_string_to_bin(argv[argvoffset + 3]);
-    int res = tox_bootstrap_from_address(tox, argv[argvoffset + 1], port, binary_string);
+    tox_bootstrap(tox, argv[argvoffset + 1], port, binary_string, 0);
     free(binary_string);
 
     char temp_id[128];
@@ -239,10 +240,10 @@ Tox *init_tox(int argc, char *argv[])
     }
 
     uint8_t *bin_id = hex_string_to_bin(temp_id);
-    int num = tox_add_friend(tox, bin_id, (uint8_t *)"Install Gentoo", sizeof("Install Gentoo") - 1);
+    uint32_t num = tox_friend_add(tox, bin_id, (uint8_t *)"Install Gentoo", sizeof("Install Gentoo") - 1, 0);
     free(bin_id);
 
-    if (num < 0) {
+    if (num == UINT32_MAX) {
         printf("\nSomething went wrong when adding friend.\n");
         exit(1);
     }
@@ -342,7 +343,7 @@ int main(int argc, char *argv[])
             }
         }
 
-        tox_do(tox);
+        tox_iterate(tox);
         usleep(1000 * 50);
     }