feat: add ngc events

TokTok · Jan 15, 2024 · 8c35e0f · 8c35e0f
1 parent 97bdd83
commit 8c35e0f
Show file tree

Hide file tree

Showing 51 changed files with 5,945 additions and 67 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -248,6 +248,24 @@ set(toxcore_SOURCES
   toxcore/events/friend_status_message.c
   toxcore/events/friend_typing.c
   toxcore/events/self_connection_status.c
+  toxcore/events/group_custom_packet.c
+  toxcore/events/group_custom_private_packet.c
+  toxcore/events/group_invite.c
+  toxcore/events/group_join_fail.c
+  toxcore/events/group_message.c
+  toxcore/events/group_moderation.c
+  toxcore/events/group_password.c
+  toxcore/events/group_peer_exit.c
+  toxcore/events/group_peer_join.c
+  toxcore/events/group_peer_limit.c
+  toxcore/events/group_peer_name.c
+  toxcore/events/group_peer_status.c
+  toxcore/events/group_privacy_state.c
+  toxcore/events/group_private_message.c
+  toxcore/events/group_self_join.c
+  toxcore/events/group_topic.c
+  toxcore/events/group_topic_lock.c
+  toxcore/events/group_voice_state.c
   toxcore/forwarding.c
   toxcore/forwarding.h
   toxcore/friend_connection.c

diff --git a/other/event_tooling/generate_event_c.cpp b/other/event_tooling/generate_event_c.cpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
-// Copyright © 2023 The TokTok team.
+// Copyright © 2023-2024 The TokTok team.
 
 // this file can be used to generate event.c files
 // requires c++17
@@ -119,22 +119,54 @@ void generate_event_impl(const std::string& event_name, const std::vector<EventT
         exit(1);
     }
 
+    bool need_stdlib_h = false;
+    bool need_string_h = false;
+    bool need_tox_unpack_h = false;
+    for (const auto& t : event_types) {
+        std::visit(
+            overloaded{
+                [&](const EventTypeTrivial& t) {
+                    if (bin_unpack_name_from_type(t.type).rfind("tox_", 0) == 0) {
+                        need_tox_unpack_h = true;
+                    }
+                },
+                [&](const EventTypeByteRange&) {
+                    need_stdlib_h = true;
+                    need_string_h = true;
+                }
+            },
+            t
+        );
+    }
+
     f << R"(/* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2023 The TokTok team.
+ * Copyright © 2023-2024 The TokTok team.
  */
 
 #include "events_alloc.h"
 
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
+#include <assert.h>)";
+    if (need_stdlib_h) {
+        f << R"(
+#include <stdlib.h>)";
+    }
+    if (need_string_h) {
+        f << R"(
+#include <string.h>)";
+    }
+    f << R"(
 
 #include "../bin_pack.h"
 #include "../bin_unpack.h"
 #include "../ccompat.h"
+#include "../mem.h"
 #include "../tox.h"
-#include "../tox_events.h"
-#include "../tox_unpack.h"
+#include "../tox_events.h")";
+    if (need_tox_unpack_h) {
+        f << R"(
+#include "../tox_unpack.h")";
+    }
+    f << R"(
 
 
 /*****************************************************
@@ -205,10 +237,11 @@ void generate_event_impl(const std::string& event_name, const std::vector<EventT
                     f << "        " << event_name_l << "->" << t.name_data << " = nullptr;\n";
                     f << "        " << event_name_l << "->" << t.name_length << " = 0;\n";
                     f << "    }\n\n";
-                    f << "    " << event_name_l << "->" << t.name_data << " = (uint8_t *)malloc(" << t.name_length << ");\n\n";
-                    f << "    if (" << event_name_l << "->" << t.name_data << " == nullptr) {\n";
+                    f << "    uint8_t *" << t.name_data << "_copy = (uint8_t *)malloc(" << t.name_length << ");\n\n";
+                    f << "    if (" << t.name_data << "_copy == nullptr) {\n";
                     f << "        return false;\n    }\n\n";
-                    f << "    memcpy(" << event_name_l << "->" << t.name_data << ", " << t.name_data << ", " << t.name_length << ");\n";
+                    f << "    memcpy(" << t.name_data << "_copy, " << t.name_data << ", " << t.name_length << ");\n";
+                    f << "    " << event_name_l << "->" << t.name_data << " = " << t.name_data << "_copy;\n";
                     f << "    " << event_name_l << "->" << t.name_length << " = " << t.name_length << ";\n";
                     f << "    return true;\n";
                 }
@@ -626,7 +659,6 @@ int main(int argc, char** argv) {
             }
         },
 
-#if 0 // not yet :)
         {
             "Group_Peer_Name",
             {
@@ -768,7 +800,6 @@ int main(int argc, char** argv) {
                 EventTypeTrivial{"Tox_Group_Mod_Event", "mod_type"},
             }
         },
-#endif
     };
 
     if (argc < 2) {

diff --git a/toxcore/Makefile.inc b/toxcore/Makefile.inc
@@ -38,6 +38,24 @@ libtoxcore_la_SOURCES = ../third_party/cmp/cmp.c \
                         ../toxcore/events/friend_status_message.c \
                         ../toxcore/events/friend_typing.c \
                         ../toxcore/events/self_connection_status.c \
+                        ../toxcore/events/group_custom_packet.c \
+                        ../toxcore/events/group_custom_private_packet.c \
+                        ../toxcore/events/group_invite.c \
+                        ../toxcore/events/group_join_fail.c \
+                        ../toxcore/events/group_message.c \
+                        ../toxcore/events/group_moderation.c \
+                        ../toxcore/events/group_password.c \
+                        ../toxcore/events/group_peer_exit.c \
+                        ../toxcore/events/group_peer_join.c \
+                        ../toxcore/events/group_peer_limit.c \
+                        ../toxcore/events/group_peer_name.c \
+                        ../toxcore/events/group_peer_status.c \
+                        ../toxcore/events/group_privacy_state.c \
+                        ../toxcore/events/group_private_message.c \
+                        ../toxcore/events/group_self_join.c \
+                        ../toxcore/events/group_topic.c \
+                        ../toxcore/events/group_topic_lock.c \
+                        ../toxcore/events/group_voice_state.c \
                         ../toxcore/DHT.h \
                         ../toxcore/DHT.c \
                         ../toxcore/mem.h \

diff --git a/toxcore/events/conference_connected.c b/toxcore/events/conference_connected.c
@@ -1,18 +1,17 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2023 The TokTok team.
+ * Copyright © 2023-2024 The TokTok team.
  */
 
 #include "events_alloc.h"
 
 #include <assert.h>
-#include <stdlib.h>
 
 #include "../bin_pack.h"
 #include "../bin_unpack.h"
 #include "../ccompat.h"
+#include "../mem.h"
 #include "../tox.h"
 #include "../tox_events.h"
-#include "../tox_unpack.h"
 
 
 /*****************************************************

diff --git a/toxcore/events/conference_invite.c b/toxcore/events/conference_invite.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2023 The TokTok team.
+ * Copyright © 2023-2024 The TokTok team.
  */
 
 #include "events_alloc.h"
@@ -11,6 +11,7 @@
 #include "../bin_pack.h"
 #include "../bin_unpack.h"
 #include "../ccompat.h"
+#include "../mem.h"
 #include "../tox.h"
 #include "../tox_events.h"
 #include "../tox_unpack.h"

diff --git a/toxcore/events/conference_message.c b/toxcore/events/conference_message.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2023 The TokTok team.
+ * Copyright © 2023-2024 The TokTok team.
  */
 
 #include "events_alloc.h"
@@ -11,6 +11,7 @@
 #include "../bin_pack.h"
 #include "../bin_unpack.h"
 #include "../ccompat.h"
+#include "../mem.h"
 #include "../tox.h"
 #include "../tox_events.h"
 #include "../tox_unpack.h"

diff --git a/toxcore/events/conference_peer_list_changed.c b/toxcore/events/conference_peer_list_changed.c
@@ -1,18 +1,17 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2023 The TokTok team.
+ * Copyright © 2023-2024 The TokTok team.
  */
 
 #include "events_alloc.h"
 
 #include <assert.h>
-#include <stdlib.h>
 
 #include "../bin_pack.h"
 #include "../bin_unpack.h"
 #include "../ccompat.h"
+#include "../mem.h"
 #include "../tox.h"
 #include "../tox_events.h"
-#include "../tox_unpack.h"
 
 
 /*****************************************************

diff --git a/toxcore/events/conference_peer_name.c b/toxcore/events/conference_peer_name.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2023 The TokTok team.
+ * Copyright © 2023-2024 The TokTok team.
  */
 
 #include "events_alloc.h"
@@ -11,9 +11,9 @@
 #include "../bin_pack.h"
 #include "../bin_unpack.h"
 #include "../ccompat.h"
+#include "../mem.h"
 #include "../tox.h"
 #include "../tox_events.h"
-#include "../tox_unpack.h"
 
 
 /*****************************************************

diff --git a/toxcore/events/conference_title.c b/toxcore/events/conference_title.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2023 The TokTok team.
+ * Copyright © 2023-2024 The TokTok team.
  */
 
 #include "events_alloc.h"
@@ -11,9 +11,9 @@
 #include "../bin_pack.h"
 #include "../bin_unpack.h"
 #include "../ccompat.h"
+#include "../mem.h"
 #include "../tox.h"
 #include "../tox_events.h"
-#include "../tox_unpack.h"
 
 
 /*****************************************************

diff --git a/toxcore/events/events_alloc.c b/toxcore/events/events_alloc.c
@@ -5,9 +5,10 @@
 #include "events_alloc.h"
 
 #include <assert.h>
-#include <stdlib.h>
 
 #include "../ccompat.h"
+#include "../mem.h"
+#include "../tox_event.h"
 #include "../tox_events.h"
 
 Tox_Events_State *tox_events_alloc(void *user_data)

diff --git a/toxcore/events/events_alloc.h b/toxcore/events/events_alloc.h
@@ -49,6 +49,24 @@ tox_friend_status_cb tox_events_handle_friend_status;
 tox_friend_status_message_cb tox_events_handle_friend_status_message;
 tox_friend_typing_cb tox_events_handle_friend_typing;
 tox_self_connection_status_cb tox_events_handle_self_connection_status;
+tox_group_peer_name_cb tox_events_handle_group_peer_name;
+tox_group_peer_status_cb tox_events_handle_group_peer_status;
+tox_group_topic_cb tox_events_handle_group_topic;
+tox_group_privacy_state_cb tox_events_handle_group_privacy_state;
+tox_group_voice_state_cb tox_events_handle_group_voice_state;
+tox_group_topic_lock_cb tox_events_handle_group_topic_lock;
+tox_group_peer_limit_cb tox_events_handle_group_peer_limit;
+tox_group_password_cb tox_events_handle_group_password;
+tox_group_message_cb tox_events_handle_group_message;
+tox_group_private_message_cb tox_events_handle_group_private_message;
+tox_group_custom_packet_cb tox_events_handle_group_custom_packet;
+tox_group_custom_private_packet_cb tox_events_handle_group_custom_private_packet;
+tox_group_invite_cb tox_events_handle_group_invite;
+tox_group_peer_join_cb tox_events_handle_group_peer_join;
+tox_group_peer_exit_cb tox_events_handle_group_peer_exit;
+tox_group_self_join_cb tox_events_handle_group_self_join;
+tox_group_join_fail_cb tox_events_handle_group_join_fail;
+tox_group_moderation_cb tox_events_handle_group_moderation;
 
 non_null(2) nullable(1)
 bool tox_events_pack(const Tox_Events *events, Bin_Pack *bp);

diff --git a/toxcore/events/file_chunk_request.c b/toxcore/events/file_chunk_request.c
@@ -1,18 +1,17 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2023 The TokTok team.
+ * Copyright © 2023-2024 The TokTok team.
  */
 
 #include "events_alloc.h"
 
 #include <assert.h>
-#include <stdlib.h>
 
 #include "../bin_pack.h"
 #include "../bin_unpack.h"
 #include "../ccompat.h"
+#include "../mem.h"
 #include "../tox.h"
 #include "../tox_events.h"
-#include "../tox_unpack.h"
 
 
 /*****************************************************

diff --git a/toxcore/events/file_recv.c b/toxcore/events/file_recv.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2023 The TokTok team.
+ * Copyright © 2023-2024 The TokTok team.
  */
 
 #include "events_alloc.h"
@@ -11,9 +11,9 @@
 #include "../bin_pack.h"
 #include "../bin_unpack.h"
 #include "../ccompat.h"
+#include "../mem.h"
 #include "../tox.h"
 #include "../tox_events.h"
-#include "../tox_unpack.h"
 
 
 /*****************************************************

diff --git a/toxcore/events/file_recv_chunk.c b/toxcore/events/file_recv_chunk.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2023 The TokTok team.
+ * Copyright © 2023-2024 The TokTok team.
  */
 
 #include "events_alloc.h"
@@ -11,9 +11,9 @@
 #include "../bin_pack.h"
 #include "../bin_unpack.h"
 #include "../ccompat.h"
+#include "../mem.h"
 #include "../tox.h"
 #include "../tox_events.h"
-#include "../tox_unpack.h"
 
 
 /*****************************************************

diff --git a/toxcore/events/file_recv_control.c b/toxcore/events/file_recv_control.c
@@ -1,15 +1,15 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2023 The TokTok team.
+ * Copyright © 2023-2024 The TokTok team.
  */
 
 #include "events_alloc.h"
 
 #include <assert.h>
-#include <stdlib.h>
 
 #include "../bin_pack.h"
 #include "../bin_unpack.h"
 #include "../ccompat.h"
+#include "../mem.h"
 #include "../tox.h"
 #include "../tox_events.h"
 #include "../tox_unpack.h"

diff --git a/toxcore/events/friend_connection_status.c b/toxcore/events/friend_connection_status.c
@@ -1,15 +1,15 @@
 /* SPDX-License-Identifier: GPL-3.0-or-later
- * Copyright © 2023 The TokTok team.
+ * Copyright © 2023-2024 The TokTok team.
  */
 
 #include "events_alloc.h"
 
 #include <assert.h>
-#include <stdlib.h>
 
 #include "../bin_pack.h"
 #include "../bin_unpack.h"
 #include "../ccompat.h"
+#include "../mem.h"
 #include "../tox.h"
 #include "../tox_events.h"
 #include "../tox_unpack.h"