From c326080f9357a864f078e6a09eaa9117ab99d172 Mon Sep 17 00:00:00 2001 From: LoaD Accumulator Date: Mon, 25 Sep 2023 22:55:35 +0200 Subject: [PATCH] [FIX] Oops! --- .gitignore | 7 --- src/include/Schema/ClientEvent.h | 39 ------------ src/include/Schema/Filter.h | 80 ------------------------- src/include/Schema/PduV1.h | 51 ---------------- src/include/Schema/PduV3.h | 50 ---------------- src/include/Schema/RoomCreateRequest.h | 82 -------------------------- 6 files changed, 309 deletions(-) delete mode 100644 src/include/Schema/ClientEvent.h delete mode 100644 src/include/Schema/Filter.h delete mode 100644 src/include/Schema/PduV1.h delete mode 100644 src/include/Schema/PduV3.h delete mode 100644 src/include/Schema/RoomCreateRequest.h diff --git a/.gitignore b/.gitignore index d1f63a6..7d63ee8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -<<<<<<< HEAD build data .env @@ -13,9 +12,3 @@ contrib/.vagrant src/Schema src/include/Schema man/mandoc.db -======= -# Telodendria .gitignore -build/* -src/Schema/* -Cytoplasm/build/* ->>>>>>> b099a3e ([ADD] WIP: User directory from #70 + .gitignore.) diff --git a/src/include/Schema/ClientEvent.h b/src/include/Schema/ClientEvent.h deleted file mode 100644 index e8bbdb0..0000000 --- a/src/include/Schema/ClientEvent.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Generated by j2s */ - -#ifndef TELODENDRIA_SCHEMA_CLIENTEVENT_H -#define TELODENDRIA_SCHEMA_CLIENTEVENT_H - -#include -#include -#include - - -typedef struct ClientEventUnsignedData -{ - HashMap * redacted_because; - char * transaction_id; - HashMap * prev_content; - Int64 age; -} ClientEventUnsignedData; - -typedef struct ClientEvent -{ - Int64 origin_server_ts; - HashMap * content; - char * room_id; - char * sender; - char * state_key; - char * event_id; - char * type; - ClientEventUnsignedData _unsigned; -} ClientEvent; - -extern int ClientEventUnsignedDataFromJson(HashMap *, ClientEventUnsignedData *, char **); -extern HashMap * ClientEventUnsignedDataToJson(ClientEventUnsignedData *); -extern void ClientEventUnsignedDataFree(ClientEventUnsignedData *); - -extern int ClientEventFromJson(HashMap *, ClientEvent *, char **); -extern HashMap * ClientEventToJson(ClientEvent *); -extern void ClientEventFree(ClientEvent *); - -#endif /* TELODENDRIA_SCHEMA_CLIENTEVENT_H */ diff --git a/src/include/Schema/Filter.h b/src/include/Schema/Filter.h deleted file mode 100644 index 676579c..0000000 --- a/src/include/Schema/Filter.h +++ /dev/null @@ -1,80 +0,0 @@ -/* Generated by j2s */ - -#ifndef TELODENDRIA_SCHEMA_FILTER_H -#define TELODENDRIA_SCHEMA_FILTER_H - -#include -#include -#include - - -typedef struct FilterEvent -{ - Array * not_senders; - Int64 limit; - Array * senders; - Array * types; - Array * not_types; -} FilterEvent; - -typedef enum FilterEventFormat -{ - FILTER_FORMAT_FEDERATION, - FILTER_FORMANT_CLIENT -} FilterEventFormat; - -typedef struct FilterRoomEvent -{ - Array * not_rooms; - Array * not_senders; - Int64 limit; - Array * senders; - int include_redundant_members; - Array * types; - Array * rooms; - int lazy_load_members; - Array * not_types; - int contains_url; - int unread_thread_notifications; -} FilterRoomEvent; - -typedef struct FilterRoom -{ - Array * not_rooms; - FilterRoomEvent state; - int include_leave; - FilterRoomEvent timeline; - FilterRoomEvent account_data; - Array * rooms; - FilterRoomEvent ephemeral; -} FilterRoom; - -typedef struct Filter -{ - FilterEventFormat event_format; - FilterEvent presence; - FilterEvent account_data; - FilterRoom room; - Array * event_fields; -} Filter; - -extern int FilterRoomFromJson(HashMap *, FilterRoom *, char **); -extern HashMap * FilterRoomToJson(FilterRoom *); -extern void FilterRoomFree(FilterRoom *); - -extern int FilterEventFormatFromStr(char *); -extern char * FilterEventFormatToStr(FilterEventFormat); - -extern int FilterEventFromJson(HashMap *, FilterEvent *, char **); -extern HashMap * FilterEventToJson(FilterEvent *); -extern void FilterEventFree(FilterEvent *); - -extern int FilterFromJson(HashMap *, Filter *, char **); -extern HashMap * FilterToJson(Filter *); -extern void FilterFree(Filter *); - -extern int FilterRoomEventFromJson(HashMap *, FilterRoomEvent *, char **); -extern HashMap * FilterRoomEventToJson(FilterRoomEvent *); -extern void FilterRoomEventFree(FilterRoomEvent *); - -#endif /* TELODENDRIA_SCHEMA_FILTER_H */ diff --git a/src/include/Schema/PduV1.h b/src/include/Schema/PduV1.h deleted file mode 100644 index 5094e82..0000000 --- a/src/include/Schema/PduV1.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Generated by j2s */ - -#ifndef TELODENDRIA_SCHEMA_PDUV1_H -#define TELODENDRIA_SCHEMA_PDUV1_H - -#include -#include -#include - - -typedef struct PduV1UnsignedData -{ - Int64 age; -} PduV1UnsignedData; - -typedef struct PduV1EventHash -{ - char * sha256; -} PduV1EventHash; - -typedef struct PduV1 -{ - Int64 origin_server_ts; - HashMap * content; - char * redacts; - char * sender; - Int64 depth; - Array * prev_events; - char * type; - PduV1UnsignedData _unsigned; - Array * auth_events; - char * room_id; - char * state_key; - HashMap * signatures; - char * event_id; - PduV1EventHash hashes; -} PduV1; - -extern int PduV1EventHashFromJson(HashMap *, PduV1EventHash *, char **); -extern HashMap * PduV1EventHashToJson(PduV1EventHash *); -extern void PduV1EventHashFree(PduV1EventHash *); - -extern int PduV1FromJson(HashMap *, PduV1 *, char **); -extern HashMap * PduV1ToJson(PduV1 *); -extern void PduV1Free(PduV1 *); - -extern int PduV1UnsignedDataFromJson(HashMap *, PduV1UnsignedData *, char **); -extern HashMap * PduV1UnsignedDataToJson(PduV1UnsignedData *); -extern void PduV1UnsignedDataFree(PduV1UnsignedData *); - -#endif /* TELODENDRIA_SCHEMA_PDUV1_H */ diff --git a/src/include/Schema/PduV3.h b/src/include/Schema/PduV3.h deleted file mode 100644 index e853343..0000000 --- a/src/include/Schema/PduV3.h +++ /dev/null @@ -1,50 +0,0 @@ -/* Generated by j2s */ - -#ifndef TELODENDRIA_SCHEMA_PDUV3_H -#define TELODENDRIA_SCHEMA_PDUV3_H - -#include -#include -#include - - -typedef struct PduV3UnsignedData -{ - Int64 age; -} PduV3UnsignedData; - -typedef struct PduV3EventHash -{ - char * sha256; -} PduV3EventHash; - -typedef struct PduV3 -{ - Int64 origin_server_ts; - HashMap * content; - char * redacts; - char * sender; - Int64 depth; - Array * prev_events; - char * type; - PduV3UnsignedData _unsigned; - Array * auth_events; - char * room_id; - char * state_key; - HashMap * signatures; - PduV3EventHash hashes; -} PduV3; - -extern int PduV3EventHashFromJson(HashMap *, PduV3EventHash *, char **); -extern HashMap * PduV3EventHashToJson(PduV3EventHash *); -extern void PduV3EventHashFree(PduV3EventHash *); - -extern int PduV3FromJson(HashMap *, PduV3 *, char **); -extern HashMap * PduV3ToJson(PduV3 *); -extern void PduV3Free(PduV3 *); - -extern int PduV3UnsignedDataFromJson(HashMap *, PduV3UnsignedData *, char **); -extern HashMap * PduV3UnsignedDataToJson(PduV3UnsignedData *); -extern void PduV3UnsignedDataFree(PduV3UnsignedData *); - -#endif /* TELODENDRIA_SCHEMA_PDUV3_H */ diff --git a/src/include/Schema/RoomCreateRequest.h b/src/include/Schema/RoomCreateRequest.h deleted file mode 100644 index 52f8d38..0000000 --- a/src/include/Schema/RoomCreateRequest.h +++ /dev/null @@ -1,82 +0,0 @@ -/* Generated by j2s */ - -#ifndef TELODENDRIA_SCHEMA_ROOMCREATE_H -#define TELODENDRIA_SCHEMA_ROOMCREATE_H - -#include -#include -#include - - -typedef enum Room3PidMedium -{ - ROOM_3PID_MSISDN, - ROOM_3PID_EMAIL -} Room3PidMedium; - -typedef enum RoomCreatePreset -{ - ROOM_CREATE_PUBLIC, - ROOM_CREATE_TRUSTED, - ROOM_CREATE_PRIVATE -} RoomCreatePreset; - -typedef struct RoomStateEvent -{ - HashMap * content; - char * state_key; - char * type; -} RoomStateEvent; - -typedef struct RoomInvite3Pid -{ - char * id_access_token; - char * address; - Room3PidMedium medium; - char * id_server; -} RoomInvite3Pid; - -typedef enum RoomVisibility -{ - ROOM_PUBLIC, - ROOM_PRIVATE -} RoomVisibility; - -typedef struct RoomCreateRequest -{ - Array * invite; - char * room_version; - Array * invite_3pid; - char * topic; - RoomVisibility visibility; - HashMap * creation_content; - int is_direct; - char * name; - Array * initial_state; - HashMap * power_level_content_override; - char * room_alias_name; - RoomCreatePreset preset; -} RoomCreateRequest; - -extern int RoomVisibilityFromStr(char *); -extern char * RoomVisibilityToStr(RoomVisibility); - -extern int RoomCreateRequestFromJson(HashMap *, RoomCreateRequest *, char **); -extern HashMap * RoomCreateRequestToJson(RoomCreateRequest *); -extern void RoomCreateRequestFree(RoomCreateRequest *); - -extern int RoomInvite3PidFromJson(HashMap *, RoomInvite3Pid *, char **); -extern HashMap * RoomInvite3PidToJson(RoomInvite3Pid *); -extern void RoomInvite3PidFree(RoomInvite3Pid *); - -extern int Room3PidMediumFromStr(char *); -extern char * Room3PidMediumToStr(Room3PidMedium); - -extern int RoomCreatePresetFromStr(char *); -extern char * RoomCreatePresetToStr(RoomCreatePreset); - -extern int RoomStateEventFromJson(HashMap *, RoomStateEvent *, char **); -extern HashMap * RoomStateEventToJson(RoomStateEvent *); -extern void RoomStateEventFree(RoomStateEvent *); - -#endif /* TELODENDRIA_SCHEMA_ROOMCREATE_H */