diff --git a/.woodpecker.yml b/.woodpecker.yml index 1cf17a3eda..8d0f20ac81 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -343,7 +343,7 @@ steps: commands: - *install_binstall - cp -r migrations crates/db_schema/ - - cargo publish --workspace --token "$CARGO_API_TOKEN" --from-git --allow-dirty --no-verify --allow-branch "${CI_COMMIT_TAG}" --yes custom "${CI_COMMIT_TAG}" + - cargo publish --workspace --token "$CARGO_API_TOKEN" --allow-dirty --no-verify when: - event: tag diff --git a/Cargo.lock b/Cargo.lock index 7b8c58353c..26079f8333 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3231,7 +3231,7 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" [[package]] name = "lemmy_api" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "activitypub_federation", "actix-web", @@ -3247,7 +3247,7 @@ dependencies = [ "lemmy_api_crud", "lemmy_api_utils", "lemmy_apub_objects", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_comment", "lemmy_db_views_community", @@ -3270,7 +3270,7 @@ dependencies = [ "lemmy_db_views_vote", "lemmy_diesel_utils", "lemmy_email", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "regex", "serde", @@ -3310,9 +3310,9 @@ dependencies = [ [[package]] name = "lemmy_api_common" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_comment", "lemmy_db_views_community", @@ -3336,12 +3336,12 @@ dependencies = [ "lemmy_db_views_site", "lemmy_db_views_vote", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", ] [[package]] name = "lemmy_api_crud" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "accept-language", "activitypub_federation", @@ -3354,7 +3354,7 @@ dependencies = [ "futures-util", "lemmy_api_utils", "lemmy_apub_objects", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_comment", "lemmy_db_views_community", @@ -3370,7 +3370,7 @@ dependencies = [ "lemmy_db_views_site", "lemmy_diesel_utils", "lemmy_email", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "rand 0.10.0", "regex", "serde", @@ -3382,18 +3382,18 @@ dependencies = [ [[package]] name = "lemmy_api_routes" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "actix-web", "lemmy_api", "lemmy_api_crud", "lemmy_routes", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", ] [[package]] name = "lemmy_api_routes_v3" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "activitypub_federation", "actix-web", @@ -3402,7 +3402,7 @@ dependencies = [ "lemmy_api_common 0.19.16", "lemmy_api_crud", "lemmy_api_utils", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_comment", "lemmy_db_views_community", @@ -3413,13 +3413,13 @@ dependencies = [ "lemmy_db_views_report_combined", "lemmy_db_views_site", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "url", ] [[package]] name = "lemmy_api_utils" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "activitypub_federation", "actix-web", @@ -3437,7 +3437,7 @@ dependencies = [ "futures", "infer 0.19.0", "jsonwebtoken", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_comment", "lemmy_db_views_community", @@ -3452,7 +3452,7 @@ dependencies = [ "lemmy_db_views_site", "lemmy_diesel_utils", "lemmy_email", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "mime", "mime_guess", "moka", @@ -3473,7 +3473,7 @@ dependencies = [ [[package]] name = "lemmy_apub" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "activitypub_federation", "actix-web", @@ -3484,7 +3484,7 @@ dependencies = [ "lemmy_api_utils", "lemmy_apub_activities", "lemmy_apub_objects", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_community_follower", "lemmy_db_views_community_follower_approval", @@ -3492,7 +3492,7 @@ dependencies = [ "lemmy_db_views_post", "lemmy_db_views_site", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_json", @@ -3504,7 +3504,7 @@ dependencies = [ [[package]] name = "lemmy_apub_activities" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "activitypub_federation", "anyhow", @@ -3517,7 +3517,7 @@ dependencies = [ "futures-util", "lemmy_api_utils", "lemmy_apub_objects", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_community", "lemmy_db_views_community_moderator", @@ -3526,7 +3526,7 @@ dependencies = [ "lemmy_db_views_private_message", "lemmy_db_views_site", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "serde", "serde_json", "serde_with", @@ -3538,7 +3538,7 @@ dependencies = [ [[package]] name = "lemmy_apub_objects" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "activitypub_federation", "anyhow", @@ -3552,14 +3552,14 @@ dependencies = [ "html2text", "itertools", "lemmy_api_utils", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_community_moderator", "lemmy_db_views_local_user", "lemmy_db_views_private_message", "lemmy_db_views_site", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "moka", "pretty_assertions", "regex", @@ -3576,7 +3576,7 @@ dependencies = [ [[package]] name = "lemmy_apub_send" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "activitypub_federation", "actix-web", @@ -3589,11 +3589,11 @@ dependencies = [ "futures", "lemmy_api_utils", "lemmy_apub_objects", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_community_follower", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "mockall", "moka", "reqwest 0.13.2", @@ -3632,7 +3632,7 @@ dependencies = [ [[package]] name = "lemmy_db_schema" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "bcrypt", "chrono", @@ -3645,7 +3645,7 @@ dependencies = [ "i-love-jesus", "lemmy_db_schema_file", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_json", @@ -3659,7 +3659,7 @@ dependencies = [ [[package]] name = "lemmy_db_schema_file" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "diesel-derive-enum", @@ -3698,18 +3698,18 @@ dependencies = [ [[package]] name = "lemmy_db_views_comment" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "chrono", "diesel", "diesel-async", "diesel_ltree", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_local_user", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_with", @@ -3720,16 +3720,16 @@ dependencies = [ [[package]] name = "lemmy_db_views_community" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "diesel-async", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_community_moderator", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "serde", "serde_with", "serial_test", @@ -3739,15 +3739,15 @@ dependencies = [ [[package]] name = "lemmy_db_views_community_follower" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "chrono", "diesel", "diesel-async", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "serde", "serde_with", "ts-rs", @@ -3755,15 +3755,15 @@ dependencies = [ [[package]] name = "lemmy_db_views_community_follower_approval" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "diesel-async", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "serde", "serde_with", "serial_test", @@ -3773,28 +3773,28 @@ dependencies = [ [[package]] name = "lemmy_db_views_community_moderator" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "diesel-async", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "serde", "ts-rs", ] [[package]] name = "lemmy_db_views_custom_emoji" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "diesel-async", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "serde", "serde_with", "ts-rs", @@ -3802,15 +3802,15 @@ dependencies = [ [[package]] name = "lemmy_db_views_local_image" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "diesel-async", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "serde", "serde_with", "ts-rs", @@ -3819,17 +3819,17 @@ dependencies = [ [[package]] name = "lemmy_db_views_local_user" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "actix-web", "chrono", "diesel", "diesel-async", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_with", @@ -3840,16 +3840,16 @@ dependencies = [ [[package]] name = "lemmy_db_views_local_user_invite" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "chrono", "diesel", "diesel-async", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_with", @@ -3871,15 +3871,15 @@ dependencies = [ [[package]] name = "lemmy_db_views_modlog" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "diesel-async", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_with", @@ -3890,13 +3890,13 @@ dependencies = [ [[package]] name = "lemmy_db_views_notification" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "chrono", "diesel", "diesel-async", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_comment", "lemmy_db_views_modlog", @@ -3904,7 +3904,7 @@ dependencies = [ "lemmy_db_views_post", "lemmy_db_views_private_message", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_with", @@ -3915,7 +3915,7 @@ dependencies = [ [[package]] name = "lemmy_db_views_notification_sql" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "lemmy_db_schema_file", @@ -3923,18 +3923,18 @@ dependencies = [ [[package]] name = "lemmy_db_views_person" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "chrono", "diesel", "diesel-async", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_community", "lemmy_db_views_community_moderator", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_with", @@ -3945,17 +3945,17 @@ dependencies = [ [[package]] name = "lemmy_db_views_person_content_combined" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "diesel-async", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_local_user", "lemmy_db_views_post_comment_combined", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_with", @@ -3966,17 +3966,17 @@ dependencies = [ [[package]] name = "lemmy_db_views_person_liked_combined" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "diesel-async", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_local_user", "lemmy_db_views_post_comment_combined", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_with", @@ -3987,17 +3987,17 @@ dependencies = [ [[package]] name = "lemmy_db_views_person_saved_combined" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "diesel-async", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_local_user", "lemmy_db_views_post_comment_combined", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_with", @@ -4008,19 +4008,19 @@ dependencies = [ [[package]] name = "lemmy_db_views_post" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "chrono", "diesel", "diesel-async", "diesel-uplete", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_community", "lemmy_db_views_local_user", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_with", @@ -4034,11 +4034,11 @@ dependencies = [ [[package]] name = "lemmy_db_views_post_comment_combined" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "chrono", "diesel", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_views_comment", "lemmy_db_views_post", "serde", @@ -4047,31 +4047,31 @@ dependencies = [ [[package]] name = "lemmy_db_views_private_message" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "diesel-async", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "serde", "ts-rs", ] [[package]] name = "lemmy_db_views_registration_applications" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "diesel-async", "extism", "extism-convert", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_with", @@ -4082,18 +4082,18 @@ dependencies = [ [[package]] name = "lemmy_db_views_report_combined" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "chrono", "diesel", "diesel-async", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_local_user", "lemmy_db_views_report_combined_sql", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_with", @@ -4104,7 +4104,7 @@ dependencies = [ [[package]] name = "lemmy_db_views_report_combined_sql" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "lemmy_db_schema_file", @@ -4112,7 +4112,7 @@ dependencies = [ [[package]] name = "lemmy_db_views_site" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "activitypub_federation", "anyhow", @@ -4121,7 +4121,7 @@ dependencies = [ "extism", "extism-convert", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_comment", "lemmy_db_views_community", @@ -4131,7 +4131,7 @@ dependencies = [ "lemmy_db_views_person", "lemmy_db_views_post", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "serde", "serde_with", "serial_test", @@ -4142,15 +4142,15 @@ dependencies = [ [[package]] name = "lemmy_db_views_vote" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "diesel", "diesel-async", "i-love-jesus", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pretty_assertions", "serde", "serde_with", @@ -4161,7 +4161,7 @@ dependencies = [ [[package]] name = "lemmy_diesel_utils" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "activitypub_federation", "anyhow", @@ -4178,7 +4178,7 @@ dependencies = [ "i-love-jesus", "itertools", "lemmy_db_schema_file", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "pathfinding", "pretty_assertions", "rustls 0.23.37", @@ -4197,14 +4197,14 @@ dependencies = [ [[package]] name = "lemmy_email" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "html2text", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_local_user", "lemmy_diesel_utils", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "lettre", "rosetta-build", "rosetta-i18n", @@ -4213,7 +4213,7 @@ dependencies = [ [[package]] name = "lemmy_routes" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "activitypub_federation", "actix-cors", @@ -4228,7 +4228,7 @@ dependencies = [ "futures-util", "http 1.4.0", "lemmy_api_utils", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_schema_file", "lemmy_db_views_community", "lemmy_db_views_local_image", @@ -4240,7 +4240,7 @@ dependencies = [ "lemmy_db_views_site", "lemmy_diesel_utils", "lemmy_email", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "percent-encoding", "pretty_assertions", "prometheus", @@ -4260,7 +4260,7 @@ dependencies = [ [[package]] name = "lemmy_server" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "activitypub_federation", "actix-web", @@ -4273,11 +4273,11 @@ dependencies = [ "lemmy_apub_activities", "lemmy_apub_objects", "lemmy_apub_send", - "lemmy_db_schema 1.0.0-beta.0", + "lemmy_db_schema 1.0.0-test-fix-publish-3", "lemmy_db_views_site", "lemmy_diesel_utils", "lemmy_routes", - "lemmy_utils 1.0.0-beta.0", + "lemmy_utils 1.0.0-test-fix-publish-3", "mimalloc", "reqwest-middleware", "reqwest-tracing", @@ -4304,7 +4304,7 @@ dependencies = [ [[package]] name = "lemmy_utils" -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" dependencies = [ "actix-extensible-rate-limit", "actix-web", diff --git a/Cargo.toml b/Cargo.toml index 8b9a377ad2..0bd2e72300 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "1.0.0-beta.0" +version = "1.0.0-test-fix-publish-3" edition = "2024" description = "A link aggregator for the fediverse" license = "AGPL-3.0" @@ -109,45 +109,45 @@ allow_attributes = "deny" unchecked_time_subtraction = "deny" [workspace.dependencies] -lemmy_api = { version = "=1.0.0-beta.0", path = "./crates/api/api" } -lemmy_api_crud = { version = "=1.0.0-beta.0", path = "./crates/api/api_crud" } -lemmy_api_routes = { version = "=1.0.0-beta.0", path = "./crates/api/routes" } -lemmy_api_routes_v3 = { version = "=1.0.0-beta.0", path = "./crates/api/routes_v3" } -lemmy_apub = { version = "=1.0.0-beta.0", path = "./crates/apub/apub" } -lemmy_apub_activities = { version = "=1.0.0-beta.0", path = "./crates/apub/activities" } -lemmy_apub_objects = { version = "=1.0.0-beta.0", path = "./crates/apub/objects" } -lemmy_utils = { version = "=1.0.0-beta.0", path = "./crates/utils", default-features = false } -lemmy_db_schema = { version = "=1.0.0-beta.0", path = "./crates/db_schema" } -lemmy_db_schema_file = { version = "=1.0.0-beta.0", path = "./crates/db_schema_file" } -lemmy_diesel_utils = { version = "=1.0.0-beta.0", path = "./crates/diesel_utils" } -lemmy_api_utils = { version = "=1.0.0-beta.0", path = "./crates/api/api_utils" } -lemmy_routes = { version = "=1.0.0-beta.0", path = "./crates/routes" } -lemmy_apub_send = { version = "=1.0.0-beta.0", path = "./crates/apub/send" } -lemmy_email = { version = "=1.0.0-beta.0", path = "./crates/email" } -lemmy_db_views_comment = { version = "=1.0.0-beta.0", path = "./crates/db_views/comment" } -lemmy_db_views_community = { version = "=1.0.0-beta.0", path = "./crates/db_views/community" } -lemmy_db_views_community_follower = { version = "=1.0.0-beta.0", path = "./crates/db_views/community_follower" } -lemmy_db_views_community_follower_approval = { version = "=1.0.0-beta.0", path = "./crates/db_views/community_follower_approval" } -lemmy_db_views_community_moderator = { version = "=1.0.0-beta.0", path = "./crates/db_views/community_moderator" } -lemmy_db_views_custom_emoji = { version = "=1.0.0-beta.0", path = "./crates/db_views/custom_emoji" } -lemmy_db_views_notification = { version = "=1.0.0-beta.0", path = "./crates/db_views/notification" } -lemmy_db_views_notification_sql = { version = "=1.0.0-beta.0", path = "./crates/db_views/notification_sql" } -lemmy_db_views_local_image = { version = "=1.0.0-beta.0", path = "./crates/db_views/local_image" } -lemmy_db_views_local_user = { version = "=1.0.0-beta.0", path = "./crates/db_views/local_user" } -lemmy_db_views_modlog = { version = "=1.0.0-beta.0", path = "./crates/db_views/modlog" } -lemmy_db_views_person = { version = "=1.0.0-beta.0", path = "./crates/db_views/person" } -lemmy_db_views_person_content_combined = { version = "=1.0.0-beta.0", path = "./crates/db_views/person_content_combined" } -lemmy_db_views_person_liked_combined = { version = "=1.0.0-beta.0", path = "./crates/db_views/person_liked_combined" } -lemmy_db_views_person_saved_combined = { version = "=1.0.0-beta.0", path = "./crates/db_views/person_saved_combined" } -lemmy_db_views_post_comment_combined = { version = "=1.0.0-beta.0", path = "./crates/db_views/post_comment_combined" } -lemmy_db_views_post = { version = "=1.0.0-beta.0", path = "./crates/db_views/post" } -lemmy_db_views_private_message = { version = "=1.0.0-beta.0", path = "./crates/db_views/private_message" } -lemmy_db_views_registration_applications = { version = "=1.0.0-beta.0", path = "./crates/db_views/registration_applications" } -lemmy_db_views_report_combined = { version = "=1.0.0-beta.0", path = "./crates/db_views/report_combined" } -lemmy_db_views_report_combined_sql = { version = "=1.0.0-beta.0", path = "./crates/db_views/report_combined_sql" } -lemmy_db_views_site = { version = "=1.0.0-beta.0", path = "./crates/db_views/site" } -lemmy_db_views_vote = { version = "=1.0.0-beta.0", path = "./crates/db_views/vote" } -lemmy_db_views_local_user_invite = { version = "=1.0.0-beta.0", path = "./crates/db_views/local_user_invite" } +lemmy_api = { version = "=1.0.0-test-fix-publish-3", path = "./crates/api/api" } +lemmy_api_crud = { version = "=1.0.0-test-fix-publish-3", path = "./crates/api/api_crud" } +lemmy_api_routes = { version = "=1.0.0-test-fix-publish-3", path = "./crates/api/routes" } +lemmy_api_routes_v3 = { version = "=1.0.0-test-fix-publish-3", path = "./crates/api/routes_v3" } +lemmy_apub = { version = "=1.0.0-test-fix-publish-3", path = "./crates/apub/apub" } +lemmy_apub_activities = { version = "=1.0.0-test-fix-publish-3", path = "./crates/apub/activities" } +lemmy_apub_objects = { version = "=1.0.0-test-fix-publish-3", path = "./crates/apub/objects" } +lemmy_utils = { version = "=1.0.0-test-fix-publish-3", path = "./crates/utils", default-features = false } +lemmy_db_schema = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_schema" } +lemmy_db_schema_file = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_schema_file" } +lemmy_diesel_utils = { version = "=1.0.0-test-fix-publish-3", path = "./crates/diesel_utils" } +lemmy_api_utils = { version = "=1.0.0-test-fix-publish-3", path = "./crates/api/api_utils" } +lemmy_routes = { version = "=1.0.0-test-fix-publish-3", path = "./crates/routes" } +lemmy_apub_send = { version = "=1.0.0-test-fix-publish-3", path = "./crates/apub/send" } +lemmy_email = { version = "=1.0.0-test-fix-publish-3", path = "./crates/email" } +lemmy_db_views_comment = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/comment" } +lemmy_db_views_community = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/community" } +lemmy_db_views_community_follower = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/community_follower" } +lemmy_db_views_community_follower_approval = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/community_follower_approval" } +lemmy_db_views_community_moderator = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/community_moderator" } +lemmy_db_views_custom_emoji = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/custom_emoji" } +lemmy_db_views_notification = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/notification" } +lemmy_db_views_notification_sql = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/notification_sql" } +lemmy_db_views_local_image = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/local_image" } +lemmy_db_views_local_user = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/local_user" } +lemmy_db_views_modlog = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/modlog" } +lemmy_db_views_person = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/person" } +lemmy_db_views_person_content_combined = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/person_content_combined" } +lemmy_db_views_person_liked_combined = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/person_liked_combined" } +lemmy_db_views_person_saved_combined = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/person_saved_combined" } +lemmy_db_views_post_comment_combined = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/post_comment_combined" } +lemmy_db_views_post = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/post" } +lemmy_db_views_private_message = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/private_message" } +lemmy_db_views_registration_applications = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/registration_applications" } +lemmy_db_views_report_combined = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/report_combined" } +lemmy_db_views_report_combined_sql = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/report_combined_sql" } +lemmy_db_views_site = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/site" } +lemmy_db_views_vote = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/vote" } +lemmy_db_views_local_user_invite = { version = "=1.0.0-test-fix-publish-3", path = "./crates/db_views/local_user_invite" } activitypub_federation = { version = "0.7.0-beta.11", default-features = false, features = [ "actix-web", ] } diff --git a/crates/api/api_common/src/comment.rs b/crates/api/api_common/src/comment.rs index 2ed796f138..9d5a14fdc8 100644 --- a/crates/api/api_common/src/comment.rs +++ b/crates/api/api_common/src/comment.rs @@ -12,8 +12,10 @@ pub mod actions { pub use lemmy_db_views_comment::api::{ CreateComment, CreateCommentLike, + CreateCommentWarning, DeleteComment, EditComment, + LockComment, SaveComment, }; diff --git a/crates/api/api_common/src/federation.rs b/crates/api/api_common/src/federation.rs index e2d22cb2a8..960973285a 100644 --- a/crates/api/api_common/src/federation.rs +++ b/crates/api/api_common/src/federation.rs @@ -8,12 +8,15 @@ pub use lemmy_db_schema::{ }, }; pub use lemmy_db_schema_file::{InstanceId, enums::FederationMode}; -pub use lemmy_db_views_site::api::{ - GetFederatedInstances, - GetFederatedInstancesKind, - ResolveObject, - UserBlockInstanceCommunitiesParams, - UserBlockInstancePersonsParams, +pub use lemmy_db_views_site::{ + FederatedInstanceView, + api::{ + GetFederatedInstances, + GetFederatedInstancesKind, + ResolveObject, + UserBlockInstanceCommunitiesParams, + UserBlockInstancePersonsParams, + }, }; pub mod administration { diff --git a/crates/api/api_common/src/modlog.rs b/crates/api/api_common/src/modlog.rs index fa8e7c61c0..a9731e6dcb 100644 --- a/crates/api/api_common/src/modlog.rs +++ b/crates/api/api_common/src/modlog.rs @@ -1,2 +1 @@ -pub use lemmy_db_schema::{newtypes::ModlogId, source::modlog::Modlog}; -pub use lemmy_db_views_modlog::api::GetModlog; +pub use lemmy_db_views_modlog::{ModlogView, api::GetModlog}; diff --git a/crates/api/api_common/src/post.rs b/crates/api/api_common/src/post.rs index ad3ff90aee..be1ae1a0fc 100644 --- a/crates/api/api_common/src/post.rs +++ b/crates/api/api_common/src/post.rs @@ -7,6 +7,9 @@ pub use lemmy_db_schema_file::enums::{PostListingMode, PostNotificationsMode}; pub use lemmy_db_views_post::{ PostView, api::{ + CreatePostWarning, + GetPost, + GetPostResponse, GetPosts, GetSiteMetadata, GetSiteMetadataResponse, diff --git a/crates/api/api_common/src/site.rs b/crates/api/api_common/src/site.rs index 5bc4336e5b..152596041a 100644 --- a/crates/api/api_common/src/site.rs +++ b/crates/api/api_common/src/site.rs @@ -20,5 +20,5 @@ pub mod administration { ApproveRegistrationApplication, ListRegistrationApplications, }; - pub use lemmy_db_views_site::api::{CreateSite, EditSite}; + pub use lemmy_db_views_site::api::{CreateSite, EditSite, Search, SearchResponse}; } diff --git a/crates/email/translations b/crates/email/translations index 39e79b5c4b..2e2623f1a5 160000 --- a/crates/email/translations +++ b/crates/email/translations @@ -1 +1 @@ -Subproject commit 39e79b5c4b248b95d8c53670770e7dd0226655f6 +Subproject commit 2e2623f1a5352b244046a3b7a1a7f026c6e923eb