Merge pull request 'Move most code into crates/ subfolder' (#159) from crates-folder into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/159
2024-11-16 09:24:00 +00:00 · 2021-01-20 15:40:03 +00:00 · 2021-01-20 15:40:03 +00:00 · a01af67948
commit a01af67948
parent 88284a999e 3b64c58198
144 changed files with 54 additions and 54 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -8,29 +8,29 @@ debug = 0
 [workspace]
 members = [
-    "lemmy_api",
+    "crates/api",
-    "lemmy_apub",
+    "crates/apub",
-    "lemmy_utils",
+    "crates/utils",
-    "lemmy_db_queries",
+    "crates/db_queries",
-    "lemmy_db_schema",
+    "crates/db_schema",
-    "lemmy_db_views",
+    "crates/db_views",
-    "lemmy_db_views_actor",
+    "crates/db_views_actor",
-    "lemmy_db_views_actor",
+    "crates/db_views_actor",
-    "lemmy_structs",
+    "crates/structs",
-    "lemmy_websocket",
+    "crates/websocket",
 ]
 [dependencies]
-lemmy_api = { path = "./lemmy_api" }
+lemmy_api = { path = "./crates/api" }
-lemmy_apub = { path = "./lemmy_apub" }
+lemmy_apub = { path = "./crates/apub" }
-lemmy_utils = { path = "./lemmy_utils" }
+lemmy_utils = { path = "./crates/utils" }
-lemmy_db_schema = { path = "./lemmy_db_schema" }
+lemmy_db_schema = { path = "./crates/db_schema" }
-lemmy_db_queries = { path = "lemmy_db_queries" }
+lemmy_db_queries = { path = "./crates/db_queries" }
-lemmy_db_views = { path = "./lemmy_db_views" }
+lemmy_db_views = { path = "./crates/db_views" }
-lemmy_db_views_moderator = { path = "./lemmy_db_views_moderator" }
+lemmy_db_views_moderator = { path = "./crates/db_views_moderator" }
-lemmy_db_views_actor = { path = "lemmy_db_views_actor" }
+lemmy_db_views_actor = { path = "./crates/db_views_actor" }
-lemmy_structs = { path = "./lemmy_structs" }
+lemmy_structs = { path = "./crates/structs" }
-lemmy_websocket = { path = "./lemmy_websocket" }
+lemmy_websocket = { path = "./crates/websocket" }
 diesel = "1.4.5"
 diesel_migrations = "1.4.0"
 chrono = { version = "0.4.19", features = ["serde"] }
--- a/crates/api/Cargo.toml
+++ b/crates/api/Cargo.toml
@ -9,15 +9,15 @@ name = "lemmy_api"
 path = "src/lib.rs"
 [dependencies]
-lemmy_apub = { path = "../lemmy_apub" }
+lemmy_apub = { path = "../apub" }
-lemmy_utils = { path = "../lemmy_utils" }
+lemmy_utils = { path = "../utils" }
-lemmy_db_queries = { path = "../lemmy_db_queries" }
+lemmy_db_queries = { path = "../db_queries" }
-lemmy_db_schema = { path = "../lemmy_db_schema" }
+lemmy_db_schema = { path = "../db_schema" }
-lemmy_db_views = { path = "../lemmy_db_views" }
+lemmy_db_views = { path = "../db_views" }
-lemmy_db_views_moderator = { path = "../lemmy_db_views_moderator" }
+lemmy_db_views_moderator = { path = "../db_views_moderator" }
-lemmy_db_views_actor = { path = "../lemmy_db_views_actor" }
+lemmy_db_views_actor = { path = "../db_views_actor" }
-lemmy_structs = { path = "../lemmy_structs" }
+lemmy_structs = { path = "../structs" }
-lemmy_websocket = { path = "../lemmy_websocket" }
+lemmy_websocket = { path = "../websocket" }
 diesel = "1.4.5"
 bcrypt = "0.9.0"
 chrono = { version = "0.4.19", features = ["serde"] }
--- a/crates/api/src/claims.rs
+++ b/crates/api/src/claims.rs
--- a/crates/api/src/comment.rs
+++ b/crates/api/src/comment.rs
--- a/crates/api/src/community.rs
+++ b/crates/api/src/community.rs
--- a/crates/api/src/lib.rs
+++ b/crates/api/src/lib.rs
--- a/crates/api/src/post.rs
+++ b/crates/api/src/post.rs
--- a/crates/api/src/site.rs
+++ b/crates/api/src/site.rs
--- a/crates/api/src/user.rs
+++ b/crates/api/src/user.rs
--- a/crates/api/src/version.rs
+++ b/crates/api/src/version.rs
--- a/crates/api/src/websocket.rs
+++ b/crates/api/src/websocket.rs
--- a/crates/apub/Cargo.toml
+++ b/crates/apub/Cargo.toml
@ -9,13 +9,13 @@ name = "lemmy_apub"
 path = "src/lib.rs"
 [dependencies]
-lemmy_utils = { path = "../lemmy_utils" }
+lemmy_utils = { path = "../utils" }
-lemmy_db_queries = { path = "../lemmy_db_queries" }
+lemmy_db_queries = { path = "../db_queries" }
-lemmy_db_schema = { path = "../lemmy_db_schema" }
+lemmy_db_schema = { path = "../db_schema" }
-lemmy_db_views = { path = "../lemmy_db_views" }
+lemmy_db_views = { path = "../db_views" }
-lemmy_db_views_actor = { path = "../lemmy_db_views_actor" }
+lemmy_db_views_actor = { path = "../db_views_actor" }
-lemmy_structs = { path = "../lemmy_structs" }
+lemmy_structs = { path = "../structs" }
-lemmy_websocket = { path = "../lemmy_websocket" }
+lemmy_websocket = { path = "../websocket" }
 diesel = "1.4.5"
 activitystreams = "0.7.0-alpha.8"
 activitystreams-ext = "0.1.0-alpha.2"
--- a/crates/apub/src/activities/mod.rs
+++ b/crates/apub/src/activities/mod.rs
--- a/crates/apub/src/activities/receive/comment.rs
+++ b/crates/apub/src/activities/receive/comment.rs
--- a/crates/apub/src/activities/receive/comment_undo.rs
+++ b/crates/apub/src/activities/receive/comment_undo.rs
--- a/crates/apub/src/activities/receive/community.rs
+++ b/crates/apub/src/activities/receive/community.rs
--- a/crates/apub/src/activities/receive/mod.rs
+++ b/crates/apub/src/activities/receive/mod.rs
--- a/crates/apub/src/activities/receive/post.rs
+++ b/crates/apub/src/activities/receive/post.rs
--- a/crates/apub/src/activities/receive/post_undo.rs
+++ b/crates/apub/src/activities/receive/post_undo.rs
--- a/crates/apub/src/activities/receive/private_message.rs
+++ b/crates/apub/src/activities/receive/private_message.rs
--- a/crates/apub/src/activities/send/comment.rs
+++ b/crates/apub/src/activities/send/comment.rs
--- a/crates/apub/src/activities/send/community.rs
+++ b/crates/apub/src/activities/send/community.rs
--- a/crates/apub/src/activities/send/mod.rs
+++ b/crates/apub/src/activities/send/mod.rs
--- a/crates/apub/src/activities/send/post.rs
+++ b/crates/apub/src/activities/send/post.rs
--- a/crates/apub/src/activities/send/private_message.rs
+++ b/crates/apub/src/activities/send/private_message.rs
--- a/crates/apub/src/activities/send/user.rs
+++ b/crates/apub/src/activities/send/user.rs
--- a/crates/apub/src/activity_queue.rs
+++ b/crates/apub/src/activity_queue.rs
--- a/crates/apub/src/extensions/context.rs
+++ b/crates/apub/src/extensions/context.rs
--- a/crates/apub/src/extensions/group_extensions.rs
+++ b/crates/apub/src/extensions/group_extensions.rs
--- a/crates/apub/src/extensions/mod.rs
+++ b/crates/apub/src/extensions/mod.rs
--- a/crates/apub/src/extensions/page_extension.rs
+++ b/crates/apub/src/extensions/page_extension.rs
--- a/crates/apub/src/extensions/signatures.rs
+++ b/crates/apub/src/extensions/signatures.rs
--- a/crates/apub/src/fetcher/community.rs
+++ b/crates/apub/src/fetcher/community.rs
--- a/crates/apub/src/fetcher/fetch.rs
+++ b/crates/apub/src/fetcher/fetch.rs
--- a/crates/apub/src/fetcher/mod.rs
+++ b/crates/apub/src/fetcher/mod.rs
--- a/crates/apub/src/fetcher/objects.rs
+++ b/crates/apub/src/fetcher/objects.rs
--- a/crates/apub/src/fetcher/search.rs
+++ b/crates/apub/src/fetcher/search.rs
--- a/crates/apub/src/fetcher/user.rs
+++ b/crates/apub/src/fetcher/user.rs
--- a/crates/apub/src/http/comment.rs
+++ b/crates/apub/src/http/comment.rs
--- a/crates/apub/src/http/community.rs
+++ b/crates/apub/src/http/community.rs
--- a/crates/apub/src/http/mod.rs
+++ b/crates/apub/src/http/mod.rs
--- a/crates/apub/src/http/post.rs
+++ b/crates/apub/src/http/post.rs
--- a/crates/apub/src/http/user.rs
+++ b/crates/apub/src/http/user.rs
--- a/crates/apub/src/inbox/community_inbox.rs
+++ b/crates/apub/src/inbox/community_inbox.rs
--- a/crates/apub/src/inbox/mod.rs
+++ b/crates/apub/src/inbox/mod.rs
--- a/crates/apub/src/inbox/receive_for_community.rs
+++ b/crates/apub/src/inbox/receive_for_community.rs
--- a/crates/apub/src/inbox/shared_inbox.rs
+++ b/crates/apub/src/inbox/shared_inbox.rs
--- a/crates/apub/src/inbox/user_inbox.rs
+++ b/crates/apub/src/inbox/user_inbox.rs
--- a/crates/apub/src/lib.rs
+++ b/crates/apub/src/lib.rs
--- a/crates/apub/src/objects/comment.rs
+++ b/crates/apub/src/objects/comment.rs
--- a/crates/apub/src/objects/community.rs
+++ b/crates/apub/src/objects/community.rs
--- a/crates/apub/src/objects/mod.rs
+++ b/crates/apub/src/objects/mod.rs
--- a/crates/apub/src/objects/post.rs
+++ b/crates/apub/src/objects/post.rs
--- a/crates/apub/src/objects/private_message.rs
+++ b/crates/apub/src/objects/private_message.rs
--- a/crates/apub/src/objects/user.rs
+++ b/crates/apub/src/objects/user.rs
--- a/crates/db_queries/Cargo.toml
+++ b/crates/db_queries/Cargo.toml
@ -8,8 +8,8 @@ name = "lemmy_db_queries"
 path = "src/lib.rs"
 [dependencies]
-lemmy_utils = { path = "../lemmy_utils" }
+lemmy_utils = { path = "../utils" }
-lemmy_db_schema = { path = "../lemmy_db_schema" }
+lemmy_db_schema = { path = "../db_schema" }
 diesel = { version = "1.4.5", features = ["postgres","chrono","r2d2","serde_json"] }
 diesel_migrations = "1.4.0"
 chrono = { version = "0.4.19", features = ["serde"] }
--- a/crates/db_queries/src/aggregates/comment_aggregates.rs
+++ b/crates/db_queries/src/aggregates/comment_aggregates.rs
--- a/crates/db_queries/src/aggregates/community_aggregates.rs
+++ b/crates/db_queries/src/aggregates/community_aggregates.rs
--- a/crates/db_queries/src/aggregates/mod.rs
+++ b/crates/db_queries/src/aggregates/mod.rs
--- a/crates/db_queries/src/aggregates/post_aggregates.rs
+++ b/crates/db_queries/src/aggregates/post_aggregates.rs
--- a/crates/db_queries/src/aggregates/site_aggregates.rs
+++ b/crates/db_queries/src/aggregates/site_aggregates.rs
--- a/crates/db_queries/src/aggregates/user_aggregates.rs
+++ b/crates/db_queries/src/aggregates/user_aggregates.rs
--- a/crates/db_queries/src/lib.rs
+++ b/crates/db_queries/src/lib.rs
--- a/crates/db_queries/src/source/activity.rs
+++ b/crates/db_queries/src/source/activity.rs
--- a/crates/db_queries/src/source/category.rs
+++ b/crates/db_queries/src/source/category.rs
--- a/crates/db_queries/src/source/comment.rs
+++ b/crates/db_queries/src/source/comment.rs
--- a/crates/db_queries/src/source/comment_report.rs
+++ b/crates/db_queries/src/source/comment_report.rs
--- a/crates/db_queries/src/source/community.rs
+++ b/crates/db_queries/src/source/community.rs
--- a/crates/db_queries/src/source/mod.rs
+++ b/crates/db_queries/src/source/mod.rs
--- a/crates/db_queries/src/source/moderator.rs
+++ b/crates/db_queries/src/source/moderator.rs
--- a/crates/db_queries/src/source/password_reset_request.rs
+++ b/crates/db_queries/src/source/password_reset_request.rs
--- a/crates/db_queries/src/source/post.rs
+++ b/crates/db_queries/src/source/post.rs
--- a/crates/db_queries/src/source/post_report.rs
+++ b/crates/db_queries/src/source/post_report.rs
--- a/crates/db_queries/src/source/private_message.rs
+++ b/crates/db_queries/src/source/private_message.rs
--- a/crates/db_queries/src/source/site.rs
+++ b/crates/db_queries/src/source/site.rs
--- a/crates/db_queries/src/source/user.rs
+++ b/crates/db_queries/src/source/user.rs
--- a/crates/db_queries/src/source/user_mention.rs
+++ b/crates/db_queries/src/source/user_mention.rs
--- a/crates/db_schema/Cargo.toml
+++ b/crates/db_schema/Cargo.toml
--- a/crates/db_schema/src/lib.rs
+++ b/crates/db_schema/src/lib.rs
--- a/crates/db_schema/src/schema.rs
+++ b/crates/db_schema/src/schema.rs
--- a/crates/db_schema/src/source/activity.rs
+++ b/crates/db_schema/src/source/activity.rs
--- a/crates/db_schema/src/source/category.rs
+++ b/crates/db_schema/src/source/category.rs
--- a/crates/db_schema/src/source/comment.rs
+++ b/crates/db_schema/src/source/comment.rs
--- a/crates/db_schema/src/source/comment_report.rs
+++ b/crates/db_schema/src/source/comment_report.rs
--- a/crates/db_schema/src/source/community.rs
+++ b/crates/db_schema/src/source/community.rs
--- a/crates/db_schema/src/source/mod.rs
+++ b/crates/db_schema/src/source/mod.rs
--- a/crates/db_schema/src/source/moderator.rs
+++ b/crates/db_schema/src/source/moderator.rs
--- a/crates/db_schema/src/source/password_reset_request.rs
+++ b/crates/db_schema/src/source/password_reset_request.rs
--- a/crates/db_schema/src/source/post.rs
+++ b/crates/db_schema/src/source/post.rs
--- a/crates/db_schema/src/source/post_report.rs
+++ b/crates/db_schema/src/source/post_report.rs
--- a/crates/db_schema/src/source/private_message.rs
+++ b/crates/db_schema/src/source/private_message.rs
--- a/crates/db_schema/src/source/site.rs
+++ b/crates/db_schema/src/source/site.rs
--- a/crates/db_schema/src/source/user.rs
+++ b/crates/db_schema/src/source/user.rs
--- a/crates/db_schema/src/source/user_mention.rs
+++ b/crates/db_schema/src/source/user_mention.rs
--- a/crates/db_views/Cargo.toml
+++ b/crates/db_views/Cargo.toml
@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2018"
 [dependencies]
-lemmy_db_queries = { path = "../lemmy_db_queries" }
+lemmy_db_queries = { path = "../db_queries" }
-lemmy_db_schema = { path = "../lemmy_db_schema" }
+lemmy_db_schema = { path = "../db_schema" }
 diesel = { version = "1.4.5", features = ["postgres","chrono","r2d2","serde_json"] }
 serde = { version = "1.0.118", features = ["derive"] }
 log = "0.4.11"
--- a/crates/db_views/src/comment_report_view.rs
+++ b/crates/db_views/src/comment_report_view.rs
--- a/crates/db_views/src/comment_view.rs
+++ b/crates/db_views/src/comment_view.rs
--- a/crates/db_views/src/lib.rs
+++ b/crates/db_views/src/lib.rs
--- a/crates/db_views/src/post_report_view.rs
+++ b/crates/db_views/src/post_report_view.rs
--- a/crates/db_views/src/post_view.rs
+++ b/crates/db_views/src/post_view.rs
--- a/Show more
+++ b/Show more