From d5d1f023905bcbf7abba9a8625ad4e5dc8fb8209 Mon Sep 17 00:00:00 2001 From: teknomunk Date: Sun, 29 Jan 2023 13:13:12 -0600 Subject: [PATCH] Rearrange file structure to prepare for separating ActivityPub code to submodule --- src/{model => }/ap/activity.c | 4 ++-- src/{model => }/ap/activity.h | 0 src/{model => }/ap/activity/attachement.c | 0 src/{model => }/ap/activity/attachement.h | 0 src/{model => }/ap/activity/context.c | 0 src/{model => }/ap/activity/context.h | 0 src/{model => }/ap/activity/layout.c | 0 .../ap/activity/layout/capabilities.c | 2 +- src/{model => }/ap/activity/layout/content.c | 0 src/{model => }/ap/activity/layout/endpoints.c | 2 +- src/{model => }/ap/activity/layout/icon.c | 2 +- src/{model => }/ap/activity/layout/signature.c | 0 src/{model => }/ap/activity/ptr_or_ref.c | 2 +- .../ap/activity/rsa_signature_2017.c | 4 +++- .../ap/activity/rsa_signature_2017.h | 0 src/{model => }/ap/activity/tag.c | 0 src/{model => }/ap/activity/tag.h | 0 src/{model => }/ap/object.h | 0 src/controller/activity_pub.c | 3 ++- src/controller/api/status.c | 7 +++++-- src/controller/cli.c | 10 ++++++++-- src/controller/inbox.c | 7 ++++--- src/controller/inbox/add.c | 6 +++++- src/controller/inbox/announce.c | 6 +++++- src/controller/inbox/follow.c | 5 ++++- src/controller/inbox/forward.c | 4 ++-- src/controller/inbox/undo.c | 6 +++++- src/controller/mastodon_api.c | 9 ++++++--- src/controller/outbox.c | 6 +++--- src/controller/owner.c | 6 +++++- src/controller/test/crypto.c | 8 ++++++-- src/dev.c | 6 +++--- src/model/account.c | 2 +- src/model/account/ap_data.c | 5 ++++- src/model/account/ap_sync.c | 4 +--- src/model/account/fed_act.c | 7 +++++-- src/model/activity.c | 8 +++++--- src/model/crypto/http_sign.c | 2 +- src/model/{ap => }/inbox_envelope.c | 0 src/model/{ap => }/inbox_envelope.h | 0 src/model/{ap => }/outbox_envelope.c | 0 src/model/{ap => }/outbox_envelope.h | 0 src/model/status.c | 18 ++++++++++-------- 43 files changed, 99 insertions(+), 52 deletions(-) rename src/{model => }/ap/activity.c (98%) rename src/{model => }/ap/activity.h (100%) rename src/{model => }/ap/activity/attachement.c (100%) rename src/{model => }/ap/activity/attachement.h (100%) rename src/{model => }/ap/activity/context.c (100%) rename src/{model => }/ap/activity/context.h (100%) rename src/{model => }/ap/activity/layout.c (100%) rename src/{model => }/ap/activity/layout/capabilities.c (97%) rename src/{model => }/ap/activity/layout/content.c (100%) rename src/{model => }/ap/activity/layout/endpoints.c (96%) rename src/{model => }/ap/activity/layout/icon.c (95%) rename src/{model => }/ap/activity/layout/signature.c (100%) rename src/{model => }/ap/activity/ptr_or_ref.c (98%) rename src/{model => }/ap/activity/rsa_signature_2017.c (98%) rename src/{model => }/ap/activity/rsa_signature_2017.h (100%) rename src/{model => }/ap/activity/tag.c (100%) rename src/{model => }/ap/activity/tag.h (100%) rename src/{model => }/ap/object.h (100%) rename src/model/{ap => }/inbox_envelope.c (100%) rename src/model/{ap => }/inbox_envelope.h (100%) rename src/model/{ap => }/outbox_envelope.c (100%) rename src/model/{ap => }/outbox_envelope.h (100%) diff --git a/src/model/ap/activity.c b/src/ap/activity.c similarity index 98% rename from src/model/ap/activity.c rename to src/ap/activity.c index 39be74b..34e5e64 100644 --- a/src/model/ap/activity.c +++ b/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 #include diff --git a/src/model/ap/activity.h b/src/ap/activity.h similarity index 100% rename from src/model/ap/activity.h rename to src/ap/activity.h diff --git a/src/model/ap/activity/attachement.c b/src/ap/activity/attachement.c similarity index 100% rename from src/model/ap/activity/attachement.c rename to src/ap/activity/attachement.c diff --git a/src/model/ap/activity/attachement.h b/src/ap/activity/attachement.h similarity index 100% rename from src/model/ap/activity/attachement.h rename to src/ap/activity/attachement.h diff --git a/src/model/ap/activity/context.c b/src/ap/activity/context.c similarity index 100% rename from src/model/ap/activity/context.c rename to src/ap/activity/context.c diff --git a/src/model/ap/activity/context.h b/src/ap/activity/context.h similarity index 100% rename from src/model/ap/activity/context.h rename to src/ap/activity/context.h diff --git a/src/model/ap/activity/layout.c b/src/ap/activity/layout.c similarity index 100% rename from src/model/ap/activity/layout.c rename to src/ap/activity/layout.c diff --git a/src/model/ap/activity/layout/capabilities.c b/src/ap/activity/layout/capabilities.c similarity index 97% rename from src/model/ap/activity/layout/capabilities.c rename to src/ap/activity/layout/capabilities.c index 52ba260..7540027 100644 --- a/src/model/ap/activity/layout/capabilities.c +++ b/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[] = { diff --git a/src/model/ap/activity/layout/content.c b/src/ap/activity/layout/content.c similarity index 100% rename from src/model/ap/activity/layout/content.c rename to src/ap/activity/layout/content.c diff --git a/src/model/ap/activity/layout/endpoints.c b/src/ap/activity/layout/endpoints.c similarity index 96% rename from src/model/ap/activity/layout/endpoints.c rename to src/ap/activity/layout/endpoints.c index cea674a..f3af4c0 100644 --- a/src/model/ap/activity/layout/endpoints.c +++ b/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[] = { diff --git a/src/model/ap/activity/layout/icon.c b/src/ap/activity/layout/icon.c similarity index 95% rename from src/model/ap/activity/layout/icon.c rename to src/ap/activity/layout/icon.c index b391104..5f37493 100644 --- a/src/model/ap/activity/layout/icon.c +++ b/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[] = { diff --git a/src/model/ap/activity/layout/signature.c b/src/ap/activity/layout/signature.c similarity index 100% rename from src/model/ap/activity/layout/signature.c rename to src/ap/activity/layout/signature.c diff --git a/src/model/ap/activity/ptr_or_ref.c b/src/ap/activity/ptr_or_ref.c similarity index 98% rename from src/model/ap/activity/ptr_or_ref.c rename to src/ap/activity/ptr_or_ref.c index fc204ab..a6b4c39 100644 --- a/src/model/ap/activity/ptr_or_ref.c +++ b/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 #include diff --git a/src/model/ap/activity/rsa_signature_2017.c b/src/ap/activity/rsa_signature_2017.c similarity index 98% rename from src/model/ap/activity/rsa_signature_2017.c rename to src/ap/activity/rsa_signature_2017.c index c8903ff..84179ed 100644 --- a/src/model/ap/activity/rsa_signature_2017.c +++ b/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" diff --git a/src/model/ap/activity/rsa_signature_2017.h b/src/ap/activity/rsa_signature_2017.h similarity index 100% rename from src/model/ap/activity/rsa_signature_2017.h rename to src/ap/activity/rsa_signature_2017.h diff --git a/src/model/ap/activity/tag.c b/src/ap/activity/tag.c similarity index 100% rename from src/model/ap/activity/tag.c rename to src/ap/activity/tag.c diff --git a/src/model/ap/activity/tag.h b/src/ap/activity/tag.h similarity index 100% rename from src/model/ap/activity/tag.h rename to src/ap/activity/tag.h diff --git a/src/model/ap/object.h b/src/ap/object.h similarity index 100% rename from src/model/ap/object.h rename to src/ap/object.h diff --git a/src/controller/activity_pub.c b/src/controller/activity_pub.c index 30f8c97..f502ac2 100644 --- a/src/controller/activity_pub.c +++ b/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 #include diff --git a/src/controller/api/status.c b/src/controller/api/status.c index b6ea575..bf4314f 100644 --- a/src/controller/api/status.c +++ b/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 #include #include diff --git a/src/controller/cli.c b/src/controller/cli.c index e694bab..16b5a63 100644 --- a/src/controller/cli.c +++ b/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 #include #include diff --git a/src/controller/inbox.c b/src/controller/inbox.c index 769c75d..64a69f0 100644 --- a/src/controller/inbox.c +++ b/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 #include #include diff --git a/src/controller/inbox/add.c b/src/controller/inbox/add.c index 9564bd5..087bea3 100644 --- a/src/controller/inbox/add.c +++ b/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 bool route_add( struct ap_activity* act ) diff --git a/src/controller/inbox/announce.c b/src/controller/inbox/announce.c index b4a1a51..e1a139e 100644 --- a/src/controller/inbox/announce.c +++ b/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 #include diff --git a/src/controller/inbox/follow.c b/src/controller/inbox/follow.c index 5706c3e..0861540 100644 --- a/src/controller/inbox/follow.c +++ b/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 bool route_follow( struct ap_object* act ) diff --git a/src/controller/inbox/forward.c b/src/controller/inbox/forward.c index dceb320..4ab07d2 100644 --- a/src/controller/inbox/forward.c +++ b/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" diff --git a/src/controller/inbox/undo.c b/src/controller/inbox/undo.c index a0e573f..e9dd01d 100644 --- a/src/controller/inbox/undo.c +++ b/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 #include diff --git a/src/controller/mastodon_api.c b/src/controller/mastodon_api.c index a4d92c3..1ac4f89 100644 --- a/src/controller/mastodon_api.c +++ b/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 #include #include diff --git a/src/controller/outbox.c b/src/controller/outbox.c index 06638a0..7c8d881 100644 --- a/src/controller/outbox.c +++ b/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 diff --git a/src/controller/owner.c b/src/controller/owner.c index 2fe57f7..c7ac3ed 100644 --- a/src/controller/owner.c +++ b/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 #include diff --git a/src/controller/test/crypto.c b/src/controller/test/crypto.c index 0329889..1d63611 100644 --- a/src/controller/test/crypto.c +++ b/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 #include #include diff --git a/src/dev.c b/src/dev.c index 826cf23..7c928ba 100644 --- a/src/dev.c +++ b/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" diff --git a/src/model/account.c b/src/model/account.c index 792d327..f9e5c9c 100644 --- a/src/model/account.c +++ b/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" diff --git a/src/model/account/ap_data.c b/src/model/account/ap_data.c index e9d1632..a01fa37 100644 --- a/src/model/account/ap_data.c +++ b/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 #include diff --git a/src/model/account/ap_sync.c b/src/model/account/ap_sync.c index 1489cbe..9a2c58e 100644 --- a/src/model/account/ap_sync.c +++ b/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 diff --git a/src/model/account/fed_act.c b/src/model/account/fed_act.c index f067f5d..5597fd4 100644 --- a/src/model/account/fed_act.c +++ b/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 #include #include diff --git a/src/model/activity.c b/src/model/activity.c index 9523360..4d38e9f 100644 --- a/src/model/activity.c +++ b/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 #include #include diff --git a/src/model/crypto/http_sign.c b/src/model/crypto/http_sign.c index bf4a95b..b5cac2b 100644 --- a/src/model/crypto/http_sign.c +++ b/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 #include diff --git a/src/model/ap/inbox_envelope.c b/src/model/inbox_envelope.c similarity index 100% rename from src/model/ap/inbox_envelope.c rename to src/model/inbox_envelope.c diff --git a/src/model/ap/inbox_envelope.h b/src/model/inbox_envelope.h similarity index 100% rename from src/model/ap/inbox_envelope.h rename to src/model/inbox_envelope.h diff --git a/src/model/ap/outbox_envelope.c b/src/model/outbox_envelope.c similarity index 100% rename from src/model/ap/outbox_envelope.c rename to src/model/outbox_envelope.c diff --git a/src/model/ap/outbox_envelope.h b/src/model/outbox_envelope.h similarity index 100% rename from src/model/ap/outbox_envelope.h rename to src/model/outbox_envelope.h diff --git a/src/model/status.c b/src/model/status.c index fb2ec7f..cabf25b 100644 --- a/src/model/status.c +++ b/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 #include #include