Complete old groupchat conversion to new API

6 files changed, 801 insertions, 485 deletions

diff --git a/toxcore/Makefile.inc b/toxcore/Makefile.inc
index cf1dfa2c..ff413a88 100644
--- a/toxcore/Makefile.inc
+++ b/toxcore/Makefile.inc
@@ -27,7 +27,6 @@ libtoxcore_la_SOURCES = ../toxcore/DHT.h \
                         ../toxcore/ping.c \
                         ../toxcore/tox.h \
                         ../toxcore/tox.c \
-                        ../toxcore/tox_group.c \
                         ../toxcore/util.h \
                         ../toxcore/util.c \
                         ../toxcore/group.h \
diff --git a/toxcore/group.c b/toxcore/group.c
index 55531ad3..b03dd6ed 100644
--- a/toxcore/group.c
+++ b/toxcore/group.c
@@ -452,9 +452,9 @@ static int addpeer(Group_Chats *g_c, int groupnumber, const uint8_t *real_pk, co
 
     add_to_closest(g_c, groupnumber, real_pk, temp_pk);
 
-    if (g_c->peer_namelistchange) {
-        g_c->peer_namelistchange(g_c->m, groupnumber, g->numpeers - 1, CHAT_CHANGE_PEER_ADD,
-                                 g_c->group_namelistchange_userdata);
+    if (g_c->group_namelistchange) {
+        g_c->group_namelistchange(g_c->m, groupnumber, g->numpeers - 1, CHAT_CHANGE_PEER_ADD,
+                                  g_c->group_namelistchange_userdata);
     }
 
     if (g->peer_on_join) {
@@ -542,8 +542,8 @@ static int delpeer(Group_Chats *g_c, int groupnumber, int peer_index)
         g->group = temp;
     }
 
-    if (g_c->peer_namelistchange) {
-        g_c->peer_namelistchange(g_c->m, groupnumber, peer_index, CHAT_CHANGE_PEER_DEL, g_c->group_namelistchange_userdata);
+    if (g_c->group_namelistchange) {
+        g_c->group_namelistchange(g_c->m, groupnumber, peer_index, CHAT_CHANGE_PEER_DEL, g_c->group_namelistchange_userdata);
     }
 
     if (g->peer_on_leave) {
@@ -578,8 +578,8 @@ static int setnick(Group_Chats *g_c, int groupnumber, int peer_index, const uint
 
     g->group[peer_index].nick_len = nick_len;
 
-    if (g_c->peer_namelistchange) {
-        g_c->peer_namelistchange(g_c->m, groupnumber, peer_index, CHAT_CHANGE_PEER_NAME, g_c->group_namelistchange_userdata);
+    if (g_c->group_namelistchange) {
+        g_c->group_namelistchange(g_c->m, groupnumber, peer_index, CHAT_CHANGE_PEER_NAME, g_c->group_namelistchange_userdata);
     }
 
     return 0;
@@ -748,7 +748,7 @@ static int group_kill_peer_send(const Group_Chats *g_c, int groupnumber, uint16_
 /* Delete a groupchat from the chats array.
  *
  * return 0 on success.
- * return -1 if failure.
+ * return -1 if groupnumber is invalid.
  */
 int del_groupchat(Group_Chats *g_c, int groupnumber)
 {
@@ -789,8 +789,9 @@ int del_groupchat(Group_Chats *g_c, int groupnumber)
 /* Copy the public key of peernumber who is in groupnumber to pk.
  * pk must be crypto_box_PUBLICKEYBYTES long.
  *
- * returns 0 on success
- * returns -1 on failure
+ * return 0 on success
+ * return -1 if groupnumber is invalid.
+ * return -2 if peernumber is invalid.
  */
 int group_peer_pubkey(const Group_Chats *g_c, int groupnumber, int peernumber, uint8_t *pk)
 {
@@ -801,13 +802,19 @@ int group_peer_pubkey(const Group_Chats *g_c, int groupnumber, int peernumber, u
     }
 
     if ((uint32_t)peernumber >= g->numpeers) {
-        return -1;
+        return -2;
     }
 
     memcpy(pk, g->group[peernumber].real_pk, crypto_box_PUBLICKEYBYTES);
     return 0;
 }
 
+/*
+ * Return the size of peernumber's name.
+ *
+ * return -1 if groupnumber is invalid.
+ * return -2 if peernumber is invalid.
+ */
 int group_peername_size(const Group_Chats *g_c, int groupnumber, int peernumber)
 {
     Group_c *g = get_group_c(g_c, groupnumber);
@@ -817,7 +824,7 @@ int group_peername_size(const Group_Chats *g_c, int groupnumber, int peernumber)
     }
 
     if ((uint32_t)peernumber >= g->numpeers) {
-        return -1;
+        return -2;
     }
 
     if (g->group[peernumber].nick_len == 0) {
@@ -831,7 +838,8 @@ int group_peername_size(const Group_Chats *g_c, int groupnumber, int peernumber)
  * name must be at least MAX_NAME_LENGTH long.
  *
  * return length of name if success
- * return -1 if failure
+ * return -1 if groupnumber is invalid.
+ * return -2 if peernumber is invalid.
  */
 int group_peername(const Group_Chats *g_c, int groupnumber, int peernumber, uint8_t *name)
 {
@@ -842,7 +850,7 @@ int group_peername(const Group_Chats *g_c, int groupnumber, int peernumber, uint
     }
 
     if ((uint32_t)peernumber >= g->numpeers) {
-        return -1;
+        return -2;
     }
 
     if (g->group[peernumber].nick_len == 0) {
@@ -883,7 +891,7 @@ int group_names(const Group_Chats *g_c, int groupnumber, uint8_t names[][MAX_NAM
 }
 
 /* Return the number of peers in the group chat on success.
- * return -1 on failure
+ * return -1 if groupnumber is invalid.
  */
 int group_number_peers(const Group_Chats *g_c, int groupnumber)
 {
@@ -897,22 +905,25 @@ int group_number_peers(const Group_Chats *g_c, int groupnumber)
 }
 
 /* return 1 if the peernumber corresponds to ours.
- * return 0 on failure.
+ * return 0 if the peernumber is not ours.
+ * return -1 if groupnumber is invalid.
+ * return -2 if peernumber is invalid.
+ * return -3 if we are not connected to the group chat.
  */
-unsigned int group_peernumber_is_ours(const Group_Chats *g_c, int groupnumber, int peernumber)
+int group_peernumber_is_ours(const Group_Chats *g_c, int groupnumber, int peernumber)
 {
     Group_c *g = get_group_c(g_c, groupnumber);
 
     if (!g) {
-        return 0;
+        return -1;
     }
 
-    if (g->status != GROUPCHAT_STATUS_CONNECTED) {
-        return 0;
+    if ((uint32_t)peernumber >= g->numpeers) {
+        return -2;
     }
 
-    if ((uint32_t)peernumber >= g->numpeers) {
-        return 0;
+    if (g->status != GROUPCHAT_STATUS_CONNECTED) {
+        return -3;
     }
 
     return g->peer_number == g->group[peernumber].peer_number;
@@ -982,9 +993,11 @@ static unsigned int send_lossy_group_peer(Friend_Connections *fr_c, int friendco
 #define INVITE_RESPONSE_PACKET_SIZE (1 + sizeof(uint16_t) * 2 + GROUP_IDENTIFIER_LENGTH)
 #define INVITE_RESPONSE_ID 1
 
-/* invite friendnumber to groupnumber
- * return 0 on success
- * return -1 on failure
+/* invite friendnumber to groupnumber.
+ *
+ * return 0 on success.
+ * return -1 if groupnumber is invalid.
+ * return -2 if invite packet failed to send.
  */
 int invite_friend(Group_Chats *g_c, int32_t friendnumber, int groupnumber)
 {
@@ -1005,7 +1018,7 @@ int invite_friend(Group_Chats *g_c, int32_t friendnumber, int groupnumber)
     }
 
     wipe_group_chat(g_c, groupnumber);
-    return -1;
+    return -2;
 }
 
 static unsigned int send_peer_query(Group_Chats *g_c, int friendcon_id, uint16_t group_num);
@@ -1014,8 +1027,13 @@ static unsigned int send_peer_query(Group_Chats *g_c, int friendcon_id, uint16_t
  *
  * expected_type is the groupchat type we expect the chat we are joining is.
  *
- * returns group number on success
- * returns -1 on failure.
+ * return group number on success.
+ * return -1 if data length is invalid.
+ * return -2 if group is not the expected type.
+ * return -3 if friendnumber is invalid.
+ * return -4 if client is already in this group.
+ * return -5 if group instance failed to initialize.
+ * return -6 if join packet fails to send.
  */
 int join_groupchat(Group_Chats *g_c, int32_t friendnumber, uint8_t expected_type, const uint8_t *data, uint16_t length)
 {
@@ -1024,23 +1042,23 @@ int join_groupchat(Group_Chats *g_c, int32_t friendnumber, uint8_t expected_type
     }
 
     if (data[sizeof(uint16_t)] != expected_type) {
-        return -1;
+        return -2;
     }
 
     int friendcon_id = getfriendcon_id(g_c->m, friendnumber);
 
     if (friendcon_id == -1) {
-        return -1;
+        return -3;
     }
 
     if (get_group_num(g_c, data + sizeof(uint16_t)) != -1) {
-        return -1;
+        return -4;
     }
 
     int groupnumber = create_group_chat(g_c);
 
     if (groupnumber == -1) {
-        return -1;
+        return -5;
     }
 
     Group_c *g = &g_c->chats[groupnumber];
@@ -1073,7 +1091,7 @@ int join_groupchat(Group_Chats *g_c, int32_t friendnumber, uint8_t expected_type
     }
 
     g->status = GROUPCHAT_STATUS_NONE;
-    return -1;
+    return -6;
 }
 
 /* Set the callback for group invites.
@@ -1094,8 +1112,7 @@ void g_callback_group_invite(Group_Chats *g_c, void (*function)(Messenger *m, ui
  *  Function(Group_Chats *g_c, int groupnumber, int friendgroupnumber, uint8_t * message, uint16_t length, void *userdata)
  */
 void g_callback_group_message(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, int, const uint8_t *,
-                              size_t,
-                              void *), void *userdata)
+                              size_t, void *), void *userdata)
 {
     g_c->message_callback = function;
     g_c->message_callback_userdata = userdata;
@@ -1121,7 +1138,7 @@ void group_lossy_packet_registerhandler(Group_Chats *g_c, uint8_t byte, int (*fu
 void g_callback_group_namelistchange(Group_Chats *g_c, void (*function)(Messenger *m, int, int, uint8_t, void *),
                                      void *userdata)
 {
-    g_c->peer_namelistchange = function;
+    g_c->group_namelistchange = function;
     g_c->group_namelistchange_userdata = userdata;
 }
 
@@ -1131,8 +1148,7 @@ void g_callback_group_namelistchange(Group_Chats *g_c, void (*function)(Messenge
  * if friendgroupnumber == -1, then author is unknown (e.g. initial joining the group)
  */
 void g_callback_group_title(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, const uint8_t *,
-                            size_t,
-                            void *), void *userdata)
+                            size_t, void *), void *userdata)
 {
     g_c->title_callback = function;
     g_c->title_callback_userdata = userdata;
@@ -1195,13 +1211,13 @@ int callback_groupchat_delete(Group_Chats *g_c, int groupnumber, void (*function
     return 0;
 }
 
-static unsigned int send_message_group(const Group_Chats *g_c, int groupnumber, uint8_t message_id, const uint8_t *data,
-                                       uint16_t len);
+static int send_message_group(const Group_Chats *g_c, int groupnumber, uint8_t message_id, const uint8_t *data,
+                              uint16_t len);
 
 #define GROUP_MESSAGE_PING_ID 0
 static int group_ping_send(const Group_Chats *g_c, int groupnumber)
 {
-    if (send_message_group(g_c, groupnumber, GROUP_MESSAGE_PING_ID, 0, 0)) {
+    if (send_message_group(g_c, groupnumber, GROUP_MESSAGE_PING_ID, 0, 0) > 0) {
         return 0;
     }
 
@@ -1224,7 +1240,7 @@ static int group_new_peer_send(const Group_Chats *g_c, int groupnumber, uint16_t
     memcpy(packet + sizeof(uint16_t), real_pk, crypto_box_PUBLICKEYBYTES);
     memcpy(packet + sizeof(uint16_t) + crypto_box_PUBLICKEYBYTES, temp_pk, crypto_box_PUBLICKEYBYTES);
 
-    if (send_message_group(g_c, groupnumber, GROUP_MESSAGE_NEW_PEER_ID, packet, sizeof(packet))) {
+    if (send_message_group(g_c, groupnumber, GROUP_MESSAGE_NEW_PEER_ID, packet, sizeof(packet)) > 0) {
         return 0;
     }
 
@@ -1245,7 +1261,7 @@ static int group_kill_peer_send(const Group_Chats *g_c, int groupnumber, uint16_
     peer_num = htons(peer_num);
     memcpy(packet, &peer_num, sizeof(uint16_t));
 
-    if (send_message_group(g_c, groupnumber, GROUP_MESSAGE_KILL_PEER_ID, packet, sizeof(packet))) {
+    if (send_message_group(g_c, groupnumber, GROUP_MESSAGE_KILL_PEER_ID, packet, sizeof(packet)) > 0) {
         return 0;
     }
 
@@ -1264,7 +1280,7 @@ static int group_name_send(const Group_Chats *g_c, int groupnumber, const uint8_
         return -1;
     }
 
-    if (send_message_group(g_c, groupnumber, GROUP_MESSAGE_NAME_ID, nick, nick_len)) {
+    if (send_message_group(g_c, groupnumber, GROUP_MESSAGE_NAME_ID, nick, nick_len) > 0) {
         return 0;
     }
 
@@ -1275,20 +1291,22 @@ static int group_name_send(const Group_Chats *g_c, int groupnumber, const uint8_
 
 /* set the group's title, limited to MAX_NAME_LENGTH
  * return 0 on success
- * return -1 on failure
+ * return -1 if groupnumber is invalid.
+ * return -2 if title is too long or empty.
+ * return -3 if packet fails to send.
  */
 int group_title_send(const Group_Chats *g_c, int groupnumber, const uint8_t *title, uint8_t title_len)
 {
-    if (title_len > MAX_NAME_LENGTH || title_len == 0) {
-        return -1;
-    }
-
     Group_c *g = get_group_c(g_c, groupnumber);
 
     if (!g) {
         return -1;
     }
 
+    if (title_len > MAX_NAME_LENGTH || title_len == 0) {
+        return -2;
+    }
+
     /* same as already set? */
     if (g->title_len == title_len && !memcmp(g->title, title, title_len)) {
         return 0;
@@ -1301,13 +1319,17 @@ int group_title_send(const Group_Chats *g_c, int groupnumber, const uint8_t *tit
         return 0;
     }
 
-    if (send_message_group(g_c, groupnumber, GROUP_MESSAGE_TITLE_ID, title, title_len)) {
+    if (send_message_group(g_c, groupnumber, GROUP_MESSAGE_TITLE_ID, title, title_len) > 0) {
         return 0;
     }
 
-    return -1;
+    return -3;
 }
 
+/* return the group's title size.
+ * return -1 of groupnumber is invalid.
+ * return -2 if title is too long or empty.
+ */
 int group_title_get_size(const Group_Chats *g_c, int groupnumber)
 {
     Group_c *g = get_group_c(g_c, groupnumber);
@@ -1317,17 +1339,18 @@ int group_title_get_size(const Group_Chats *g_c, int groupnumber)
     }
 
     if (g->title_len == 0 || g->title_len > MAX_NAME_LENGTH) {
-        return -1;
+        return -2;
     }
 
     return g->title_len;
 }
 
 /* Get group title from groupnumber and put it in title.
- * title needs to be a valid memory location with a max_length size of at least MAX_NAME_LENGTH (128) bytes.
+ * Title needs to be a valid memory location with a size of at least MAX_NAME_LENGTH (128) bytes.
  *
- *  return length of copied title if success.
- *  return -1 if failure.
+ * return length of copied title if success.
+ * return -1 if groupnumber is invalid.
+ * return -2 if title is too long or empty.
  */
 int group_title_get(const Group_Chats *g_c, int groupnumber, uint8_t *title)
 {
@@ -1338,7 +1361,7 @@ int group_title_get(const Group_Chats *g_c, int groupnumber, uint8_t *title)
     }
 
     if (g->title_len == 0 || g->title_len > MAX_NAME_LENGTH) {
-        return -1;
+        return -2;
     }
 
     memcpy(title, g->title, g->title_len);
@@ -1851,23 +1874,26 @@ static unsigned int send_lossy_all_close(const Group_Chats *g_c, int groupnumber
 /* Send data of len with message_id to groupnumber.
  *
  * return number of peers it was sent to on success.
- * return 0 on failure.
+ * return -1 if groupnumber is invalid.
+ * return -2 if message is too long.
+ * return -3 if we are not connected to the group.
+ * reutrn -4 if message failed to send.
  */
-static unsigned int send_message_group(const Group_Chats *g_c, int groupnumber, uint8_t message_id, const uint8_t *data,
-                                       uint16_t len)
+static int send_message_group(const Group_Chats *g_c, int groupnumber, uint8_t message_id, const uint8_t *data,
+                              uint16_t len)
 {
-    if (len > MAX_GROUP_MESSAGE_DATA_LEN) {
-        return 0;
-    }
-
     Group_c *g = get_group_c(g_c, groupnumber);
 
     if (!g) {
-        return 0;
+        return -1;
+    }
+
+    if (len > MAX_GROUP_MESSAGE_DATA_LEN) {
+        return -2;
     }
 
     if (g->status != GROUPCHAT_STATUS_CONNECTED) {
-        return 0;
+        return -3;
     }
 
     uint8_t packet[sizeof(uint16_t) + sizeof(uint32_t) + 1 + len];
@@ -1889,33 +1915,39 @@ static unsigned int send_message_group(const Group_Chats *g_c, int groupnumber,
         memcpy(packet + sizeof(uint16_t) + sizeof(uint32_t) + 1, data, len);
     }
 
-    return send_message_all_close(g_c, groupnumber, packet, sizeof(packet), -1);
+    unsigned int ret = send_message_all_close(g_c, groupnumber, packet, sizeof(packet), -1);
+
+    return (ret == 0) ? -4 : ret;
 }
 
 /* send a group message
  * return 0 on success
- * return -1 on failure
+ * see: send_message_group() for error codes.
  */
 int group_message_send(const Group_Chats *g_c, int groupnumber, const uint8_t *message, uint16_t length)
 {
-    if (send_message_group(g_c, groupnumber, PACKET_ID_MESSAGE, message, length)) {
+    int ret = send_message_group(g_c, groupnumber, PACKET_ID_MESSAGE, message, length);
+
+    if (ret > 0) {
         return 0;
     }
 
-    return -1;
+    return ret;
 }
 
 /* send a group action
  * return 0 on success
- * return -1 on failure
+ * see: send_message_group() for error codes.
  */
 int group_action_send(const Group_Chats *g_c, int groupnumber, const uint8_t *action, uint16_t length)
 {
-    if (send_message_group(g_c, groupnumber, PACKET_ID_ACTION, action, length)) {
+    int ret = send_message_group(g_c, groupnumber, PACKET_ID_ACTION, action, length);
+
+    if (ret > 0) {
         return 0;
     }
 
-    return -1;
+    return ret;
 }
 
 /* High level function to send custom lossy packets.
diff --git a/toxcore/group.h b/toxcore/group.h
index 6d278dde..fc7629f3 100644
--- a/toxcore/group.h
+++ b/toxcore/group.h
@@ -120,7 +120,7 @@ typedef struct {
     void *invite_callback_userdata;
     void (*message_callback)(Messenger *m, uint32_t, uint32_t, int, const uint8_t *, size_t, void *);
     void *message_callback_userdata;
-    void (*peer_namelistchange)(Messenger *m, int, int, uint8_t, void *);
+    void (*group_namelistchange)(Messenger *m, int, int, uint8_t, void *);
     void *group_namelistchange_userdata;
     void (*title_callback)(Messenger *m, uint32_t, uint32_t, const uint8_t *, size_t, void *);
     void *title_callback_userdata;
@@ -144,8 +144,7 @@ void g_callback_group_invite(Group_Chats *g_c, void (*function)(Messenger *m, ui
  *  Function(Group_Chats *g_c, int groupnumber, int friendgroupnumber, uint8_t * message, uint16_t length, void *userdata)
  */
 void g_callback_group_message(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, int, const uint8_t *,
-                              size_t,
-                              void *), void *userdata);
+                              size_t, void *), void *userdata);
 
 
 /* Set callback function for title changes.
@@ -154,8 +153,7 @@ void g_callback_group_message(Group_Chats *g_c, void (*function)(Messenger *m, u
  * if friendgroupnumber == -1, then author is unknown (e.g. initial joining the group)
  */
 void g_callback_group_title(Group_Chats *g_c, void (*function)(Messenger *m, uint32_t, uint32_t, const uint8_t *,
-                            size_t,
-                            void *), void *userdata);
+                            size_t, void *), void *userdata);
 
 /* Set callback function for peer name list changes.
  *
@@ -182,31 +180,41 @@ int add_groupchat(Group_Chats *g_c, uint8_t type);
 /* Delete a groupchat from the chats array.
  *
  * return 0 on success.
- * return -1 if failure.
+ * return -1 if groupnumber is invalid.
  */
 int del_groupchat(Group_Chats *g_c, int groupnumber);
 
 /* Copy the public key of peernumber who is in groupnumber to pk.
  * pk must be crypto_box_PUBLICKEYBYTES long.
  *
- * returns 0 on success
- * returns -1 on failure
+ * return 0 on success
+ * return -1 if groupnumber is invalid.
+ * return -2 if peernumber is invalid.
  */
 int group_peer_pubkey(const Group_Chats *g_c, int groupnumber, int peernumber, uint8_t *pk);
 
+/*
+ * Return the size of peernumber's name.
+ *
+ * return -1 if groupnumber is invalid.
+ * return -2 if peernumber is invalid.
+ */
 int group_peername_size(const Group_Chats *g_c, int groupnumber, int peernumber);
 
 /* Copy the name of peernumber who is in groupnumber to name.
  * name must be at least MAX_NAME_LENGTH long.
  *
  * return length of name if success
- * return -1 if failure
+ * return -1 if groupnumber is invalid.
+ * return -2 if peernumber is invalid.
  */
 int group_peername(const Group_Chats *g_c, int groupnumber, int peernumber, uint8_t *name);
 
 /* invite friendnumber to groupnumber
- * return 0 on success
- * return -1 on failure
+ *
+ * return 0 on success.
+ * return -1 if groupnumber is invalid.
+ * return -2 if invite packet failed to send.
  */
 int invite_friend(Group_Chats *g_c, int32_t friendnumber, int groupnumber);
 
@@ -214,49 +222,64 @@ int invite_friend(Group_Chats *g_c, int32_t friendnumber, int groupnumber);
  *
  * expected_type is the groupchat type we expect the chat we are joining is.
  *
- * returns group number on success
- * returns -1 on failure.
+ * return group number on success.
+ * return -1 if data length is invalid.
+ * return -2 if group is not the expected type.
+ * return -3 if friendnumber is invalid.
+ * return -4 if client is already in this group.
+ * return -5 if group instance failed to initialize.
+ * return -6 if join packet fails to send.
  */
 int join_groupchat(Group_Chats *g_c, int32_t friendnumber, uint8_t expected_type, const uint8_t *data, uint16_t length);
 
 /* send a group message
  * return 0 on success
- * return -1 on failure
+ * see: send_message_group() for error codes.
  */
 int group_message_send(const Group_Chats *g_c, int groupnumber, const uint8_t *message, uint16_t length);
 
 /* send a group action
  * return 0 on success
- * return -1 on failure
+ * see: send_message_group() for error codes.
  */
 int group_action_send(const Group_Chats *g_c, int groupnumber, const uint8_t *action, uint16_t length);
 
 /* set the group's title, limited to MAX_NAME_LENGTH
  * return 0 on success
- * return -1 on failure
+ * return -1 if groupnumber is invalid.
+ * return -2 if title is too long or empty.
+ * return -3 if packet fails to send.
  */
 int group_title_send(const Group_Chats *g_c, int groupnumber, const uint8_t *title, uint8_t title_len);
 
 
+/* return the group's title size.
+ * return -1 of groupnumber is invalid.
+ * return -2 if title is too long or empty.
+ */
 int group_title_get_size(const Group_Chats *g_c, int groupnumber);
 
 /* Get group title from groupnumber and put it in title.
- * title needs to be a valid memory location with a max_length size of at least MAX_NAME_LENGTH (128) bytes.
+ * Title needs to be a valid memory location with a size of at least MAX_NAME_LENGTH (128) bytes.
  *
- *  return length of copied title if success.
- *  return -1 if failure.
+ * return length of copied title if success.
+ * return -1 if groupnumber is invalid.
+ * return -2 if title is too long or empty.
  */
 int group_title_get(const Group_Chats *g_c, int groupnumber, uint8_t *title);
 
 /* Return the number of peers in the group chat on success.
- * return -1 on failure
+ * return -1 if groupnumber is invalid.
  */
 int group_number_peers(const Group_Chats *g_c, int groupnumber);
 
 /* return 1 if the peernumber corresponds to ours.
- * return 0 on failure.
+ * return 0 if the peernumber is not ours.
+ * return -1 if groupnumber is invalid.
+ * return -2 if peernumber is invalid.
+ * return -3 if we are not connected to the group chat.
  */
-unsigned int group_peernumber_is_ours(const Group_Chats *g_c, int groupnumber, int peernumber);
+int group_peernumber_is_ours(const Group_Chats *g_c, int groupnumber, int peernumber);
 
 /* List all the peers in the group chat.
  *
diff --git a/toxcore/tox.c b/toxcore/tox.c
index b9bab973..fa53f35e 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -1216,6 +1216,340 @@ void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *callback)
     callback_file_data(m, callback);
 }
 
+void tox_callback_conference_invite(Tox *tox, tox_conference_invite_cb *callback, void *user_data)
+{
+    Messenger *m = tox;
+    g_callback_group_invite(m->group_chat_object, (void (*)(Messenger * m, uint32_t, int, const uint8_t *, size_t,
+                            void *))callback, user_data);
+}
+
+void tox_callback_conference_message(Tox *tox, tox_conference_message_cb *callback, void *user_data)
+{
+    Messenger *m = tox;
+    g_callback_group_message(m->group_chat_object, (void (*)(Messenger * m, uint32_t, uint32_t, int, const uint8_t *,
+                             size_t, void *))callback, user_data);
+}
+
+void tox_callback_conference_title(Tox *tox, tox_conference_title_cb *callback, void *user_data)
+{
+    Messenger *m = tox;
+    g_callback_group_title(m->group_chat_object, callback, user_data);
+}
+
+void tox_callback_conference_namelist_change(Tox *tox, tox_conference_namelist_change_cb *callback, void *user_data)
+{
+    Messenger *m = tox;
+    g_callback_group_namelistchange(m->group_chat_object, (void (*)(struct Messenger *, int, int, uint8_t,
+                                    void *))callback, user_data);
+}
+
+uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE_NEW *error)
+{
+    Messenger *m = tox;
+    int ret = add_groupchat(m->group_chat_object, GROUPCHAT_TYPE_TEXT);
+
+    if (ret == -1) {
+        SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_NEW_INIT);
+        return UINT32_MAX;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_NEW_OK);
+    return ret;
+}
+
+bool tox_conference_delete(Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_DELETE *error)
+{
+    Messenger *m = tox;
+    int ret = del_groupchat(m->group_chat_object, conference_number);
+
+    if (ret == -1) {
+        SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_DELETE_CONFERENCE_NOT_FOUND);
+        return false;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_DELETE_OK);
+    return true;
+}
+
+uint32_t tox_conference_peer_count(const Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_PEER_QUERY *error)
+{
+    const Messenger *m = tox;
+    int ret = group_number_peers(m->group_chat_object, conference_number);
+
+    if (ret == -1) {
+        SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND);
+        return UINT32_MAX;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_OK);
+    return ret;
+}
+
+size_t tox_conference_peer_get_name_size(const Tox *tox, uint32_t conference_number, uint32_t peer_number,
+        TOX_ERR_CONFERENCE_PEER_QUERY *error)
+{
+    const Messenger *m = tox;
+    int ret = group_peername_size(m->group_chat_object, conference_number, peer_number);
+
+    switch (ret) {
+        case -1:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND);
+            return -1;
+
+        case -2:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_PEER_NOT_FOUND);
+            return -1;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_OK);
+    return ret;
+}
+
+bool tox_conference_peer_get_name(const Tox *tox, uint32_t conference_number, uint32_t peer_number, uint8_t *name,
+                                  TOX_ERR_CONFERENCE_PEER_QUERY *error)
+{
+    const Messenger *m = tox;
+    int ret = group_peername(m->group_chat_object, conference_number, peer_number, name);
+
+    switch (ret) {
+        case -1:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND);
+            return false;
+
+        case -2:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_PEER_NOT_FOUND);
+            return false;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_OK);
+    return true;
+}
+
+bool tox_conference_peer_get_public_key(const Tox *tox, uint32_t conference_number, uint32_t peer_number,
+                                        uint8_t *public_key, TOX_ERR_CONFERENCE_PEER_QUERY *error)
+{
+    const Messenger *m = tox;
+    int ret = group_peer_pubkey(m->group_chat_object, conference_number, peer_number, public_key);
+
+    switch (ret) {
+        case -1:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND);
+            return false;
+
+        case -2:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_PEER_NOT_FOUND);
+            return false;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_OK);
+    return true;
+}
+
+bool tox_conference_peer_number_is_ours(const Tox *tox, uint32_t conference_number, uint32_t peer_number,
+                                        TOX_ERR_CONFERENCE_PEER_QUERY *error)
+{
+    const Messenger *m = tox;
+    int ret = group_peernumber_is_ours(m->group_chat_object, conference_number, peer_number);
+
+    switch (ret) {
+        case -1:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND);
+            return false;
+
+        case -2:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_PEER_NOT_FOUND);
+            return false;
+
+        case -3:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_NO_CONNECTION);
+            return false;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_PEER_QUERY_OK);
+    return ret;
+}
+
+bool tox_conference_invite(Tox *tox, uint32_t friend_number, uint32_t conference_number,
+                           TOX_ERR_CONFERENCE_INVITE *error)
+{
+    Messenger *m = tox;
+    int ret = invite_friend(m->group_chat_object, friend_number, conference_number);
+
+    switch (ret) {
+        case -1:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_INVITE_CONFERENCE_NOT_FOUND);
+            return false;
+
+        case -2:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_INVITE_FAIL_SEND);
+            return false;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_INVITE_OK);
+    return true;
+}
+
+uint32_t tox_conference_join(Tox *tox, uint32_t friend_number, const uint8_t *cookie, size_t length,
+                             TOX_ERR_CONFERENCE_JOIN *error)
+{
+    Messenger *m = tox;
+    int ret = join_groupchat(m->group_chat_object, friend_number, GROUPCHAT_TYPE_TEXT, cookie, length);
+
+    switch (ret) {
+        case -1:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_JOIN_INVALID_LENGTH);
+            return UINT32_MAX;
+
+        case -2:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_JOIN_WRONG_TYPE);
+            return UINT32_MAX;
+
+        case -3:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_JOIN_FRIEND_NOT_FOUND);
+            return UINT32_MAX;
+
+        case -4:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_JOIN_DUPLICATE);
+            return UINT32_MAX;
+
+        case -5:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_JOIN_INIT_FAIL);
+            return UINT32_MAX;
+
+        case -6:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_JOIN_FAIL_SEND);
+            return UINT32_MAX;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_JOIN_OK);
+    return ret;
+}
+
+bool tox_conference_send_message(Tox *tox, uint32_t conference_number, TOX_MESSAGE_TYPE type, const uint8_t *message,
+                                 size_t length, TOX_ERR_CONFERENCE_SEND_MESSAGE *error)
+{
+    Messenger *m = tox;
+    int ret = 0;
+
+    if (type == TOX_MESSAGE_TYPE_NORMAL) {
+        ret = group_message_send(m->group_chat_object, conference_number, message, length);
+    } else {
+        ret = group_action_send(m->group_chat_object, conference_number, message, length);
+    }
+
+    switch (ret) {
+        case -1:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_SEND_MESSAGE_CONFERENCE_NOT_FOUND);
+            return false;
+
+        case -2:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_SEND_MESSAGE_TOO_LONG);
+            return false;
+
+        case -3:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_SEND_MESSAGE_NO_CONNECTION);
+            return false;
+
+        case -4:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_SEND_MESSAGE_FAIL_SEND);
+            return false;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_SEND_MESSAGE_OK);
+    return true;
+}
+
+size_t tox_conference_get_title_size(const Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_TITLE *error)
+{
+    const Messenger *m = tox;
+    int ret = group_title_get_size(m->group_chat_object, conference_number);
+
+    switch (ret) {
+        case -1:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_TITLE_CONFERENCE_NOT_FOUND);
+            return -1;
+
+        case -2:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_TITLE_INVALID_LENGTH);
+            return -1;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_TITLE_OK);
+    return ret;
+}
+
+bool tox_conference_get_title(const Tox *tox, uint32_t conference_number, uint8_t *title,
+                              TOX_ERR_CONFERENCE_TITLE *error)
+{
+    const Messenger *m = tox;
+    int ret = group_title_get(m->group_chat_object, conference_number, title);
+
+    switch (ret) {
+        case -1:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_TITLE_CONFERENCE_NOT_FOUND);
+            return false;
+
+        case -2:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_TITLE_INVALID_LENGTH);
+            return false;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_TITLE_OK);
+    return true;
+}
+
+bool tox_conference_set_title(Tox *tox, uint32_t conference_number, const uint8_t *title, size_t length,
+                              TOX_ERR_CONFERENCE_TITLE *error)
+{
+    Messenger *m = tox;
+    int ret = group_title_send(m->group_chat_object, conference_number, title, length);
+
+    switch (ret) {
+        case -1:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_TITLE_CONFERENCE_NOT_FOUND);
+            return false;
+
+        case -2:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_TITLE_INVALID_LENGTH);
+            return false;
+
+        case -3:
+            SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_TITLE_FAIL_SEND);
+            return false;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_TITLE_OK);
+    return true;
+}
+
+size_t tox_conference_get_chatlist_size(const Tox *tox)
+{
+    const Messenger *m = tox;
+    return count_chatlist(m->group_chat_object);
+}
+
+void tox_conference_get_chatlist(const Tox *tox, uint32_t *chatlist)
+{
+    const Messenger *m = tox;
+    size_t list_size = tox_conference_get_chatlist_size(tox);
+    copy_chatlist(m->group_chat_object, chatlist, list_size);
+}
+
+TOX_CONFERENCE_TYPE tox_conference_get_type(const Tox *tox, uint32_t conference_number,
+        TOX_ERR_CONFERENCE_GET_TYPE *error)
+{
+    const Messenger *m = tox;
+    int ret = group_get_type(m->group_chat_object, conference_number);
+
+    if (ret == -1) {
+        SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_GET_TYPE_CONFERENCE_NOT_FOUND);
+        return -1;
+    }
+
+    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_GET_TYPE_OK);
+    return ret;
+}
+
 static void set_custom_packet_error(int ret, TOX_ERR_FRIEND_CUSTOM_PACKET *error)
 {
     switch (ret) {
diff --git a/toxcore/tox.h b/toxcore/tox.h
index 7b04bb14..268ae779 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -344,7 +344,7 @@ typedef enum TOX_USER_STATUS {
 
 
 /**
- * Represents message types for tox_friend_send_message and group chat
+ * Represents message types for tox_friend_send_message and conference
  * messages.
  */
 typedef enum TOX_MESSAGE_TYPE {
@@ -2268,27 +2268,12 @@ void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *callback);
 
 /*******************************************************************************
  *
- * :: Group chat management
+ * :: Conference management
  *
  ******************************************************************************/
 
 
 
-typedef enum TOX_ERR_CONFERENCE {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_CONFERENCE_OK,
-
-    /**
-     * Some error occurred.
-     */
-    TOX_ERR_CONFERENCE_FAILURE,
-
-} TOX_ERR_CONFERENCE;
-
-
 /**
  * Conference types for the conference_invite event.
  */
@@ -2329,188 +2314,420 @@ typedef void tox_conference_invite_cb(Tox *tox, uint32_t friend_number, TOX_CONF
 void tox_callback_conference_invite(Tox *tox, tox_conference_invite_cb *callback, void *user_data);
 
 /**
- * TODO
+ * @param conference_number The conference number of the conference the message is intended for.
+ * @param peer_number The ID of the peer who sent the message.
+ * @param type The type of message (normal, action, ...).
+ * @param message The message data.
+ * @param length The length of the message.
  */
-typedef void tox_conference_message_cb(Tox *tox, uint32_t group_number, uint32_t peer_number, TOX_MESSAGE_TYPE type,
-                                       const uint8_t *message, size_t length, void *user_data);
+typedef void tox_conference_message_cb(Tox *tox, uint32_t conference_number, uint32_t peer_number,
+                                       TOX_MESSAGE_TYPE type, const uint8_t *message, size_t length, void *user_data);
 
 
 /**
  * Set the callback for the `conference_message` event. Pass NULL to unset.
  *
- * Set the callback for group messages.
+ * This event is triggered when the client receives a conference message.
  */
 void tox_callback_conference_message(Tox *tox, tox_conference_message_cb *callback, void *user_data);
 
 /**
- * TODO
+ * @param conference_number The conference number of the conference the title change is intended for.
+ * @param peer_number The ID of the peer who changed the title.
+ * @param title The title data.
+ * @param length The title length.
  */
-typedef void tox_conference_title_cb(Tox *tox, uint32_t group_number, uint32_t peer_number, const uint8_t *title,
+typedef void tox_conference_title_cb(Tox *tox, uint32_t conference_number, uint32_t peer_number, const uint8_t *title,
                                      size_t length, void *user_data);
 
 
 /**
  * Set the callback for the `conference_title` event. Pass NULL to unset.
  *
- * Set callback function for title changes.
+ * This event is triggered when a peer changes the conference title.
  *
- * if peer_number == UINT32_MAX, then author is unknown (e.g. initial joining the group)
+ * If peer_number == UINT32_MAX, then author is unknown (e.g. initial joining the conference).
  */
 void tox_callback_conference_title(Tox *tox, tox_conference_title_cb *callback, void *user_data);
 
-typedef enum TOX_CONFERENCE_CHANGE {
+/**
+ * Peer list state change types.
+ */
+typedef enum TOX_CONFERENCE_STATE_CHANGE {
 
     /**
-     * TODO: Generate doc
+     * A peer has joined the conference.
      */
-    TOX_CONFERENCE_CHANGE_PEER_ADD,
+    TOX_CONFERENCE_STATE_CHANGE_PEER_JOIN,
 
     /**
-     * TODO: Generate doc
+     * A peer has exited the conference.
      */
-    TOX_CONFERENCE_CHANGE_PEER_DEL,
+    TOX_CONFERENCE_STATE_CHANGE_PEER_EXIT,
 
     /**
-     * TODO: Generate doc
+     * A peer has changed their name.
      */
-    TOX_CONFERENCE_CHANGE_PEER_NAME,
+    TOX_CONFERENCE_STATE_CHANGE_PEER_NAME_CHANGE,
 
-} TOX_CONFERENCE_CHANGE;
+} TOX_CONFERENCE_STATE_CHANGE;
 
 
 /**
- * TODO
+ * @param conference_number The conference number of the conference the title change is intended for.
+ * @param peer_number The ID of the peer who changed the title.
+ * @param change The type of change (one of TOX_CONFERENCE_STATE_CHANGE).
  */
-typedef void tox_conference_namelist_change_cb(Tox *tox, uint32_t group_number, uint32_t peer_number,
-        TOX_CONFERENCE_CHANGE change, void *user_data);
+typedef void tox_conference_namelist_change_cb(Tox *tox, uint32_t conference_number, uint32_t peer_number,
+        TOX_CONFERENCE_STATE_CHANGE change, void *user_data);
 
 
 /**
  * Set the callback for the `conference_namelist_change` event. Pass NULL to unset.
  *
- * Set callback function for peer name list changes.
- *
- * It gets called every time the name list changes(new peer/name, deleted peer)
+ * This event is triggered when the peer list changes (name change, peer join, peer exit).
  */
 void tox_callback_conference_namelist_change(Tox *tox, tox_conference_namelist_change_cb *callback, void *user_data);
 
+typedef enum TOX_ERR_CONFERENCE_NEW {
+
+    /**
+     * The function returned successfully.
+     */
+    TOX_ERR_CONFERENCE_NEW_OK,
+
+    /**
+     * The conference instance failed to initialize.
+     */
+    TOX_ERR_CONFERENCE_NEW_INIT,
+
+} TOX_ERR_CONFERENCE_NEW;
+
+
 /**
- * Creates a new groupchat.
+ * Creates a new conference.
+ *
+ * This function creates a new text conference.
  *
- * @return the group number.
+ * @return conference number on success, or UINT32_MAX on failure.
  */
-uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE *error);
+uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE_NEW *error);
+
+typedef enum TOX_ERR_CONFERENCE_DELETE {
+
+    /**
+     * The function returned successfully.
+     */
+    TOX_ERR_CONFERENCE_DELETE_OK,
+
+    /**
+     * The conference number passed did not designate a valid conference.
+     */
+    TOX_ERR_CONFERENCE_DELETE_CONFERENCE_NOT_FOUND,
+
+} TOX_ERR_CONFERENCE_DELETE;
+
 
 /**
- * Delete a groupchat.
+ * This function deletes a conference.
+ *
+ * @param conference_number The conference number of the conference to be deleted.
  *
  * @return true on success.
  */
-bool tox_conference_delete(Tox *tox, uint32_t group_number, TOX_ERR_CONFERENCE *error);
+bool tox_conference_delete(Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_DELETE *error);
 
 /**
- * Return the number of peers in the group chat.
+ * Error codes for peer info queries.
  */
-uint32_t tox_conference_peer_count(const Tox *tox, uint32_t group_number, TOX_ERR_CONFERENCE *error);
+typedef enum TOX_ERR_CONFERENCE_PEER_QUERY {
+
+    /**
+     * The function returned successfully.
+     */
+    TOX_ERR_CONFERENCE_PEER_QUERY_OK,
+
+    /**
+     * The conference number passed did not designate a valid conference.
+     */
+    TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND,
+
+    /**
+     * The peer number passed did not designate a valid peer.
+     */
+    TOX_ERR_CONFERENCE_PEER_QUERY_PEER_NOT_FOUND,
+
+    /**
+     * The client is not connected to the conference.
+     */
+    TOX_ERR_CONFERENCE_PEER_QUERY_NO_CONNECTION,
+
+} TOX_ERR_CONFERENCE_PEER_QUERY;
 
-size_t tox_conference_peer_get_name_size(const Tox *tox, uint32_t group_number, uint32_t peer_number,
-        TOX_ERR_CONFERENCE *error);
 
 /**
- * Copy the name of peer_number who is in group_number to name.
+ * Return the number of peers in the conference. Return value is unspecified on failure.
+ */
+uint32_t tox_conference_peer_count(const Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_PEER_QUERY *error);
+
+/**
+ * Return the length of the peer's name. Return value is unspecified on failure.
+ */
+size_t tox_conference_peer_get_name_size(const Tox *tox, uint32_t conference_number, uint32_t peer_number,
+        TOX_ERR_CONFERENCE_PEER_QUERY *error);
+
+/**
+ * Copy the name of peer_number who is in conference_number to name.
  * name must be at least TOX_MAX_NAME_LENGTH long.
  *
- * return length of name if success
- * return -1 if failure
+ * @return true on success.
  */
-bool tox_conference_peer_get_name(const Tox *tox, uint32_t group_number, uint32_t peer_number, uint8_t *name,
-                                  TOX_ERR_CONFERENCE *error);
+bool tox_conference_peer_get_name(const Tox *tox, uint32_t conference_number, uint32_t peer_number, uint8_t *name,
+                                  TOX_ERR_CONFERENCE_PEER_QUERY *error);
 
 /**
- * Copy the public key of peer_number who is in group_number to public_key.
+ * Copy the public key of peer_number who is in conference_number to public_key.
  * public_key must be TOX_PUBLIC_KEY_SIZE long.
  *
- * returns 0 on success
- * returns -1 on failure
+ * @return true on success.
  */
-bool tox_conference_peer_get_public_key(const Tox *tox, uint32_t group_number, uint32_t peer_number,
-                                        uint8_t *public_key, TOX_ERR_CONFERENCE *error);
+bool tox_conference_peer_get_public_key(const Tox *tox, uint32_t conference_number, uint32_t peer_number,
+                                        uint8_t *public_key, TOX_ERR_CONFERENCE_PEER_QUERY *error);
 
 /**
- * Check if the current peer_number corresponds to ours.
- *
- * return 1 if the peer_number corresponds to ours.
- * return 0 on failure.
+ * Return true if passed peer_number corresponds to our own.
  */
-bool tox_conference_peer_number_is_ours(const Tox *tox, uint32_t group_number, uint32_t peer_number);
+bool tox_conference_peer_number_is_ours(const Tox *tox, uint32_t conference_number, uint32_t peer_number,
+                                        TOX_ERR_CONFERENCE_PEER_QUERY *error);
+
+typedef enum TOX_ERR_CONFERENCE_INVITE {
+
+    /**
+     * The function returned successfully.
+     */
+    TOX_ERR_CONFERENCE_INVITE_OK,
+
+    /**
+     * The conference number passed did not designate a valid conference.
+     */
+    TOX_ERR_CONFERENCE_INVITE_CONFERENCE_NOT_FOUND,
+
+    /**
+     * The invite packet failed to send.
+     */
+    TOX_ERR_CONFERENCE_INVITE_FAIL_SEND,
+
+} TOX_ERR_CONFERENCE_INVITE;
+
 
 /**
- * invite friend_number to group_number
- * return 0 on success
- * return -1 on failure
+ * Invites a friend to a conference.
+ *
+ * @param friend_number The friend number of the friend we want to invite.
+ * @param conference_number The conference number of the conference we want to invite the friend to.
+ *
+ * @return true on success.
  */
-bool tox_conference_invite(Tox *tox, uint32_t friend_number, uint32_t group_number, TOX_ERR_CONFERENCE *error);
+bool tox_conference_invite(Tox *tox, uint32_t friend_number, uint32_t conference_number,
+                           TOX_ERR_CONFERENCE_INVITE *error);
+
+typedef enum TOX_ERR_CONFERENCE_JOIN {
+
+    /**
+     * The function returned successfully.
+     */
+    TOX_ERR_CONFERENCE_JOIN_OK,
+
+    /**
+     * The cookie passed has an invalid length.
+     */
+    TOX_ERR_CONFERENCE_JOIN_INVALID_LENGTH,
+
+    /**
+     * The conference is not the expected type. This indicates an invalid cookie.
+     */
+    TOX_ERR_CONFERENCE_JOIN_WRONG_TYPE,
+
+    /**
+     * The friend number passed does not designate a valid friend.
+     */
+    TOX_ERR_CONFERENCE_JOIN_FRIEND_NOT_FOUND,
+
+    /**
+     * Client is already in this conference.
+     */
+    TOX_ERR_CONFERENCE_JOIN_DUPLICATE,
+
+    /**
+     * Conference instance failed to initialize.
+     */
+    TOX_ERR_CONFERENCE_JOIN_INIT_FAIL,
+
+    /**
+     * The join packet failed to send.
+     */
+    TOX_ERR_CONFERENCE_JOIN_FAIL_SEND,
+
+} TOX_ERR_CONFERENCE_JOIN;
+
 
 /**
- * Join a group (you need to have been invited first.) using cookie of length obtained
- * in the group invite callback.
+ * Joins a conference that the client has been invited to.
  *
- * returns group number on success
- * returns -1 on failure.
+ * @param friend_number The friend number of the friend who sent the invite.
+ * @param cookie Received via the `conference_invite` event.
+ * @param length The size of cookie.
+ *
+ * @return conference number on success, UINT32_MAX on failure.
  */
 uint32_t tox_conference_join(Tox *tox, uint32_t friend_number, const uint8_t *cookie, size_t length,
-                             TOX_ERR_CONFERENCE *error);
+                             TOX_ERR_CONFERENCE_JOIN *error);
+
+typedef enum TOX_ERR_CONFERENCE_SEND_MESSAGE {
+
+    /**
+     * The function returned successfully.
+     */
+    TOX_ERR_CONFERENCE_SEND_MESSAGE_OK,
+
+    /**
+     * The conference number passed did not designate a valid conference.
+     */
+    TOX_ERR_CONFERENCE_SEND_MESSAGE_CONFERENCE_NOT_FOUND,
+
+    /**
+     * The message is too long.
+     */
+    TOX_ERR_CONFERENCE_SEND_MESSAGE_TOO_LONG,
+
+    /**
+     * The client is not connected to the conference.
+     */
+    TOX_ERR_CONFERENCE_SEND_MESSAGE_NO_CONNECTION,
+
+    /**
+     * The message packet failed to send.
+     */
+    TOX_ERR_CONFERENCE_SEND_MESSAGE_FAIL_SEND,
+
+} TOX_ERR_CONFERENCE_SEND_MESSAGE;
+
 
 /**
- * send a group message
- * return 0 on success
- * return -1 on failure
+ * Send a text chat message to the conference.
+ *
+ * This function creates a conference message packet and pushes it into the send
+ * queue.
+ *
+ * The message length may not exceed TOX_MAX_MESSAGE_LENGTH. Larger messages
+ * must be split by the client and sent as separate messages. Other clients can
+ * then reassemble the fragments.
+ *
+ * @param conference_number The conference number of the conference the message is intended for.
+ * @param type Message type (normal, action, ...).
+ * @param message A non-NULL pointer to the first element of a byte array
+ *   containing the message text.
+ * @param length Length of the message to be sent.
+ *
+ * @return true on success.
  */
-bool tox_conference_send_message(Tox *tox, uint32_t group_number, TOX_MESSAGE_TYPE type, const uint8_t *message,
-                                 size_t length, TOX_ERR_CONFERENCE *error);
+bool tox_conference_send_message(Tox *tox, uint32_t conference_number, TOX_MESSAGE_TYPE type, const uint8_t *message,
+                                 size_t length, TOX_ERR_CONFERENCE_SEND_MESSAGE *error);
+
+typedef enum TOX_ERR_CONFERENCE_TITLE {
+
+    /**
+     * The function returned successfully.
+     */
+    TOX_ERR_CONFERENCE_TITLE_OK,
+
+    /**
+     * The conference number passed did not designate a valid conference.
+     */
+    TOX_ERR_CONFERENCE_TITLE_CONFERENCE_NOT_FOUND,
 
-size_t tox_conference_get_title_size(const Tox *tox, uint32_t group_number, TOX_ERR_CONFERENCE *error);
+    /**
+     * The title is too long or empty.
+     */
+    TOX_ERR_CONFERENCE_TITLE_INVALID_LENGTH,
+
+    /**
+     * The title packet failed to send.
+     */
+    TOX_ERR_CONFERENCE_TITLE_FAIL_SEND,
+
+} TOX_ERR_CONFERENCE_TITLE;
+
+
+/**
+ * Return the length of the conference title. Return value is unspecified on failure.
+ *
+ * The return value is equal to the `length` argument received by the last
+ * `conference_title` callback.
+ */
+size_t tox_conference_get_title_size(const Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_TITLE *error);
 
 /**
- * Get group title from group_number and put it in title.
- * title needs to be a valid memory location with a max_length size of at least MAX_NAME_LENGTH (128) bytes.
+ * Write the title designated by the given conference number to a byte array.
+ *
+ * Call tox_conference_get_title_size to determine the allocation size for the `title` parameter.
  *
- *  return length of copied title if success.
- *  return -1 if failure.
+ * The data written to `title` is equal to the data received by the last
+ * `conference_title` callback.
+ *
+ * @param title A valid memory region large enough to store the title.
+ *   If this parameter is NULL, this function has no effect.
+ *
+ * @return true on success.
  */
-bool tox_conference_get_title(const Tox *tox, uint32_t group_number, uint8_t *title, TOX_ERR_CONFERENCE *error);
+bool tox_conference_get_title(const Tox *tox, uint32_t conference_number, uint8_t *title,
+                              TOX_ERR_CONFERENCE_TITLE *error);
 
 /**
- * set the group's title, limited to MAX_NAME_LENGTH
- * return 0 on success
- * return -1 on failure
+ * Set the conference title and broadcast it to the rest of the conference.
+ *
+ * Title length cannot be longer than TOX_MAX_NAME_LENGTH.
+ *
+ * @return true on success.
  */
-bool tox_conference_set_title(Tox *tox, uint32_t group_number, const uint8_t *title, size_t length,
-                              TOX_ERR_CONFERENCE *error);
+bool tox_conference_set_title(Tox *tox, uint32_t conference_number, const uint8_t *title, size_t length,
+                              TOX_ERR_CONFERENCE_TITLE *error);
 
 /**
- * Return the number of chats in the instance m.
- * You should use this to determine how much memory to allocate
- * for copy_chatlist.
+ * Return the number of conferences in the Tox instance.
+ * This should be used to determine how much memory to allocate for `tox_conference_get_chatlist`.
  */
 size_t tox_conference_get_chatlist_size(const Tox *tox);
 
 /**
- * Copy a list of valid chat IDs into the array out_list.
- * If out_list is NULL, returns 0.
- * Otherwise, returns the number of elements copied.
- * If the array was too small, the contents
- * of out_list will be truncated to list_size.
+ * Copy a list of valid conference IDs into the array chatlist. Determine how much space
+ * to allocate for the array with the `tox_conference_get_chatlist_size` function.
+ *
+ * @return The number of elements copied to the array, or 0 if chatlist is set to NULL.
  */
 void tox_conference_get_chatlist(const Tox *tox, uint32_t *chatlist);
 
 /**
- * return the type of groupchat (TOX_CONFERENCE_TYPE) that group_number is.
- *
- * return -1 on failure.
- * return type on success.
+ * Returns the type of conference (TOX_CONFERENCE_TYPE) that conference_number is. Return value is
+ * unspecified on failure.
  */
-TOX_CONFERENCE_TYPE tox_conference_get_type(const Tox *tox, uint32_t group_number, TOX_ERR_CONFERENCE *error);
+typedef enum TOX_ERR_CONFERENCE_GET_TYPE {
+
+    /**
+     * The function returned successfully.
+     */
+    TOX_ERR_CONFERENCE_GET_TYPE_OK,
+
+    /**
+     * The conference number passed did not designate a valid conference.
+     */
+    TOX_ERR_CONFERENCE_GET_TYPE_CONFERENCE_NOT_FOUND,
+
+} TOX_ERR_CONFERENCE_GET_TYPE;
+
+
+TOX_CONFERENCE_TYPE tox_conference_get_type(const Tox *tox, uint32_t conference_number,
+        TOX_ERR_CONFERENCE_GET_TYPE *error);
 
 
 /*******************************************************************************
diff --git a/toxcore/tox_group.c b/toxcore/tox_group.c
deleted file mode 100644
index 445ce9de..00000000
--- a/toxcore/tox_group.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/* tox.c
- *
- * The Tox public API.
- *
- *  Copyright (C) 2013 Tox project All Rights Reserved.
- *
- *  This file is part of Tox.
- *
- *  Tox is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Tox is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#define TOX_DEFINED
-typedef struct Messenger Tox;
-#include "tox_group.h"
-
-#include "Messenger.h"
-#include "group.h"
-
-#define SET_ERROR_PARAMETER(param, x) {if(param) {*param = x;}}
-
-/**********GROUP CHAT FUNCTIONS: WARNING Group chats will be rewritten so this might change ************/
-
-/* Set the callback for group invites.
- *
- *  Function(Tox *tox, int32_t friendnumber, uint8_t type, uint8_t *data, uint16_t length, void *userdata)
- *
- * data of length is what needs to be passed to join_groupchat().
- */
-void tox_callback_conference_invite(Tox *tox, tox_conference_invite_cb *callback, void *user_data)
-{
-    Messenger *m = tox;
-    g_callback_group_invite(
-        m->group_chat_object,
-        (void (*)(Messenger * m, uint32_t, int, const uint8_t *, size_t, void *))callback,
-        user_data);
-}
-
-/* Set the callback for group messages.
- *
- *  Function(Tox *tox, int groupnumber, int peernumber, uint8_t * message, uint16_t length, void *userdata)
- */
-void tox_callback_conference_message(Tox *tox, tox_conference_message_cb *callback, void *user_data)
-{
-    Messenger *m = tox;
-    g_callback_group_message(
-        m->group_chat_object,
-        (void (*)(Messenger * m, uint32_t, uint32_t, int, const uint8_t *, size_t, void *))callback,
-        user_data);
-}
-
-/* Set callback function for title changes.
- *
- * Function(Tox *tox, int groupnumber, int peernumber, uint8_t * title, uint8_t length, void *userdata)
- * if peernumber == -1, then author is unknown (e.g. initial joining the group)
- */
-void tox_callback_conference_title(Tox *tox, tox_conference_title_cb *callback, void *user_data)
-{
-    Messenger *m = tox;
-    g_callback_group_title(m->group_chat_object, callback, user_data);
-}
-
-/* Set callback function for peer name list changes.
- *
- * It gets called every time the name list changes(new peer/name, deleted peer)
- *  Function(Tox *tox, int groupnumber, void *userdata)
- */
-void tox_callback_conference_namelist_change(Tox *tox, tox_conference_namelist_change_cb *callback, void *user_data)
-{
-    Messenger *m = tox;
-    g_callback_group_namelistchange(
-        m->group_chat_object,
-        (void (*)(struct Messenger *, int, int, uint8_t, void *))callback,
-        user_data);
-}
-
-/* Creates a new groupchat and puts it in the chats array.
- *
- * return group number on success.
- * return -1 on failure.
- */
-uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE *error)
-{
-    Messenger *m = tox;
-    int res = add_groupchat(m->group_chat_object, GROUPCHAT_TYPE_TEXT);
-
-    if (res == -1) {
-        SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_FAILURE);
-        return 0;
-    }
-
-    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_OK);
-    return res;
-}
-
-/* Delete a groupchat from the chats array.
- *
- * return 0 on success.
- * return -1 if failure.
- */
-bool tox_conference_delete(Tox *tox, uint32_t group_number, TOX_ERR_CONFERENCE *error)
-{
-    Messenger *m = tox;
-    int res = del_groupchat(m->group_chat_object, group_number);
-
-    if (res == -1) {
-        SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_FAILURE);
-        return false;
-    }
-
-    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_OK);
-    return true;
-}
-
-size_t tox_conference_peer_get_name_size(
-    const Tox *tox, uint32_t group_number, uint32_t peer_number, TOX_ERR_CONFERENCE *error)
-{
-    const Messenger *m = tox;
-    int res = group_peername_size(m->group_chat_object, group_number, peer_number);
-
-    if (res == -1) {
-        SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_FAILURE);
-        return 0;
-    }
-
-    SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_OK);
-    return res;
-}
-
-/* Copy the name of peernumber who is in groupnumber to name.
- * name must be at least MAX_NICK_BYTES long.
- *
- * return length of name if success
- * return -1 if failure
- */
-bool tox_conference_peer_get_name(const Tox *tox, uint32_t group_number, uint32_t peer_number, uint8_t *name,
-                                  TOX_ERR_CONFERENCE *error)
-{
-    const Messenger *m = tox;
-    return group_peername(m->group_chat_object, group_number, peer_number, name);
-}
-
-/* Copy the public key of peernumber who is in groupnumber to public_key.
- * public_key must be crypto_box_PUBLICKEYBYTES long.
- *
- * returns 0 on success
- * returns -1 on failure
- */
-bool tox_conference_peer_get_public_key(const Tox *tox, uint32_t group_number, uint32_t peer_number,
-                                        uint8_t *public_key, TOX_ERR_CONFERENCE *error)
-{
-    const Messenger *m = tox;
-    return group_peer_pubkey(m->group_chat_object, group_number, peer_number, public_key);
-}
-
-/* invite friendnumber to groupnumber
- * return 0 on success
- * return -1 on failure
- */
-bool tox_conference_invite(Tox *tox, uint32_t friendnumber, uint32_t group_number, TOX_ERR_CONFERENCE *error)
-{
-    Messenger *m = tox;
-    return invite_friend(m->group_chat_object, friendnumber, group_number);
-}
-
-/* Join a group (you need to have been invited first.) using data of length obtained
- * in the group invite callback.
- *
- * returns group number on success
- * returns -1 on failure.
- */
-uint32_t tox_conference_join(Tox *tox, uint32_t friendnumber, const uint8_t *data, size_t length,
-                             TOX_ERR_CONFERENCE *error)
-{
-    Messenger *m = tox;
-    return join_groupchat(m->group_chat_object, friendnumber, GROUPCHAT_TYPE_TEXT, data, length);
-}
-
-/* send a group message
- * return 0 on success
- * return -1 on failure
- */
-bool tox_conference_send_message(Tox *tox, uint32_t groupnumber, TOX_MESSAGE_TYPE type, const uint8_t *message,
-                                 size_t length, TOX_ERR_CONFERENCE *error)
-{
-    Messenger *m = tox;
-
-    if (type == TOX_MESSAGE_TYPE_NORMAL) {
-        return group_message_send(m->group_chat_object, groupnumber, message, length);
-    } else {
-        return group_action_send(m->group_chat_object, groupnumber, message, length);
-    }
-}
-
-/* set the group's title, limited to MAX_NAME_LENGTH
- * return 0 on success
- * return -1 on failure
- */
-bool tox_conference_set_title(Tox *tox, uint32_t groupnumber, const uint8_t *title, size_t length,
-                              TOX_ERR_CONFERENCE *error)
-{
-    Messenger *m = tox;
-    return group_title_send(m->group_chat_object, groupnumber, title, length);
-}
-
-size_t tox_conference_get_title_size(const Tox *tox, uint32_t groupnumber, TOX_ERR_CONFERENCE *error)
-{
-    const Messenger *m = tox;
-    return group_title_get_size(m->group_chat_object, groupnumber);
-}
-
-/* Get group title from groupnumber and put it in title.
- * title needs to be a valid memory location with a max_length size of at least MAX_NAME_LENGTH (128) bytes.
- *
- *  return length of copied title if success.
- *  return -1 if failure.
- */
-bool tox_conference_get_title(const Tox *tox, uint32_t groupnumber, uint8_t *title, TOX_ERR_CONFERENCE *error)
-{
-    const Messenger *m = tox;
-    return group_title_get(m->group_chat_object, groupnumber, title);
-}
-
-/* Check if the current peernumber corresponds to ours.
- *
- * return 1 if the peernumber corresponds to ours.
- * return 0 on failure.
- */
-bool tox_conference_peer_number_is_ours(const Tox *tox, uint32_t groupnumber, uint32_t peernumber)
-{
-    const Messenger *m = tox;
-    return group_peernumber_is_ours(m->group_chat_object, groupnumber, peernumber);
-}
-
-/* Return the number of peers in the group chat on success.
- * return -1 on failure
- */
-uint32_t tox_conference_peer_count(const Tox *tox, uint32_t groupnumber, TOX_ERR_CONFERENCE *error)
-{
-    const Messenger *m = tox;
-    return group_number_peers(m->group_chat_object, groupnumber);
-}
-
-/* Return the number of chats in the instance m.
- * You should use this to determine how much memory to allocate
- * for copy_chatlist. */
-size_t tox_conference_get_chatlist_size(const Tox *tox)
-{
-    const Messenger *m = tox;
-    return count_chatlist(m->group_chat_object);
-}
-
-/* Copy a list of valid chat IDs into the array out_list.
- * If out_list is NULL, returns 0.
- * Otherwise, returns the number of elements copied.
- * If the array was too small, the contents
- * of out_list will be truncated to list_size. */
-void tox_conference_get_chatlist(const Tox *tox, uint32_t *out_list)
-{
-    const Messenger *m = tox;
-    size_t list_size = tox_conference_get_chatlist_size(tox);
-    copy_chatlist(m->group_chat_object, out_list, list_size);
-}
-
-/* return the type of groupchat (TOX_GROUPCHAT_TYPE_) that groupnumber is.
- *
- * return -1 on failure.
- * return type on success.
- */
-TOX_CONFERENCE_TYPE tox_conference_get_type(const Tox *tox, uint32_t groupnumber, TOX_ERR_CONFERENCE *error)
-{
-    const Messenger *m = tox;
-    return group_get_type(m->group_chat_object, groupnumber);
-}