Rearrange file structure to prepare for separating ActivityPub code to submodule

src/ap/activity.c

@@ -11,8 +11,8 @@
 #include "model/status.h"
 #include "model/emoji.h"
 #include "model/media.h"
-#include "model/ap/outbox_envelope.h"
-#include "model/ap/activity/rsa_signature_2017.h"
+//#include "model/ap/outbox_envelope.h"
+#include "activity/rsa_signature_2017.h"
 
 #include <stddef.h>
 #include <stdlib.h>

src/ap/activity/layout/capabilities.c

@@ -1,4 +1,4 @@
-#include "model/ap/activity.h"
+#include "../../activity.h"
 
 #define OBJ_TYPE struct ap_object
 static struct json_object_field capabilities_layout[] = {

src/ap/activity/layout/endpoints.c

@@ -1,4 +1,4 @@
-#include "model/ap/activity.h"
+#include "../../activity.h"
 
 #define OBJ_TYPE struct ap_object
 static struct json_object_field endpoints_layout[] = {

src/ap/activity/layout/icon.c

@@ -1,4 +1,4 @@
-#include "model/ap/activity.h"
+#include "../../activity.h"
 
 #define OBJ_TYPE struct ap_object
 static struct json_object_field image_layout[] = {

src/ap/activity/ptr_or_ref.c

@@ -2,7 +2,7 @@
 #include "json/json.h"
 #include "json/layout.h"
 
-#include "model/ap/activity.h"
+#include "../activity.h"
 
 #include <stdlib.h>
 #include <string.h>

src/ap/activity/rsa_signature_2017.c

@@ -1,7 +1,9 @@
 #define _GNU_SOURCE
 #include "rsa_signature_2017.h"
 
-#include "model/ap/activity.h"
+#include "../activity.h"
+
+// TODO: figure out how to remove this dependency
 #include "model/crypto/keys.h"
 
 #include "rdf/serial.h"

src/controller/activity_pub.c

@@ -4,7 +4,7 @@
 #include "http/server/request.h"
 #include "collections/array.h"
 #include "format.h"
-#include "model/ap/object.h"
+#include "ap/object.h"
 
 // Model
 #include "model/server.h"
@@ -12,6 +12,7 @@
 #include "model/account.h"
 #include "model/activity.h"
 
+// Standard Library
 #include <string.h>
 #include <stdlib.h>
 

src/controller/api/status.c

@@ -1,22 +1,25 @@
 #include "status.h"
 
+// Submodules
 #include "http/server/request.h"
 #include "json/json.h"
 #include "json/layout.h"
 #include "collections/array.h"
 #include "format.h"
 
+// Model
 #include "model/server.h"
 #include "model/status.h"
 #include "model/status/react.h"
 #include "model/account.h"
 #include "model/media.h"
-#include "model/ap/activity.h"
-#include "model/ap/outbox_envelope.h"
+#include "model/outbox_envelope.h"
 
+// View
 #include "view/api/Account.h"
 #include "view/api/Status.h"
 
+// Standard Library
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/controller/cli.c

@@ -1,18 +1,24 @@
 #include "cli.h"
 
+// Submodules
 #include "format.h"
 #include "json/json.h"
+#include "ap/object.h"
 
+// Model
 #include "model/account.h"
 #include "model/status.h"
 #include "model/notification.h"
-#include "model/ap/activity.h"
 #include "model/gc.h"
-#include "controller/inbox.h"
 
+// View
 #include "view/api/Status.h"
 #include "view/api/Notification.h"
 
+// Controller
+#include "controller/inbox.h"
+
+// Standard Library
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>

src/controller/inbox.c

@@ -6,20 +6,21 @@
 #include "ffdb/fs_list.h"
 #include "collections/array.h"
 #include "format.h"
-#include "model/ap/object.h"
+#include "ap/object.h"
 
 // Model
 #include "model/server.h"
 #include "model/status.h"
 #include "model/account.h"
 #include "model/notification.h"
-#include "model/ap/inbox_envelope.h"
+#include "model/inbox_envelope.h"
 #include "model/crypto/http_sign.h"
 
+// Controller
 #include "controller/inbox/follow.h"
 #include "controller/inbox/forward.h"
 
-// Stdlib
+// Standard Library
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>

src/controller/inbox/add.c

@@ -1,9 +1,13 @@
 #include "../inbox.h"
 
+// Submodules
+#include "ap/object.h"
+
+// Model
 #include "model/account.h"
-#include "model/ap/activity.h"
 #include "model/status.h"
 
+// Standard Library
 #include <string.h>
 
 bool route_add( struct ap_activity* act )

src/controller/inbox/announce.c

@@ -1,9 +1,13 @@
 #include "../inbox.h"
 
+// Submodules
+#include "ap/activity.h"
+
+// Model
 #include "model/account.h"
 #include "model/status.h"
-#include "model/ap/activity.h"
 
+// Standard Library
 #include <string.h>
 #include <stdlib.h>
 

src/controller/inbox/follow.c

@@ -1,11 +1,14 @@
 #include "follow.h"
 
-#include "model/ap/object.h"
+// Submodules
+#include "ap/object.h"
 
+// Model
 #include "model/activity.h"
 #include "model/account.h"
 #include "model/server.h"
 
+// Standard Library
 #include <string.h>
 
 bool route_follow( struct ap_object* act )

src/controller/inbox/forward.c

@@ -1,11 +1,11 @@
 #include "forward.h"
 
 #include "http/server/request.h"
-#include "model/ap/object.h"
+#include "ap/object.h"
 
 #include "model/account.h"
 #include "model/activity.h"
-#include "model/ap/inbox_envelope.h"
+#include "model/inbox_envelope.h"
 
 #include "controller/api/client_apps.h"
 

src/controller/inbox/undo.c

@@ -1,9 +1,13 @@
 #include "../inbox.h"
 
+// Submodules
+#include "ap/object.h"
+
+// Model
 #include "model/account.h"
-#include "model/ap/activity.h"
 #include "model/server.h"
 
+// Standard Library
 #include <stdio.h>
 #include <string.h>
 

src/controller/mastodon_api.c

@@ -7,14 +7,19 @@
 #include "http/query.h"
 #include "ffdb/fs_list.h"
 #include "format.h"
+#include "ap/object.h"
 
+// Model
 #include "model/status.h"
 #include "model/account.h"
 #include "model/notification.h"
 #include "model/server.h"
 #include "model/media.h"
-#include "model/ap/activity.h"
 
+// View
+#include "view/api/Attachement.h"
+
+// Controller
 #include "controller/pleroma_api.h"
 #include "controller/api/timeline.h"
 #include "controller/api/client_apps.h"
@@ -23,8 +28,6 @@
 #include "controller/api/accounts.h"
 #include "controller/api/emoji.h"
 
-#include "view/api/Attachement.h"
-
 #include <stddef.h>
 #include <limits.h>
 #include <stdio.h>

src/controller/outbox.c

@@ -4,7 +4,8 @@
 #include "ffdb/fs_list.h"
 #include "collections/array.h"
 #include "http/client/client.h"
-#include "model/ap/object.h"
+#include "ap/object.h"
+#include "ap/activity/rsa_signature_2017.h"
 
 // Model
 #include "model/server.h"
@@ -12,8 +13,7 @@
 #include "model/crypto/http_sign.h"
 #include "model/account.h"
 #include "model/activity.h"
-#include "model/ap/outbox_envelope.h"
-#include "model/ap/activity/rsa_signature_2017.h"
+#include "model/outbox_envelope.h"
 
 // Stdlib
 #include <stdlib.h>

src/controller/owner.c

@@ -1,12 +1,16 @@
 #include "owner.h"
 
+// Submodules
 #include "http/server/request.h"
+#include "ap/activity.h"
 
+// Model
 #include "model/server.h"
-#include "model/ap/activity.h"
 
+// View
 #include "view/layout.h"
 
+// Standard Library
 #include <stdio.h>
 #include <string.h>
 

src/controller/test/crypto.c

@@ -1,11 +1,15 @@
 #include "crypto.h"
 
+// Submodules
 #include "http/server/header.h"
-#include "model/ap/inbox_envelope.h"
+#include "format.h"
+
+// Model
+#include "model/inbox_envelope.h"
 #include "model/crypto/keys.h"
 #include "model/crypto/http_sign.h"
-#include "format.h"
 
+// Standard Library
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/dev.c

@@ -2,13 +2,13 @@
 
 #include "ffdb/fs_list.h"
 #include "ffdb/trie.h"
+#include "ap/activity/rsa_signature_2017.h"
+#include "ap/object.h"
 #include "collections/array.h"
 
 #include "model/account.h"
 #include "model/activity.h"
-#include "model/ap/object.h"
-#include "model/ap/activity/rsa_signature_2017.h"
-#include "model/ap/outbox_envelope.h"
+#include "model/outbox_envelope.h"
 #include "model/status.h"
 #include "model/server.h"
 

src/model/account.c

@@ -9,11 +9,11 @@
 #include "ffdb/trie.h"
 #include "format.h"
 #include "collections/array.h"
+#include "ap/activity.h"
 
 // Model
 #include "model/server.h"
 #include "model/status.h"
-#include "model/ap/activity.h"
 #include "model/crypto/keys.h"
 #include "model/notification.h"
 

src/model/account/ap_data.c

@@ -1,14 +1,17 @@
 #include "model/account.h"
 
+// Submodules
 #include "format.h"
 #include "ffdb/trie.h"
 #include "collections/array.h"
+#include "ap/object.h"
 
+// Model
 #include "model/server.h"
 #include "model/status.h"
 #include "model/activity.h"
-#include "model/ap/object.h"
 
+// Standard Library
 #include <stdlib.h>
 #include <string.h>
 

src/model/account/ap_sync.c

@@ -3,9 +3,7 @@
 // Submodules
 #include "collections/array.h"
 #include "format.h"
-
-// Model
-#include "model/ap/activity.h"
+#include "ap/activity.h"
 
 // Standard Library
 #include <string.h>

src/model/account/fed_act.c

@@ -1,15 +1,18 @@
 #include "model/account.h"
 
+// Submodules
 #include "format.h"
 #include "ffdb/trie.h"
 #include "collections/array.h"
+#include "ap/object.h"
 
+// Model
 #include "model/server.h"
 #include "model/status.h"
 #include "model/activity.h"
-#include "model/ap/object.h"
-#include "model/ap/outbox_envelope.h"
+#include "model/outbox_envelope.h"
 
+// Standard Library
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>

src/model/activity.c

@@ -1,19 +1,21 @@
 #define _GNU_SOURCE
 #include "activity.h"
 
+// Submodules
 #include "format.h"
 #include "ffdb/fs_list.h"
 #include "collections/array.h"
-// TODO: change to submodule
-#include "model/ap/object.h"
+#include "ap/object.h"
 
+// Model
 #include "model/server.h"
 #include "model/account.h"
 #include "model/status.h"
 #include "model/emoji.h"
 #include "model/media.h"
-#include "model/ap/outbox_envelope.h"
+#include "model/outbox_envelope.h"
 
+// Standard Library
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>

src/model/crypto/http_sign.c

@@ -7,7 +7,7 @@
 #include "model/account.h"
 #include "model/crypto/keys.h"
 #include "model/crypto/base64.h"
-#include "model/ap/inbox_envelope.h"
+#include "model/inbox_envelope.h"
 
 #include <stdlib.h>
 #include <stdio.h>

src/model/status.c

@@ -2,14 +2,6 @@
 #include "status.h"
 #include "status/react.h"
 
-#include "model/server.h"
-#include "model/account.h"
-#include "model/activity.h"
-#include "model/ap/object.h"
-#include "model/notification.h"
-#include "model/timeline.h"
-#include "model/emoji.h"
-
 // Submodules
 #include "json/json.h"
 #include "json/layout.h"
@@ -19,7 +11,17 @@
 #include "collections/array.h"
 #include "http/client/client.h"
 #include "format.h"
+#include "ap/object.h"
+
+// Model
+#include "model/server.h"
+#include "model/account.h"
+#include "model/activity.h"
+#include "model/notification.h"
+#include "model/timeline.h"
+#include "model/emoji.h"
 
+// Standard Library
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>