From 89d3e3e6de420a005bff6c8cc95fdfcbfed0f353 Mon Sep 17 00:00:00 2001 From: Orual Date: Tue, 14 Oct 2025 18:34:56 -0400 Subject: [PATCH] added builder derivees to more generated api structs --- CHANGELOG.md | 58 ++ Cargo.lock | 82 +- Cargo.toml | 2 +- crates/jacquard-api/Cargo.toml | 2 +- .../src/app_blebbit/authr/folder.rs | 21 +- .../app_blebbit/authr/folder/create_folder.rs | 7 +- .../folder/delete_folder_relationship.rs | 4 +- .../src/app_blebbit/authr/folder/record.rs | 12 +- .../app_blebbit/authr/folder/update_folder.rs | 7 +- .../src/app_blebbit/authr/group.rs | 31 +- .../app_blebbit/authr/group/create_group.rs | 11 +- .../authr/group/delete_group_relationship.rs | 4 +- .../src/app_blebbit/authr/group/record.rs | 18 +- .../app_blebbit/authr/group/update_group.rs | 11 +- .../src/app_blebbit/authr/page.rs | 24 +- .../src/app_blebbit/authr/page/create_page.rs | 7 +- .../authr/page/delete_page_relationship.rs | 4 +- .../src/app_blebbit/authr/page/record.rs | 15 +- .../src/app_blebbit/authr/page/update_page.rs | 7 +- crates/jacquard-api/src/app_bsky/actor.rs | 433 ++++++---- .../src/app_bsky/actor/get_suggestions.rs | 2 +- .../src/app_bsky/actor/profile.rs | 47 +- .../jacquard-api/src/app_bsky/actor/status.rs | 20 +- crates/jacquard-api/src/app_bsky/bookmark.rs | 15 +- .../src/app_bsky/bookmark/create_bookmark.rs | 2 +- .../src/app_bsky/bookmark/delete_bookmark.rs | 18 +- crates/jacquard-api/src/app_bsky/embed.rs | 5 +- .../src/app_bsky/embed/external.rs | 24 +- .../jacquard-api/src/app_bsky/embed/images.rs | 28 +- .../jacquard-api/src/app_bsky/embed/record.rs | 38 +- .../src/app_bsky/embed/record_with_media.rs | 6 +- .../jacquard-api/src/app_bsky/embed/video.rs | 31 +- crates/jacquard-api/src/app_bsky/feed.rs | 244 +++--- .../app_bsky/feed/describe_feed_generator.rs | 12 +- .../src/app_bsky/feed/generator.rs | 30 +- .../src/app_bsky/feed/get_feed_generator.rs | 4 +- .../src/app_bsky/feed/get_feed_skeleton.rs | 2 +- .../src/app_bsky/feed/get_likes.rs | 3 +- crates/jacquard-api/src/app_bsky/feed/like.rs | 8 +- crates/jacquard-api/src/app_bsky/feed/post.rs | 58 +- .../src/app_bsky/feed/postgate.rs | 26 +- .../jacquard-api/src/app_bsky/feed/repost.rs | 8 +- .../src/app_bsky/feed/search_posts.rs | 2 +- .../src/app_bsky/feed/threadgate.rs | 39 +- crates/jacquard-api/src/app_bsky/graph.rs | 119 ++- .../jacquard-api/src/app_bsky/graph/block.rs | 7 +- .../jacquard-api/src/app_bsky/graph/follow.rs | 5 +- .../graph/get_lists_with_membership.rs | 8 +- .../src/app_bsky/graph/get_relationships.rs | 2 +- .../get_starter_packs_with_membership.rs | 8 +- .../graph/get_suggested_follows_by_actor.rs | 4 +- .../jacquard-api/src/app_bsky/graph/list.rs | 24 +- .../src/app_bsky/graph/listblock.rs | 7 +- .../src/app_bsky/graph/listitem.rs | 9 +- .../src/app_bsky/graph/starterpack.rs | 26 +- .../src/app_bsky/graph/verification.rs | 14 +- crates/jacquard-api/src/app_bsky/labeler.rs | 61 +- .../src/app_bsky/labeler/service.rs | 29 +- .../jacquard-api/src/app_bsky/notification.rs | 25 +- .../src/app_bsky/notification/declaration.rs | 8 +- .../notification/list_notifications.rs | 12 +- .../notification/put_preferences_v2.rs | 57 +- .../app_bsky/notification/register_push.rs | 5 +- .../src/app_bsky/richtext/facet.rs | 26 +- crates/jacquard-api/src/app_bsky/unspecced.rs | 117 ++- .../src/app_bsky/unspecced/get_config.rs | 3 +- .../unspecced/get_post_thread_other_v2.rs | 7 +- .../app_bsky/unspecced/get_post_thread_v2.rs | 9 +- .../unspecced/get_suggestions_skeleton.rs | 4 +- .../unspecced/get_tagged_suggestions.rs | 5 +- .../app_bsky/unspecced/init_age_assurance.rs | 6 +- .../unspecced/search_actors_skeleton.rs | 2 +- .../unspecced/search_posts_skeleton.rs | 2 +- .../search_starter_packs_skeleton.rs | 2 +- crates/jacquard-api/src/app_bsky/video.rs | 21 +- crates/jacquard-api/src/app_ocho/auth.rs | 6 +- .../src/app_ocho/auth/update_email.rs | 9 +- .../src/app_ocho/auth/update_handle.rs | 2 +- .../jacquard-api/src/app_ocho/auth/whoami.rs | 6 +- .../src/app_ocho/edu/get_verification_url.rs | 2 +- .../src/app_ocho/edu/is_verified.rs | 2 +- .../src/app_ocho/edu/verification.rs | 12 +- .../jacquard-api/src/app_ocho/message/send.rs | 6 +- .../src/app_ocho/payment/get_stripe_intent.rs | 12 +- crates/jacquard-api/src/app_ocho/plugin.rs | 225 ++++-- .../src/app_ocho/plugin/get_launch_asset.rs | 2 +- .../src/app_ocho/plugin/put_hosting_url.rs | 2 +- .../src/app_ocho/plugin/service.rs | 10 +- .../src/app_ocho/push/register.rs | 4 +- .../src/app_ocho/server/swap_launch_token.rs | 2 +- .../src/app_ocho/state/get_config.rs | 6 +- .../jacquard-api/src/app_ocho/state/login.rs | 2 +- .../src/beauty_cybernetic/trustcow/review.rs | 27 +- .../beauty_cybernetic/trustcow/transaction.rs | 31 +- .../src/beauty_cybernetic/trustcow/warrant.rs | 30 +- crates/jacquard-api/src/blog_pckt/blog.rs | 52 +- crates/jacquard-api/src/blog_pckt/post.rs | 22 +- .../jacquard-api/src/blog_pckt/publication.rs | 40 +- crates/jacquard-api/src/blog_pckt/theme.rs | 34 +- crates/jacquard-api/src/blue__2048.rs | 10 +- crates/jacquard-api/src/blue__2048/game.rs | 16 +- crates/jacquard-api/src/blue__2048/key.rs | 19 +- .../jacquard-api/src/blue__2048/key/game.rs | 7 +- .../src/blue__2048/key/player/stats.rs | 7 +- .../src/blue__2048/player/profile.rs | 9 +- .../src/blue__2048/player/stats.rs | 21 +- .../src/blue__2048/verification.rs | 14 +- .../src/blue__2048/verification/game.rs | 15 +- .../src/blue__2048/verification/stats.rs | 15 +- .../src/blue_atplane/fav_client.rs | 8 +- crates/jacquard-api/src/blue_linkat/board.rs | 25 +- .../src/blue_zio/atfile/finger.rs | 28 +- .../jacquard-api/src/blue_zio/atfile/lock.rs | 8 +- .../jacquard-api/src/blue_zio/atfile/meta.rs | 8 +- crates/jacquard-api/src/buzz_bookhive.rs | 117 ++- crates/jacquard-api/src/buzz_bookhive/book.rs | 42 +- crates/jacquard-api/src/buzz_bookhive/buzz.rs | 10 +- .../src/buzz_bookhive/get_book.rs | 16 +- .../src/buzz_bookhive/get_profile.rs | 6 +- .../src/buzz_bookhive/hive_book.rs | 52 +- .../src/buzz_bookhive/search_books.rs | 2 +- crates/jacquard-api/src/chat_bsky/actor.rs | 26 +- .../src/chat_bsky/actor/declaration.rs | 6 +- crates/jacquard-api/src/chat_bsky/convo.rs | 120 ++- .../src/chat_bsky/convo/accept_convo.rs | 2 +- .../src/chat_bsky/convo/add_reaction.rs | 6 +- .../src/chat_bsky/convo/remove_reaction.rs | 4 +- .../src/chat_bsky/convo/send_message_batch.rs | 4 +- .../src/chat_bsky/convo/update_all_read.rs | 6 +- .../src/chat_bsky/convo/update_read.rs | 4 +- .../moderation/get_actor_metadata.rs | 3 +- .../moderation/update_actor_access.rs | 4 +- .../src/club_stellz/evm/address_control.rs | 36 +- crates/jacquard-api/src/com_atproto/admin.rs | 56 +- .../admin/disable_account_invites.rs | 6 +- .../com_atproto/admin/disable_invite_codes.rs | 6 +- .../admin/enable_account_invites.rs | 6 +- .../src/com_atproto/admin/send_email.rs | 10 +- .../com_atproto/admin/update_account_email.rs | 2 +- .../admin/update_account_signing_key.rs | 2 +- .../admin/update_subject_status.rs | 6 +- .../jacquard-api/src/com_atproto/identity.rs | 7 +- .../get_recommended_did_credentials.rs | 2 +- .../com_atproto/identity/refresh_identity.rs | 6 +- .../src/com_atproto/identity/resolve_did.rs | 6 +- .../com_atproto/identity/resolve_handle.rs | 2 +- .../com_atproto/identity/resolve_identity.rs | 6 +- .../identity/sign_plc_operation.rs | 22 +- .../src/com_atproto/identity/update_handle.rs | 2 +- crates/jacquard-api/src/com_atproto/label.rs | 89 +- .../src/com_atproto/label/subscribe_labels.rs | 10 +- .../src/com_atproto/lexicon/schema.rs | 7 +- .../src/com_atproto/moderation.rs | 16 +- .../com_atproto/moderation/create_report.rs | 24 +- crates/jacquard-api/src/com_atproto/repo.rs | 3 +- .../src/com_atproto/repo/apply_writes.rs | 49 +- .../src/com_atproto/repo/create_record.rs | 23 +- .../src/com_atproto/repo/delete_record.rs | 16 +- .../src/com_atproto/repo/describe_repo.rs | 6 +- .../com_atproto/repo/list_missing_blobs.rs | 3 +- .../src/com_atproto/repo/list_records.rs | 3 +- .../src/com_atproto/repo/put_record.rs | 23 +- .../src/com_atproto/repo/strong_ref.rs | 3 +- crates/jacquard-api/src/com_atproto/server.rs | 9 +- .../src/com_atproto/server/create_account.rs | 44 +- .../com_atproto/server/create_app_password.rs | 15 +- .../com_atproto/server/create_invite_code.rs | 3 +- .../com_atproto/server/create_invite_codes.rs | 7 +- .../src/com_atproto/server/create_session.rs | 13 +- .../com_atproto/server/deactivate_account.rs | 5 +- .../src/com_atproto/server/describe_server.rs | 25 +- .../com_atproto/server/get_service_auth.rs | 2 +- .../src/com_atproto/server/get_session.rs | 2 +- .../com_atproto/server/list_app_passwords.rs | 7 +- .../src/com_atproto/server/refresh_session.rs | 2 +- .../com_atproto/server/reserve_signing_key.rs | 7 +- .../src/com_atproto/server/update_email.rs | 9 +- .../src/com_atproto/sync/get_host_status.rs | 4 +- .../src/com_atproto/sync/get_repo_status.rs | 4 +- .../src/com_atproto/sync/list_hosts.rs | 19 +- .../src/com_atproto/sync/list_repos.rs | 13 +- .../sync/list_repos_by_collection.rs | 3 +- .../src/com_atproto/sync/notify_of_update.rs | 2 +- .../src/com_atproto/sync/request_crawl.rs | 2 +- .../src/com_atproto/sync/subscribe_repos.rs | 89 +- .../temp/check_handle_availability.rs | 22 +- .../src/com_atproto/temp/dereference_scope.rs | 4 +- .../identity/resolve_mini_doc.rs | 8 +- .../src/com_crabdance/nandi/post.rs | 27 +- .../com_shinolabs/pinksea/app_view_defs.rs | 41 +- .../pinksea/get_handle_from_did.rs | 2 +- .../src/com_shinolabs/pinksea/get_identity.rs | 4 +- .../pinksea/get_parent_for_reply.rs | 4 +- .../src/com_shinolabs/pinksea/oekaki.rs | 39 +- .../src/com_shinolabs/pinksea/profile.rs | 35 +- crates/jacquard-api/src/com_whtwnd/blog.rs | 26 +- .../jacquard-api/src/com_whtwnd/blog/entry.rs | 34 +- .../blog/get_entry_metadata_by_name.rs | 2 +- .../community_lexicon/bookmarks/bookmark.rs | 10 +- .../src/community_lexicon/calendar/event.rs | 79 +- .../src/community_lexicon/calendar/rsvp.rs | 12 +- .../src/community_lexicon/interaction/like.rs | 5 +- .../src/community_lexicon/location/address.rs | 33 +- .../src/community_lexicon/location/fsq.rs | 19 +- .../src/community_lexicon/location/geo.rs | 15 +- .../src/community_lexicon/location/hthree.rs | 13 +- .../payments/web_monetization.rs | 12 +- .../src/dev_baileytownsend/health/calories.rs | 5 +- .../src/dev_baileytownsend/health/rings.rs | 17 +- .../src/dev_baileytownsend/health/steps.rs | 3 +- .../src/dev_baileytownsend/health/workout.rs | 16 +- .../experimental/atforumv1/feed/post.rs | 13 +- .../experimental/atforumv1/feed/reply.rs | 9 +- .../atforumv1/forum/announcement.rs | 7 +- .../experimental/atforumv1/forum/category.rs | 10 +- .../experimental/atforumv1/forum/group.rs | 9 +- .../experimental/atforumv1/forum/identity.rs | 12 +- .../src/dev_ocbwoy3/blueboard/board.rs | 13 +- .../src/dev_ocbwoy3/blueboard/post.rs | 15 +- .../src/dev_regnault/webfishing/savefile.rs | 6 +- .../src/fyi_unravel/frontpage/comment.rs | 13 +- .../src/fyi_unravel/frontpage/post.rs | 12 +- .../src/fyi_unravel/frontpage/vote.rs | 7 +- .../src/moe_karashiiro/kpaste/paste.rs | 22 +- crates/jacquard-api/src/my_skylights.rs | 5 +- crates/jacquard-api/src/my_skylights/list.rs | 13 +- .../src/my_skylights/list_item.rs | 26 +- crates/jacquard-api/src/my_skylights/rel.rs | 19 +- .../src/net_aftertheinter/coolthingtwo.rs | 4 +- .../src/net_anisota/beta/game/collection.rs | 115 +-- .../src/net_anisota/beta/game/inventory.rs | 87 +- .../src/net_anisota/beta/game/log.rs | 265 +++--- .../src/net_anisota/beta/game/pack.rs | 68 +- .../src/net_anisota/beta/game/progress.rs | 126 +-- .../src/net_anisota/beta/game/session.rs | 193 +++-- .../src/net_anisota/feed/draft.rs | 44 +- .../jacquard-api/src/net_anisota/feed/like.rs | 9 +- .../jacquard-api/src/net_anisota/feed/list.rs | 25 +- .../src/net_anisota/feed/list_item.rs | 11 +- .../jacquard-api/src/net_anisota/feed/post.rs | 39 +- .../src/net_anisota/feed/repost.rs | 9 +- .../src/net_anisota/graph/list_mute.rs | 58 +- .../src/net_anisota/graph/mute.rs | 58 +- .../src/net_bnewbold/demo/mushies.rs | 12 +- .../src/net_bnewbold/demo/mushroom.rs | 12 +- crates/jacquard-api/src/net_bnewbold/m.rs | 12 +- .../jacquard-api/src/net_mmatt/right/now.rs | 15 +- .../jacquard-api/src/net_mmatt/vitals/car.rs | 30 +- .../jacquard-api/src/network_slices/actor.rs | 14 +- .../src/network_slices/actor/profile.rs | 21 +- .../src/network_slices/lexicon.rs | 28 +- .../jacquard-api/src/network_slices/slice.rs | 57 +- .../slice/clear_slice_records.rs | 4 +- .../slice/create_o_auth_client.rs | 42 +- .../slice/delete_o_auth_client.rs | 4 +- .../src/network_slices/slice/get_actors.rs | 35 +- .../slice/get_jetstream_status.rs | 2 +- .../src/network_slices/slice/get_job_logs.rs | 36 +- .../network_slices/slice/get_job_status.rs | 49 +- .../slice/get_o_auth_clients.rs | 49 +- .../network_slices/slice/get_slice_records.rs | 40 +- .../network_slices/slice/get_sparklines.rs | 24 +- .../network_slices/slice/get_sync_summary.rs | 12 +- .../src/network_slices/slice/start_sync.rs | 33 +- .../src/network_slices/slice/stats.rs | 19 +- .../slice/sync_user_collections.rs | 13 +- .../slice/update_o_auth_client.rs | 39 +- .../src/network_slices/waitlist.rs | 40 +- .../src/network_slices/waitlist/invite.rs | 16 +- .../src/network_slices/waitlist/request.rs | 9 +- .../jacquard-api/src/org_devcon/event/test.rs | 28 +- .../src/org_robocracy/demo/fungus.rs | 12 +- .../src/org_robocracy/demo/mushies.rs | 12 +- .../src/place_atwork/endorsement.rs | 21 +- .../src/place_atwork/endorsement_proof.rs | 7 +- .../src/place_atwork/get_listing.rs | 12 +- .../src/place_atwork/get_listings.rs | 14 +- .../jacquard-api/src/place_atwork/listing.rs | 37 +- .../jacquard-api/src/place_atwork/profile.rs | 49 +- .../src/place_atwork/search_listings.rs | 16 +- crates/jacquard-api/src/place_stream.rs | 10 +- crates/jacquard-api/src/place_stream/chat.rs | 16 +- .../src/place_stream/chat/gate.rs | 7 +- .../src/place_stream/chat/message.rs | 25 +- .../src/place_stream/chat/profile.rs | 13 +- crates/jacquard-api/src/place_stream/key.rs | 15 +- .../src/place_stream/livestream.rs | 49 +- .../src/place_stream/richtext/facet.rs | 5 +- .../jacquard-api/src/place_stream/segment.rs | 49 +- .../jacquard-api/src/place_stream/server.rs | 70 +- .../src/place_stream/server/create_webhook.rs | 49 +- .../src/place_stream/server/delete_webhook.rs | 8 +- .../src/place_stream/server/get_webhook.rs | 4 +- .../src/place_stream/server/list_webhooks.rs | 4 +- .../src/place_stream/server/settings.rs | 10 +- .../src/place_stream/server/update_webhook.rs | 59 +- .../src/pub_leaflet/blocks/blockquote.rs | 7 +- .../src/pub_leaflet/blocks/bsky_post.rs | 3 +- .../src/pub_leaflet/blocks/code.rs | 10 +- .../src/pub_leaflet/blocks/header.rs | 10 +- .../src/pub_leaflet/blocks/horizontal_rule.rs | 3 +- .../src/pub_leaflet/blocks/iframe.rs | 6 +- .../src/pub_leaflet/blocks/image.rs | 11 +- .../src/pub_leaflet/blocks/math.rs | 4 +- .../src/pub_leaflet/blocks/text.rs | 7 +- .../src/pub_leaflet/blocks/unordered_list.rs | 11 +- .../src/pub_leaflet/blocks/website.rs | 12 +- .../jacquard-api/src/pub_leaflet/comment.rs | 23 +- .../jacquard-api/src/pub_leaflet/document.rs | 17 +- .../src/pub_leaflet/graph/subscription.rs | 5 +- .../src/pub_leaflet/pages/linear_document.rs | 20 +- .../src/pub_leaflet/publication.rs | 56 +- .../src/pub_leaflet/richtext/facet.rs | 53 +- .../src/pub_leaflet/theme/background_image.rs | 9 +- .../src/pub_leaflet/theme/color.rs | 6 +- .../src/sh_tangled/actor/profile.rs | 30 +- .../src/sh_tangled/feed/reaction.rs | 4 +- .../jacquard-api/src/sh_tangled/feed/star.rs | 3 +- .../src/sh_tangled/git/ref_update.rs | 49 +- .../src/sh_tangled/graph/follow.rs | 3 +- crates/jacquard-api/src/sh_tangled/knot.rs | 3 +- .../src/sh_tangled/knot/list_keys.rs | 14 +- .../src/sh_tangled/knot/member.rs | 6 +- .../src/sh_tangled/label/definition.rs | 34 +- .../jacquard-api/src/sh_tangled/label/op.rs | 13 +- crates/jacquard-api/src/sh_tangled/owner.rs | 2 +- .../jacquard-api/src/sh_tangled/pipeline.rs | 57 +- .../src/sh_tangled/pipeline/status.rs | 22 +- .../jacquard-api/src/sh_tangled/public_key.rs | 11 +- crates/jacquard-api/src/sh_tangled/repo.rs | 27 +- .../src/sh_tangled/repo/archive.rs | 10 +- .../src/sh_tangled/repo/artifact.rs | 14 +- .../jacquard-api/src/sh_tangled/repo/blob.rs | 52 +- .../src/sh_tangled/repo/branch.rs | 29 +- .../src/sh_tangled/repo/branches.rs | 4 +- .../src/sh_tangled/repo/collaborator.rs | 5 +- .../src/sh_tangled/repo/compare.rs | 10 +- .../src/sh_tangled/repo/create.rs | 14 +- .../src/sh_tangled/repo/delete.rs | 6 +- .../jacquard-api/src/sh_tangled/repo/diff.rs | 6 +- .../src/sh_tangled/repo/fork_status.rs | 12 +- .../src/sh_tangled/repo/fork_sync.rs | 8 +- .../src/sh_tangled/repo/get_default_branch.rs | 25 +- .../src/sh_tangled/repo/hidden_ref.rs | 12 +- .../jacquard-api/src/sh_tangled/repo/issue.rs | 7 +- .../src/sh_tangled/repo/issue/comment.rs | 7 +- .../src/sh_tangled/repo/issue/state.rs | 6 +- .../src/sh_tangled/repo/issue/state/closed.rs | 2 +- .../src/sh_tangled/repo/issue/state/open.rs | 2 +- .../src/sh_tangled/repo/languages.rs | 37 +- .../src/sh_tangled/repo/list_secrets.rs | 4 +- .../jacquard-api/src/sh_tangled/repo/log.rs | 8 +- .../jacquard-api/src/sh_tangled/repo/merge.rs | 32 +- .../src/sh_tangled/repo/merge_check.rs | 25 +- .../jacquard-api/src/sh_tangled/repo/pull.rs | 23 +- .../src/sh_tangled/repo/pull/comment.rs | 4 +- .../src/sh_tangled/repo/pull/status.rs | 6 +- .../src/sh_tangled/repo/pull/status/closed.rs | 2 +- .../src/sh_tangled/repo/pull/status/merged.rs | 2 +- .../src/sh_tangled/repo/pull/status/open.rs | 2 +- .../jacquard-api/src/sh_tangled/repo/tags.rs | 4 +- .../jacquard-api/src/sh_tangled/repo/tree.rs | 54 +- crates/jacquard-api/src/sh_tangled/spindle.rs | 3 +- .../src/sh_tangled/spindle/member.rs | 6 +- crates/jacquard-api/src/sh_tangled/string.rs | 6 +- crates/jacquard-api/src/sh_weaver/actor.rs | 78 +- .../src/sh_weaver/actor/profile.rs | 51 +- crates/jacquard-api/src/sh_weaver/edit.rs | 9 +- .../jacquard-api/src/sh_weaver/edit/cursor.rs | 31 +- .../jacquard-api/src/sh_weaver/edit/diff.rs | 5 +- .../jacquard-api/src/sh_weaver/edit/root.rs | 5 +- crates/jacquard-api/src/sh_weaver/embed.rs | 10 +- .../src/sh_weaver/embed/external.rs | 22 +- .../src/sh_weaver/embed/images.rs | 17 +- .../src/sh_weaver/embed/record_with_media.rs | 6 +- .../src/sh_weaver/embed/records.rs | 38 +- .../jacquard-api/src/sh_weaver/embed/video.rs | 31 +- crates/jacquard-api/src/sh_weaver/notebook.rs | 75 +- .../src/sh_weaver/notebook/authors.rs | 19 +- .../src/sh_weaver/notebook/book.rs | 16 +- .../src/sh_weaver/notebook/chapter.rs | 18 +- .../src/sh_weaver/notebook/entry.rs | 18 +- .../src/sh_weaver/publish/blob.rs | 7 +- .../jacquard-api/src/social_clippr/actor.rs | 37 +- .../social_clippr/actor/get_preferences.rs | 2 +- .../src/social_clippr/actor/profile.rs | 20 +- .../social_clippr/actor/put_preferences.rs | 2 +- .../src/social_clippr/actor/search_clips.rs | 4 +- .../social_clippr/actor/search_profiles.rs | 2 +- .../src/social_clippr/actor/search_tags.rs | 4 +- crates/jacquard-api/src/social_clippr/feed.rs | 30 +- .../src/social_clippr/feed/clip.rs | 39 +- .../src/social_clippr/feed/get_clips.rs | 2 +- .../src/social_clippr/feed/get_tag_list.rs | 2 +- .../src/social_clippr/feed/get_tags.rs | 2 +- .../src/social_clippr/feed/tag.rs | 20 +- crates/jacquard-api/src/social_grain.rs | 5 +- crates/jacquard-api/src/social_grain/actor.rs | 18 +- .../src/social_grain/actor/profile.rs | 21 +- .../jacquard-api/src/social_grain/favorite.rs | 3 +- .../jacquard-api/src/social_grain/gallery.rs | 21 +- .../src/social_grain/gallery/item.rs | 6 +- crates/jacquard-api/src/social_grain/photo.rs | 69 +- .../src/social_grain/photo/exif.rs | 37 +- .../jacquard-api/src/social_pmsky/proposal.rs | 45 +- crates/jacquard-api/src/social_pmsky/vote.rs | 31 +- .../src/social_psky/actor/profile.rs | 8 +- .../src/social_psky/chat/message.rs | 16 +- .../jacquard-api/src/social_psky/chat/room.rs | 30 +- .../src/social_psky/richtext/facet.rs | 26 +- .../src/tools_ozone/communication.rs | 22 +- .../communication/create_template.rs | 16 +- .../communication/update_template.rs | 33 +- .../hosting/get_account_history.rs | 27 +- .../src/tools_ozone/moderation.rs | 758 +++++++++++------- .../moderation/cancel_scheduled_actions.rs | 22 +- .../src/tools_ozone/moderation/emit_event.rs | 16 +- .../moderation/get_account_timeline.rs | 9 +- .../moderation/list_scheduled_actions.rs | 30 +- .../tools_ozone/moderation/schedule_action.rs | 60 +- crates/jacquard-api/src/tools_ozone/report.rs | 80 +- .../jacquard-api/src/tools_ozone/safelink.rs | 36 +- .../src/tools_ozone/safelink/add_rule.rs | 17 +- .../src/tools_ozone/safelink/query_events.rs | 30 +- .../src/tools_ozone/safelink/query_rules.rs | 46 +- .../src/tools_ozone/safelink/remove_rule.rs | 15 +- .../src/tools_ozone/safelink/update_rule.rs | 15 +- .../src/tools_ozone/server/get_config.rs | 14 +- crates/jacquard-api/src/tools_ozone/set.rs | 14 +- .../src/tools_ozone/set/add_values.rs | 4 +- .../src/tools_ozone/set/delete_set.rs | 4 +- .../src/tools_ozone/set/delete_values.rs | 6 +- .../src/tools_ozone/set/get_values.rs | 2 +- .../jacquard-api/src/tools_ozone/setting.rs | 10 +- .../src/tools_ozone/setting/upsert_option.rs | 8 +- .../jacquard-api/src/tools_ozone/signature.rs | 5 +- .../signature/find_related_accounts.rs | 8 +- crates/jacquard-api/src/tools_ozone/team.rs | 27 +- .../src/tools_ozone/team/add_member.rs | 2 +- .../src/tools_ozone/team/delete_member.rs | 4 +- .../src/tools_ozone/team/update_member.rs | 9 +- .../src/tools_ozone/verification.rs | 45 +- .../verification/grant_verifications.rs | 27 +- .../verification/revoke_verifications.rs | 22 +- .../tools_smokesignal/blahg/content/post.rs | 32 +- crates/jacquard-api/src/uk_ewancroft/now.rs | 8 +- crates/jacquard-api/src/uk_skyblur/post.rs | 23 +- .../src/uk_skyblur/post/decrypt_by_cid.rs | 2 +- .../src/uk_skyblur/post/encrypt.rs | 2 +- .../src/uk_skyblur/post/get_post.rs | 8 +- .../jacquard-api/src/uk_skyblur/preference.rs | 15 +- crates/jacquard-api/src/us_polhem/blog.rs | 5 +- .../src/us_polhem/blog/content.rs | 10 +- .../jacquard-api/src/us_polhem/blog/post.rs | 25 +- crates/jacquard-api/src/us_polhem/blog/tag.rs | 8 +- crates/jacquard-api/src/win_tomo_x/pushat.rs | 23 +- .../src/win_tomo_x/pushat/allow.rs | 8 +- .../src/win_tomo_x/pushat/push_notify.rs | 2 +- crates/jacquard-axum/Cargo.toml | 4 +- crates/jacquard-common/Cargo.toml | 2 +- crates/jacquard-derive/src/lib.rs | 140 +++- crates/jacquard-identity/Cargo.toml | 2 +- .../jacquard-lexicon/src/codegen/structs.rs | 90 ++- crates/jacquard-lexicon/src/codegen/utils.rs | 2 +- crates/jacquard-oauth/Cargo.toml | 2 +- 465 files changed, 6600 insertions(+), 4287 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e88d8185..80e6304b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,63 @@ # Changelog +## [0.5.2] - 2025-10-14 + +### Added + +**Service Auth** (`jacquard-axum`, `jacquard-common`) +- Full service authentication implementation for inter-service JWT verification +- `ExtractServiceAuth` Axum extractor for validating service auth tokens +- JWT parsing and signature verification (ES256, ES256K) +- Service auth claims validation (issuer, audience, expiration, method binding) +- DID document resolution for signing key verification +- Optional replay protection via `ReplayTracker` trait +- See CLAUDE.md for detailed implementation notes + +**XrpcRequest derive macro** (`jacquard-derive`) +- `#[derive(XrpcRequest)]` for custom XRPC endpoints +- Automatically generates response marker struct and trait implementations +- Supports both client-side (`XrpcRequest`) and server-side (`XrpcEndpoint`) with `server` flag +- Simplifies defining custom XRPC endpoints outside of generated API + +**Builder integration** (`jacquard-derive`) +- `#[lexicon]` macro now detects `bon::Builder` derive +- Automatically adds `#[builder(default)]` to `extra_data` field when Builder is present +- Makes `extra_data` optional in generated builders + +### Fixed + +**String deserialization** (`jacquard-common`) +- All string types (Did, Handle, Nsid, etc.) now properly handle URL-encoded values +- `serde_html_form` correctly decodes percent-encoded characters during deserialization +- Fixes issues with DIDs and other identifiers containing colons in query parameters + +**Axum extractor** (`jacquard-axum`) +- Removed unnecessary URL-decoding workaround (now handled by improved string deserialization) +- Added comprehensive tests for URL-encoded query parameters +- Cleaner implementation with proper delegation to serde + +### Changed + +**Dependencies** +- Moved `clap` to dev-dependencies in `jacquard` (only used in examples) +- Moved `axum-macros` and `tracing-subscriber` to dev-dependencies in `jacquard-axum` (only used in examples) +- Removed unused dependencies: `urlencoding` (jacquard, jacquard-axum), `uuid` (jacquard-oauth), `serde_with` (jacquard-common) +- Removed `fancy` feature from `jacquard` (design smell for library crates) +- Moved various proc-macro crate dependencies to dev-dependencies in `jacquard-derive` + +**Development tooling** +- Improved justfile with dynamic example discovery +- `just examples` now auto-discovers all examples +- `just example ` auto-detects package without manual configuration +- Better error messages when examples not found + +**Documentation** (`jacquard`, `jacquard-common`) +- Improved lifetime pattern explanations +- Better documentation of zero-copy deserialization approach +- Links to docs.rs for generated documentation + +--- + ## [0.5.1] - 2025-10-13 ### Fixed diff --git a/Cargo.lock b/Cargo.lock index 08adf253c..435e80743 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1732,17 +1732,17 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jacquard" -version = "0.5.1" +version = "0.5.2" dependencies = [ "async-trait", "bon", "bytes", "clap", "http", - "jacquard-api 0.5.1", - "jacquard-common 0.5.1", - "jacquard-derive 0.5.1", - "jacquard-identity 0.5.1", + "jacquard-api 0.5.2", + "jacquard-common 0.5.2", + "jacquard-derive 0.5.2", + "jacquard-identity 0.5.2", "jacquard-oauth", "jose-jwk", "miette", @@ -1763,6 +1763,7 @@ dependencies = [ [[package]] name = "jacquard-api" version = "0.5.1" +source = "git+https://tangled.org/@nonbinary.computer/jacquard#77915fd4920b282b4b1342749dcdad9dce30cadf" dependencies = [ "bon", "bytes", @@ -1775,13 +1776,12 @@ dependencies = [ [[package]] name = "jacquard-api" -version = "0.5.1" -source = "git+https://tangled.org/@nonbinary.computer/jacquard#77915fd4920b282b4b1342749dcdad9dce30cadf" +version = "0.5.2" dependencies = [ "bon", "bytes", - "jacquard-common 0.5.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", - "jacquard-derive 0.5.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", + "jacquard-common 0.5.2", + "jacquard-derive 0.5.2", "miette", "serde", "thiserror 2.0.17", @@ -1789,7 +1789,7 @@ dependencies = [ [[package]] name = "jacquard-axum" -version = "0.5.1" +version = "0.5.2" dependencies = [ "axum", "axum-macros", @@ -1798,9 +1798,9 @@ dependencies = [ "bytes", "chrono", "jacquard", - "jacquard-common 0.5.1", - "jacquard-derive 0.5.1", - "jacquard-identity 0.5.1", + "jacquard-common 0.5.2", + "jacquard-derive 0.5.2", + "jacquard-identity 0.5.2", "k256", "miette", "multibase", @@ -1821,6 +1821,7 @@ dependencies = [ [[package]] name = "jacquard-common" version = "0.5.1" +source = "git+https://tangled.org/@nonbinary.computer/jacquard#77915fd4920b282b4b1342749dcdad9dce30cadf" dependencies = [ "async-trait", "base64 0.22.1", @@ -1828,16 +1829,13 @@ dependencies = [ "bytes", "chrono", "cid", - "ed25519-dalek", "http", "ipld-core", - "k256", "langtag", "miette", "multibase", "multihash", "ouroboros", - "p256", "rand 0.9.2", "regex", "reqwest", @@ -1845,17 +1843,17 @@ dependencies = [ "serde_html_form", "serde_ipld_dagcbor", "serde_json", - "signature", + "serde_with", "smol_str", "thiserror 2.0.17", "tokio", + "trait-variant", "url", ] [[package]] name = "jacquard-common" -version = "0.5.1" -source = "git+https://tangled.org/@nonbinary.computer/jacquard#77915fd4920b282b4b1342749dcdad9dce30cadf" +version = "0.5.2" dependencies = [ "async-trait", "base64 0.22.1", @@ -1863,13 +1861,16 @@ dependencies = [ "bytes", "chrono", "cid", + "ed25519-dalek", "http", "ipld-core", + "k256", "langtag", "miette", "multibase", "multihash", "ouroboros", + "p256", "rand 0.9.2", "regex", "reqwest", @@ -1877,51 +1878,50 @@ dependencies = [ "serde_html_form", "serde_ipld_dagcbor", "serde_json", - "serde_with", + "signature", "smol_str", "thiserror 2.0.17", "tokio", - "trait-variant", "url", ] [[package]] name = "jacquard-derive" version = "0.5.1" +source = "git+https://tangled.org/@nonbinary.computer/jacquard#77915fd4920b282b4b1342749dcdad9dce30cadf" dependencies = [ - "jacquard-common 0.5.1", + "heck 0.5.0", + "itertools", + "prettyplease", "proc-macro2", "quote", "serde", "serde_json", + "serde_repr", + "serde_with", "syn 2.0.106", ] [[package]] name = "jacquard-derive" -version = "0.5.1" -source = "git+https://tangled.org/@nonbinary.computer/jacquard#77915fd4920b282b4b1342749dcdad9dce30cadf" +version = "0.5.2" dependencies = [ - "heck 0.5.0", - "itertools", - "prettyplease", + "jacquard-common 0.5.2", "proc-macro2", "quote", "serde", "serde_json", - "serde_repr", - "serde_with", "syn 2.0.106", ] [[package]] name = "jacquard-identity" version = "0.5.1" +source = "git+https://tangled.org/@nonbinary.computer/jacquard#77915fd4920b282b4b1342749dcdad9dce30cadf" dependencies = [ "async-trait", "bon", "bytes", - "hickory-resolver", "http", "jacquard-api 0.5.1", "jacquard-common 0.5.1", @@ -1939,15 +1939,15 @@ dependencies = [ [[package]] name = "jacquard-identity" -version = "0.5.1" -source = "git+https://tangled.org/@nonbinary.computer/jacquard#77915fd4920b282b4b1342749dcdad9dce30cadf" +version = "0.5.2" dependencies = [ "async-trait", "bon", "bytes", + "hickory-resolver", "http", - "jacquard-api 0.5.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", - "jacquard-common 0.5.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", + "jacquard-api 0.5.2", + "jacquard-common 0.5.2", "miette", "percent-encoding", "reqwest", @@ -1962,15 +1962,15 @@ dependencies = [ [[package]] name = "jacquard-lexicon" -version = "0.5.1" +version = "0.5.2" dependencies = [ "async-trait", "clap", "glob", "heck 0.5.0", - "jacquard-api 0.5.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", - "jacquard-common 0.5.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", - "jacquard-identity 0.5.1 (git+https://tangled.org/@nonbinary.computer/jacquard)", + "jacquard-api 0.5.1", + "jacquard-common 0.5.1", + "jacquard-identity 0.5.1", "kdl", "miette", "prettyplease", @@ -1990,7 +1990,7 @@ dependencies = [ [[package]] name = "jacquard-oauth" -version = "0.5.1" +version = "0.5.2" dependencies = [ "async-trait", "base64 0.22.1", @@ -1999,8 +1999,8 @@ dependencies = [ "dashmap", "elliptic-curve", "http", - "jacquard-common 0.5.1", - "jacquard-identity 0.5.1", + "jacquard-common 0.5.2", + "jacquard-identity 0.5.2", "jose-jwa", "jose-jwk", "miette", diff --git a/Cargo.toml b/Cargo.toml index 4b4511e6f..edfdf94a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ members = ["crates/*"] [workspace.package] edition = "2024" -version = "0.5.1" +version = "0.5.2" authors = ["Orual "] repository = "https://tangled.org/@nonbinary.computer/jacquard" keywords = ["atproto", "at", "bluesky", "api", "client"] diff --git a/crates/jacquard-api/Cargo.toml b/crates/jacquard-api/Cargo.toml index 83418bbc9..aa50facf5 100644 --- a/crates/jacquard-api/Cargo.toml +++ b/crates/jacquard-api/Cargo.toml @@ -2,7 +2,7 @@ name = "jacquard-api" description = "Generated AT Protocol API bindings for Jacquard" edition.workspace = true -version = "0.5.1" +version = "0.5.2" authors.workspace = true repository.workspace = true keywords.workspace = true diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder.rs b/crates/jacquard-api/src/app_blebbit/authr/folder.rs index 881e9ae48..d4da4078a 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder.rs @@ -23,15 +23,18 @@ pub mod update_folder_relationship; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct FolderForm<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, + pub name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, } #[jacquard_derive::lexicon] @@ -42,16 +45,20 @@ pub struct FolderForm<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct FolderView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cuid: std::option::Option>, + pub cuid: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, + pub name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder.rs index 313922289..ec34ecc7e 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder/create_folder.rs @@ -20,11 +20,12 @@ #[builder(start_fn = new)] pub struct CreateFolder<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub name: std::option::Option>, + #[serde(borrow)] + pub name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder_relationship.rs index ccb81b1c7..3a5375c8d 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder_relationship.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder/delete_folder_relationship.rs @@ -20,9 +20,9 @@ #[builder(start_fn = new)] pub struct DeleteFolderRelationship<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub relation: std::option::Option>, + #[serde(borrow)] + pub relation: Option>, #[serde(borrow)] #[builder(into)] pub resource: jacquard_common::CowStr<'a>, diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs index ab221100c..34924f010 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder/record.rs @@ -13,18 +13,22 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Record<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cuid: std::option::Option>, + pub cuid: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, + pub name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder.rs b/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder.rs index b12d0ea3c..7c529d80d 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/folder/update_folder.rs @@ -39,11 +39,12 @@ pub struct UpdateFolderParams<'a> { #[builder(start_fn = new)] pub struct UpdateFolder<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub name: std::option::Option>, + #[serde(borrow)] + pub name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/app_blebbit/authr/group.rs b/crates/jacquard-api/src/app_blebbit/authr/group.rs index 5d0739399..13975dac7 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group.rs @@ -23,20 +23,25 @@ pub mod update_group_relationship; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct GroupForm<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display: std::option::Option>, + pub display: Option>, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, } #[jacquard_derive::lexicon] @@ -47,22 +52,28 @@ pub struct GroupForm<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct GroupView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cuid: std::option::Option>, + pub cuid: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display: std::option::Option>, + pub display: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, + pub name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/create_group.rs b/crates/jacquard-api/src/app_blebbit/authr/group/create_group.rs index b1050733b..f1bb446e5 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group/create_group.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group/create_group.rs @@ -20,18 +20,19 @@ #[builder(start_fn = new)] pub struct CreateGroup<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub description: std::option::Option>, - #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] + pub description: Option>, + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub display: std::option::Option>, + #[serde(borrow)] + pub display: Option>, #[serde(borrow)] #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/delete_group_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/group/delete_group_relationship.rs index 0e6277bdf..053278e6a 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group/delete_group_relationship.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group/delete_group_relationship.rs @@ -20,9 +20,9 @@ #[builder(start_fn = new)] pub struct DeleteGroupRelationship<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub relation: std::option::Option>, + #[serde(borrow)] + pub relation: Option>, #[serde(borrow)] #[builder(into)] pub resource: jacquard_common::CowStr<'a>, diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/record.rs b/crates/jacquard-api/src/app_blebbit/authr/group/record.rs index 4ace6d65b..144b0e527 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group/record.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group/record.rs @@ -13,24 +13,30 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Record<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cuid: std::option::Option>, + pub cuid: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display: std::option::Option>, + pub display: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, + pub name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/app_blebbit/authr/group/update_group.rs b/crates/jacquard-api/src/app_blebbit/authr/group/update_group.rs index 115dfc0f5..a64cde24a 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/group/update_group.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/group/update_group.rs @@ -39,18 +39,19 @@ pub struct UpdateGroupParams<'a> { #[builder(start_fn = new)] pub struct UpdateGroup<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub description: std::option::Option>, - #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] + pub description: Option>, + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub display: std::option::Option>, + #[serde(borrow)] + pub display: Option>, #[serde(borrow)] #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/app_blebbit/authr/page.rs b/crates/jacquard-api/src/app_blebbit/authr/page.rs index 860d34c32..ddb2a7f3a 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page.rs @@ -23,15 +23,18 @@ pub mod update_page_relationship; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PageForm<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, + pub name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, } #[jacquard_derive::lexicon] @@ -42,19 +45,24 @@ pub struct PageForm<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PageView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub content: std::option::Option>, + pub content: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cuid: std::option::Option>, + pub cuid: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, + pub name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/create_page.rs b/crates/jacquard-api/src/app_blebbit/authr/page/create_page.rs index bb9a85326..fdf54953c 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page/create_page.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page/create_page.rs @@ -20,11 +20,12 @@ #[builder(start_fn = new)] pub struct CreatePage<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub name: std::option::Option>, + #[serde(borrow)] + pub name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/delete_page_relationship.rs b/crates/jacquard-api/src/app_blebbit/authr/page/delete_page_relationship.rs index 61725c1bd..7e4686ebf 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page/delete_page_relationship.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page/delete_page_relationship.rs @@ -20,9 +20,9 @@ #[builder(start_fn = new)] pub struct DeletePageRelationship<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub relation: std::option::Option>, + #[serde(borrow)] + pub relation: Option>, #[serde(borrow)] #[builder(into)] pub resource: jacquard_common::CowStr<'a>, diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/record.rs b/crates/jacquard-api/src/app_blebbit/authr/page/record.rs index 7efa9ce73..91c250ba6 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page/record.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page/record.rs @@ -13,21 +13,26 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Record<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub content: std::option::Option>, + pub content: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cuid: std::option::Option>, + pub cuid: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, + pub name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/app_blebbit/authr/page/update_page.rs b/crates/jacquard-api/src/app_blebbit/authr/page/update_page.rs index 30486103b..b5042abde 100644 --- a/crates/jacquard-api/src/app_blebbit/authr/page/update_page.rs +++ b/crates/jacquard-api/src/app_blebbit/authr/page/update_page.rs @@ -39,11 +39,12 @@ pub struct UpdatePageParams<'a> { #[builder(start_fn = new)] pub struct UpdatePage<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub name: std::option::Option>, + #[serde(borrow)] + pub name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub public: std::option::Option, + #[builder(into)] + pub public: Option, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/app_bsky/actor.rs b/crates/jacquard-api/src/app_bsky/actor.rs index e07c00264..f5805cc8b 100644 --- a/crates/jacquard-api/src/app_bsky/actor.rs +++ b/crates/jacquard-api/src/app_bsky/actor.rs @@ -23,14 +23,15 @@ pub mod status; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AdultContentPref<'a> { pub enabled: bool, } -///If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. +/// If set, an active progress guide. Once completed, can be set to undefined. Should have unspecced fields tracking progress. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -39,15 +40,17 @@ pub struct AdultContentPref<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct BskyAppProgressGuide<'a> { #[serde(borrow)] + #[builder(into)] pub guide: jacquard_common::CowStr<'a>, } -///A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. +/// A grab bag of state that's specific to the bsky.app program. Third-party apps shouldn't use this. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -56,23 +59,25 @@ pub struct BskyAppProgressGuide<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct BskyAppStatePref<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub active_progress_guide: std::option::Option< - crate::app_bsky::actor::BskyAppProgressGuide<'a>, - >, - ///Storage for NUXs the user has encountered. + pub active_progress_guide: Option>, + /// Storage for NUXs the user has encountered. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub nuxs: std::option::Option>>, - ///An array of tokens which identify nudges (modals, popups, tours, highlight dots) that should be shown to the user. + pub nuxs: Option>>, + /// An array of tokens which identify nudges (modals, popups, tours, highlight dots) that should be shown to the user. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub queued_nudges: std::option::Option>>, + pub queued_nudges: Option>>, } #[jacquard_derive::lexicon] @@ -83,17 +88,21 @@ pub struct BskyAppStatePref<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ContentLabelPref<'a> { #[serde(borrow)] + #[builder(into)] pub label: jacquard_common::CowStr<'a>, - ///Which labeler does this preference apply to? If undefined, applies globally. + /// Which labeler does this preference apply to? If undefined, applies globally. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labeler_did: std::option::Option>, + pub labeler_did: Option>, #[serde(borrow)] + #[builder(into)] pub visibility: jacquard_common::CowStr<'a>, } @@ -105,28 +114,35 @@ pub struct ContentLabelPref<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct FeedViewPref<'a> { - ///The URI of the feed, or an identifier which describes the feed. + /// The URI of the feed, or an identifier which describes the feed. #[serde(borrow)] + #[builder(into)] pub feed: jacquard_common::CowStr<'a>, - ///Hide quote posts in the feed. + /// Hide quote posts in the feed. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub hide_quote_posts: std::option::Option, - ///Hide replies in the feed. + #[builder(into)] + pub hide_quote_posts: Option, + /// Hide replies in the feed. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub hide_replies: std::option::Option, - ///Hide replies in the feed if they do not have this number of likes. + #[builder(into)] + pub hide_replies: Option, + /// Hide replies in the feed if they do not have this number of likes. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub hide_replies_by_like_count: std::option::Option, - ///Hide replies in the feed if they are not by followed users. + #[builder(into)] + pub hide_replies_by_like_count: Option, + /// Hide replies in the feed if they are not by followed users. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub hide_replies_by_unfollowed: std::option::Option, - ///Hide reposts in the feed. + #[builder(into)] + pub hide_replies_by_unfollowed: Option, + /// Hide reposts in the feed. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub hide_reposts: std::option::Option, + #[builder(into)] + pub hide_reposts: Option, } #[jacquard_derive::lexicon] @@ -137,11 +153,12 @@ pub struct FeedViewPref<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct HiddenPostsPref<'a> { - ///A list of URIs of posts the account owner has hidden. + /// A list of URIs of posts the account owner has hidden. #[serde(borrow)] pub items: Vec>, } @@ -154,16 +171,17 @@ pub struct HiddenPostsPref<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct InterestsPref<'a> { - ///A list of tags which describe the account owner's interests gathered during onboarding. + /// A list of tags which describe the account owner's interests gathered during onboarding. #[serde(borrow)] pub tags: Vec>, } -///The subject's followers whom you also follow +/// The subject's followers whom you also follow #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -172,7 +190,8 @@ pub struct InterestsPref<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct KnownFollowers<'a> { @@ -189,7 +208,8 @@ pub struct KnownFollowers<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LabelerPrefItem<'a> { @@ -205,7 +225,8 @@ pub struct LabelerPrefItem<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LabelersPref<'a> { @@ -213,7 +234,7 @@ pub struct LabelersPref<'a> { pub labelers: Vec>, } -///A word that the account owner has muted. +/// A word that the account owner has muted. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -222,25 +243,30 @@ pub struct LabelersPref<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct MutedWord<'a> { - ///Groups of users to apply the muted word to. If undefined, applies to all users. + /// Groups of users to apply the muted word to. If undefined, applies to all users. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub actor_target: std::option::Option>, - ///The date and time at which the muted word will expire and no longer be applied. + pub actor_target: Option>, + /// The date and time at which the muted word will expire and no longer be applied. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub expires_at: std::option::Option, + #[builder(into)] + pub expires_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub id: std::option::Option>, - ///The intended targets of the muted word. + pub id: Option>, + /// The intended targets of the muted word. #[serde(borrow)] pub targets: Vec>, - ///The muted word itself. + /// The muted word itself. #[serde(borrow)] + #[builder(into)] pub value: jacquard_common::CowStr<'a>, } @@ -328,16 +354,17 @@ impl jacquard_common::IntoStatic for MutedWordTarget<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct MutedWordsPref<'a> { - ///A list of words the account owner has muted. + /// A list of words the account owner has muted. #[serde(borrow)] pub items: Vec>, } -///A new user experiences (NUX) storage object +/// A new user experiences (NUX) storage object #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -346,19 +373,23 @@ pub struct MutedWordsPref<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Nux<'a> { pub completed: bool, - ///Arbitrary data for the NUX. The structure is defined by the NUX itself. Limited to 300 characters. + /// Arbitrary data for the NUX. The structure is defined by the NUX itself. Limited to 300 characters. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub data: std::option::Option>, - ///The date and time at which the NUX will expire and should be considered completed. + pub data: Option>, + /// The date and time at which the NUX will expire and should be considered completed. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub expires_at: std::option::Option, + #[builder(into)] + pub expires_at: Option, #[serde(borrow)] + #[builder(into)] pub id: jacquard_common::CowStr<'a>, } @@ -370,16 +401,18 @@ pub struct Nux<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PersonalDetailsPref<'a> { - ///The birth date of account owner. + /// The birth date of account owner. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub birth_date: std::option::Option, + #[builder(into)] + pub birth_date: Option, } -///Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. +/// Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -388,20 +421,23 @@ pub struct PersonalDetailsPref<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PostInteractionSettingsPref<'a> { - ///Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed. + /// Matches postgate record. List of rules defining who can embed this users posts. If value is an empty array or is undefined, no particular rules apply and anyone can embed. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub postgate_embedding_rules: std::option::Option< + pub postgate_embedding_rules: Option< Vec>, >, - ///Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. + /// Matches threadgate record. List of rules defining who can reply to this users posts. If value is an empty array, no one can reply. If value is undefined, anyone can reply. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub threadgate_allow_rules: std::option::Option< + pub threadgate_allow_rules: Option< Vec>, >, } @@ -483,26 +519,33 @@ pub type Preferences<'a> = Vec>; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ProfileAssociated<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub activity_subscription: std::option::Option< + pub activity_subscription: Option< crate::app_bsky::actor::ProfileAssociatedActivitySubscription<'a>, >, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub chat: std::option::Option>, + pub chat: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub feedgens: std::option::Option, + #[builder(into)] + pub feedgens: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub labeler: std::option::Option, + #[builder(into)] + pub labeler: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub lists: std::option::Option, + #[builder(into)] + pub lists: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub starter_packs: std::option::Option, + #[builder(into)] + pub starter_packs: Option, } #[jacquard_derive::lexicon] @@ -513,11 +556,13 @@ pub struct ProfileAssociated<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ProfileAssociatedActivitySubscription<'a> { #[serde(borrow)] + #[builder(into)] pub allow_subscriptions: jacquard_common::CowStr<'a>, } @@ -529,11 +574,13 @@ pub struct ProfileAssociatedActivitySubscription<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ProfileAssociatedChat<'a> { #[serde(borrow)] + #[builder(into)] pub allow_incoming: jacquard_common::CowStr<'a>, } @@ -545,45 +592,57 @@ pub struct ProfileAssociatedChat<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ProfileView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub associated: std::option::Option>, + pub associated: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, + pub avatar: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display_name: std::option::Option>, + pub display_name: Option>, #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub indexed_at: std::option::Option, + #[builder(into)] + pub indexed_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pronouns: std::option::Option>, + pub pronouns: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option>, + pub status: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub verification: std::option::Option>, + pub verification: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub viewer: std::option::Option>, + pub viewer: Option>, } #[jacquard_derive::lexicon] @@ -594,40 +653,50 @@ pub struct ProfileView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ProfileViewBasic<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub associated: std::option::Option>, + pub associated: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, + pub avatar: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display_name: std::option::Option>, + pub display_name: Option>, #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pronouns: std::option::Option>, + pub pronouns: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option>, + pub status: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub verification: std::option::Option>, + pub verification: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub viewer: std::option::Option>, + pub viewer: Option>, } #[jacquard_derive::lexicon] @@ -638,67 +707,84 @@ pub struct ProfileViewBasic<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ProfileViewDetailed<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub associated: std::option::Option>, + pub associated: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, + pub avatar: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub banner: std::option::Option>, + pub banner: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display_name: std::option::Option>, + pub display_name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub followers_count: std::option::Option, + #[builder(into)] + pub followers_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub follows_count: std::option::Option, + #[builder(into)] + pub follows_count: Option, #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub indexed_at: std::option::Option, + #[builder(into)] + pub indexed_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub joined_via_starter_pack: std::option::Option< + pub joined_via_starter_pack: Option< crate::app_bsky::graph::StarterPackViewBasic<'a>, >, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pinned_post: std::option::Option< - crate::com_atproto::repo::strong_ref::StrongRef<'a>, - >, + pub pinned_post: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub posts_count: std::option::Option, + #[builder(into)] + pub posts_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pronouns: std::option::Option>, + pub pronouns: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option>, + pub status: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub verification: std::option::Option>, + pub verification: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub viewer: std::option::Option>, + pub viewer: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub website: std::option::Option>, + pub website: Option>, } #[jacquard_derive::lexicon] @@ -709,16 +795,20 @@ pub struct ProfileViewDetailed<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SavedFeed<'a> { #[serde(borrow)] + #[builder(into)] pub id: jacquard_common::CowStr<'a>, pub pinned: bool, #[serde(borrow)] + #[builder(into)] pub r#type: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub value: jacquard_common::CowStr<'a>, } @@ -730,7 +820,8 @@ pub struct SavedFeed<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SavedFeedsPref<'a> { @@ -739,7 +830,8 @@ pub struct SavedFeedsPref<'a> { #[serde(borrow)] pub saved: Vec>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub timeline_index: std::option::Option, + #[builder(into)] + pub timeline_index: Option, } #[jacquard_derive::lexicon] @@ -750,7 +842,8 @@ pub struct SavedFeedsPref<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SavedFeedsPrefV2<'a> { @@ -766,24 +859,29 @@ pub struct SavedFeedsPrefV2<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct StatusView<'a> { - ///An optional embed associated with the status. + /// An optional embed associated with the status. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub embed: std::option::Option>, - ///The date when this status will expire. The application might choose to no longer return the status after expiration. + pub embed: Option>, + /// The date when this status will expire. The application might choose to no longer return the status after expiration. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub expires_at: std::option::Option, - ///True if the status is not expired, false if it is expired. Only present if expiration was set. + #[builder(into)] + pub expires_at: Option, + /// True if the status is not expired, false if it is expired. Only present if expiration was set. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub is_active: std::option::Option, + #[builder(into)] + pub is_active: Option, #[serde(borrow)] pub record: jacquard_common::types::value::Data<'a>, - ///The status for the account. + /// The status for the account. #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, } @@ -795,20 +893,23 @@ pub struct StatusView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ThreadViewPref<'a> { - ///Show followed users at the top of all replies. + /// Show followed users at the top of all replies. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub prioritize_followed_users: std::option::Option, - ///Sorting mode for threads. + #[builder(into)] + pub prioritize_followed_users: Option, + /// Sorting mode for threads. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub sort: std::option::Option>, + pub sort: Option>, } -///Preferences for how verified accounts appear in the app. +/// Preferences for how verified accounts appear in the app. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -817,16 +918,18 @@ pub struct ThreadViewPref<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct VerificationPrefs<'a> { - ///Hide the blue check badges for verified accounts and trusted verifiers. + /// Hide the blue check badges for verified accounts and trusted verifiers. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub hide_badges: std::option::Option, + #[builder(into)] + pub hide_badges: Option, } -///Represents the verification information about the user this object is attached to. +/// Represents the verification information about the user this object is attached to. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -835,22 +938,25 @@ pub struct VerificationPrefs<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct VerificationState<'a> { - ///The user's status as a trusted verifier. + /// The user's status as a trusted verifier. #[serde(borrow)] + #[builder(into)] pub trusted_verifier_status: jacquard_common::CowStr<'a>, - ///All verifications issued by trusted verifiers on behalf of this user. Verifications by untrusted verifiers are not included. + /// All verifications issued by trusted verifiers on behalf of this user. Verifications by untrusted verifiers are not included. #[serde(borrow)] pub verifications: Vec>, - ///The user's status as a verified account. + /// The user's status as a verified account. #[serde(borrow)] + #[builder(into)] pub verified_status: jacquard_common::CowStr<'a>, } -///An individual verification for an associated subject. +/// An individual verification for an associated subject. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -859,23 +965,24 @@ pub struct VerificationState<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct VerificationView<'a> { - ///Timestamp when the verification was created. + /// Timestamp when the verification was created. pub created_at: jacquard_common::types::string::Datetime, - ///True if the verification passes validation, otherwise false. + /// True if the verification passes validation, otherwise false. pub is_valid: bool, - ///The user who issued this verification. + /// The user who issued this verification. #[serde(borrow)] pub issuer: jacquard_common::types::string::Did<'a>, - ///The AT-URI of the verification record. + /// The AT-URI of the verification record. #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, } -///Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. +/// Metadata about the requesting account's relationship with the subject account. Only has meaningful content for authed requests. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -884,37 +991,47 @@ pub struct VerificationView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewerState<'a> { - ///This property is present only in selected cases, as an optimization. + /// This property is present only in selected cases, as an optimization. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub activity_subscription: std::option::Option< + pub activity_subscription: Option< crate::app_bsky::notification::ActivitySubscription<'a>, >, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub blocked_by: std::option::Option, + #[builder(into)] + pub blocked_by: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub blocking: std::option::Option>, + pub blocking: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub blocking_by_list: std::option::Option>, + pub blocking_by_list: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub followed_by: std::option::Option>, + pub followed_by: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub following: std::option::Option>, - ///This property is present only in selected cases, as an optimization. + pub following: Option>, + /// This property is present only in selected cases, as an optimization. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub known_followers: std::option::Option>, + pub known_followers: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub muted: std::option::Option, + #[builder(into)] + pub muted: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub muted_by_list: std::option::Option>, + pub muted_by_list: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/actor/get_suggestions.rs b/crates/jacquard-api/src/app_bsky/actor/get_suggestions.rs index a06f816fd..33656a723 100644 --- a/crates/jacquard-api/src/app_bsky/actor/get_suggestions.rs +++ b/crates/jacquard-api/src/app_bsky/actor/get_suggestions.rs @@ -44,7 +44,7 @@ pub struct GetSuggestionsOutput<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, - ///Snowflake for this recommendation, use when submitting recommendation events. + /// Snowflake for this recommendation, use when submitting recommendation events. #[serde(skip_serializing_if = "std::option::Option::is_none")] pub rec_id: std::option::Option, } diff --git a/crates/jacquard-api/src/app_bsky/actor/profile.rs b/crates/jacquard-api/src/app_bsky/actor/profile.rs index 8c9b46edf..7c5d8477e 100644 --- a/crates/jacquard-api/src/app_bsky/actor/profile.rs +++ b/crates/jacquard-api/src/app_bsky/actor/profile.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of a Bluesky account profile. +/// A declaration of a Bluesky account profile. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,48 +14,57 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Profile<'a> { - ///Small image to be displayed next to posts from account. AKA, 'profile picture' + /// Small image to be displayed next to posts from account. AKA, 'profile picture' #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, - ///Larger horizontal image to display behind profile view. + pub avatar: Option>, + /// Larger horizontal image to display behind profile view. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub banner: std::option::Option>, + pub banner: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, - ///Free-form profile description text. + #[builder(into)] + pub created_at: Option, + /// Free-form profile description text. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display_name: std::option::Option>, + pub display_name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub joined_via_starter_pack: std::option::Option< + pub joined_via_starter_pack: Option< crate::com_atproto::repo::strong_ref::StrongRef<'a>, >, - ///Self-label values, specific to the Bluesky application, on the overall account. + /// Self-label values, specific to the Bluesky application, on the overall account. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>, + pub labels: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pinned_post: std::option::Option< - crate::com_atproto::repo::strong_ref::StrongRef<'a>, - >, - ///Free-form pronouns text. + pub pinned_post: Option>, + /// Free-form pronouns text. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pronouns: std::option::Option>, + pub pronouns: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub website: std::option::Option>, + pub website: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/app_bsky/actor/status.rs b/crates/jacquard-api/src/app_bsky/actor/status.rs index b4735dd07..3113e0e7f 100644 --- a/crates/jacquard-api/src/app_bsky/actor/status.rs +++ b/crates/jacquard-api/src/app_bsky/actor/status.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Advertises an account as currently offering live content. +/// Advertises an account as currently offering live content. #[derive( serde::Serialize, serde::Deserialize, @@ -23,7 +23,7 @@ impl std::fmt::Display for Live { } } -///A declaration of a Bluesky account status. +/// A declaration of a Bluesky account status. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -32,20 +32,24 @@ impl std::fmt::Display for Live { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Status<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///The duration of the status in minutes. Applications can choose to impose minimum and maximum limits. + /// The duration of the status in minutes. Applications can choose to impose minimum and maximum limits. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub duration_minutes: std::option::Option, - ///An optional embed associated with the status. + #[builder(into)] + pub duration_minutes: Option, + /// An optional embed associated with the status. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub embed: std::option::Option>, - ///The status for the account. + pub embed: Option>, + /// The status for the account. #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/app_bsky/bookmark.rs b/crates/jacquard-api/src/app_bsky/bookmark.rs index bd647ffca..1ce1ae5d1 100644 --- a/crates/jacquard-api/src/app_bsky/bookmark.rs +++ b/crates/jacquard-api/src/app_bsky/bookmark.rs @@ -9,7 +9,7 @@ pub mod create_bookmark; pub mod delete_bookmark; pub mod get_bookmarks; -///Object used to store bookmark data in stash. +/// Object used to store bookmark data in stash. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -18,11 +18,12 @@ pub mod get_bookmarks; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Bookmark<'a> { - ///A strong ref to the record to be bookmarked. Currently, only `app.bsky.feed.post` records are supported. + /// A strong ref to the record to be bookmarked. Currently, only `app.bsky.feed.post` records are supported. #[serde(borrow)] pub subject: crate::com_atproto::repo::strong_ref::StrongRef<'a>, } @@ -35,15 +36,17 @@ pub struct Bookmark<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct BookmarkView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, #[serde(borrow)] pub item: BookmarkViewItem<'a>, - ///A strong ref to the bookmarked record. + /// A strong ref to the bookmarked record. #[serde(borrow)] pub subject: crate::com_atproto::repo::strong_ref::StrongRef<'a>, } diff --git a/crates/jacquard-api/src/app_bsky/bookmark/create_bookmark.rs b/crates/jacquard-api/src/app_bsky/bookmark/create_bookmark.rs index 2705aca7b..19570f488 100644 --- a/crates/jacquard-api/src/app_bsky/bookmark/create_bookmark.rs +++ b/crates/jacquard-api/src/app_bsky/bookmark/create_bookmark.rs @@ -47,7 +47,7 @@ pub struct CreateBookmark<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum CreateBookmarkError<'a> { - ///The URI to be bookmarked is for an unsupported collection. + /// The URI to be bookmarked is for an unsupported collection. #[serde(rename = "UnsupportedCollection")] UnsupportedCollection(std::option::Option), } diff --git a/crates/jacquard-api/src/app_bsky/bookmark/delete_bookmark.rs b/crates/jacquard-api/src/app_bsky/bookmark/delete_bookmark.rs index 55e0e7b95..490482925 100644 --- a/crates/jacquard-api/src/app_bsky/bookmark/delete_bookmark.rs +++ b/crates/jacquard-api/src/app_bsky/bookmark/delete_bookmark.rs @@ -14,7 +14,7 @@ PartialEq, Eq, bon::Builder, - jacquard_derive::IntoStatic, + jacquard_derive::IntoStatic )] #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] @@ -40,12 +40,12 @@ pub struct DeleteBookmark<'a> { Eq, thiserror::Error, miette::Diagnostic, - jacquard_derive::IntoStatic, + jacquard_derive::IntoStatic )] #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum DeleteBookmarkError<'a> { - ///The URI to be bookmarked is for an unsupported collection. + /// The URI to be bookmarked is for an unsupported collection. #[serde(rename = "UnsupportedCollection")] UnsupportedCollection(std::option::Option), } @@ -77,8 +77,9 @@ impl jacquard_common::xrpc::XrpcResp for DeleteBookmarkResponse { impl<'a> jacquard_common::xrpc::XrpcRequest for DeleteBookmark<'a> { const NSID: &'static str = "app.bsky.bookmark.deleteBookmark"; - const METHOD: jacquard_common::xrpc::XrpcMethod = - jacquard_common::xrpc::XrpcMethod::Procedure("application/json"); + const METHOD: jacquard_common::xrpc::XrpcMethod = jacquard_common::xrpc::XrpcMethod::Procedure( + "application/json", + ); type Response = DeleteBookmarkResponse; } @@ -87,8 +88,9 @@ impl<'a> jacquard_common::xrpc::XrpcRequest for DeleteBookmark<'a> { pub struct DeleteBookmarkRequest; impl jacquard_common::xrpc::XrpcEndpoint for DeleteBookmarkRequest { const PATH: &'static str = "/xrpc/app.bsky.bookmark.deleteBookmark"; - const METHOD: jacquard_common::xrpc::XrpcMethod = - jacquard_common::xrpc::XrpcMethod::Procedure("application/json"); + const METHOD: jacquard_common::xrpc::XrpcMethod = jacquard_common::xrpc::XrpcMethod::Procedure( + "application/json", + ); type Request<'de> = DeleteBookmark<'de>; type Response = DeleteBookmarkResponse; -} +} \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/embed.rs b/crates/jacquard-api/src/app_bsky/embed.rs index 1b00f393f..05d06c260 100644 --- a/crates/jacquard-api/src/app_bsky/embed.rs +++ b/crates/jacquard-api/src/app_bsky/embed.rs @@ -11,7 +11,7 @@ pub mod record; pub mod record_with_media; pub mod video; -///width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. +/// width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -20,7 +20,8 @@ pub mod video; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AspectRatio<'a> { diff --git a/crates/jacquard-api/src/app_bsky/embed/external.rs b/crates/jacquard-api/src/app_bsky/embed/external.rs index 4dafdbabf..f2efc6727 100644 --- a/crates/jacquard-api/src/app_bsky/embed/external.rs +++ b/crates/jacquard-api/src/app_bsky/embed/external.rs @@ -13,22 +13,26 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct External<'a> { #[serde(borrow)] + #[builder(into)] pub description: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub thumb: std::option::Option>, + pub thumb: Option>, #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, #[serde(borrow)] pub uri: jacquard_common::types::string::Uri<'a>, } -///A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post). +/// A representation of some externally linked content (eg, a URL and 'card'), embedded in a Bluesky record (eg, a post). #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -37,7 +41,8 @@ pub struct External<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ExternalRecord<'a> { @@ -53,7 +58,8 @@ pub struct ExternalRecord<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct View<'a> { @@ -69,16 +75,20 @@ pub struct View<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewExternal<'a> { #[serde(borrow)] + #[builder(into)] pub description: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub thumb: std::option::Option>, + pub thumb: Option>, #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, #[serde(borrow)] pub uri: jacquard_common::types::string::Uri<'a>, diff --git a/crates/jacquard-api/src/app_bsky/embed/images.rs b/crates/jacquard-api/src/app_bsky/embed/images.rs index c35901a32..116a76f17 100644 --- a/crates/jacquard-api/src/app_bsky/embed/images.rs +++ b/crates/jacquard-api/src/app_bsky/embed/images.rs @@ -13,16 +13,19 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Image<'a> { - ///Alt text description of the image, for accessibility. + /// Alt text description of the image, for accessibility. #[serde(borrow)] + #[builder(into)] pub alt: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub aspect_ratio: std::option::Option>, + pub aspect_ratio: Option>, #[serde(borrow)] pub image: jacquard_common::types::blob::Blob<'a>, } @@ -35,7 +38,8 @@ pub struct Image<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Images<'a> { @@ -51,7 +55,8 @@ pub struct Images<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct View<'a> { @@ -67,20 +72,23 @@ pub struct View<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewImage<'a> { - ///Alt text description of the image, for accessibility. + /// Alt text description of the image, for accessibility. #[serde(borrow)] + #[builder(into)] pub alt: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub aspect_ratio: std::option::Option>, - ///Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View. + pub aspect_ratio: Option>, + /// Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View. #[serde(borrow)] pub fullsize: jacquard_common::types::string::Uri<'a>, - ///Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View. + /// Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View. #[serde(borrow)] pub thumb: jacquard_common::types::string::Uri<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/embed/record.rs b/crates/jacquard-api/src/app_bsky/embed/record.rs index 8ae0b808a..644919137 100644 --- a/crates/jacquard-api/src/app_bsky/embed/record.rs +++ b/crates/jacquard-api/src/app_bsky/embed/record.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Record<'a> { @@ -29,7 +30,8 @@ pub struct Record<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct View<'a> { @@ -76,7 +78,8 @@ pub enum ViewUnionRecord<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewBlocked<'a> { @@ -95,7 +98,8 @@ pub struct ViewBlocked<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewDetached<'a> { @@ -112,7 +116,8 @@ pub struct ViewDetached<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewNotFound<'a> { @@ -129,7 +134,8 @@ pub struct ViewNotFound<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewRecord<'a> { @@ -138,23 +144,29 @@ pub struct ViewRecord<'a> { #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub embeds: std::option::Option>>, + pub embeds: Option>>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub like_count: std::option::Option, + #[builder(into)] + pub like_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub quote_count: std::option::Option, + #[builder(into)] + pub quote_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub reply_count: std::option::Option, + #[builder(into)] + pub reply_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub repost_count: std::option::Option, + #[builder(into)] + pub repost_count: Option, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, - ///The record data itself. + /// The record data itself. #[serde(borrow)] pub value: jacquard_common::types::value::Data<'a>, } diff --git a/crates/jacquard-api/src/app_bsky/embed/record_with_media.rs b/crates/jacquard-api/src/app_bsky/embed/record_with_media.rs index f0f322908..d6c16288b 100644 --- a/crates/jacquard-api/src/app_bsky/embed/record_with_media.rs +++ b/crates/jacquard-api/src/app_bsky/embed/record_with_media.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RecordWithMedia<'a> { @@ -52,7 +53,8 @@ pub enum RecordWithMediaMedia<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct View<'a> { diff --git a/crates/jacquard-api/src/app_bsky/embed/video.rs b/crates/jacquard-api/src/app_bsky/embed/video.rs index eaf87f9f0..9785ef4d8 100644 --- a/crates/jacquard-api/src/app_bsky/embed/video.rs +++ b/crates/jacquard-api/src/app_bsky/embed/video.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Caption<'a> { @@ -30,21 +31,25 @@ pub struct Caption<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Video<'a> { - ///Alt text description of the video, for accessibility. + /// Alt text description of the video, for accessibility. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub alt: std::option::Option>, + pub alt: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub aspect_ratio: std::option::Option>, + pub aspect_ratio: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub captions: std::option::Option>>, - ///The mp4 video file. May be up to 100mb, formerly limited to 50mb. + pub captions: Option>>, + /// The mp4 video file. May be up to 100mb, formerly limited to 50mb. #[serde(borrow)] pub video: jacquard_common::types::blob::Blob<'a>, } @@ -57,21 +62,25 @@ pub struct Video<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct View<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub alt: std::option::Option>, + pub alt: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub aspect_ratio: std::option::Option>, + pub aspect_ratio: Option>, #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, #[serde(borrow)] pub playlist: jacquard_common::types::string::Uri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub thumbnail: std::option::Option>, + pub thumbnail: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/feed.rs b/crates/jacquard-api/src/app_bsky/feed.rs index 6e9f80b98..79c775559 100644 --- a/crates/jacquard-api/src/app_bsky/feed.rs +++ b/crates/jacquard-api/src/app_bsky/feed.rs @@ -38,15 +38,17 @@ pub mod threadgate; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct BlockedAuthor<'a> { #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub viewer: std::option::Option>, + pub viewer: Option>, } #[jacquard_derive::lexicon] @@ -57,7 +59,8 @@ pub struct BlockedAuthor<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct BlockedPost<'a> { @@ -68,7 +71,7 @@ pub struct BlockedPost<'a> { pub uri: jacquard_common::types::string::AtUri<'a>, } -///User clicked through to the author of the feed item +/// User clicked through to the author of the feed item #[derive( serde::Serialize, serde::Deserialize, @@ -86,7 +89,7 @@ impl std::fmt::Display for ClickthroughAuthor { } } -///User clicked through to the embedded content of the feed item +/// User clicked through to the embedded content of the feed item #[derive( serde::Serialize, serde::Deserialize, @@ -104,7 +107,7 @@ impl std::fmt::Display for ClickthroughEmbed { } } -///User clicked through to the feed item +/// User clicked through to the feed item #[derive( serde::Serialize, serde::Deserialize, @@ -122,7 +125,7 @@ impl std::fmt::Display for ClickthroughItem { } } -///User clicked through to the reposter of the feed item +/// User clicked through to the reposter of the feed item #[derive( serde::Serialize, serde::Deserialize, @@ -140,7 +143,7 @@ impl std::fmt::Display for ClickthroughReposter { } } -///Declares the feed generator returns any types of posts. +/// Declares the feed generator returns any types of posts. #[derive( serde::Serialize, serde::Deserialize, @@ -158,7 +161,7 @@ impl std::fmt::Display for ContentModeUnspecified { } } -///Declares the feed generator returns posts containing app.bsky.embed.video embeds. +/// Declares the feed generator returns posts containing app.bsky.embed.video embeds. #[derive( serde::Serialize, serde::Deserialize, @@ -184,26 +187,31 @@ impl std::fmt::Display for ContentModeVideo { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct FeedViewPost<'a> { - ///Context provided by feed generator that may be passed back alongside interactions. + /// Context provided by feed generator that may be passed back alongside interactions. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub feed_context: std::option::Option>, + pub feed_context: Option>, #[serde(borrow)] pub post: crate::app_bsky::feed::PostView<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reason: std::option::Option>, + pub reason: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reply: std::option::Option>, - ///Unique identifier per request that may be passed back alongside interactions. + pub reply: Option>, + /// Unique identifier per request that may be passed back alongside interactions. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub req_id: std::option::Option>, + pub req_id: Option>, } #[jacquard_derive::open_union] @@ -233,45 +241,53 @@ pub enum FeedViewPostReason<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct GeneratorView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub accepts_interactions: std::option::Option, + #[builder(into)] + pub accepts_interactions: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, + pub avatar: Option>, #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub content_mode: std::option::Option>, + pub content_mode: Option>, #[serde(borrow)] pub creator: crate::app_bsky::actor::ProfileView<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description_facets: std::option::Option< - Vec>, - >, + pub description_facets: Option>>, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(borrow)] + #[builder(into)] pub display_name: jacquard_common::CowStr<'a>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub like_count: std::option::Option, + #[builder(into)] + pub like_count: Option, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub viewer: std::option::Option>, + pub viewer: Option>, } #[jacquard_derive::lexicon] @@ -282,13 +298,15 @@ pub struct GeneratorView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct GeneratorViewerState<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub like: std::option::Option>, + pub like: Option>, } #[jacquard_derive::lexicon] @@ -299,27 +317,32 @@ pub struct GeneratorViewerState<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Interaction<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub event: std::option::Option>, - ///Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton. + pub event: Option>, + /// Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub feed_context: std::option::Option>, + pub feed_context: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub item: std::option::Option>, - ///Unique identifier per request that may be passed back alongside interactions. + pub item: Option>, + /// Unique identifier per request that may be passed back alongside interactions. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub req_id: std::option::Option>, + pub req_id: Option>, } -///User liked the feed item +/// User liked the feed item #[derive( serde::Serialize, serde::Deserialize, @@ -337,7 +360,7 @@ impl std::fmt::Display for InteractionLike { } } -///User quoted the feed item +/// User quoted the feed item #[derive( serde::Serialize, serde::Deserialize, @@ -355,7 +378,7 @@ impl std::fmt::Display for InteractionQuote { } } -///User replied to the feed item +/// User replied to the feed item #[derive( serde::Serialize, serde::Deserialize, @@ -373,7 +396,7 @@ impl std::fmt::Display for InteractionReply { } } -///User reposted the feed item +/// User reposted the feed item #[derive( serde::Serialize, serde::Deserialize, @@ -391,7 +414,7 @@ impl std::fmt::Display for InteractionRepost { } } -///Feed item was seen by user +/// Feed item was seen by user #[derive( serde::Serialize, serde::Deserialize, @@ -409,7 +432,7 @@ impl std::fmt::Display for InteractionSeen { } } -///User shared the feed item +/// User shared the feed item #[derive( serde::Serialize, serde::Deserialize, @@ -435,7 +458,8 @@ impl std::fmt::Display for InteractionShare { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct NotFoundPost<'a> { @@ -452,41 +476,51 @@ pub struct NotFoundPost<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PostView<'a> { #[serde(borrow)] pub author: crate::app_bsky::actor::ProfileViewBasic<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub bookmark_count: std::option::Option, + #[builder(into)] + pub bookmark_count: Option, #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub embed: std::option::Option>, + pub embed: Option>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub like_count: std::option::Option, + #[builder(into)] + pub like_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub quote_count: std::option::Option, + #[builder(into)] + pub quote_count: Option, #[serde(borrow)] pub record: jacquard_common::types::value::Data<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub reply_count: std::option::Option, + #[builder(into)] + pub reply_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub repost_count: std::option::Option, + #[builder(into)] + pub repost_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub threadgate: std::option::Option>, + pub threadgate: Option>, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub viewer: std::option::Option>, + pub viewer: Option>, } #[jacquard_derive::open_union] @@ -522,7 +556,8 @@ pub enum PostViewEmbed<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ReasonPin<'a> {} @@ -534,19 +569,22 @@ pub struct ReasonPin<'a> {} Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ReasonRepost<'a> { #[serde(borrow)] pub by: crate::app_bsky::actor::ProfileViewBasic<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cid: std::option::Option>, + pub cid: Option>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub uri: std::option::Option>, + pub uri: Option>, } #[jacquard_derive::lexicon] @@ -557,16 +595,16 @@ pub struct ReasonRepost<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ReplyRef<'a> { - ///When parent is a reply to another post, this is the author of that post. + /// When parent is a reply to another post, this is the author of that post. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub grandparent_author: std::option::Option< - crate::app_bsky::actor::ProfileViewBasic<'a>, - >, + pub grandparent_author: Option>, #[serde(borrow)] pub parent: ReplyRefParent<'a>, #[serde(borrow)] @@ -615,7 +653,7 @@ pub enum ReplyRefRoot<'a> { BlockedPost(Box>), } -///Request that less content like the given feed item be shown in the feed +/// Request that less content like the given feed item be shown in the feed #[derive( serde::Serialize, serde::Deserialize, @@ -633,7 +671,7 @@ impl std::fmt::Display for RequestLess { } } -///Request that more content like the given feed item be shown in the feed +/// Request that more content like the given feed item be shown in the feed #[derive( serde::Serialize, serde::Deserialize, @@ -659,19 +697,22 @@ impl std::fmt::Display for RequestMore { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SkeletonFeedPost<'a> { - ///Context that will be passed through to client and may be passed to feed generator back alongside interactions. + /// Context that will be passed through to client and may be passed to feed generator back alongside interactions. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub feed_context: std::option::Option>, + pub feed_context: Option>, #[serde(borrow)] pub post: jacquard_common::types::string::AtUri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reason: std::option::Option>, + pub reason: Option>, } #[jacquard_derive::open_union] @@ -701,7 +742,8 @@ pub enum SkeletonFeedPostReason<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SkeletonReasonPin<'a> {} @@ -713,7 +755,8 @@ pub struct SkeletonReasonPin<'a> {} Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SkeletonReasonRepost<'a> { @@ -721,7 +764,7 @@ pub struct SkeletonReasonRepost<'a> { pub repost: jacquard_common::types::string::AtUri<'a>, } -///Metadata about this post within the context of the thread it is in. +/// Metadata about this post within the context of the thread it is in. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -730,13 +773,15 @@ pub struct SkeletonReasonRepost<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ThreadContext<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub root_author_like: std::option::Option>, + pub root_author_like: Option>, } #[jacquard_derive::lexicon] @@ -747,21 +792,25 @@ pub struct ThreadContext<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ThreadViewPost<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub parent: std::option::Option>, + pub parent: Option>, #[serde(borrow)] pub post: crate::app_bsky::feed::PostView<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub replies: std::option::Option>>, + pub replies: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub thread_context: std::option::Option>, + pub thread_context: Option>, } #[jacquard_derive::open_union] @@ -814,25 +863,30 @@ pub enum ThreadViewPostRepliesItem<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ThreadgateView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cid: std::option::Option>, + pub cid: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub lists: std::option::Option>>, + pub lists: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub record: std::option::Option>, + pub record: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub uri: std::option::Option>, + pub uri: Option>, } -///Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. +/// Metadata about the requesting account's relationship with the subject content. Only has meaningful content for authed requests. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -841,24 +895,32 @@ pub struct ThreadgateView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewerState<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub bookmarked: std::option::Option, + #[builder(into)] + pub bookmarked: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub embedding_disabled: std::option::Option, + #[builder(into)] + pub embedding_disabled: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub like: std::option::Option>, + pub like: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub pinned: std::option::Option, + #[builder(into)] + pub pinned: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub reply_disabled: std::option::Option, + #[builder(into)] + pub reply_disabled: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub repost: std::option::Option>, + pub repost: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub thread_muted: std::option::Option, + #[builder(into)] + pub thread_muted: Option, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs b/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs index 4cb794bc9..f65d275c0 100644 --- a/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs +++ b/crates/jacquard-api/src/app_bsky/feed/describe_feed_generator.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Feed<'a> { @@ -29,16 +30,19 @@ pub struct Feed<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Links<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub privacy_policy: std::option::Option>, + pub privacy_policy: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub terms_of_service: std::option::Option>, + pub terms_of_service: Option>, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/app_bsky/feed/generator.rs b/crates/jacquard-api/src/app_bsky/feed/generator.rs index ef9244030..f847b2f9d 100644 --- a/crates/jacquard-api/src/app_bsky/feed/generator.rs +++ b/crates/jacquard-api/src/app_bsky/feed/generator.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record declaring of the existence of a feed generator, and containing metadata about it. The record can exist in any repository. +/// Record declaring of the existence of a feed generator, and containing metadata about it. The record can exist in any repository. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,36 +14,42 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Generator<'a> { - ///Declaration that a feed accepts feedback interactions from a client through app.bsky.feed.sendInteractions + /// Declaration that a feed accepts feedback interactions from a client through app.bsky.feed.sendInteractions #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub accepts_interactions: std::option::Option, + #[builder(into)] + pub accepts_interactions: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, + pub avatar: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub content_mode: std::option::Option>, + pub content_mode: Option>, pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description_facets: std::option::Option< - Vec>, - >, + pub description_facets: Option>>, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(borrow)] + #[builder(into)] pub display_name: jacquard_common::CowStr<'a>, - ///Self-label values + /// Self-label values #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>, + pub labels: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/app_bsky/feed/get_feed_generator.rs b/crates/jacquard-api/src/app_bsky/feed/get_feed_generator.rs index b5804ab69..1c933cdd1 100644 --- a/crates/jacquard-api/src/app_bsky/feed/get_feed_generator.rs +++ b/crates/jacquard-api/src/app_bsky/feed/get_feed_generator.rs @@ -34,9 +34,9 @@ pub struct GetFeedGenerator<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetFeedGeneratorOutput<'a> { - ///Indicates whether the feed generator service has been online recently, or else seems to be inactive. + /// Indicates whether the feed generator service has been online recently, or else seems to be inactive. pub is_online: bool, - ///Indicates whether the feed generator service is compatible with the record declaration. + /// Indicates whether the feed generator service is compatible with the record declaration. pub is_valid: bool, #[serde(borrow)] pub view: crate::app_bsky::feed::GeneratorView<'a>, diff --git a/crates/jacquard-api/src/app_bsky/feed/get_feed_skeleton.rs b/crates/jacquard-api/src/app_bsky/feed/get_feed_skeleton.rs index 881f28e16..1d65ce0e1 100644 --- a/crates/jacquard-api/src/app_bsky/feed/get_feed_skeleton.rs +++ b/crates/jacquard-api/src/app_bsky/feed/get_feed_skeleton.rs @@ -46,7 +46,7 @@ pub struct GetFeedSkeletonOutput<'a> { pub cursor: std::option::Option>, #[serde(borrow)] pub feed: Vec>, - ///Unique identifier per request that may be passed back alongside interactions. + /// Unique identifier per request that may be passed back alongside interactions. #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub req_id: std::option::Option>, diff --git a/crates/jacquard-api/src/app_bsky/feed/get_likes.rs b/crates/jacquard-api/src/app_bsky/feed/get_likes.rs index 1b2d7f3bd..9aca8b7c1 100644 --- a/crates/jacquard-api/src/app_bsky/feed/get_likes.rs +++ b/crates/jacquard-api/src/app_bsky/feed/get_likes.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Like<'a> { diff --git a/crates/jacquard-api/src/app_bsky/feed/like.rs b/crates/jacquard-api/src/app_bsky/feed/like.rs index 807a63520..b0971f56a 100644 --- a/crates/jacquard-api/src/app_bsky/feed/like.rs +++ b/crates/jacquard-api/src/app_bsky/feed/like.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record declaring a 'like' of a piece of subject content. +/// Record declaring a 'like' of a piece of subject content. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,7 +14,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Like<'a> { @@ -22,8 +23,9 @@ pub struct Like<'a> { #[serde(borrow)] pub subject: crate::com_atproto::repo::strong_ref::StrongRef<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub via: std::option::Option>, + pub via: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/app_bsky/feed/post.rs b/crates/jacquard-api/src/app_bsky/feed/post.rs index db85c2975..ab79bc87c 100644 --- a/crates/jacquard-api/src/app_bsky/feed/post.rs +++ b/crates/jacquard-api/src/app_bsky/feed/post.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Deprecated: use facets instead. +/// Deprecated: use facets instead. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,20 +14,23 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Entity<'a> { #[serde(borrow)] pub index: crate::app_bsky::feed::post::TextSlice<'a>, - ///Expected values are 'mention' and 'link'. + /// Expected values are 'mention' and 'link'. #[serde(borrow)] + #[builder(into)] pub r#type: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub value: jacquard_common::CowStr<'a>, } -///Record containing a Bluesky post. +/// Record containing a Bluesky post. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -36,39 +39,48 @@ pub struct Entity<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Post<'a> { - ///Client-declared timestamp when this post was originally created. + /// Client-declared timestamp when this post was originally created. pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub embed: std::option::Option>, - ///DEPRECATED: replaced by app.bsky.richtext.facet. + pub embed: Option>, + /// DEPRECATED: replaced by app.bsky.richtext.facet. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub entities: std::option::Option>>, - ///Annotations of text (mentions, URLs, hashtags, etc) + pub entities: Option>>, + /// Annotations of text (mentions, URLs, hashtags, etc) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub facets: std::option::Option>>, - ///Self-label values for this post. Effectively content warnings. + pub facets: Option>>, + /// Self-label values for this post. Effectively content warnings. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>, - ///Indicates human language of post primary text content. + pub labels: Option>, + /// Indicates human language of post primary text content. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub langs: std::option::Option>, + #[builder(into)] + pub langs: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reply: std::option::Option>, - ///Additional hashtags, in addition to any included in post text and facets. + pub reply: Option>, + /// Additional hashtags, in addition to any included in post text and facets. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>>, - ///The primary post content. May be an empty string, if there are embeds. + pub tags: Option>>, + /// The primary post content. May be an empty string, if there are embeds. #[serde(borrow)] + #[builder(into)] pub text: jacquard_common::CowStr<'a>, } @@ -147,7 +159,8 @@ impl From> for Post<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ReplyRef<'a> { @@ -157,7 +170,7 @@ pub struct ReplyRef<'a> { pub root: crate::com_atproto::repo::strong_ref::StrongRef<'a>, } -///Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. +/// Deprecated. Use app.bsky.richtext instead -- A text segment. Start is inclusive, end is exclusive. Indices are for utf16-encoded strings. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -166,7 +179,8 @@ pub struct ReplyRef<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct TextSlice<'a> { diff --git a/crates/jacquard-api/src/app_bsky/feed/postgate.rs b/crates/jacquard-api/src/app_bsky/feed/postgate.rs index eba29651d..8fbf7610b 100644 --- a/crates/jacquard-api/src/app_bsky/feed/postgate.rs +++ b/crates/jacquard-api/src/app_bsky/feed/postgate.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Disables embedding of this post. +/// Disables embedding of this post. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,11 +14,12 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct DisableRule<'a> {} -///Record defining interaction rules for a post. The record key (rkey) of the postgate record must match the record key of the post, and that record must be in the same repository. +/// Record defining interaction rules for a post. The record key (rkey) of the postgate record must match the record key of the post, and that record must be in the same repository. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -27,24 +28,23 @@ pub struct DisableRule<'a> {} Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Postgate<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///List of AT-URIs embedding this post that the author has detached from. + /// List of AT-URIs embedding this post that the author has detached from. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub detached_embedding_uris: std::option::Option< - Vec>, - >, - ///List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed. + pub detached_embedding_uris: Option>>, + /// List of rules defining who can embed this post. If value is an empty array or is undefined, no particular rules apply and anyone can embed. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub embedding_rules: std::option::Option< - Vec>, - >, - ///Reference (AT-URI) to the post record. + pub embedding_rules: Option>>, + /// Reference (AT-URI) to the post record. #[serde(borrow)] pub post: jacquard_common::types::string::AtUri<'a>, } diff --git a/crates/jacquard-api/src/app_bsky/feed/repost.rs b/crates/jacquard-api/src/app_bsky/feed/repost.rs index ac9b347cd..840907db6 100644 --- a/crates/jacquard-api/src/app_bsky/feed/repost.rs +++ b/crates/jacquard-api/src/app_bsky/feed/repost.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record representing a 'repost' of an existing Bluesky post. +/// Record representing a 'repost' of an existing Bluesky post. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,7 +14,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Repost<'a> { @@ -22,8 +23,9 @@ pub struct Repost<'a> { #[serde(borrow)] pub subject: crate::com_atproto::repo::strong_ref::StrongRef<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub via: std::option::Option>, + pub via: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/app_bsky/feed/search_posts.rs b/crates/jacquard-api/src/app_bsky/feed/search_posts.rs index f2e838ed9..853ab3a54 100644 --- a/crates/jacquard-api/src/app_bsky/feed/search_posts.rs +++ b/crates/jacquard-api/src/app_bsky/feed/search_posts.rs @@ -76,7 +76,7 @@ pub struct SearchPostsOutput<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, - ///Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. + /// Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. #[serde(skip_serializing_if = "std::option::Option::is_none")] pub hits_total: std::option::Option, #[serde(borrow)] diff --git a/crates/jacquard-api/src/app_bsky/feed/threadgate.rs b/crates/jacquard-api/src/app_bsky/feed/threadgate.rs index 23ee5944c..c76ab6562 100644 --- a/crates/jacquard-api/src/app_bsky/feed/threadgate.rs +++ b/crates/jacquard-api/src/app_bsky/feed/threadgate.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Allow replies from actors who follow you. +/// Allow replies from actors who follow you. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,11 +14,12 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct FollowerRule<'a> {} -///Allow replies from actors you follow. +/// Allow replies from actors you follow. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -27,11 +28,12 @@ pub struct FollowerRule<'a> {} Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct FollowingRule<'a> {} -///Allow replies from actors on a list. +/// Allow replies from actors on a list. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -40,7 +42,8 @@ pub struct FollowingRule<'a> {} Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ListRule<'a> { @@ -48,7 +51,7 @@ pub struct ListRule<'a> { pub list: jacquard_common::types::string::AtUri<'a>, } -///Record defining interaction gating rules for a thread (aka, reply controls). The record key (rkey) of the threadgate record must match the record key of the thread's root post, and that record must be in the same repository. +/// Record defining interaction gating rules for a thread (aka, reply controls). The record key (rkey) of the threadgate record must match the record key of the thread's root post, and that record must be in the same repository. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -57,22 +60,23 @@ pub struct ListRule<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Threadgate<'a> { - ///List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. + /// List of rules defining who can reply to this post. If value is an empty array, no one can reply. If value is undefined, anyone can reply. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub allow: std::option::Option>>, + pub allow: Option>>, pub created_at: jacquard_common::types::string::Datetime, - ///List of hidden reply URIs. + /// List of hidden reply URIs. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub hidden_replies: std::option::Option< - Vec>, - >, - ///Reference (AT-URI) to the post record. + pub hidden_replies: Option>>, + /// Reference (AT-URI) to the post record. #[serde(borrow)] pub post: jacquard_common::types::string::AtUri<'a>, } @@ -142,7 +146,7 @@ impl From> for Threadgate<'_> { } } -///Allow replies from actors mentioned in your post. +/// Allow replies from actors mentioned in your post. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -151,7 +155,8 @@ impl From> for Threadgate<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct MentionRule<'a> {} \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/graph.rs b/crates/jacquard-api/src/app_bsky/graph.rs index 4db56b4da..a15ee7d7f 100644 --- a/crates/jacquard-api/src/app_bsky/graph.rs +++ b/crates/jacquard-api/src/app_bsky/graph.rs @@ -36,7 +36,7 @@ pub mod unmute_actor_list; pub mod unmute_thread; pub mod verification; -///A list of actors used for curation purposes such as list feeds or interaction gating. +/// A list of actors used for curation purposes such as list feeds or interaction gating. #[derive( serde::Serialize, serde::Deserialize, @@ -62,7 +62,8 @@ impl std::fmt::Display for Curatelist { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ListItemView<'a> { @@ -165,40 +166,46 @@ impl jacquard_common::IntoStatic for ListPurpose<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ListView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, + pub avatar: Option>, #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, #[serde(borrow)] pub creator: crate::app_bsky::actor::ProfileView<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description_facets: std::option::Option< - Vec>, - >, + pub description_facets: Option>>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub list_item_count: std::option::Option, + #[builder(into)] + pub list_item_count: Option, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(borrow)] pub purpose: crate::app_bsky::graph::ListPurpose<'a>, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub viewer: std::option::Option>, + pub viewer: Option>, } #[jacquard_derive::lexicon] @@ -209,31 +216,38 @@ pub struct ListView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ListViewBasic<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, + pub avatar: Option>, #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub indexed_at: std::option::Option, + #[builder(into)] + pub indexed_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub list_item_count: std::option::Option, + #[builder(into)] + pub list_item_count: Option, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(borrow)] pub purpose: crate::app_bsky::graph::ListPurpose<'a>, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub viewer: std::option::Option>, + pub viewer: Option>, } #[jacquard_derive::lexicon] @@ -244,18 +258,21 @@ pub struct ListViewBasic<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ListViewerState<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub blocked: std::option::Option>, + pub blocked: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub muted: std::option::Option, + #[builder(into)] + pub muted: Option, } -///A list of actors to apply an aggregate moderation action (mute/block) on. +/// A list of actors to apply an aggregate moderation action (mute/block) on. #[derive( serde::Serialize, serde::Deserialize, @@ -273,7 +290,7 @@ impl std::fmt::Display for Modlist { } } -///indicates that a handle or DID could not be resolved +/// indicates that a handle or DID could not be resolved #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -282,7 +299,8 @@ impl std::fmt::Display for Modlist { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct NotFoundActor<'a> { @@ -291,7 +309,7 @@ pub struct NotFoundActor<'a> { pub not_found: bool, } -///A list of actors used for only for reference purposes such as within a starter pack. +/// A list of actors used for only for reference purposes such as within a starter pack. #[derive( serde::Serialize, serde::Deserialize, @@ -309,7 +327,7 @@ impl std::fmt::Display for Referencelist { } } -///lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) +/// lists the bi-directional graph relationships between one actor (not indicated in the object), and the target actors (the DID included in the object) #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -318,20 +336,23 @@ impl std::fmt::Display for Referencelist { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Relationship<'a> { #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///if the actor is followed by this DID, contains the AT-URI of the follow record + /// if the actor is followed by this DID, contains the AT-URI of the follow record #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub followed_by: std::option::Option>, - ///if the actor follows this DID, this is the AT-URI of the follow record + pub followed_by: Option>, + /// if the actor follows this DID, this is the AT-URI of the follow record #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub following: std::option::Option>, + pub following: Option>, } #[jacquard_derive::lexicon] @@ -342,7 +363,8 @@ pub struct Relationship<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct StarterPackView<'a> { @@ -351,24 +373,28 @@ pub struct StarterPackView<'a> { #[serde(borrow)] pub creator: crate::app_bsky::actor::ProfileViewBasic<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub feeds: std::option::Option>>, + pub feeds: Option>>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub joined_all_time_count: std::option::Option, + #[builder(into)] + pub joined_all_time_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub joined_week_count: std::option::Option, + #[builder(into)] + pub joined_week_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub list: std::option::Option>, + pub list: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub list_items_sample: std::option::Option< - Vec>, - >, + pub list_items_sample: Option>>, #[serde(borrow)] pub record: jacquard_common::types::value::Data<'a>, #[serde(borrow)] @@ -383,7 +409,8 @@ pub struct StarterPackView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct StarterPackViewBasic<'a> { @@ -393,14 +420,18 @@ pub struct StarterPackViewBasic<'a> { pub creator: crate::app_bsky::actor::ProfileViewBasic<'a>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub joined_all_time_count: std::option::Option, + #[builder(into)] + pub joined_all_time_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub joined_week_count: std::option::Option, + #[builder(into)] + pub joined_week_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub list_item_count: std::option::Option, + #[builder(into)] + pub list_item_count: Option, #[serde(borrow)] pub record: jacquard_common::types::value::Data<'a>, #[serde(borrow)] diff --git a/crates/jacquard-api/src/app_bsky/graph/block.rs b/crates/jacquard-api/src/app_bsky/graph/block.rs index b50738d16..a2dd40964 100644 --- a/crates/jacquard-api/src/app_bsky/graph/block.rs +++ b/crates/jacquard-api/src/app_bsky/graph/block.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record declaring a 'block' relationship against another account. NOTE: blocks are public in Bluesky; see blog posts for details. +/// Record declaring a 'block' relationship against another account. NOTE: blocks are public in Bluesky; see blog posts for details. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,12 +14,13 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Block<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///DID of the account to be blocked. + /// DID of the account to be blocked. #[serde(borrow)] pub subject: jacquard_common::types::string::Did<'a>, } diff --git a/crates/jacquard-api/src/app_bsky/graph/follow.rs b/crates/jacquard-api/src/app_bsky/graph/follow.rs index 799c7ecfb..b9e326454 100644 --- a/crates/jacquard-api/src/app_bsky/graph/follow.rs +++ b/crates/jacquard-api/src/app_bsky/graph/follow.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record declaring a social 'follow' relationship of another account. Duplicate follows will be ignored by the AppView. +/// Record declaring a social 'follow' relationship of another account. Duplicate follows will be ignored by the AppView. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,7 +14,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Follow<'a> { diff --git a/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs b/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs index 7c825fce2..e3d7f9644 100644 --- a/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs +++ b/crates/jacquard-api/src/app_bsky/graph/get_lists_with_membership.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A list and an optional list item indicating membership of a target user to that list. +/// A list and an optional list item indicating membership of a target user to that list. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,15 +14,17 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ListWithMembership<'a> { #[serde(borrow)] pub list: crate::app_bsky::graph::ListView<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub list_item: std::option::Option>, + pub list_item: Option>, } #[derive( diff --git a/crates/jacquard-api/src/app_bsky/graph/get_relationships.rs b/crates/jacquard-api/src/app_bsky/graph/get_relationships.rs index 776d3e0f7..7bc824ec8 100644 --- a/crates/jacquard-api/src/app_bsky/graph/get_relationships.rs +++ b/crates/jacquard-api/src/app_bsky/graph/get_relationships.rs @@ -80,7 +80,7 @@ pub enum GetRelationshipsOutputRelationshipsItem<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum GetRelationshipsError<'a> { - ///the primary actor at-identifier could not be resolved + /// the primary actor at-identifier could not be resolved #[serde(rename = "ActorNotFound")] ActorNotFound(std::option::Option), } diff --git a/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs b/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs index b35c8681a..39b853491 100644 --- a/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs +++ b/crates/jacquard-api/src/app_bsky/graph/get_starter_packs_with_membership.rs @@ -74,7 +74,7 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetStarterPacksWithMembershipReques type Response = GetStarterPacksWithMembershipResponse; } -///A starter pack and an optional list item indicating membership of a target user to that starter pack. +/// A starter pack and an optional list item indicating membership of a target user to that starter pack. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -83,13 +83,15 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetStarterPacksWithMembershipReques Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct StarterPackWithMembership<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub list_item: std::option::Option>, + pub list_item: Option>, #[serde(borrow)] pub starter_pack: crate::app_bsky::graph::StarterPackView<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/graph/get_suggested_follows_by_actor.rs b/crates/jacquard-api/src/app_bsky/graph/get_suggested_follows_by_actor.rs index d04790d7a..b9a32de76 100644 --- a/crates/jacquard-api/src/app_bsky/graph/get_suggested_follows_by_actor.rs +++ b/crates/jacquard-api/src/app_bsky/graph/get_suggested_follows_by_actor.rs @@ -34,10 +34,10 @@ pub struct GetSuggestedFollowsByActor<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetSuggestedFollowsByActorOutput<'a> { - ///If true, response has fallen-back to generic results, and is not scoped using relativeToDid + /// If true, response has fallen-back to generic results, and is not scoped using relativeToDid #[serde(skip_serializing_if = "std::option::Option::is_none")] pub is_fallback: std::option::Option, - ///Snowflake for this recommendation, use when submitting recommendation events. + /// Snowflake for this recommendation, use when submitting recommendation events. #[serde(skip_serializing_if = "std::option::Option::is_none")] pub rec_id: std::option::Option, #[serde(borrow)] diff --git a/crates/jacquard-api/src/app_bsky/graph/list.rs b/crates/jacquard-api/src/app_bsky/graph/list.rs index 3aae54456..1f2c118d2 100644 --- a/crates/jacquard-api/src/app_bsky/graph/list.rs +++ b/crates/jacquard-api/src/app_bsky/graph/list.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record representing a list of accounts (actors). Scope includes both moderation-oriented lists and curration-oriented lists. +/// Record representing a list of accounts (actors). Scope includes both moderation-oriented lists and curration-oriented lists. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,29 +14,33 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct List<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, + pub avatar: Option>, pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description_facets: std::option::Option< - Vec>, - >, + pub description_facets: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>, - ///Display name for list; can not be empty. + pub labels: Option>, + /// Display name for list; can not be empty. #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Defines the purpose of the list (aka, moderation-oriented or curration-oriented) + /// Defines the purpose of the list (aka, moderation-oriented or curration-oriented) #[serde(borrow)] pub purpose: crate::app_bsky::graph::ListPurpose<'a>, } diff --git a/crates/jacquard-api/src/app_bsky/graph/listblock.rs b/crates/jacquard-api/src/app_bsky/graph/listblock.rs index ccbfa01f4..71e032faa 100644 --- a/crates/jacquard-api/src/app_bsky/graph/listblock.rs +++ b/crates/jacquard-api/src/app_bsky/graph/listblock.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record representing a block relationship against an entire an entire list of accounts (actors). +/// Record representing a block relationship against an entire an entire list of accounts (actors). #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,12 +14,13 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Listblock<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///Reference (AT-URI) to the mod list record. + /// Reference (AT-URI) to the mod list record. #[serde(borrow)] pub subject: jacquard_common::types::string::AtUri<'a>, } diff --git a/crates/jacquard-api/src/app_bsky/graph/listitem.rs b/crates/jacquard-api/src/app_bsky/graph/listitem.rs index 106742104..4f6464b21 100644 --- a/crates/jacquard-api/src/app_bsky/graph/listitem.rs +++ b/crates/jacquard-api/src/app_bsky/graph/listitem.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record representing an account's inclusion on a specific list. The AppView will ignore duplicate listitem records. +/// Record representing an account's inclusion on a specific list. The AppView will ignore duplicate listitem records. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,15 +14,16 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Listitem<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///Reference (AT-URI) to the list record (app.bsky.graph.list). + /// Reference (AT-URI) to the list record (app.bsky.graph.list). #[serde(borrow)] pub list: jacquard_common::types::string::AtUri<'a>, - ///The account which is included on the list. + /// The account which is included on the list. #[serde(borrow)] pub subject: jacquard_common::types::string::Did<'a>, } diff --git a/crates/jacquard-api/src/app_bsky/graph/starterpack.rs b/crates/jacquard-api/src/app_bsky/graph/starterpack.rs index 9836d2c43..f651655d9 100644 --- a/crates/jacquard-api/src/app_bsky/graph/starterpack.rs +++ b/crates/jacquard-api/src/app_bsky/graph/starterpack.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct FeedItem<'a> { @@ -21,7 +22,7 @@ pub struct FeedItem<'a> { pub uri: jacquard_common::types::string::AtUri<'a>, } -///Record defining a starter pack of actors and feeds for new users. +/// Record defining a starter pack of actors and feeds for new users. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -30,29 +31,30 @@ pub struct FeedItem<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Starterpack<'a> { pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description_facets: std::option::Option< - Vec>, - >, + pub description_facets: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub feeds: std::option::Option< - Vec>, - >, - ///Reference (AT-URI) to the list record. + pub feeds: Option>>, + /// Reference (AT-URI) to the list record. #[serde(borrow)] pub list: jacquard_common::types::string::AtUri<'a>, - ///Display name for starter pack; can not be empty. + /// Display name for starter pack; can not be empty. #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/app_bsky/graph/verification.rs b/crates/jacquard-api/src/app_bsky/graph/verification.rs index 22bef74e5..18c235ea1 100644 --- a/crates/jacquard-api/src/app_bsky/graph/verification.rs +++ b/crates/jacquard-api/src/app_bsky/graph/verification.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record declaring a verification relationship between two accounts. Verifications are only considered valid by an app if issued by an account the app considers trusted. +/// Record declaring a verification relationship between two accounts. Verifications are only considered valid by an app if issued by an account the app considers trusted. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,19 +14,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Verification<'a> { - ///Date of when the verification was created. + /// Date of when the verification was created. pub created_at: jacquard_common::types::string::Datetime, - ///Display name of the subject the verification applies to at the moment of verifying, which might not be the same at the time of viewing. The verification is only valid if the current displayName matches the one at the time of verifying. + /// Display name of the subject the verification applies to at the moment of verifying, which might not be the same at the time of viewing. The verification is only valid if the current displayName matches the one at the time of verifying. #[serde(borrow)] + #[builder(into)] pub display_name: jacquard_common::CowStr<'a>, - ///Handle of the subject the verification applies to at the moment of verifying, which might not be the same at the time of viewing. The verification is only valid if the current handle matches the one at the time of verifying. + /// Handle of the subject the verification applies to at the moment of verifying, which might not be the same at the time of viewing. The verification is only valid if the current handle matches the one at the time of verifying. #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, - ///DID of the subject the verification applies to. + /// DID of the subject the verification applies to. #[serde(borrow)] pub subject: jacquard_common::types::string::Did<'a>, } diff --git a/crates/jacquard-api/src/app_bsky/labeler.rs b/crates/jacquard-api/src/app_bsky/labeler.rs index 0d323387d..622065d3c 100644 --- a/crates/jacquard-api/src/app_bsky/labeler.rs +++ b/crates/jacquard-api/src/app_bsky/labeler.rs @@ -16,17 +16,19 @@ pub mod service; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LabelerPolicies<'a> { - ///Label values created by this labeler and scoped exclusively to it. Labels defined here will override global label definitions for this labeler. + /// Label values created by this labeler and scoped exclusively to it. Labels defined here will override global label definitions for this labeler. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub label_value_definitions: std::option::Option< + pub label_value_definitions: Option< Vec>, >, - ///The label values which this labeler publishes. May include global or custom labels. + /// The label values which this labeler publishes. May include global or custom labels. #[serde(borrow)] pub label_values: Vec>, } @@ -39,7 +41,8 @@ pub struct LabelerPolicies<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LabelerView<'a> { @@ -49,15 +52,18 @@ pub struct LabelerView<'a> { pub creator: crate::app_bsky::actor::ProfileView<'a>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub like_count: std::option::Option, + #[builder(into)] + pub like_count: Option, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub viewer: std::option::Option>, + pub viewer: Option>, } #[jacquard_derive::lexicon] @@ -68,7 +74,8 @@ pub struct LabelerView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LabelerViewDetailed<'a> { @@ -78,35 +85,35 @@ pub struct LabelerViewDetailed<'a> { pub creator: crate::app_bsky::actor::ProfileView<'a>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub like_count: std::option::Option, + #[builder(into)] + pub like_count: Option, #[serde(borrow)] pub policies: crate::app_bsky::labeler::LabelerPolicies<'a>, - ///The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed. + /// The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reason_types: std::option::Option< - Vec>, - >, - ///Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type. + pub reason_types: Option>>, + /// Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subject_collections: std::option::Option< - Vec>, - >, - ///The set of subject types (account, record, etc) this service accepts reports on. + pub subject_collections: Option>>, + /// The set of subject types (account, record, etc) this service accepts reports on. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subject_types: std::option::Option< - Vec>, - >, + pub subject_types: Option>>, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub viewer: std::option::Option>, + pub viewer: Option>, } #[jacquard_derive::lexicon] @@ -117,11 +124,13 @@ pub struct LabelerViewDetailed<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LabelerViewerState<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub like: std::option::Option>, + pub like: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/labeler/service.rs b/crates/jacquard-api/src/app_bsky/labeler/service.rs index 9f556359e..afa5855ac 100644 --- a/crates/jacquard-api/src/app_bsky/labeler/service.rs +++ b/crates/jacquard-api/src/app_bsky/labeler/service.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of the existence of labeler service. +/// A declaration of the existence of labeler service. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,34 +14,33 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Service<'a> { pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>, + pub labels: Option>, #[serde(borrow)] pub policies: crate::app_bsky::labeler::LabelerPolicies<'a>, - ///The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed. + /// The set of report reason 'codes' which are in-scope for this service to review and action. These usually align to policy categories. If not defined (distinct from empty array), all reason types are allowed. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reason_types: std::option::Option< - Vec>, - >, - ///Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type. + pub reason_types: Option>>, + /// Set of record types (collection NSIDs) which can be reported to this service. If not defined (distinct from empty array), default is any record type. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subject_collections: std::option::Option< - Vec>, - >, - ///The set of subject types (account, record, etc) this service accepts reports on. + pub subject_collections: Option>>, + /// The set of subject types (account, record, etc) this service accepts reports on. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subject_types: std::option::Option< - Vec>, - >, + pub subject_types: Option>>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/app_bsky/notification.rs b/crates/jacquard-api/src/app_bsky/notification.rs index cd5eeb591..cbfd2f99c 100644 --- a/crates/jacquard-api/src/app_bsky/notification.rs +++ b/crates/jacquard-api/src/app_bsky/notification.rs @@ -25,7 +25,8 @@ pub mod update_seen; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ActivitySubscription<'a> { @@ -41,11 +42,13 @@ pub struct ActivitySubscription<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ChatPreference<'a> { #[serde(borrow)] + #[builder(into)] pub include: jacquard_common::CowStr<'a>, pub push: bool, } @@ -58,11 +61,13 @@ pub struct ChatPreference<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct FilterablePreference<'a> { #[serde(borrow)] + #[builder(into)] pub include: jacquard_common::CowStr<'a>, pub list: bool, pub push: bool, @@ -76,7 +81,8 @@ pub struct FilterablePreference<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Preference<'a> { @@ -92,7 +98,8 @@ pub struct Preference<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Preferences<'a> { @@ -132,11 +139,12 @@ pub struct Preferences<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RecordDeleted<'a> {} -///Object used to store activity subscription data in stash. +/// Object used to store activity subscription data in stash. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -145,7 +153,8 @@ pub struct RecordDeleted<'a> {} Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SubjectActivitySubscription<'a> { diff --git a/crates/jacquard-api/src/app_bsky/notification/declaration.rs b/crates/jacquard-api/src/app_bsky/notification/declaration.rs index 2c836cd2d..4738c93b3 100644 --- a/crates/jacquard-api/src/app_bsky/notification/declaration.rs +++ b/crates/jacquard-api/src/app_bsky/notification/declaration.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of the user's choices related to notifications that can be produced by them. +/// A declaration of the user's choices related to notifications that can be produced by them. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,12 +14,14 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Declaration<'a> { - ///A declaration of the user's preference for allowing activity subscriptions from other users. Absence of a record implies 'followers'. + /// A declaration of the user's preference for allowing activity subscriptions from other users. Absence of a record implies 'followers'. #[serde(borrow)] + #[builder(into)] pub allow_subscriptions: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs b/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs index 438077903..c783ca69e 100644 --- a/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs +++ b/crates/jacquard-api/src/app_bsky/notification/list_notifications.rs @@ -91,7 +91,8 @@ impl jacquard_common::xrpc::XrpcEndpoint for ListNotificationsRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Notification<'a> { @@ -102,14 +103,17 @@ pub struct Notification<'a> { pub indexed_at: jacquard_common::types::string::Datetime, pub is_read: bool, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, - ///The reason why this notification was delivered - e.g. your post was liked, or you received a new follower. + pub labels: Option>>, + /// The reason why this notification was delivered - e.g. your post was liked, or you received a new follower. #[serde(borrow)] + #[builder(into)] pub reason: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reason_subject: std::option::Option>, + pub reason_subject: Option>, #[serde(borrow)] pub record: jacquard_common::types::value::Data<'a>, #[serde(borrow)] diff --git a/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs b/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs index 0dd8343d8..b06941a00 100644 --- a/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs +++ b/crates/jacquard-api/src/app_bsky/notification/put_preferences_v2.rs @@ -20,64 +20,59 @@ #[builder(start_fn = new)] pub struct PutPreferencesV2<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub chat: std::option::Option>, + pub chat: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub follow: std::option::Option< - crate::app_bsky::notification::FilterablePreference<'a>, - >, + pub follow: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub like: std::option::Option< - crate::app_bsky::notification::FilterablePreference<'a>, - >, + pub like: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub like_via_repost: std::option::Option< - crate::app_bsky::notification::FilterablePreference<'a>, - >, + pub like_via_repost: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub mention: std::option::Option< - crate::app_bsky::notification::FilterablePreference<'a>, - >, + pub mention: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub quote: std::option::Option< - crate::app_bsky::notification::FilterablePreference<'a>, - >, + pub quote: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reply: std::option::Option< - crate::app_bsky::notification::FilterablePreference<'a>, - >, + pub reply: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub repost: std::option::Option< - crate::app_bsky::notification::FilterablePreference<'a>, - >, + pub repost: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub repost_via_repost: std::option::Option< + pub repost_via_repost: Option< crate::app_bsky::notification::FilterablePreference<'a>, >, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub starterpack_joined: std::option::Option< - crate::app_bsky::notification::Preference<'a>, - >, + pub starterpack_joined: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subscribed_post: std::option::Option< - crate::app_bsky::notification::Preference<'a>, - >, + pub subscribed_post: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub unverified: std::option::Option>, + pub unverified: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub verified: std::option::Option>, + pub verified: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/app_bsky/notification/register_push.rs b/crates/jacquard-api/src/app_bsky/notification/register_push.rs index 32aa63edc..11ac36047 100644 --- a/crates/jacquard-api/src/app_bsky/notification/register_push.rs +++ b/crates/jacquard-api/src/app_bsky/notification/register_push.rs @@ -19,9 +19,10 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct RegisterPush<'a> { - ///Set to true when the actor is age restricted + /// Set to true when the actor is age restricted #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub age_restricted: std::option::Option, + #[builder(into)] + pub age_restricted: Option, #[serde(borrow)] #[builder(into)] pub app_id: jacquard_common::CowStr<'a>, diff --git a/crates/jacquard-api/src/app_bsky/richtext/facet.rs b/crates/jacquard-api/src/app_bsky/richtext/facet.rs index 091cb5306..a3688b1b6 100644 --- a/crates/jacquard-api/src/app_bsky/richtext/facet.rs +++ b/crates/jacquard-api/src/app_bsky/richtext/facet.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. +/// Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,7 +14,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ByteSlice<'a> { @@ -22,7 +23,7 @@ pub struct ByteSlice<'a> { pub byte_start: i64, } -///Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. +/// Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -31,7 +32,8 @@ pub struct ByteSlice<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Link<'a> { @@ -39,7 +41,7 @@ pub struct Link<'a> { pub uri: jacquard_common::types::string::Uri<'a>, } -///Annotation of a sub-string within rich text. +/// Annotation of a sub-string within rich text. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -48,7 +50,8 @@ pub struct Link<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Facet<'a> { @@ -79,7 +82,7 @@ pub enum FacetFeaturesItem<'a> { Tag(Box>), } -///Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. +/// Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -88,7 +91,8 @@ pub enum FacetFeaturesItem<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Mention<'a> { @@ -96,7 +100,7 @@ pub struct Mention<'a> { pub did: jacquard_common::types::string::Did<'a>, } -///Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). +/// Facet feature for a hashtag. The text usually includes a '#' prefix, but the facet reference should not (except in the case of 'double hash tags'). #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -105,10 +109,12 @@ pub struct Mention<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Tag<'a> { #[serde(borrow)] + #[builder(into)] pub tag: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/unspecced.rs b/crates/jacquard-api/src/app_bsky/unspecced.rs index 5899a65fc..3007b7697 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced.rs @@ -28,7 +28,7 @@ pub mod search_actors_skeleton; pub mod search_posts_skeleton; pub mod search_starter_packs_skeleton; -///Object used to store age assurance data in stash. +/// Object used to store age assurance data in stash. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -37,41 +37,49 @@ pub mod search_starter_packs_skeleton; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AgeAssuranceEvent<'a> { - ///The unique identifier for this instance of the age assurance flow, in UUID format. + /// The unique identifier for this instance of the age assurance flow, in UUID format. #[serde(borrow)] + #[builder(into)] pub attempt_id: jacquard_common::CowStr<'a>, - ///The IP address used when completing the AA flow. + /// The IP address used when completing the AA flow. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub complete_ip: std::option::Option>, - ///The user agent used when completing the AA flow. + pub complete_ip: Option>, + /// The user agent used when completing the AA flow. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub complete_ua: std::option::Option>, - ///The date and time of this write operation. + pub complete_ua: Option>, + /// The date and time of this write operation. pub created_at: jacquard_common::types::string::Datetime, - ///The email used for AA. + /// The email used for AA. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub email: std::option::Option>, - ///The IP address used when initiating the AA flow. + pub email: Option>, + /// The IP address used when initiating the AA flow. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub init_ip: std::option::Option>, - ///The user agent used when initiating the AA flow. + pub init_ip: Option>, + /// The user agent used when initiating the AA flow. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub init_ua: std::option::Option>, - ///The status of the age assurance process. + pub init_ua: Option>, + /// The status of the age assurance process. #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, } -///The computed state of the age assurance process, returned to the user in question on certain authenticated requests. +/// The computed state of the age assurance process, returned to the user in question on certain authenticated requests. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -80,15 +88,18 @@ pub struct AgeAssuranceEvent<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AgeAssuranceState<'a> { - ///The timestamp when this state was last updated. + /// The timestamp when this state was last updated. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub last_initiated_at: std::option::Option, - ///The status of the age assurance process. + #[builder(into)] + pub last_initiated_at: Option, + /// The status of the age assurance process. #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, } @@ -100,7 +111,8 @@ pub struct AgeAssuranceState<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SkeletonSearchActor<'a> { @@ -116,7 +128,8 @@ pub struct SkeletonSearchActor<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SkeletonSearchPost<'a> { @@ -132,7 +145,8 @@ pub struct SkeletonSearchPost<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SkeletonSearchStarterPack<'a> { @@ -148,25 +162,31 @@ pub struct SkeletonSearchStarterPack<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SkeletonTrend<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub category: std::option::Option>, + pub category: Option>, #[serde(borrow)] pub dids: Vec>, #[serde(borrow)] + #[builder(into)] pub display_name: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub link: jacquard_common::CowStr<'a>, pub post_count: i64, pub started_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option>, + pub status: Option>, #[serde(borrow)] + #[builder(into)] pub topic: jacquard_common::CowStr<'a>, } @@ -178,7 +198,8 @@ pub struct SkeletonTrend<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ThreadItemBlocked<'a> { @@ -194,7 +215,8 @@ pub struct ThreadItemBlocked<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ThreadItemNoUnauthenticated<'a> {} @@ -206,7 +228,8 @@ pub struct ThreadItemNoUnauthenticated<'a> {} Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ThreadItemNotFound<'a> {} @@ -218,19 +241,20 @@ pub struct ThreadItemNotFound<'a> {} Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ThreadItemPost<'a> { - ///The threadgate created by the author indicates this post as a reply to be hidden for everyone consuming the thread. + /// The threadgate created by the author indicates this post as a reply to be hidden for everyone consuming the thread. pub hidden_by_threadgate: bool, - ///This post has more parents that were not present in the response. This is just a boolean, without the number of parents. + /// This post has more parents that were not present in the response. This is just a boolean, without the number of parents. pub more_parents: bool, - ///This post has more replies that were not present in the response. This is a numeric value, which is best-effort and might not be accurate. + /// This post has more replies that were not present in the response. This is a numeric value, which is best-effort and might not be accurate. pub more_replies: i64, - ///This is by an account muted by the viewer requesting it. + /// This is by an account muted by the viewer requesting it. pub muted_by_viewer: bool, - ///This post is part of a contiguous thread by the OP from the thread root. Many different OP threads can happen in the same thread. + /// This post is part of a contiguous thread by the OP from the thread root. Many different OP threads can happen in the same thread. pub op_thread: bool, #[serde(borrow)] pub post: crate::app_bsky::feed::PostView<'a>, @@ -244,25 +268,31 @@ pub struct ThreadItemPost<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct TrendView<'a> { #[serde(borrow)] pub actors: Vec>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub category: std::option::Option>, + pub category: Option>, #[serde(borrow)] + #[builder(into)] pub display_name: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub link: jacquard_common::CowStr<'a>, pub post_count: i64, pub started_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option>, + pub status: Option>, #[serde(borrow)] + #[builder(into)] pub topic: jacquard_common::CowStr<'a>, } @@ -274,18 +304,23 @@ pub struct TrendView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct TrendingTopic<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display_name: std::option::Option>, + pub display_name: Option>, #[serde(borrow)] + #[builder(into)] pub link: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub topic: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs index 96c545b23..db4275b34 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/get_config.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LiveNowConfig<'a> { diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs index 0b258d60d..b6f8643cd 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_other_v2.rs @@ -37,7 +37,7 @@ pub struct GetPostThreadOtherV2<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetPostThreadOtherV2Output<'a> { - ///A flat list of other thread items. The depth of each item is indicated by the depth property inside the item. + /// A flat list of other thread items. The depth of each item is indicated by the depth property inside the item. #[serde(borrow)] pub thread: Vec>, } @@ -76,11 +76,12 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetPostThreadOtherV2Request { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ThreadItem<'a> { - ///The nesting level of this item in the thread. Depth 0 means the anchor item. Items above have negative depths, items below have positive depths. + /// The nesting level of this item in the thread. Depth 0 means the anchor item. Items above have negative depths, items below have positive depths. pub depth: i64, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs index c49cbb8b9..d787e3151 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/get_post_thread_v2.rs @@ -51,9 +51,9 @@ pub struct GetPostThreadV2<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetPostThreadV2Output<'a> { - ///Whether this thread has additional replies. If true, a call can be made to the `getPostThreadOtherV2` endpoint to retrieve them. + /// Whether this thread has additional replies. If true, a call can be made to the `getPostThreadOtherV2` endpoint to retrieve them. pub has_other_replies: bool, - ///A flat list of thread items. The depth of each item is indicated by the depth property inside the item. + /// A flat list of thread items. The depth of each item is indicated by the depth property inside the item. #[serde(borrow)] pub thread: Vec>, #[serde(skip_serializing_if = "std::option::Option::is_none")] @@ -95,11 +95,12 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetPostThreadV2Request { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ThreadItem<'a> { - ///The nesting level of this item in the thread. Depth 0 means the anchor item. Items above have negative depths, items below have positive depths. + /// The nesting level of this item in the thread. Depth 0 means the anchor item. Items above have negative depths, items below have positive depths. pub depth: i64, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_suggestions_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_suggestions_skeleton.rs index 30c1b0566..aa555936d 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/get_suggestions_skeleton.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/get_suggestions_skeleton.rs @@ -50,10 +50,10 @@ pub struct GetSuggestionsSkeletonOutput<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, - ///Snowflake for this recommendation, use when submitting recommendation events. + /// Snowflake for this recommendation, use when submitting recommendation events. #[serde(skip_serializing_if = "std::option::Option::is_none")] pub rec_id: std::option::Option, - ///DID of the account these suggestions are relative to. If this is returned undefined, suggestions are based on the viewer. + /// DID of the account these suggestions are relative to. If this is returned undefined, suggestions are based on the viewer. #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub relative_to_did: std::option::Option>, diff --git a/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs b/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs index 638e7b1b8..342c92663 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/get_tagged_suggestions.rs @@ -68,14 +68,17 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetTaggedSuggestionsRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Suggestion<'a> { #[serde(borrow)] pub subject: jacquard_common::types::string::Uri<'a>, #[serde(borrow)] + #[builder(into)] pub subject_type: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub tag: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs b/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs index 85451920a..1b627e2e8 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/init_age_assurance.rs @@ -19,15 +19,15 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct InitAgeAssurance<'a> { - ///An ISO 3166-1 alpha-2 code of the user's location. + /// An ISO 3166-1 alpha-2 code of the user's location. #[serde(borrow)] #[builder(into)] pub country_code: jacquard_common::CowStr<'a>, - ///The user's email address to receive assurance instructions. + /// The user's email address to receive assurance instructions. #[serde(borrow)] #[builder(into)] pub email: jacquard_common::CowStr<'a>, - ///The user's preferred language for communication during the assurance process. + /// The user's preferred language for communication during the assurance process. #[serde(borrow)] #[builder(into)] pub language: jacquard_common::CowStr<'a>, diff --git a/crates/jacquard-api/src/app_bsky/unspecced/search_actors_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/search_actors_skeleton.rs index 8b945e881..08cb38ea3 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/search_actors_skeleton.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/search_actors_skeleton.rs @@ -52,7 +52,7 @@ pub struct SearchActorsSkeletonOutput<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, - ///Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. + /// Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. #[serde(skip_serializing_if = "std::option::Option::is_none")] pub hits_total: std::option::Option, } diff --git a/crates/jacquard-api/src/app_bsky/unspecced/search_posts_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/search_posts_skeleton.rs index 51bf4468e..f0190bfa4 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/search_posts_skeleton.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/search_posts_skeleton.rs @@ -79,7 +79,7 @@ pub struct SearchPostsSkeletonOutput<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, - ///Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. + /// Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. #[serde(skip_serializing_if = "std::option::Option::is_none")] pub hits_total: std::option::Option, #[serde(borrow)] diff --git a/crates/jacquard-api/src/app_bsky/unspecced/search_starter_packs_skeleton.rs b/crates/jacquard-api/src/app_bsky/unspecced/search_starter_packs_skeleton.rs index 0a779a1d3..9b9ad21f5 100644 --- a/crates/jacquard-api/src/app_bsky/unspecced/search_starter_packs_skeleton.rs +++ b/crates/jacquard-api/src/app_bsky/unspecced/search_starter_packs_skeleton.rs @@ -48,7 +48,7 @@ pub struct SearchStarterPacksSkeletonOutput<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, - ///Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. + /// Count of search hits. Optional, may be rounded/truncated, and may not be possible to paginate through all hits. #[serde(skip_serializing_if = "std::option::Option::is_none")] pub hits_total: std::option::Option, #[serde(borrow)] diff --git a/crates/jacquard-api/src/app_bsky/video.rs b/crates/jacquard-api/src/app_bsky/video.rs index fecd3c110..41ff32b3d 100644 --- a/crates/jacquard-api/src/app_bsky/video.rs +++ b/crates/jacquard-api/src/app_bsky/video.rs @@ -17,27 +17,34 @@ pub mod upload_video; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct JobStatus<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub blob: std::option::Option>, + pub blob: Option>, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub error: std::option::Option>, + pub error: Option>, #[serde(borrow)] + #[builder(into)] pub job_id: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub message: std::option::Option>, - ///Progress within the current processing state. + pub message: Option>, + /// Progress within the current processing state. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub progress: std::option::Option, - ///The state of the video processing job. All values not listed as a known value indicate that the job is in process. + #[builder(into)] + pub progress: Option, + /// The state of the video processing job. All values not listed as a known value indicate that the job is in process. #[serde(borrow)] + #[builder(into)] pub state: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_ocho/auth.rs b/crates/jacquard-api/src/app_ocho/auth.rs index 6fdf47db1..38cc06498 100644 --- a/crates/jacquard-api/src/app_ocho/auth.rs +++ b/crates/jacquard-api/src/app_ocho/auth.rs @@ -22,16 +22,20 @@ pub mod whoami; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AuthCallback<'a> { #[serde(borrow)] + #[builder(into)] pub access_jwt: jacquard_common::CowStr<'a>, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(borrow)] + #[builder(into)] pub handle: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub refresh_jwt: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_ocho/auth/update_email.rs b/crates/jacquard-api/src/app_ocho/auth/update_email.rs index a33783d61..4e530869b 100644 --- a/crates/jacquard-api/src/app_ocho/auth/update_email.rs +++ b/crates/jacquard-api/src/app_ocho/auth/update_email.rs @@ -23,12 +23,13 @@ pub struct UpdateEmail<'a> { #[builder(into)] pub email: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub email_auth_factor: std::option::Option, - ///Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. + #[builder(into)] + pub email_auth_factor: Option, + /// Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub token: std::option::Option>, + #[serde(borrow)] + pub token: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/app_ocho/auth/update_handle.rs b/crates/jacquard-api/src/app_ocho/auth/update_handle.rs index 49a0790da..ce2dd4a0d 100644 --- a/crates/jacquard-api/src/app_ocho/auth/update_handle.rs +++ b/crates/jacquard-api/src/app_ocho/auth/update_handle.rs @@ -19,7 +19,7 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct UpdateHandle<'a> { - ///The new handle. + /// The new handle. #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, #[serde(flatten)] diff --git a/crates/jacquard-api/src/app_ocho/auth/whoami.rs b/crates/jacquard-api/src/app_ocho/auth/whoami.rs index 66a00f715..ead4d41f7 100644 --- a/crates/jacquard-api/src/app_ocho/auth/whoami.rs +++ b/crates/jacquard-api/src/app_ocho/auth/whoami.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///The session data +/// The session data #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -18,10 +18,10 @@ )] #[serde(rename_all = "camelCase")] pub struct WhoamiOutput<'a> { - ///The user's DID + /// The user's DID #[serde(borrow)] pub did: jacquard_common::CowStr<'a>, - ///The user's ID + /// The user's ID #[serde(borrow)] pub handle: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/app_ocho/edu/get_verification_url.rs b/crates/jacquard-api/src/app_ocho/edu/get_verification_url.rs index 924453188..11158f45a 100644 --- a/crates/jacquard-api/src/app_ocho/edu/get_verification_url.rs +++ b/crates/jacquard-api/src/app_ocho/edu/get_verification_url.rs @@ -23,7 +23,7 @@ pub struct GetVerificationUrl<'a> { pub domain: jacquard_common::CowStr<'a>, } -///The intent data +/// The intent data #[jacquard_derive::lexicon] #[derive( serde::Serialize, diff --git a/crates/jacquard-api/src/app_ocho/edu/is_verified.rs b/crates/jacquard-api/src/app_ocho/edu/is_verified.rs index 5062dd583..35cc1d233 100644 --- a/crates/jacquard-api/src/app_ocho/edu/is_verified.rs +++ b/crates/jacquard-api/src/app_ocho/edu/is_verified.rs @@ -23,7 +23,7 @@ pub struct IsVerified<'a> { pub domain: jacquard_common::CowStr<'a>, } -///Whether the user is verified on that domain +/// Whether the user is verified on that domain #[jacquard_derive::lexicon] #[derive( serde::Serialize, diff --git a/crates/jacquard-api/src/app_ocho/edu/verification.rs b/crates/jacquard-api/src/app_ocho/edu/verification.rs index 200918755..30f62bc89 100644 --- a/crates/jacquard-api/src/app_ocho/edu/verification.rs +++ b/crates/jacquard-api/src/app_ocho/edu/verification.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record declaring a verification relationship between an account and a .edu domain. Verifications are only considered valid by an app if issued by an account the app considers trusted. +/// Record declaring a verification relationship between an account and a .edu domain. Verifications are only considered valid by an app if issued by an account the app considers trusted. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,16 +14,18 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Verification<'a> { - ///Date of when the verification was created. + /// Date of when the verification was created. pub created_at: jacquard_common::types::string::Datetime, - ///The domain the subject is verified under. + /// The domain the subject is verified under. #[serde(borrow)] + #[builder(into)] pub domain: jacquard_common::CowStr<'a>, - ///DID of the subject the verification applies to. + /// DID of the subject the verification applies to. #[serde(borrow)] pub subject: jacquard_common::types::string::Did<'a>, } diff --git a/crates/jacquard-api/src/app_ocho/message/send.rs b/crates/jacquard-api/src/app_ocho/message/send.rs index ba4c74027..f6d648b78 100644 --- a/crates/jacquard-api/src/app_ocho/message/send.rs +++ b/crates/jacquard-api/src/app_ocho/message/send.rs @@ -19,11 +19,11 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct Send<'a> { - ///The user to send the message to. + /// The user to send the message to. #[serde(borrow)] #[builder(into)] pub did: jacquard_common::CowStr<'a>, - ///The message to send to the user. + /// The message to send to the user. #[serde(borrow)] #[builder(into)] pub message: jacquard_common::CowStr<'a>, @@ -48,7 +48,7 @@ pub struct Send<'a> { )] #[serde(rename_all = "camelCase")] pub struct SendOutput<'a> { - ///Whether the token was successfully registered. + /// Whether the token was successfully registered. pub success: bool, } diff --git a/crates/jacquard-api/src/app_ocho/payment/get_stripe_intent.rs b/crates/jacquard-api/src/app_ocho/payment/get_stripe_intent.rs index e82e6822f..61df1e98c 100644 --- a/crates/jacquard-api/src/app_ocho/payment/get_stripe_intent.rs +++ b/crates/jacquard-api/src/app_ocho/payment/get_stripe_intent.rs @@ -30,7 +30,7 @@ pub struct GetStripeIntent<'a> { pub token: std::option::Option>, } -///The intent data +/// The intent data #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -43,19 +43,19 @@ pub struct GetStripeIntent<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetStripeIntentOutput<'a> { - ///The customer ID for the payment intent + /// The customer ID for the payment intent #[serde(borrow)] pub customer: jacquard_common::CowStr<'a>, - ///The customer session ID for the payment intent + /// The customer session ID for the payment intent #[serde(borrow)] pub customer_session: jacquard_common::CowStr<'a>, - ///The ephemeral key for the payment intent + /// The ephemeral key for the payment intent #[serde(borrow)] pub ephemeral_key: jacquard_common::CowStr<'a>, - ///The payment intent ID + /// The payment intent ID #[serde(borrow)] pub payment_intent: jacquard_common::CowStr<'a>, - ///The publishable key for the payment intent + /// The publishable key for the payment intent #[serde(borrow)] pub publishable_key: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/app_ocho/plugin.rs b/crates/jacquard-api/src/app_ocho/plugin.rs index 7621cb0f2..05a0591f7 100644 --- a/crates/jacquard-api/src/app_ocho/plugin.rs +++ b/crates/jacquard-api/src/app_ocho/plugin.rs @@ -18,23 +18,25 @@ pub mod service; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AdaptiveIcon<'a> { - ///The background color of the adaptive icon. + /// The background color of the adaptive icon. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub background_color: std::option::Option>, - ///The URL to the foreground image of the adaptive icon. + pub background_color: Option>, + /// The URL to the foreground image of the adaptive icon. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub foreground_image: std::option::Option>, + pub foreground_image: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub foreground_image_blob: std::option::Option< - jacquard_common::types::blob::Blob<'a>, - >, + pub foreground_image_blob: Option>, } #[jacquard_derive::lexicon] @@ -45,20 +47,23 @@ pub struct AdaptiveIcon<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Android<'a> { - ///Configuration for the adaptive icon on Android. + /// Configuration for the adaptive icon on Android. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub adaptive_icon: std::option::Option>, - ///Whether edge-to-edge mode is enabled for the app. + pub adaptive_icon: Option>, + /// Whether edge-to-edge mode is enabled for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub edge_to_edge_enabled: std::option::Option, + #[builder(into)] + pub edge_to_edge_enabled: Option, } -///Android status bar configuration. +/// Android status bar configuration. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -67,14 +72,16 @@ pub struct Android<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AndroidStatusBar<'a> { - ///The background color of the Android status bar. + /// The background color of the Android status bar. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub background_color: std::option::Option>, + pub background_color: Option>, } #[jacquard_derive::lexicon] @@ -85,22 +92,26 @@ pub struct AndroidStatusBar<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Asset<'a> { - ///The blob of the asset + /// The blob of the asset #[serde(borrow)] pub blob: jacquard_common::types::blob::Blob<'a>, - ///The hash of the asset + /// The hash of the asset #[serde(borrow)] + #[builder(into)] pub hash: jacquard_common::CowStr<'a>, - ///The type of the asset + /// The type of the asset #[serde(borrow)] + #[builder(into)] pub r#type: jacquard_common::CowStr<'a>, - ///The date and time when this asset was last updated. Used to reset the jetstream cache, among other things. + /// The date and time when this asset was last updated. Used to reset the jetstream cache, among other things. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, } #[jacquard_derive::lexicon] @@ -111,12 +122,14 @@ pub struct Asset<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Db<'a> { - ///The ID of the database. + /// The ID of the database. #[serde(borrow)] + #[builder(into)] pub id: jacquard_common::CowStr<'a>, } @@ -128,12 +141,14 @@ pub struct Db<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Developer<'a> { - ///The tool used for development, e.g., 'expo-cli'. + /// The tool used for development, e.g., 'expo-cli'. #[serde(borrow)] + #[builder(into)] pub tool: jacquard_common::CowStr<'a>, } @@ -145,81 +160,98 @@ pub struct Developer<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ExpoClient<'a> { - ///Android-specific configuration for the app. + /// Android-specific configuration for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub android: std::option::Option>, - ///Configuration for the Android status bar. + pub android: Option>, + /// Configuration for the Android status bar. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub android_status_bar: std::option::Option< - crate::app_ocho::plugin::AndroidStatusBar<'a>, - >, - ///Experimental features enabled for the app. + pub android_status_bar: Option>, + /// Experimental features enabled for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub expirements: std::option::Option>, - ///Additional configuration for the app. + pub expirements: Option>, + /// Additional configuration for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub extra: std::option::Option>, - ///The URL to the app icon. + pub extra: Option>, + /// The URL to the app icon. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub icon: std::option::Option>, - ///ios-specific configuration for the app. + pub icon: Option>, + /// ios-specific configuration for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub ios: std::option::Option>, - ///Localization settings for the app. + pub ios: Option>, + /// Localization settings for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub locales: std::option::Option>, - ///The name of the Expo client application. + pub locales: Option>, + /// The name of the Expo client application. #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Whether the new architecture is enabled for the app. + /// Whether the new architecture is enabled for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub new_arch_enabled: std::option::Option, - ///The default orientation of the app. + #[builder(into)] + pub new_arch_enabled: Option, + /// The default orientation of the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub orientation: std::option::Option>, - ///The platforms supported by the app. + pub orientation: Option>, + /// The platforms supported by the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub platforms: std::option::Option>>, - ///A list of plugins used by the app. + pub platforms: Option>>, + /// A list of plugins used by the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub plugins: std::option::Option>, - ///The custom URI scheme for deep linking. + pub plugins: Option>, + /// The custom URI scheme for deep linking. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub scheme: std::option::Option>, - ///The SDK version of the Expo client. + pub scheme: Option>, + /// The SDK version of the Expo client. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub sdk_version: std::option::Option>, - ///A URL-friendly identifier for the app. + pub sdk_version: Option>, + /// A URL-friendly identifier for the app. #[serde(borrow)] + #[builder(into)] pub slug: jacquard_common::CowStr<'a>, - ///The default user interface style. + /// The default user interface style. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub user_interface_style: std::option::Option>, - ///The version of the app. + pub user_interface_style: Option>, + /// The version of the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub version: std::option::Option>, - ///Web-specific configuration for the app. + pub version: Option>, + /// Web-specific configuration for the app. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub web: std::option::Option>, + pub web: Option>, } #[jacquard_derive::lexicon] @@ -230,11 +262,12 @@ pub struct ExpoClient<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ExpoGo<'a> { - ///Developer-specific configuration for the Expo Go app. + /// Developer-specific configuration for the Expo Go app. #[serde(borrow)] pub developer: crate::app_ocho::plugin::Developer<'a>, } @@ -247,13 +280,15 @@ pub struct ExpoGo<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Ios<'a> { - ///Whether the app supports iPad. + /// Whether the app supports iPad. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub supports_tablet: std::option::Option, + #[builder(into)] + pub supports_tablet: Option, } #[jacquard_derive::lexicon] @@ -264,17 +299,20 @@ pub struct Ios<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LaunchAsset<'a> { - ///The MIME type of the asset, e.g., 'image/png'. + /// The MIME type of the asset, e.g., 'image/png'. #[serde(borrow)] + #[builder(into)] pub content_type: jacquard_common::CowStr<'a>, - ///The unique key for this asset, used to reference it in the plugin. + /// The unique key for this asset, used to reference it in the plugin. #[serde(borrow)] + #[builder(into)] pub key: jacquard_common::CowStr<'a>, - ///The URL where the asset can be accessed. + /// The URL where the asset can be accessed. #[serde(borrow)] pub url: jacquard_common::types::string::Uri<'a>, } @@ -287,25 +325,28 @@ pub struct LaunchAsset<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Manifest<'a> { - ///The date and time when this plugin manifest was created. + /// The date and time when this plugin manifest was created. pub created_at: jacquard_common::types::string::Datetime, - ///Additional metadata for the plugin, including Expo client and Go configurations. + /// Additional metadata for the plugin, including Expo client and Go configurations. #[serde(borrow)] pub extra: crate::app_ocho::plugin::ManifestExtra<'a>, - ///The unique identifier for this plugin manifest. + /// The unique identifier for this plugin manifest. #[serde(borrow)] + #[builder(into)] pub id: jacquard_common::CowStr<'a>, - ///The launch asset for the plugin (the main javascipt bundle). + /// The launch asset for the plugin (the main javascipt bundle). #[serde(borrow)] pub launch_asset: crate::app_ocho::plugin::LaunchAsset<'a>, #[serde(borrow)] pub metadata: jacquard_common::types::value::Data<'a>, - ///The version of the Expo runtime this plugin is compatible with. + /// The version of the Expo runtime this plugin is compatible with. #[serde(borrow)] + #[builder(into)] pub runtime_version: jacquard_common::CowStr<'a>, } @@ -317,7 +358,8 @@ pub struct Manifest<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ManifestExtra<'a> { @@ -348,7 +390,7 @@ pub enum PluginItem<'a> { pub type Plugin<'a> = Vec>; pub type PluginConfig<'a> = jacquard_common::types::value::Data<'a>; -///A string identifier for a plugin, used to reference it in the app. +/// A string identifier for a plugin, used to reference it in the app. pub type StringId<'a> = jacquard_common::CowStr<'a>; #[jacquard_derive::lexicon] #[derive( @@ -358,23 +400,28 @@ pub type StringId<'a> = jacquard_common::CowStr<'a>; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Web<'a> { - ///The bundler used for the web app. + /// The bundler used for the web app. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub bundler: std::option::Option>, - ///The URL to the favicon for the web app. + pub bundler: Option>, + /// The URL to the favicon for the web app. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub favicon: std::option::Option>, + pub favicon: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub favicon_blob: std::option::Option>, - ///The output directory for the web app. + pub favicon_blob: Option>, + /// The output directory for the web app. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub output: std::option::Option>, + pub output: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/app_ocho/plugin/get_launch_asset.rs b/crates/jacquard-api/src/app_ocho/plugin/get_launch_asset.rs index 8715c025e..1ea4f6178 100644 --- a/crates/jacquard-api/src/app_ocho/plugin/get_launch_asset.rs +++ b/crates/jacquard-api/src/app_ocho/plugin/get_launch_asset.rs @@ -25,7 +25,7 @@ pub struct GetLaunchAsset<'a> { pub platform: jacquard_common::CowStr<'a>, } -///The launch asset for the plugin, which is the main JavaScript bundle. +/// The launch asset for the plugin, which is the main JavaScript bundle. #[jacquard_derive::lexicon] #[derive( serde::Serialize, diff --git a/crates/jacquard-api/src/app_ocho/plugin/put_hosting_url.rs b/crates/jacquard-api/src/app_ocho/plugin/put_hosting_url.rs index 8c8266545..498f2a0a7 100644 --- a/crates/jacquard-api/src/app_ocho/plugin/put_hosting_url.rs +++ b/crates/jacquard-api/src/app_ocho/plugin/put_hosting_url.rs @@ -19,7 +19,7 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct PutHostingUrl<'a> { - ///The expo push token + /// The expo push token #[serde(borrow)] #[builder(into)] pub url: jacquard_common::CowStr<'a>, diff --git a/crates/jacquard-api/src/app_ocho/plugin/service.rs b/crates/jacquard-api/src/app_ocho/plugin/service.rs index 8008b7419..d1f838878 100644 --- a/crates/jacquard-api/src/app_ocho/plugin/service.rs +++ b/crates/jacquard-api/src/app_ocho/plugin/service.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///The definitions for the plugin. +/// The definitions for the plugin. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,14 +14,16 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Service<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub db: std::option::Option>, - ///Additional metadata for the plugin, including Expo client and Go configurations. + pub db: Option>, + /// Additional metadata for the plugin, including Expo client and Go configurations. #[serde(borrow)] pub permissions: Vec>, } diff --git a/crates/jacquard-api/src/app_ocho/push/register.rs b/crates/jacquard-api/src/app_ocho/push/register.rs index a5d9ee44e..8add09e4b 100644 --- a/crates/jacquard-api/src/app_ocho/push/register.rs +++ b/crates/jacquard-api/src/app_ocho/push/register.rs @@ -19,7 +19,7 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct Register<'a> { - ///The expo push token + /// The expo push token #[serde(borrow)] #[builder(into)] pub push_token: jacquard_common::CowStr<'a>, @@ -44,7 +44,7 @@ pub struct Register<'a> { )] #[serde(rename_all = "camelCase")] pub struct RegisterOutput<'a> { - ///Whether the token was successfully registered. + /// Whether the token was successfully registered. pub success: bool, } diff --git a/crates/jacquard-api/src/app_ocho/server/swap_launch_token.rs b/crates/jacquard-api/src/app_ocho/server/swap_launch_token.rs index 466d504ac..eccbab2cf 100644 --- a/crates/jacquard-api/src/app_ocho/server/swap_launch_token.rs +++ b/crates/jacquard-api/src/app_ocho/server/swap_launch_token.rs @@ -35,7 +35,7 @@ pub struct SwapLaunchToken<'a> { )] #[serde(rename_all = "camelCase")] pub struct SwapLaunchTokenOutput<'a> { - ///The did of the user + /// The did of the user #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub did: std::option::Option>, diff --git a/crates/jacquard-api/src/app_ocho/state/get_config.rs b/crates/jacquard-api/src/app_ocho/state/get_config.rs index f32951440..fce894b4a 100644 --- a/crates/jacquard-api/src/app_ocho/state/get_config.rs +++ b/crates/jacquard-api/src/app_ocho/state/get_config.rs @@ -17,13 +17,13 @@ )] #[serde(rename_all = "camelCase")] pub struct GetConfigOutput<'a> { - ///The token for the InstantDB account + /// The token for the InstantDB account #[serde(borrow)] pub account_token: jacquard_common::CowStr<'a>, - ///The InstantDB admin token + /// The InstantDB admin token #[serde(borrow)] pub admin_token: jacquard_common::CowStr<'a>, - ///The App ID + /// The App ID #[serde(borrow)] pub id: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/app_ocho/state/login.rs b/crates/jacquard-api/src/app_ocho/state/login.rs index e74b924f0..eff9121b4 100644 --- a/crates/jacquard-api/src/app_ocho/state/login.rs +++ b/crates/jacquard-api/src/app_ocho/state/login.rs @@ -17,7 +17,7 @@ )] #[serde(rename_all = "camelCase")] pub struct LoginOutput<'a> { - ///The code used to login on the InstantDB website + /// The code used to login on the InstantDB website #[serde(borrow)] pub code: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs b/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs index 903be1689..e05972b03 100644 --- a/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs +++ b/crates/jacquard-api/src/beauty_cybernetic/trustcow/review.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A review connected to a verified transaction, can only be created by one of the transaction parties +/// A review connected to a verified transaction, can only be created by one of the transaction parties #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,28 +14,33 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Review<'a> { - ///When the review was created + /// When the review was created pub created_at: jacquard_common::types::string::Datetime, - ///The detailed review text + /// The detailed review text #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///Rating score from 1 to 5 + pub description: Option>, + /// Rating score from 1 to 5 pub rating: i64, - ///Whether this review is from the service provider or consumer + /// Whether this review is from the service provider or consumer #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reviewer_role: std::option::Option>, - ///The title of the review + pub reviewer_role: Option>, + /// The title of the review #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub title: std::option::Option>, - ///AT URI reference to the transaction record (at://did/beauty.cybernetic.trustcow.transaction/rkey) + pub title: Option>, + /// AT URI reference to the transaction record (at://did/beauty.cybernetic.trustcow.transaction/rkey) #[serde(borrow)] + #[builder(into)] pub transaction: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs b/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs index d6e603467..19315ce5d 100644 --- a/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs +++ b/crates/jacquard-api/src/beauty_cybernetic/trustcow/transaction.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A verified transaction between two ATProto identities that must be stored in both parties' PDS +/// A verified transaction between two ATProto identities that must be stored in both parties' PDS #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,32 +14,39 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Transaction<'a> { - ///Transaction amount (optional, in whatever currency applies) + /// Transaction amount (optional, in whatever currency applies) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub amount: std::option::Option>, - ///When the transaction occurred + pub amount: Option>, + /// When the transaction occurred pub created_at: jacquard_common::types::string::Datetime, - ///Currency code (optional, e.g. USD, EUR, BTC) + /// Currency code (optional, e.g. USD, EUR, BTC) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub currency: std::option::Option>, - ///Description of the service or product transacted + pub currency: Option>, + /// Description of the service or product transacted #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///DID of the service consumer identity + pub description: Option>, + /// DID of the service consumer identity #[serde(borrow)] + #[builder(into)] pub service_consumer: jacquard_common::CowStr<'a>, - ///DID of the service provider identity + /// DID of the service provider identity #[serde(borrow)] + #[builder(into)] pub service_provider: jacquard_common::CowStr<'a>, - ///Unique identifier for this transaction, must be identical in both parties' records + /// Unique identifier for this transaction, must be identical in both parties' records #[serde(borrow)] + #[builder(into)] pub transaction_id: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs b/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs index 3fafc4d9d..f2bd6b92b 100644 --- a/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs +++ b/crates/jacquard-api/src/beauty_cybernetic/trustcow/warrant.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A warrant where one ATProto identity vouches for the trustworthiness of another identity +/// A warrant where one ATProto identity vouches for the trustworthiness of another identity #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,30 +14,36 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Warrant<'a> { - ///When the warrant was created + /// When the warrant was created pub created_at: jacquard_common::types::string::Datetime, - ///Optional description explaining the basis for this warrant + /// Optional description explaining the basis for this warrant #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///Optional expiration date for this warrant + pub description: Option>, + /// Optional expiration date for this warrant #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub expires_at: std::option::Option, - ///DID of the identity being warranted for + #[builder(into)] + pub expires_at: Option, + /// DID of the identity being warranted for #[serde(borrow)] + #[builder(into)] pub subject: jacquard_common::CowStr<'a>, - ///Level of trust being warranted + /// Level of trust being warranted #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub trust_level: std::option::Option>, - ///Type of warrant being provided + pub trust_level: Option>, + /// Type of warrant being provided #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub warrant_type: std::option::Option>, + pub warrant_type: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/blog_pckt/blog.rs b/crates/jacquard-api/src/blog_pckt/blog.rs index 91e32a9f8..c06b9ad54 100644 --- a/crates/jacquard-api/src/blog_pckt/blog.rs +++ b/crates/jacquard-api/src/blog_pckt/blog.rs @@ -13,29 +13,37 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Blog<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub icon: std::option::Option>, + pub icon: Option>, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub rss: std::option::Option>, + pub rss: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub theme: std::option::Option>, + pub theme: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub url: std::option::Option>, + pub url: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. @@ -88,25 +96,31 @@ impl From> for Blog<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Palette<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub accent: std::option::Option>, + pub accent: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub background: std::option::Option>, + pub background: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub link: std::option::Option>, + pub link: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub surface_hover: std::option::Option>, + pub surface_hover: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub text: std::option::Option>, + pub text: Option>, } #[jacquard_derive::lexicon] @@ -117,17 +131,21 @@ pub struct Palette<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Theme<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub dark: std::option::Option>, + pub dark: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub font: std::option::Option>, + pub font: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub light: std::option::Option>, + pub light: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/blog_pckt/post.rs b/crates/jacquard-api/src/blog_pckt/post.rs index 986ad55e6..167088a2f 100644 --- a/crates/jacquard-api/src/blog_pckt/post.rs +++ b/crates/jacquard-api/src/blog_pckt/post.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Post<'a> { @@ -22,23 +23,30 @@ pub struct Post<'a> { #[serde(borrow)] pub blog: crate::com_atproto::repo::strong_ref::StrongRef<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub body_plain: std::option::Option>, + pub body_plain: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cover: std::option::Option>, + pub cover: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub images: std::option::Option>>, + pub images: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub published_at: std::option::Option, + #[builder(into)] + pub published_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>>, + pub tags: Option>>, #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, #[serde(borrow)] pub url: jacquard_common::types::string::Uri<'a>, } diff --git a/crates/jacquard-api/src/blog_pckt/publication.rs b/crates/jacquard-api/src/blog_pckt/publication.rs index 3446f0380..287706119 100644 --- a/crates/jacquard-api/src/blog_pckt/publication.rs +++ b/crates/jacquard-api/src/blog_pckt/publication.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record declaring a publication +/// Record declaring a publication #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,38 +14,46 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Publication<'a> { - ///Base URL path for the publication ex https://blog.pckt.blog + /// Base URL path for the publication ex https://blog.pckt.blog #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub base_path: std::option::Option>, - ///Timestamp when the publication was first created + pub base_path: Option>, + /// Timestamp when the publication was first created pub created_at: jacquard_common::types::string::Datetime, - ///Publication description + /// Publication description #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///Extension objects (open union) for additional features + pub description: Option>, + /// Extension objects (open union) for additional features #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub extensions: std::option::Option>>, - ///Publication icon/avatar image + pub extensions: Option>>, + /// Publication icon/avatar image #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub icon: std::option::Option>, - ///Publication name/title + pub icon: Option>, + /// Publication name/title #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Theme configuration as an open union; accepts blog.pckt.theme and future types. + /// Theme configuration as an open union; accepts blog.pckt.theme and future types. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub theme: std::option::Option>, - ///Timestamp when the publication was last updated (optional) + pub theme: Option>, + /// Timestamp when the publication was last updated (optional) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/blog_pckt/theme.rs b/crates/jacquard-api/src/blog_pckt/theme.rs index badb7716f..00430f38e 100644 --- a/crates/jacquard-api/src/blog_pckt/theme.rs +++ b/crates/jacquard-api/src/blog_pckt/theme.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Theme configuration for a blog publication +/// Theme configuration for a blog publication #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,18 +14,20 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Theme<'a> { - ///Dark mode color palette + /// Dark mode color palette #[serde(borrow)] pub dark: crate::blog_pckt::theme::Palette<'a>, - ///Font family name (optional) + /// Font family name (optional) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub font: std::option::Option>, - ///Light mode color palette + pub font: Option>, + /// Light mode color palette #[serde(borrow)] pub light: crate::blog_pckt::theme::Palette<'a>, } @@ -72,7 +74,7 @@ impl From> for Theme<'_> { } } -///Color palette with CSS hex values +/// Color palette with CSS hex values #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -81,23 +83,29 @@ impl From> for Theme<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Palette<'a> { - ///Accent color (hex value) + /// Accent color (hex value) #[serde(borrow)] + #[builder(into)] pub accent: jacquard_common::CowStr<'a>, - ///Background color (hex value) + /// Background color (hex value) #[serde(borrow)] + #[builder(into)] pub background: jacquard_common::CowStr<'a>, - ///Link color (hex value) + /// Link color (hex value) #[serde(borrow)] + #[builder(into)] pub link: jacquard_common::CowStr<'a>, - ///Surface hover color (hex value) + /// Surface hover color (hex value) #[serde(borrow)] + #[builder(into)] pub surface_hover: jacquard_common::CowStr<'a>, - ///Primary text color (hex value) + /// Primary text color (hex value) #[serde(borrow)] + #[builder(into)] pub text: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/blue__2048.rs b/crates/jacquard-api/src/blue__2048.rs index d5d2943b5..cd1aea561 100644 --- a/crates/jacquard-api/src/blue__2048.rs +++ b/crates/jacquard-api/src/blue__2048.rs @@ -10,7 +10,7 @@ pub mod key; pub mod player; pub mod verification; -///The sync status for a record used to help sync between your ATProto record and local record. +/// The sync status for a record used to help sync between your ATProto record and local record. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -19,15 +19,17 @@ pub mod verification; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SyncStatus<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///A XXH3 hash of the record to tell if anything has changed + /// A XXH3 hash of the record to tell if anything has changed #[serde(borrow)] + #[builder(into)] pub hash: jacquard_common::CowStr<'a>, - ///A flag to know if it has been synced with the AT repo. Used mostly client side to filter what records need syncing + /// A flag to know if it has been synced with the AT repo. Used mostly client side to filter what records need syncing pub synced_with_at_repo: bool, pub updated_at: jacquard_common::types::string::Datetime, } \ No newline at end of file diff --git a/crates/jacquard-api/src/blue__2048/game.rs b/crates/jacquard-api/src/blue__2048/game.rs index fd41295d8..fe840ee70 100644 --- a/crates/jacquard-api/src/blue__2048/game.rs +++ b/crates/jacquard-api/src/blue__2048/game.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of an instance of a at://2048 game +/// A declaration of an instance of a at://2048 game #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,22 +14,24 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Game<'a> { - ///The player no longer has any moves left + /// The player no longer has any moves left pub completed: bool, pub created_at: jacquard_common::types::string::Datetime, - ///The game's current score + /// The game's current score pub current_score: i64, - ///This is the recording of the game. Like chess notation, but for 2048 + /// This is the recording of the game. Like chess notation, but for 2048 #[serde(borrow)] + #[builder(into)] pub seeded_recording: jacquard_common::CowStr<'a>, - ///The sync status of this record with the users AT Protocol repo. + /// The sync status of this record with the users AT Protocol repo. #[serde(borrow)] pub sync_status: crate::blue__2048::SyncStatus<'a>, - ///The player has found a 2048 tile (they have won) + /// The player has found a 2048 tile (they have won) pub won: bool, } diff --git a/crates/jacquard-api/src/blue__2048/key.rs b/crates/jacquard-api/src/blue__2048/key.rs index 11776d7a7..46ee8e7b0 100644 --- a/crates/jacquard-api/src/blue__2048/key.rs +++ b/crates/jacquard-api/src/blue__2048/key.rs @@ -8,7 +8,7 @@ pub mod game; pub mod player; -///A record that holds a did:key used to verify records. Use the collection to know the type of verification. Example blue.2048.key.game is for blue.2048.game records +/// A record that holds a did:key used to verify records. Use the collection to know the type of verification. Example blue.2048.key.game is for blue.2048.game records #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -17,17 +17,19 @@ pub mod player; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Key<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///A did:key used to verify records came from an at://2048 authority + /// A did:key used to verify records came from an at://2048 authority #[serde(borrow)] + #[builder(into)] pub key: jacquard_common::CowStr<'a>, } -///a signature for an at://2048 record meaning it has been verified by a service. Most likely @2048.blue +/// a signature for an at://2048 record meaning it has been verified by a service. Most likely @2048.blue #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -36,15 +38,18 @@ pub struct Key<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SignatureRef<'a> { - ///The at://uri for the public did:key to verify this record. This also counts as the authority of the verification (example @2048.blue). As well as the type of verification by the collection name (blue.2048.key.game). + /// The at://uri for the public did:key to verify this record. This also counts as the authority of the verification (example @2048.blue). As well as the type of verification by the collection name (blue.2048.key.game). #[serde(borrow)] + #[builder(into)] pub at_uri: jacquard_common::CowStr<'a>, pub created_at: jacquard_common::types::string::Datetime, - ///The public verifiable signature of the record. Serialization of the records value minus the signature field + /// The public verifiable signature of the record. Serialization of the records value minus the signature field #[serde(borrow)] + #[builder(into)] pub signature: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/blue__2048/key/game.rs b/crates/jacquard-api/src/blue__2048/key/game.rs index d28834df7..a83b89fdf 100644 --- a/crates/jacquard-api/src/blue__2048/key/game.rs +++ b/crates/jacquard-api/src/blue__2048/key/game.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A record that holds a did:key for verifying a players game. This is intended to be written at a verification authorities repo +/// A record that holds a did:key for verifying a players game. This is intended to be written at a verification authorities repo #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,12 +14,13 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Game<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///A did:key that is used to verify an at://2048 authority has verified this game to a certain degree + /// A did:key that is used to verify an at://2048 authority has verified this game to a certain degree #[serde(borrow)] pub key: crate::blue__2048::key::Key<'a>, } diff --git a/crates/jacquard-api/src/blue__2048/key/player/stats.rs b/crates/jacquard-api/src/blue__2048/key/player/stats.rs index 0b94e4ed8..80ed50572 100644 --- a/crates/jacquard-api/src/blue__2048/key/player/stats.rs +++ b/crates/jacquard-api/src/blue__2048/key/player/stats.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A record that holds a did:key for verifying a players stats. This is intended to be written at a verification authorities repo +/// A record that holds a did:key for verifying a players stats. This is intended to be written at a verification authorities repo #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,12 +14,13 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Stats<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///A did:key that is used to verify an at://2048 authority has verified this players stats to a certain degree + /// A did:key that is used to verify an at://2048 authority has verified this players stats to a certain degree #[serde(borrow)] pub key: crate::blue__2048::key::Key<'a>, } diff --git a/crates/jacquard-api/src/blue__2048/player/profile.rs b/crates/jacquard-api/src/blue__2048/player/profile.rs index 34c4cde80..811572e3f 100644 --- a/crates/jacquard-api/src/blue__2048/player/profile.rs +++ b/crates/jacquard-api/src/blue__2048/player/profile.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of a at://2048 player's profile +/// A declaration of a at://2048 player's profile #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,14 +14,15 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Profile<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///Does not want to show up anywhere. Keep stats to your PDS. + /// Does not want to show up anywhere. Keep stats to your PDS. pub solo_play: bool, - ///The sync status of this record with the users AT Protocol repo. + /// The sync status of this record with the users AT Protocol repo. #[serde(borrow)] pub sync_status: crate::blue__2048::SyncStatus<'a>, } diff --git a/crates/jacquard-api/src/blue__2048/player/stats.rs b/crates/jacquard-api/src/blue__2048/player/stats.rs index b605f64b7..a4d414850 100644 --- a/crates/jacquard-api/src/blue__2048/player/stats.rs +++ b/crates/jacquard-api/src/blue__2048/player/stats.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of a at://2048 player's stats over the course of their playtime +/// A declaration of a at://2048 player's stats over the course of their playtime #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,27 +14,28 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Stats<'a> { - ///Average score across all games + /// Average score across all games pub average_score: i64, pub created_at: jacquard_common::types::string::Datetime, - ///Total numbers of games the user has played + /// Total numbers of games the user has played pub games_played: i64, - ///The highest number block the player has fround. example 128, 256, etc + /// The highest number block the player has fround. example 128, 256, etc pub highest_number_block: i64, - ///The highest score the user has gotten in a game + /// The highest score the user has gotten in a game pub highest_score: i64, - ///The smallest number of moves to get the 2048 block + /// The smallest number of moves to get the 2048 block pub least_moves_to_find_twenty_forty_eight: i64, - ///The sync status of this record with the users AT Protocol repo. + /// The sync status of this record with the users AT Protocol repo. #[serde(borrow)] pub sync_status: crate::blue__2048::SyncStatus<'a>, - ///Times the 2048 block has been found also count as wins + /// Times the 2048 block has been found also count as wins pub times_twenty_forty_eight_been_found: i64, - ///Total score across all games + /// Total score across all games pub total_score: i64, } diff --git a/crates/jacquard-api/src/blue__2048/verification.rs b/crates/jacquard-api/src/blue__2048/verification.rs index 9ff4c394e..9fe7fa9af 100644 --- a/crates/jacquard-api/src/blue__2048/verification.rs +++ b/crates/jacquard-api/src/blue__2048/verification.rs @@ -8,7 +8,7 @@ pub mod game; pub mod stats; -///Holds the signature for another record showing it has verified it to the best of it's ability and it should be trusted if the signatures match. +/// Holds the signature for another record showing it has verified it to the best of it's ability and it should be trusted if the signatures match. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -17,21 +17,23 @@ pub mod stats; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct VerificationRef<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///The at://uri for the public did:key to verify the remote record. This also counts as the authority of the verification (example @2048.blue). As well as the type of verification by the collection name (blue.2048.key.game). + /// The at://uri for the public did:key to verify the remote record. This also counts as the authority of the verification (example @2048.blue). As well as the type of verification by the collection name (blue.2048.key.game). #[serde(borrow)] pub key_ref: jacquard_common::types::string::AtUri<'a>, - ///The at://uri for the record that is being verified. + /// The at://uri for the record that is being verified. #[serde(borrow)] pub record_ref: jacquard_common::types::string::AtUri<'a>, - ///The public verifiable signature of the record. Serialization of the records valued + /// The public verifiable signature of the record. Serialization of the records valued #[serde(borrow)] + #[builder(into)] pub signature: jacquard_common::CowStr<'a>, - ///DID of the subject the verification applies to. + /// DID of the subject the verification applies to. #[serde(borrow)] pub subject: jacquard_common::types::string::Did<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/blue__2048/verification/game.rs b/crates/jacquard-api/src/blue__2048/verification/game.rs index 6fdd7ec29..dd570dcfd 100644 --- a/crates/jacquard-api/src/blue__2048/verification/game.rs +++ b/crates/jacquard-api/src/blue__2048/verification/game.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A record that holds a verification of a game record saying the owner of the repo has verified that it is a valid game played. +/// A record that holds a verification of a game record saying the owner of the repo has verified that it is a valid game played. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,18 +14,19 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Game<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, - ///This is the record that holds the publicly verifiable signature of a game record + #[builder(into)] + pub created_at: Option, + /// This is the record that holds the publicly verifiable signature of a game record #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub verified_ref: std::option::Option< - crate::blue__2048::verification::VerificationRef<'a>, - >, + pub verified_ref: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/blue__2048/verification/stats.rs b/crates/jacquard-api/src/blue__2048/verification/stats.rs index 7fd6ab61e..2272594e7 100644 --- a/crates/jacquard-api/src/blue__2048/verification/stats.rs +++ b/crates/jacquard-api/src/blue__2048/verification/stats.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A record that holds a verification of a stats record saying the owner of the repo has verified that it is a valid and most likely not tampered with. +/// A record that holds a verification of a stats record saying the owner of the repo has verified that it is a valid and most likely not tampered with. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,18 +14,19 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Stats<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, - ///This is the record that holds the publicly verifiable signature of a stats record + #[builder(into)] + pub created_at: Option, + /// This is the record that holds the publicly verifiable signature of a stats record #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub verified_ref: std::option::Option< - crate::blue__2048::verification::VerificationRef<'a>, - >, + pub verified_ref: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/blue_atplane/fav_client.rs b/crates/jacquard-api/src/blue_atplane/fav_client.rs index f43d9aed1..d65d30f37 100644 --- a/crates/jacquard-api/src/blue_atplane/fav_client.rs +++ b/crates/jacquard-api/src/blue_atplane/fav_client.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of a favorite client. +/// A declaration of a favorite client. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,12 +14,14 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct FavClient<'a> { - ///Set to your favorite client. + /// Set to your favorite client. #[serde(borrow)] + #[builder(into)] pub fav_client: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/blue_linkat/board.rs b/crates/jacquard-api/src/blue_linkat/board.rs index b0e0ac1df..ce1fac96a 100644 --- a/crates/jacquard-api/src/blue_linkat/board.rs +++ b/crates/jacquard-api/src/blue_linkat/board.rs @@ -13,25 +13,29 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Card<'a> { - ///Emoji of the card + /// Emoji of the card #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub emoji: std::option::Option>, - ///Text of the card + pub emoji: Option>, + /// Text of the card #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub text: std::option::Option>, - ///URL of the link + pub text: Option>, + /// URL of the link #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub url: std::option::Option>, + pub url: Option>, } -///Record containing a cards of your profile. +/// Record containing a cards of your profile. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -40,11 +44,12 @@ pub struct Card<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Board<'a> { - ///List of cards in the board. + /// List of cards in the board. #[serde(borrow)] pub cards: Vec>, } diff --git a/crates/jacquard-api/src/blue_zio/atfile/finger.rs b/crates/jacquard-api/src/blue_zio/atfile/finger.rs index cd3a60fa3..fca4d0967 100644 --- a/crates/jacquard-api/src/blue_zio/atfile/finger.rs +++ b/crates/jacquard-api/src/blue_zio/atfile/finger.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A fingerprint of a browser upload. +/// A fingerprint of a browser upload. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,19 +14,22 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Browser<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub id: std::option::Option>, + pub id: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub user_agent: std::option::Option>, + pub user_agent: Option>, } -///A fingerprint of a machine upload. +/// A fingerprint of a machine upload. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -35,20 +38,25 @@ pub struct Browser<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Machine<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub app: std::option::Option>, + pub app: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub host: std::option::Option>, + pub host: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub id: std::option::Option>, + pub id: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub os: std::option::Option>, + pub os: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/blue_zio/atfile/lock.rs b/crates/jacquard-api/src/blue_zio/atfile/lock.rs index 220c11a71..47a38f162 100644 --- a/crates/jacquard-api/src/blue_zio/atfile/lock.rs +++ b/crates/jacquard-api/src/blue_zio/atfile/lock.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A reference to a locked file. +/// A reference to a locked file. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,12 +14,14 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Lock<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub lock: std::option::Option, + #[builder(into)] + pub lock: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/blue_zio/atfile/meta.rs b/crates/jacquard-api/src/blue_zio/atfile/meta.rs index c9fb8ba11..24542318c 100644 --- a/crates/jacquard-api/src/blue_zio/atfile/meta.rs +++ b/crates/jacquard-api/src/blue_zio/atfile/meta.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Unknown metadata for an uploaded file. +/// Unknown metadata for an uploaded file. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,11 +14,13 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Unknown<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reason: std::option::Option>, + pub reason: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/buzz_bookhive.rs b/crates/jacquard-api/src/buzz_bookhive.rs index a63d59642..f0a2a4b79 100644 --- a/crates/jacquard-api/src/buzz_bookhive.rs +++ b/crates/jacquard-api/src/buzz_bookhive.rs @@ -12,7 +12,7 @@ pub mod get_profile; pub mod hive_book; pub mod search_books; -///User has abandoned the book +/// User has abandoned the book #[derive( serde::Serialize, serde::Deserialize, @@ -38,18 +38,22 @@ impl std::fmt::Display for Abandoned { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Activity<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///The hive id of the book + /// The hive id of the book #[serde(borrow)] + #[builder(into)] pub hive_id: jacquard_common::CowStr<'a>, - ///The title of the book + /// The title of the book #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub r#type: jacquard_common::CowStr<'a>, } @@ -61,28 +65,32 @@ pub struct Activity<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Comment<'a> { #[serde(borrow)] pub book: crate::com_atproto::repo::strong_ref::StrongRef<'a>, - ///The content of the comment. + /// The content of the comment. #[serde(borrow)] + #[builder(into)] pub comment: jacquard_common::CowStr<'a>, - ///Client-declared timestamp when this comment was originally created. + /// Client-declared timestamp when this comment was originally created. pub created_at: jacquard_common::types::string::Datetime, - ///The DID of the user who made the comment + /// The DID of the user who made the comment #[serde(borrow)] + #[builder(into)] pub did: jacquard_common::CowStr<'a>, - ///The handle of the user who made the comment + /// The handle of the user who made the comment #[serde(borrow)] + #[builder(into)] pub handle: jacquard_common::CowStr<'a>, #[serde(borrow)] pub parent: crate::com_atproto::repo::strong_ref::StrongRef<'a>, } -///User has finished reading the book +/// User has finished reading the book #[derive( serde::Serialize, serde::Deserialize, @@ -100,7 +108,7 @@ impl std::fmt::Display for Finished { } } -///User owns the book +/// User owns the book #[derive( serde::Serialize, serde::Deserialize, @@ -126,25 +134,30 @@ impl std::fmt::Display for Owned { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Profile<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, + pub avatar: Option>, pub books_read: i64, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(borrow)] + #[builder(into)] pub display_name: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub handle: jacquard_common::CowStr<'a>, pub reviews: i64, } -///User is currently reading the book +/// User is currently reading the book #[derive( serde::Serialize, serde::Deserialize, @@ -170,24 +183,29 @@ impl std::fmt::Display for Reading { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Review<'a> { - ///The date the review was created + /// The date the review was created pub created_at: jacquard_common::types::string::Datetime, - ///The DID of the user who made the review + /// The DID of the user who made the review #[serde(borrow)] + #[builder(into)] pub did: jacquard_common::CowStr<'a>, - ///The handle of the user who made the review + /// The handle of the user who made the review #[serde(borrow)] + #[builder(into)] pub handle: jacquard_common::CowStr<'a>, - ///The review content + /// The review content #[serde(borrow)] + #[builder(into)] pub review: jacquard_common::CowStr<'a>, - ///The number of stars given to the book + /// The number of stars given to the book #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub stars: std::option::Option, + #[builder(into)] + pub stars: Option, } #[jacquard_derive::lexicon] @@ -198,53 +216,66 @@ pub struct Review<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct UserBook<'a> { - ///The authors of the book (tab separated) + /// The authors of the book (tab separated) #[serde(borrow)] + #[builder(into)] pub authors: jacquard_common::CowStr<'a>, - ///Cover image of the book + /// Cover image of the book #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cover: std::option::Option>, + pub cover: Option>, pub created_at: jacquard_common::types::string::Datetime, - ///Book description/summary + /// Book description/summary #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///The date the user finished reading the book + pub description: Option>, + /// The date the user finished reading the book #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub finished_at: std::option::Option, - ///The book's hive id, used to correlate user's books with the hive + #[builder(into)] + pub finished_at: Option, + /// The book's hive id, used to correlate user's books with the hive #[serde(borrow)] + #[builder(into)] pub hive_id: jacquard_common::CowStr<'a>, - ///Average rating (0-1000) + /// Average rating (0-1000) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub rating: std::option::Option, - ///The book's review + #[builder(into)] + pub rating: Option, + /// The book's review #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub review: std::option::Option>, - ///Number of stars given to the book (1-10) which will be mapped to 1-5 stars + pub review: Option>, + /// Number of stars given to the book (1-10) which will be mapped to 1-5 stars #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub stars: std::option::Option, - ///The date the user started reading the book + #[builder(into)] + pub stars: Option, + /// The date the user started reading the book #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub started_at: std::option::Option, + #[builder(into)] + pub started_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option>, - ///Cover image of the book + pub status: Option>, + /// Cover image of the book #[serde(borrow)] + #[builder(into)] pub thumbnail: jacquard_common::CowStr<'a>, - ///The title of the book + /// The title of the book #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, } -///User wants to read the book +/// User wants to read the book #[derive( serde::Serialize, serde::Deserialize, diff --git a/crates/jacquard-api/src/buzz_bookhive/book.rs b/crates/jacquard-api/src/buzz_bookhive/book.rs index 6a47c127f..36debf7e0 100644 --- a/crates/jacquard-api/src/buzz_bookhive/book.rs +++ b/crates/jacquard-api/src/buzz_bookhive/book.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A book in the user's library +/// A book in the user's library #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,39 +14,49 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Book<'a> { - ///The authors of the book (tab separated) + /// The authors of the book (tab separated) #[serde(borrow)] + #[builder(into)] pub authors: jacquard_common::CowStr<'a>, - ///Cover image of the book + /// Cover image of the book #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cover: std::option::Option>, + pub cover: Option>, pub created_at: jacquard_common::types::string::Datetime, - ///The date the user finished reading the book + /// The date the user finished reading the book #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub finished_at: std::option::Option, - ///The book's hive id, used to correlate user's books with the hive + #[builder(into)] + pub finished_at: Option, + /// The book's hive id, used to correlate user's books with the hive #[serde(borrow)] + #[builder(into)] pub hive_id: jacquard_common::CowStr<'a>, - ///The book's review + /// The book's review #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub review: std::option::Option>, - ///Number of stars given to the book (1-10) which will be mapped to 1-5 stars + pub review: Option>, + /// Number of stars given to the book (1-10) which will be mapped to 1-5 stars #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub stars: std::option::Option, - ///The date the user started reading the book + #[builder(into)] + pub stars: Option, + /// The date the user started reading the book #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub started_at: std::option::Option, + #[builder(into)] + pub started_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option>, - ///The title of the book + pub status: Option>, + /// The title of the book #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/buzz_bookhive/buzz.rs b/crates/jacquard-api/src/buzz_bookhive/buzz.rs index ca1963dfc..5c282eb82 100644 --- a/crates/jacquard-api/src/buzz_bookhive/buzz.rs +++ b/crates/jacquard-api/src/buzz_bookhive/buzz.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record containing a Bookhive comment. +/// Record containing a Bookhive comment. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,16 +14,18 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Buzz<'a> { #[serde(borrow)] pub book: crate::com_atproto::repo::strong_ref::StrongRef<'a>, - ///The content of the comment. + /// The content of the comment. #[serde(borrow)] + #[builder(into)] pub comment: jacquard_common::CowStr<'a>, - ///Client-declared timestamp when this comment was originally created. + /// Client-declared timestamp when this comment was originally created. pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] pub parent: crate::com_atproto::repo::strong_ref::StrongRef<'a>, diff --git a/crates/jacquard-api/src/buzz_bookhive/get_book.rs b/crates/jacquard-api/src/buzz_bookhive/get_book.rs index f5d89cc20..0a663bf69 100644 --- a/crates/jacquard-api/src/buzz_bookhive/get_book.rs +++ b/crates/jacquard-api/src/buzz_bookhive/get_book.rs @@ -35,32 +35,32 @@ pub struct GetBook<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetBookOutput<'a> { - ///The hive book's info + /// The hive book's info #[serde(borrow)] pub book: jacquard_common::types::value::Data<'a>, - ///Comments on the book + /// Comments on the book #[serde(borrow)] pub comments: Vec>, - ///Cover image of the book + /// Cover image of the book #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cover: std::option::Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] pub created_at: std::option::Option, - ///The date the user finished reading the book + /// The date the user finished reading the book #[serde(skip_serializing_if = "std::option::Option::is_none")] pub finished_at: std::option::Option, - ///The book's review + /// The book's review #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub review: std::option::Option>, - ///Reviews of the book + /// Reviews of the book #[serde(borrow)] pub reviews: Vec>, - ///Number of stars given to the book (1-10) which will be mapped to 1-5 stars + /// Number of stars given to the book (1-10) which will be mapped to 1-5 stars #[serde(skip_serializing_if = "std::option::Option::is_none")] pub stars: std::option::Option, - ///The date the user started reading the book + /// The date the user started reading the book #[serde(skip_serializing_if = "std::option::Option::is_none")] pub started_at: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] diff --git a/crates/jacquard-api/src/buzz_bookhive/get_profile.rs b/crates/jacquard-api/src/buzz_bookhive/get_profile.rs index eec25cae7..1cf5a9612 100644 --- a/crates/jacquard-api/src/buzz_bookhive/get_profile.rs +++ b/crates/jacquard-api/src/buzz_bookhive/get_profile.rs @@ -40,13 +40,13 @@ pub struct GetProfile<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetProfileOutput<'a> { - ///The user's activity + /// The user's activity #[serde(borrow)] pub activity: Vec>, - ///All books in the user's library + /// All books in the user's library #[serde(borrow)] pub books: Vec>, - ///The user's profile + /// The user's profile #[serde(borrow)] pub profile: crate::buzz_bookhive::Profile<'a>, } diff --git a/crates/jacquard-api/src/buzz_bookhive/hive_book.rs b/crates/jacquard-api/src/buzz_bookhive/hive_book.rs index 2c8b241d3..88f397ac8 100644 --- a/crates/jacquard-api/src/buzz_bookhive/hive_book.rs +++ b/crates/jacquard-api/src/buzz_bookhive/hive_book.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A book within the hive +/// A book within the hive #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,48 +14,60 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct HiveBook<'a> { - ///The authors of the book (tab separated) + /// The authors of the book (tab separated) #[serde(borrow)] + #[builder(into)] pub authors: jacquard_common::CowStr<'a>, - ///URL to full-size cover image + /// URL to full-size cover image #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cover: std::option::Option>, + pub cover: Option>, pub created_at: jacquard_common::types::string::Datetime, - ///Book description/summary + /// Book description/summary #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///The book's hive id, used to correlate user's books with the hive + pub description: Option>, + /// The book's hive id, used to correlate user's books with the hive #[serde(borrow)] + #[builder(into)] pub id: jacquard_common::CowStr<'a>, - ///Average rating (0-1000) + /// Average rating (0-1000) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub rating: std::option::Option, - ///Number of ratings + #[builder(into)] + pub rating: Option, + /// Number of ratings #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub ratings_count: std::option::Option, - ///The source service name (e.g. Goodreads) + #[builder(into)] + pub ratings_count: Option, + /// The source service name (e.g. Goodreads) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub source: std::option::Option>, - ///ID of the book in the source service + pub source: Option>, + /// ID of the book in the source service #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub source_id: std::option::Option>, - ///URL to the book on the source service + pub source_id: Option>, + /// URL to the book on the source service #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub source_url: std::option::Option>, - ///URL to thumbnail image + pub source_url: Option>, + /// URL to thumbnail image #[serde(borrow)] + #[builder(into)] pub thumbnail: jacquard_common::CowStr<'a>, - ///The title of the book + /// The title of the book #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, pub updated_at: jacquard_common::types::string::Datetime, } diff --git a/crates/jacquard-api/src/buzz_bookhive/search_books.rs b/crates/jacquard-api/src/buzz_bookhive/search_books.rs index efcd67771..4fd933a73 100644 --- a/crates/jacquard-api/src/buzz_bookhive/search_books.rs +++ b/crates/jacquard-api/src/buzz_bookhive/search_books.rs @@ -46,7 +46,7 @@ pub struct SearchBooks<'a> { pub struct SearchBooksOutput<'a> { #[serde(borrow)] pub books: Vec>, - ///The next offset to use for pagination (result of limit + offset) + /// The next offset to use for pagination (result of limit + offset) #[serde(skip_serializing_if = "std::option::Option::is_none")] pub offset: std::option::Option, } diff --git a/crates/jacquard-api/src/chat_bsky/actor.rs b/crates/jacquard-api/src/chat_bsky/actor.rs index 1cf60933e..91429a760 100644 --- a/crates/jacquard-api/src/chat_bsky/actor.rs +++ b/crates/jacquard-api/src/chat_bsky/actor.rs @@ -17,33 +17,41 @@ pub mod export_account_data; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ProfileViewBasic<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub associated: std::option::Option>, + pub associated: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, - ///Set to true when the actor cannot actively participate in conversations + pub avatar: Option>, + /// Set to true when the actor cannot actively participate in conversations #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub chat_disabled: std::option::Option, + #[builder(into)] + pub chat_disabled: Option, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display_name: std::option::Option>, + pub display_name: Option>, #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub verification: std::option::Option>, + pub verification: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub viewer: std::option::Option>, + pub viewer: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/chat_bsky/actor/declaration.rs b/crates/jacquard-api/src/chat_bsky/actor/declaration.rs index 490a06318..daec3aefc 100644 --- a/crates/jacquard-api/src/chat_bsky/actor/declaration.rs +++ b/crates/jacquard-api/src/chat_bsky/actor/declaration.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of a Bluesky chat account. +/// A declaration of a Bluesky chat account. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,11 +14,13 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Declaration<'a> { #[serde(borrow)] + #[builder(into)] pub allow_incoming: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/chat_bsky/convo.rs b/crates/jacquard-api/src/chat_bsky/convo.rs index 8f99c5ea2..ca3f54782 100644 --- a/crates/jacquard-api/src/chat_bsky/convo.rs +++ b/crates/jacquard-api/src/chat_bsky/convo.rs @@ -31,28 +31,32 @@ pub mod update_read; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ConvoView<'a> { #[serde(borrow)] + #[builder(into)] pub id: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub last_message: std::option::Option>, + pub last_message: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub last_reaction: std::option::Option< - crate::chat_bsky::convo::MessageAndReactionView<'a>, - >, + pub last_reaction: Option>, #[serde(borrow)] pub members: Vec>, pub muted: bool, #[serde(borrow)] + #[builder(into)] pub rev: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option>, + pub status: Option>, pub unread_count: i64, } @@ -83,13 +87,16 @@ pub enum ConvoViewLastMessage<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct DeletedMessageView<'a> { #[serde(borrow)] + #[builder(into)] pub id: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub rev: jacquard_common::CowStr<'a>, #[serde(borrow)] pub sender: crate::chat_bsky::convo::MessageViewSender<'a>, @@ -104,13 +111,16 @@ pub struct DeletedMessageView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LogAcceptConvo<'a> { #[serde(borrow)] + #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -122,17 +132,20 @@ pub struct LogAcceptConvo<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LogAddReaction<'a> { #[serde(borrow)] + #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] pub message: LogAddReactionMessage<'a>, #[serde(borrow)] pub reaction: crate::chat_bsky::convo::ReactionView<'a>, #[serde(borrow)] + #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -163,13 +176,16 @@ pub enum LogAddReactionMessage<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LogBeginConvo<'a> { #[serde(borrow)] + #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -181,15 +197,18 @@ pub struct LogBeginConvo<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LogCreateMessage<'a> { #[serde(borrow)] + #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] pub message: LogCreateMessageMessage<'a>, #[serde(borrow)] + #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -220,15 +239,18 @@ pub enum LogCreateMessageMessage<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LogDeleteMessage<'a> { #[serde(borrow)] + #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] pub message: LogDeleteMessageMessage<'a>, #[serde(borrow)] + #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -259,13 +281,16 @@ pub enum LogDeleteMessageMessage<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LogLeaveConvo<'a> { #[serde(borrow)] + #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -277,13 +302,16 @@ pub struct LogLeaveConvo<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LogMuteConvo<'a> { #[serde(borrow)] + #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -295,15 +323,18 @@ pub struct LogMuteConvo<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LogReadMessage<'a> { #[serde(borrow)] + #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] pub message: LogReadMessageMessage<'a>, #[serde(borrow)] + #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -334,17 +365,20 @@ pub enum LogReadMessageMessage<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LogRemoveReaction<'a> { #[serde(borrow)] + #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] pub message: LogRemoveReactionMessage<'a>, #[serde(borrow)] pub reaction: crate::chat_bsky::convo::ReactionView<'a>, #[serde(borrow)] + #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -375,13 +409,16 @@ pub enum LogRemoveReactionMessage<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LogUnmuteConvo<'a> { #[serde(borrow)] + #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub rev: jacquard_common::CowStr<'a>, } @@ -393,7 +430,8 @@ pub struct LogUnmuteConvo<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct MessageAndReactionView<'a> { @@ -411,18 +449,22 @@ pub struct MessageAndReactionView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct MessageInput<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub embed: std::option::Option>, - ///Annotations of text (mentions, URLs, hashtags, etc) + pub embed: Option>, + /// Annotations of text (mentions, URLs, hashtags, etc) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub facets: std::option::Option>>, + pub facets: Option>>, #[serde(borrow)] + #[builder(into)] pub text: jacquard_common::CowStr<'a>, } @@ -434,15 +476,18 @@ pub struct MessageInput<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct MessageRef<'a> { #[serde(borrow)] + #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(borrow)] + #[builder(into)] pub message_id: jacquard_common::CowStr<'a>, } @@ -454,29 +499,36 @@ pub struct MessageRef<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct MessageView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub embed: std::option::Option>, - ///Annotations of text (mentions, URLs, hashtags, etc) + pub embed: Option>, + /// Annotations of text (mentions, URLs, hashtags, etc) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub facets: std::option::Option>>, + pub facets: Option>>, #[serde(borrow)] + #[builder(into)] pub id: jacquard_common::CowStr<'a>, - ///Reactions to this message, in ascending order of creation time. + /// Reactions to this message, in ascending order of creation time. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reactions: std::option::Option>>, + pub reactions: Option>>, #[serde(borrow)] + #[builder(into)] pub rev: jacquard_common::CowStr<'a>, #[serde(borrow)] pub sender: crate::chat_bsky::convo::MessageViewSender<'a>, pub sent_at: jacquard_common::types::string::Datetime, #[serde(borrow)] + #[builder(into)] pub text: jacquard_common::CowStr<'a>, } @@ -488,7 +540,8 @@ pub struct MessageView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct MessageViewSender<'a> { @@ -504,7 +557,8 @@ pub struct MessageViewSender<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ReactionView<'a> { @@ -512,6 +566,7 @@ pub struct ReactionView<'a> { #[serde(borrow)] pub sender: crate::chat_bsky::convo::ReactionViewSender<'a>, #[serde(borrow)] + #[builder(into)] pub value: jacquard_common::CowStr<'a>, } @@ -523,7 +578,8 @@ pub struct ReactionView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ReactionViewSender<'a> { diff --git a/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs b/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs index 6dad1d0b8..fab72ce0c 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/accept_convo.rs @@ -43,7 +43,7 @@ pub struct AcceptConvo<'a> { )] #[serde(rename_all = "camelCase")] pub struct AcceptConvoOutput<'a> { - ///Rev when the convo was accepted. If not present, the convo was already accepted. + /// Rev when the convo was accepted. If not present, the convo was already accepted. #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub rev: std::option::Option>, diff --git a/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs b/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs index 1a75c316e..d12cc00ca 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/add_reaction.rs @@ -68,13 +68,13 @@ pub struct AddReactionOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum AddReactionError<'a> { - ///Indicates that the message has been deleted and reactions can no longer be added/removed. + /// Indicates that the message has been deleted and reactions can no longer be added/removed. #[serde(rename = "ReactionMessageDeleted")] ReactionMessageDeleted(std::option::Option), - ///Indicates that the message has the maximum number of reactions allowed for a single user, and the requested reaction wasn't yet present. If it was already present, the request will not fail since it is idempotent. + /// Indicates that the message has the maximum number of reactions allowed for a single user, and the requested reaction wasn't yet present. If it was already present, the request will not fail since it is idempotent. #[serde(rename = "ReactionLimitReached")] ReactionLimitReached(std::option::Option), - ///Indicates the value for the reaction is not acceptable. In general, this means it is not an emoji. + /// Indicates the value for the reaction is not acceptable. In general, this means it is not an emoji. #[serde(rename = "ReactionInvalidValue")] ReactionInvalidValue(std::option::Option), } diff --git a/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs b/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs index 88ab8bfe8..f4c69b251 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/remove_reaction.rs @@ -68,10 +68,10 @@ pub struct RemoveReactionOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum RemoveReactionError<'a> { - ///Indicates that the message has been deleted and reactions can no longer be added/removed. + /// Indicates that the message has been deleted and reactions can no longer be added/removed. #[serde(rename = "ReactionMessageDeleted")] ReactionMessageDeleted(std::option::Option), - ///Indicates the value for the reaction is not acceptable. In general, this means it is not an emoji. + /// Indicates the value for the reaction is not acceptable. In general, this means it is not an emoji. #[serde(rename = "ReactionInvalidValue")] ReactionInvalidValue(std::option::Option), } diff --git a/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs b/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs index 3f63d1fdf..cce03286a 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/send_message_batch.rs @@ -13,11 +13,13 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct BatchItem<'a> { #[serde(borrow)] + #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(borrow)] pub message: crate::chat_bsky::convo::MessageInput<'a>, diff --git a/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs b/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs index d02374e8e..f726266ef 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/update_all_read.rs @@ -20,9 +20,9 @@ #[builder(start_fn = new)] pub struct UpdateAllRead<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub status: std::option::Option>, + #[serde(borrow)] + pub status: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] @@ -44,7 +44,7 @@ pub struct UpdateAllRead<'a> { )] #[serde(rename_all = "camelCase")] pub struct UpdateAllReadOutput<'a> { - ///The count of updated convos. + /// The count of updated convos. pub updated_count: i64, } diff --git a/crates/jacquard-api/src/chat_bsky/convo/update_read.rs b/crates/jacquard-api/src/chat_bsky/convo/update_read.rs index f491b222b..1af49167c 100644 --- a/crates/jacquard-api/src/chat_bsky/convo/update_read.rs +++ b/crates/jacquard-api/src/chat_bsky/convo/update_read.rs @@ -23,9 +23,9 @@ pub struct UpdateRead<'a> { #[builder(into)] pub convo_id: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub message_id: std::option::Option>, + #[serde(borrow)] + pub message_id: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs b/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs index 7bed629e4..011051079 100644 --- a/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs +++ b/crates/jacquard-api/src/chat_bsky/moderation/get_actor_metadata.rs @@ -76,7 +76,8 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetActorMetadataRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Metadata<'a> { diff --git a/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs b/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs index 7db352918..4ceebb989 100644 --- a/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs +++ b/crates/jacquard-api/src/chat_bsky/moderation/update_actor_access.rs @@ -23,9 +23,9 @@ pub struct UpdateActorAccess<'a> { pub actor: jacquard_common::types::string::Did<'a>, pub allow_access: bool, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub r#ref: std::option::Option>, + #[serde(borrow)] + pub r#ref: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/club_stellz/evm/address_control.rs b/crates/jacquard-api/src/club_stellz/evm/address_control.rs index 47fa0583b..8ef068f32 100644 --- a/crates/jacquard-api/src/club_stellz/evm/address_control.rs +++ b/crates/jacquard-api/src/club_stellz/evm/address_control.rs @@ -13,16 +13,18 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AddressControl<'a> { - ///Ethereum address as bytes (20 bytes) + /// Ethereum address as bytes (20 bytes) pub address: bytes::Bytes, - ///List of all Chain IDs (besides the one in the sign-in message, though you can include it) that the holder of this address is also active on & accepts tokens thru. + /// List of all Chain IDs (besides the one in the sign-in message, though you can include it) that the holder of this address is also active on & accepts tokens thru. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub also_on: std::option::Option>, - ///Sign in With Ethereum message signature as bytes + #[builder(into)] + pub also_on: Option>, + /// Sign in With Ethereum message signature as bytes pub signature: bytes::Bytes, #[serde(borrow)] pub siwe: crate::club_stellz::evm::address_control::SiweMessage<'a>, @@ -36,30 +38,36 @@ pub struct AddressControl<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SiweMessage<'a> { - ///Ethereum address in 0x-prefixed, checksummed hex format + /// Ethereum address in 0x-prefixed, checksummed hex format #[serde(borrow)] + #[builder(into)] pub address: jacquard_common::CowStr<'a>, - ///Chain ID of the Ethereum VM network the address is on + /// Chain ID of the Ethereum VM network the address is on pub chain_id: i64, - ///Domain of the application requesting the signature, e.g. 'wallet-link.stellz.club' + /// Domain of the application requesting the signature, e.g. 'wallet-link.stellz.club' #[serde(borrow)] + #[builder(into)] pub domain: jacquard_common::CowStr<'a>, - ///Timestamp when the message was signed + /// Timestamp when the message was signed pub issued_at: jacquard_common::types::string::Datetime, - ///Random nonce the message was signed with + /// Random nonce the message was signed with #[serde(borrow)] + #[builder(into)] pub nonce: jacquard_common::CowStr<'a>, - ///The message shown to the user in their wallet before signing, which MUST be of the format 'Prove control of ${address} to link it to ${did}', where ${address} is the linked Ethereum address in 0x-prefixed, checksummed hex format, and ${did} is the DID of the user. + /// The message shown to the user in their wallet before signing, which MUST be of the format 'Prove control of ${address} to link it to ${did}', where ${address} is the linked Ethereum address in 0x-prefixed, checksummed hex format, and ${did} is the DID of the user. #[serde(borrow)] + #[builder(into)] pub statement: jacquard_common::CowStr<'a>, - ///URI of the application requesting the signature, e.g. 'https://wallet-link.stellz.club' + /// URI of the application requesting the signature, e.g. 'https://wallet-link.stellz.club' #[serde(borrow)] pub uri: jacquard_common::types::string::Uri<'a>, - ///Sign in With Ethereum message version + /// Sign in With Ethereum message version #[serde(borrow)] + #[builder(into)] pub version: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/admin.rs b/crates/jacquard-api/src/com_atproto/admin.rs index f8830b579..70909ba6d 100644 --- a/crates/jacquard-api/src/com_atproto/admin.rs +++ b/crates/jacquard-api/src/com_atproto/admin.rs @@ -29,45 +29,49 @@ pub mod update_subject_status; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AccountView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub deactivated_at: std::option::Option, + #[builder(into)] + pub deactivated_at: Option, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub email: std::option::Option>, + pub email: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub email_confirmed_at: std::option::Option< - jacquard_common::types::string::Datetime, - >, + #[builder(into)] + pub email_confirmed_at: Option, #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub invite_note: std::option::Option>, + pub invite_note: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub invited_by: std::option::Option>, + pub invited_by: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub invites: std::option::Option>>, + pub invites: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub invites_disabled: std::option::Option, + #[builder(into)] + pub invites_disabled: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub related_records: std::option::Option< - Vec>, - >, + pub related_records: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub threat_signatures: std::option::Option< - Vec>, - >, + pub threat_signatures: Option>>, } #[jacquard_derive::lexicon] @@ -78,7 +82,8 @@ pub struct AccountView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RepoBlobRef<'a> { @@ -87,8 +92,9 @@ pub struct RepoBlobRef<'a> { #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub record_uri: std::option::Option>, + pub record_uri: Option>, } #[jacquard_derive::lexicon] @@ -99,7 +105,8 @@ pub struct RepoBlobRef<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RepoRef<'a> { @@ -115,14 +122,16 @@ pub struct RepoRef<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct StatusAttr<'a> { pub applied: bool, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub r#ref: std::option::Option>, + pub r#ref: Option>, } #[jacquard_derive::lexicon] @@ -133,12 +142,15 @@ pub struct StatusAttr<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ThreatSignature<'a> { #[serde(borrow)] + #[builder(into)] pub property: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub value: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs b/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs index cfcc55c1f..457c53994 100644 --- a/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs +++ b/crates/jacquard-api/src/com_atproto/admin/disable_account_invites.rs @@ -21,11 +21,11 @@ pub struct DisableAccountInvites<'a> { #[serde(borrow)] pub account: jacquard_common::types::string::Did<'a>, - ///Optional reason for disabled invites. + /// Optional reason for disabled invites. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub note: std::option::Option>, + #[serde(borrow)] + pub note: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs b/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs index ff4fb2af1..43c3a991c 100644 --- a/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs +++ b/crates/jacquard-api/src/com_atproto/admin/disable_invite_codes.rs @@ -20,11 +20,13 @@ #[builder(start_fn = new)] pub struct DisableInviteCodes<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub accounts: std::option::Option>>, + pub accounts: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub codes: std::option::Option>>, + pub codes: Option>>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs b/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs index 56d7cb4ad..fd3f18109 100644 --- a/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs +++ b/crates/jacquard-api/src/com_atproto/admin/enable_account_invites.rs @@ -21,11 +21,11 @@ pub struct EnableAccountInvites<'a> { #[serde(borrow)] pub account: jacquard_common::types::string::Did<'a>, - ///Optional reason for enabled invites. + /// Optional reason for enabled invites. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub note: std::option::Option>, + #[serde(borrow)] + pub note: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/com_atproto/admin/send_email.rs b/crates/jacquard-api/src/com_atproto/admin/send_email.rs index 9c13ffb7e..91b407e86 100644 --- a/crates/jacquard-api/src/com_atproto/admin/send_email.rs +++ b/crates/jacquard-api/src/com_atproto/admin/send_email.rs @@ -19,11 +19,11 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct SendEmail<'a> { - ///Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers + /// Additional comment by the sender that won't be used in the email itself but helpful to provide more context for moderators/reviewers #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub comment: std::option::Option>, + #[serde(borrow)] + pub comment: Option>, #[serde(borrow)] #[builder(into)] pub content: jacquard_common::CowStr<'a>, @@ -32,9 +32,9 @@ pub struct SendEmail<'a> { #[serde(borrow)] pub sender_did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub subject: std::option::Option>, + #[serde(borrow)] + pub subject: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/com_atproto/admin/update_account_email.rs b/crates/jacquard-api/src/com_atproto/admin/update_account_email.rs index 752c13d38..3c3214375 100644 --- a/crates/jacquard-api/src/com_atproto/admin/update_account_email.rs +++ b/crates/jacquard-api/src/com_atproto/admin/update_account_email.rs @@ -19,7 +19,7 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct UpdateAccountEmail<'a> { - ///The handle or DID of the repo. + /// The handle or DID of the repo. #[serde(borrow)] pub account: jacquard_common::types::ident::AtIdentifier<'a>, #[serde(borrow)] diff --git a/crates/jacquard-api/src/com_atproto/admin/update_account_signing_key.rs b/crates/jacquard-api/src/com_atproto/admin/update_account_signing_key.rs index 5c18f4a18..d4f70f056 100644 --- a/crates/jacquard-api/src/com_atproto/admin/update_account_signing_key.rs +++ b/crates/jacquard-api/src/com_atproto/admin/update_account_signing_key.rs @@ -21,7 +21,7 @@ pub struct UpdateAccountSigningKey<'a> { #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///Did-key formatted public key + /// Did-key formatted public key #[serde(borrow)] pub signing_key: jacquard_common::types::string::Did<'a>, #[serde(flatten)] diff --git a/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs b/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs index f86a5df8b..cfa976d68 100644 --- a/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs +++ b/crates/jacquard-api/src/com_atproto/admin/update_subject_status.rs @@ -20,13 +20,15 @@ #[builder(start_fn = new)] pub struct UpdateSubjectStatus<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub deactivated: std::option::Option>, + pub deactivated: Option>, #[serde(borrow)] pub subject: UpdateSubjectStatusSubject<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub takedown: std::option::Option>, + pub takedown: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/com_atproto/identity.rs b/crates/jacquard-api/src/com_atproto/identity.rs index 42794595f..8a8a7d450 100644 --- a/crates/jacquard-api/src/com_atproto/identity.rs +++ b/crates/jacquard-api/src/com_atproto/identity.rs @@ -23,16 +23,17 @@ pub mod update_handle; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct IdentityInfo<'a> { #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///The complete DID document for the identity. + /// The complete DID document for the identity. #[serde(borrow)] pub did_doc: jacquard_common::types::value::Data<'a>, - ///The validated handle of the account; or 'handle.invalid' if the handle did not bi-directionally match the DID document. + /// The validated handle of the account; or 'handle.invalid' if the handle did not bi-directionally match the DID document. #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs b/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs index fd771d177..858f7104c 100644 --- a/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs +++ b/crates/jacquard-api/src/com_atproto/identity/get_recommended_did_credentials.rs @@ -20,7 +20,7 @@ pub struct GetRecommendedDidCredentialsOutput<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub also_known_as: std::option::Option>>, - ///Recommended rotation keys for PLC dids. Should be undefined (or ignored) for did:webs. + /// Recommended rotation keys for PLC dids. Should be undefined (or ignored) for did:webs. #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub rotation_keys: std::option::Option>>, diff --git a/crates/jacquard-api/src/com_atproto/identity/refresh_identity.rs b/crates/jacquard-api/src/com_atproto/identity/refresh_identity.rs index dc988c35d..a69946f19 100644 --- a/crates/jacquard-api/src/com_atproto/identity/refresh_identity.rs +++ b/crates/jacquard-api/src/com_atproto/identity/refresh_identity.rs @@ -62,13 +62,13 @@ pub struct RefreshIdentityOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum RefreshIdentityError<'a> { - ///The resolution process confirmed that the handle does not resolve to any DID. + /// The resolution process confirmed that the handle does not resolve to any DID. #[serde(rename = "HandleNotFound")] HandleNotFound(std::option::Option), - ///The DID resolution process confirmed that there is no current DID. + /// The DID resolution process confirmed that there is no current DID. #[serde(rename = "DidNotFound")] DidNotFound(std::option::Option), - ///The DID previously existed, but has been deactivated. + /// The DID previously existed, but has been deactivated. #[serde(rename = "DidDeactivated")] DidDeactivated(std::option::Option), } diff --git a/crates/jacquard-api/src/com_atproto/identity/resolve_did.rs b/crates/jacquard-api/src/com_atproto/identity/resolve_did.rs index ccb03028e..65ffcea4b 100644 --- a/crates/jacquard-api/src/com_atproto/identity/resolve_did.rs +++ b/crates/jacquard-api/src/com_atproto/identity/resolve_did.rs @@ -34,7 +34,7 @@ pub struct ResolveDid<'a> { )] #[serde(rename_all = "camelCase")] pub struct ResolveDidOutput<'a> { - ///The complete DID document for the identity. + /// The complete DID document for the identity. #[serde(borrow)] pub did_doc: jacquard_common::types::value::Data<'a>, } @@ -54,10 +54,10 @@ pub struct ResolveDidOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum ResolveDidError<'a> { - ///The DID resolution process confirmed that there is no current DID. + /// The DID resolution process confirmed that there is no current DID. #[serde(rename = "DidNotFound")] DidNotFound(std::option::Option), - ///The DID previously existed, but has been deactivated. + /// The DID previously existed, but has been deactivated. #[serde(rename = "DidDeactivated")] DidDeactivated(std::option::Option), } diff --git a/crates/jacquard-api/src/com_atproto/identity/resolve_handle.rs b/crates/jacquard-api/src/com_atproto/identity/resolve_handle.rs index 72e3806bd..798da7762 100644 --- a/crates/jacquard-api/src/com_atproto/identity/resolve_handle.rs +++ b/crates/jacquard-api/src/com_atproto/identity/resolve_handle.rs @@ -53,7 +53,7 @@ pub struct ResolveHandleOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum ResolveHandleError<'a> { - ///The resolution process confirmed that the handle does not resolve to any DID. + /// The resolution process confirmed that the handle does not resolve to any DID. #[serde(rename = "HandleNotFound")] HandleNotFound(std::option::Option), } diff --git a/crates/jacquard-api/src/com_atproto/identity/resolve_identity.rs b/crates/jacquard-api/src/com_atproto/identity/resolve_identity.rs index f3f6074be..366b68c16 100644 --- a/crates/jacquard-api/src/com_atproto/identity/resolve_identity.rs +++ b/crates/jacquard-api/src/com_atproto/identity/resolve_identity.rs @@ -54,13 +54,13 @@ pub struct ResolveIdentityOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum ResolveIdentityError<'a> { - ///The resolution process confirmed that the handle does not resolve to any DID. + /// The resolution process confirmed that the handle does not resolve to any DID. #[serde(rename = "HandleNotFound")] HandleNotFound(std::option::Option), - ///The DID resolution process confirmed that there is no current DID. + /// The DID resolution process confirmed that there is no current DID. #[serde(rename = "DidNotFound")] DidNotFound(std::option::Option), - ///The DID previously existed, but has been deactivated. + /// The DID previously existed, but has been deactivated. #[serde(rename = "DidDeactivated")] DidDeactivated(std::option::Option), } diff --git a/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs b/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs index bca5929be..f93198ae9 100644 --- a/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs +++ b/crates/jacquard-api/src/com_atproto/identity/sign_plc_operation.rs @@ -20,24 +20,26 @@ #[builder(start_fn = new)] pub struct SignPlcOperation<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub also_known_as: std::option::Option>>, + pub also_known_as: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub rotation_keys: std::option::Option>>, + pub rotation_keys: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub services: std::option::Option>, - ///A token received through com.atproto.identity.requestPlcOperationSignature + pub services: Option>, + /// A token received through com.atproto.identity.requestPlcOperationSignature #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub token: std::option::Option>, + #[serde(borrow)] + pub token: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub verification_methods: std::option::Option< - jacquard_common::types::value::Data<'a>, - >, + pub verification_methods: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] @@ -59,7 +61,7 @@ pub struct SignPlcOperation<'a> { )] #[serde(rename_all = "camelCase")] pub struct SignPlcOperationOutput<'a> { - ///A signed DID PLC operation. + /// A signed DID PLC operation. #[serde(borrow)] pub operation: jacquard_common::types::value::Data<'a>, } diff --git a/crates/jacquard-api/src/com_atproto/identity/update_handle.rs b/crates/jacquard-api/src/com_atproto/identity/update_handle.rs index cd4228bd2..12c6f341b 100644 --- a/crates/jacquard-api/src/com_atproto/identity/update_handle.rs +++ b/crates/jacquard-api/src/com_atproto/identity/update_handle.rs @@ -19,7 +19,7 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct UpdateHandle<'a> { - ///The new handle. + /// The new handle. #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, #[serde(flatten)] diff --git a/crates/jacquard-api/src/com_atproto/label.rs b/crates/jacquard-api/src/com_atproto/label.rs index 1087766f6..973cc4963 100644 --- a/crates/jacquard-api/src/com_atproto/label.rs +++ b/crates/jacquard-api/src/com_atproto/label.rs @@ -8,7 +8,7 @@ pub mod query_labels; pub mod subscribe_labels; -///Metadata tag on an atproto resource (eg, repo or record). +/// Metadata tag on an atproto resource (eg, repo or record). #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -17,37 +17,44 @@ pub mod subscribe_labels; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Label<'a> { - ///Optionally, CID specifying the specific version of 'uri' resource this label applies to. + /// Optionally, CID specifying the specific version of 'uri' resource this label applies to. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cid: std::option::Option>, - ///Timestamp when this label was created. + pub cid: Option>, + /// Timestamp when this label was created. pub cts: jacquard_common::types::string::Datetime, - ///Timestamp at which this label expires (no longer applies). + /// Timestamp at which this label expires (no longer applies). #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub exp: std::option::Option, - ///If true, this is a negation label, overwriting a previous label. + #[builder(into)] + pub exp: Option, + /// If true, this is a negation label, overwriting a previous label. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub neg: std::option::Option, - ///Signature of dag-cbor encoded label. + #[builder(into)] + pub neg: Option, + /// Signature of dag-cbor encoded label. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub sig: std::option::Option, - ///DID of the actor who created this label. + #[builder(into)] + pub sig: Option, + /// DID of the actor who created this label. #[serde(borrow)] pub src: jacquard_common::types::string::Did<'a>, - ///AT URI of the record, repository (account), or other resource that this label applies to. + /// AT URI of the record, repository (account), or other resource that this label applies to. #[serde(borrow)] pub uri: jacquard_common::types::string::Uri<'a>, - ///The short string name of the value or type of this label. + /// The short string name of the value or type of this label. #[serde(borrow)] + #[builder(into)] pub val: jacquard_common::CowStr<'a>, - ///The AT Protocol version of the label object. + /// The AT Protocol version of the label object. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub ver: std::option::Option, + #[builder(into)] + pub ver: Option, } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -171,7 +178,7 @@ impl jacquard_common::IntoStatic for LabelValue<'_> { } } -///Declares a label value and its expected interpretations and behaviors. +/// Declares a label value and its expected interpretations and behaviors. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -180,31 +187,37 @@ impl jacquard_common::IntoStatic for LabelValue<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LabelValueDefinition<'a> { - ///Does the user need to have adult content enabled in order to configure this label? + /// Does the user need to have adult content enabled in order to configure this label? #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub adult_only: std::option::Option, - ///What should this label hide in the UI, if applied? 'content' hides all of the target; 'media' hides the images/video/audio; 'none' hides nothing. + #[builder(into)] + pub adult_only: Option, + /// What should this label hide in the UI, if applied? 'content' hides all of the target; 'media' hides the images/video/audio; 'none' hides nothing. #[serde(borrow)] + #[builder(into)] pub blurs: jacquard_common::CowStr<'a>, - ///The default setting for this label. + /// The default setting for this label. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub default_setting: std::option::Option>, - ///The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+). + pub default_setting: Option>, + /// The value of the label being defined. Must only include lowercase ascii and the '-' character ([a-z-]+). #[serde(borrow)] + #[builder(into)] pub identifier: jacquard_common::CowStr<'a>, #[serde(borrow)] pub locales: Vec>, - ///How should a client visually convey this label? 'inform' means neutral and informational; 'alert' means negative and warning; 'none' means show nothing. + /// How should a client visually convey this label? 'inform' means neutral and informational; 'alert' means negative and warning; 'none' means show nothing. #[serde(borrow)] + #[builder(into)] pub severity: jacquard_common::CowStr<'a>, } -///Strings which describe the label in the UI, localized into a specific language. +/// Strings which describe the label in the UI, localized into a specific language. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -213,21 +226,24 @@ pub struct LabelValueDefinition<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LabelValueDefinitionStrings<'a> { - ///A longer description of what the label means and why it might be applied. + /// A longer description of what the label means and why it might be applied. #[serde(borrow)] + #[builder(into)] pub description: jacquard_common::CowStr<'a>, - ///The code of the language these strings are written in. + /// The code of the language these strings are written in. pub lang: jacquard_common::types::string::Language, - ///A short human-readable name for the label. + /// A short human-readable name for the label. #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } -///Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. +/// Metadata tag on an atproto record, published by the author within the record. Note that schemas should use #selfLabels, not #selfLabel. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -236,16 +252,18 @@ pub struct LabelValueDefinitionStrings<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SelfLabel<'a> { - ///The short string name of the value or type of this label. + /// The short string name of the value or type of this label. #[serde(borrow)] + #[builder(into)] pub val: jacquard_common::CowStr<'a>, } -///Metadata tags on an atproto record, published by the author within the record. +/// Metadata tags on an atproto record, published by the author within the record. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -254,7 +272,8 @@ pub struct SelfLabel<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SelfLabels<'a> { diff --git a/crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs b/crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs index 674a521fb..f4ab550e3 100644 --- a/crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs +++ b/crates/jacquard-api/src/com_atproto/label/subscribe_labels.rs @@ -13,14 +13,17 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Info<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub message: std::option::Option>, + pub message: Option>, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } @@ -32,7 +35,8 @@ pub struct Info<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Labels<'a> { diff --git a/crates/jacquard-api/src/com_atproto/lexicon/schema.rs b/crates/jacquard-api/src/com_atproto/lexicon/schema.rs index 418d53362..95671acdc 100644 --- a/crates/jacquard-api/src/com_atproto/lexicon/schema.rs +++ b/crates/jacquard-api/src/com_atproto/lexicon/schema.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Representation of Lexicon schemas themselves, when published as atproto records. Note that the schema language is not defined in Lexicon; this meta schema currently only includes a single version field ('lexicon'). See the atproto specifications for description of the other expected top-level fields ('id', 'defs', etc). +/// Representation of Lexicon schemas themselves, when published as atproto records. Note that the schema language is not defined in Lexicon; this meta schema currently only includes a single version field ('lexicon'). See the atproto specifications for description of the other expected top-level fields ('id', 'defs', etc). #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,11 +14,12 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Schema<'a> { - ///Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system. + /// Indicates the 'version' of the Lexicon language. Must be '1' for the current atproto/Lexicon schema system. pub lexicon: i64, } diff --git a/crates/jacquard-api/src/com_atproto/moderation.rs b/crates/jacquard-api/src/com_atproto/moderation.rs index f2ad24450..1ea1c599c 100644 --- a/crates/jacquard-api/src/com_atproto/moderation.rs +++ b/crates/jacquard-api/src/com_atproto/moderation.rs @@ -7,7 +7,7 @@ pub mod create_report; -///Appeal a previously taken moderation action +/// Appeal a previously taken moderation action #[derive( serde::Serialize, serde::Deserialize, @@ -25,7 +25,7 @@ impl std::fmt::Display for ReasonAppeal { } } -///Misleading identity, affiliation, or content. Prefer new lexicon definition `tools.ozone.report.defs#reasonMisleadingOther`. +/// Misleading identity, affiliation, or content. Prefer new lexicon definition `tools.ozone.report.defs#reasonMisleadingOther`. #[derive( serde::Serialize, serde::Deserialize, @@ -43,7 +43,7 @@ impl std::fmt::Display for ReasonMisleading { } } -///Reports not falling under another report category. Prefer new lexicon definition `tools.ozone.report.defs#reasonOther`. +/// Reports not falling under another report category. Prefer new lexicon definition `tools.ozone.report.defs#reasonOther`. #[derive( serde::Serialize, serde::Deserialize, @@ -61,7 +61,7 @@ impl std::fmt::Display for ReasonOther { } } -///Rude, harassing, explicit, or otherwise unwelcoming behavior. Prefer new lexicon definition `tools.ozone.report.defs#reasonHarassmentOther`. +/// Rude, harassing, explicit, or otherwise unwelcoming behavior. Prefer new lexicon definition `tools.ozone.report.defs#reasonHarassmentOther`. #[derive( serde::Serialize, serde::Deserialize, @@ -79,7 +79,7 @@ impl std::fmt::Display for ReasonRude { } } -///Unwanted or mislabeled sexual content. Prefer new lexicon definition `tools.ozone.report.defs#reasonSexualUnlabeled`. +/// Unwanted or mislabeled sexual content. Prefer new lexicon definition `tools.ozone.report.defs#reasonSexualUnlabeled`. #[derive( serde::Serialize, serde::Deserialize, @@ -97,7 +97,7 @@ impl std::fmt::Display for ReasonSexual { } } -///Spam: frequent unwanted promotion, replies, mentions. Prefer new lexicon definition `tools.ozone.report.defs#reasonMisleadingSpam`. +/// Spam: frequent unwanted promotion, replies, mentions. Prefer new lexicon definition `tools.ozone.report.defs#reasonMisleadingSpam`. #[derive( serde::Serialize, serde::Deserialize, @@ -792,7 +792,7 @@ impl jacquard_common::IntoStatic for ReasonType<'_> { } } -///Direct violation of server rules, laws, terms of service. Prefer new lexicon definition `tools.ozone.report.defs#reasonRuleOther`. +/// Direct violation of server rules, laws, terms of service. Prefer new lexicon definition `tools.ozone.report.defs#reasonRuleOther`. #[derive( serde::Serialize, serde::Deserialize, @@ -810,7 +810,7 @@ impl std::fmt::Display for ReasonViolation { } } -///Tag describing a type of subject that might be reported. +/// Tag describing a type of subject that might be reported. #[derive(Debug, Clone, PartialEq, Eq, Hash)] pub enum SubjectType<'a> { Account, diff --git a/crates/jacquard-api/src/com_atproto/moderation/create_report.rs b/crates/jacquard-api/src/com_atproto/moderation/create_report.rs index 232b8560a..4a80cd744 100644 --- a/crates/jacquard-api/src/com_atproto/moderation/create_report.rs +++ b/crates/jacquard-api/src/com_atproto/moderation/create_report.rs @@ -20,14 +20,15 @@ #[builder(start_fn = new)] pub struct CreateReport<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub mod_tool: std::option::Option>, - ///Additional context about the content and violation. + pub mod_tool: Option>, + /// Additional context about the content and violation. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub reason: std::option::Option>, - ///Indicates the broad category of violation the report is for. + #[serde(borrow)] + pub reason: Option>, + /// Indicates the broad category of violation the report is for. #[serde(borrow)] pub reason_type: crate::com_atproto::moderation::ReasonType<'a>, #[serde(borrow)] @@ -134,7 +135,7 @@ impl jacquard_common::xrpc::XrpcEndpoint for CreateReportRequest { type Response = CreateReportResponse; } -///Moderation tool information for tracing the source of the action +/// Moderation tool information for tracing the source of the action #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -143,15 +144,18 @@ impl jacquard_common::xrpc::XrpcEndpoint for CreateReportRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModTool<'a> { - ///Additional arbitrary metadata about the source + /// Additional arbitrary metadata about the source #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub meta: std::option::Option>, - ///Name/identifier of the source (e.g., 'bsky-app/android', 'bsky-web/chrome') + pub meta: Option>, + /// Name/identifier of the source (e.g., 'bsky-app/android', 'bsky-web/chrome') #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/repo.rs b/crates/jacquard-api/src/com_atproto/repo.rs index f78be561c..1eb4667c1 100644 --- a/crates/jacquard-api/src/com_atproto/repo.rs +++ b/crates/jacquard-api/src/com_atproto/repo.rs @@ -25,7 +25,8 @@ pub mod upload_blob; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct CommitMeta<'a> { diff --git a/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs b/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs index d7d21d6ef..bec4be6e7 100644 --- a/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs +++ b/crates/jacquard-api/src/com_atproto/repo/apply_writes.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Operation which creates a new record. +/// Operation which creates a new record. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,16 +14,18 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Create<'a> { #[serde(borrow)] pub collection: jacquard_common::types::string::Nsid<'a>, - ///NOTE: maxLength is redundant with record-key format. Keeping it temporarily to ensure backwards compatibility. + /// NOTE: maxLength is redundant with record-key format. Keeping it temporarily to ensure backwards compatibility. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub rkey: std::option::Option< + pub rkey: Option< jacquard_common::types::string::RecordKey< jacquard_common::types::string::Rkey<'a>, >, @@ -40,7 +42,8 @@ pub struct Create<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct CreateResult<'a> { @@ -49,11 +52,12 @@ pub struct CreateResult<'a> { #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub validation_status: std::option::Option>, + pub validation_status: Option>, } -///Operation which deletes an existing record. +/// Operation which deletes an existing record. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -62,7 +66,8 @@ pub struct CreateResult<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Delete<'a> { @@ -82,7 +87,8 @@ pub struct Delete<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct DeleteResult<'a> {} @@ -100,16 +106,18 @@ pub struct DeleteResult<'a> {} #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct ApplyWrites<'a> { - ///The handle or DID of the repo (aka, current account). + /// The handle or DID of the repo (aka, current account). #[serde(borrow)] pub repo: jacquard_common::types::ident::AtIdentifier<'a>, - ///If provided, the entire operation will fail if the current repo commit CID does not match this value. Used to prevent conflicting repo mutations. + /// If provided, the entire operation will fail if the current repo commit CID does not match this value. Used to prevent conflicting repo mutations. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub swap_commit: std::option::Option>, - ///Can be set to 'false' to skip Lexicon schema validation of record data across all operations, 'true' to require it, or leave unset to validate only for known Lexicons. + pub swap_commit: Option>, + /// Can be set to 'false' to skip Lexicon schema validation of record data across all operations, 'true' to require it, or leave unset to validate only for known Lexicons. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub validate: std::option::Option, + #[builder(into)] + pub validate: Option, #[serde(borrow)] pub writes: Vec>, #[serde(flatten)] @@ -196,7 +204,7 @@ pub enum ApplyWritesOutputResultsItem<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum ApplyWritesError<'a> { - ///Indicates that the 'swapCommit' parameter did not match current commit. + /// Indicates that the 'swapCommit' parameter did not match current commit. #[serde(rename = "InvalidSwap")] InvalidSwap(std::option::Option), } @@ -246,7 +254,7 @@ impl jacquard_common::xrpc::XrpcEndpoint for ApplyWritesRequest { type Response = ApplyWritesResponse; } -///Operation which updates an existing record. +/// Operation which updates an existing record. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -255,7 +263,8 @@ impl jacquard_common::xrpc::XrpcEndpoint for ApplyWritesRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Update<'a> { @@ -277,7 +286,8 @@ pub struct Update<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct UpdateResult<'a> { @@ -286,6 +296,7 @@ pub struct UpdateResult<'a> { #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub validation_status: std::option::Option>, + pub validation_status: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/repo/create_record.rs b/crates/jacquard-api/src/com_atproto/repo/create_record.rs index 528380a54..2543954c1 100644 --- a/crates/jacquard-api/src/com_atproto/repo/create_record.rs +++ b/crates/jacquard-api/src/com_atproto/repo/create_record.rs @@ -19,30 +19,33 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct CreateRecord<'a> { - ///The NSID of the record collection. + /// The NSID of the record collection. #[serde(borrow)] pub collection: jacquard_common::types::string::Nsid<'a>, - ///The record itself. Must contain a $type field. + /// The record itself. Must contain a $type field. #[serde(borrow)] pub record: jacquard_common::types::value::Data<'a>, - ///The handle or DID of the repo (aka, current account). + /// The handle or DID of the repo (aka, current account). #[serde(borrow)] pub repo: jacquard_common::types::ident::AtIdentifier<'a>, - ///The Record Key. + /// The Record Key. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub rkey: std::option::Option< + pub rkey: Option< jacquard_common::types::string::RecordKey< jacquard_common::types::string::Rkey<'a>, >, >, - ///Compare and swap with the previous commit by CID. + /// Compare and swap with the previous commit by CID. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub swap_commit: std::option::Option>, - ///Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. + pub swap_commit: Option>, + /// Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub validate: std::option::Option, + #[builder(into)] + pub validate: Option, #[serde(flatten)] #[serde(borrow)] #[builder(default)] @@ -91,7 +94,7 @@ pub struct CreateRecordOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum CreateRecordError<'a> { - ///Indicates that 'swapCommit' didn't match current repo commit. + /// Indicates that 'swapCommit' didn't match current repo commit. #[serde(rename = "InvalidSwap")] InvalidSwap(std::option::Option), } diff --git a/crates/jacquard-api/src/com_atproto/repo/delete_record.rs b/crates/jacquard-api/src/com_atproto/repo/delete_record.rs index ce2ae3081..de2d2b86c 100644 --- a/crates/jacquard-api/src/com_atproto/repo/delete_record.rs +++ b/crates/jacquard-api/src/com_atproto/repo/delete_record.rs @@ -19,25 +19,27 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct DeleteRecord<'a> { - ///The NSID of the record collection. + /// The NSID of the record collection. #[serde(borrow)] pub collection: jacquard_common::types::string::Nsid<'a>, - ///The handle or DID of the repo (aka, current account). + /// The handle or DID of the repo (aka, current account). #[serde(borrow)] pub repo: jacquard_common::types::ident::AtIdentifier<'a>, - ///The Record Key. + /// The Record Key. #[serde(borrow)] pub rkey: jacquard_common::types::string::RecordKey< jacquard_common::types::string::Rkey<'a>, >, - ///Compare and swap with the previous commit by CID. + /// Compare and swap with the previous commit by CID. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub swap_commit: std::option::Option>, - ///Compare and swap with the previous record by CID. + pub swap_commit: Option>, + /// Compare and swap with the previous record by CID. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub swap_record: std::option::Option>, + pub swap_record: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/com_atproto/repo/describe_repo.rs b/crates/jacquard-api/src/com_atproto/repo/describe_repo.rs index 37b11c2c7..20d36a021 100644 --- a/crates/jacquard-api/src/com_atproto/repo/describe_repo.rs +++ b/crates/jacquard-api/src/com_atproto/repo/describe_repo.rs @@ -34,17 +34,17 @@ pub struct DescribeRepo<'a> { )] #[serde(rename_all = "camelCase")] pub struct DescribeRepoOutput<'a> { - ///List of all the collections (NSIDs) for which this repo contains at least one record. + /// List of all the collections (NSIDs) for which this repo contains at least one record. #[serde(borrow)] pub collections: Vec>, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///The complete DID document for this account. + /// The complete DID document for this account. #[serde(borrow)] pub did_doc: jacquard_common::types::value::Data<'a>, #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, - ///Indicates if handle is currently valid (resolves bi-directionally) + /// Indicates if handle is currently valid (resolves bi-directionally) pub handle_is_correct: bool, } diff --git a/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs b/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs index e86731bef..5fe98c2e8 100644 --- a/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs +++ b/crates/jacquard-api/src/com_atproto/repo/list_missing_blobs.rs @@ -80,7 +80,8 @@ impl jacquard_common::xrpc::XrpcEndpoint for ListMissingBlobsRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RecordBlob<'a> { diff --git a/crates/jacquard-api/src/com_atproto/repo/list_records.rs b/crates/jacquard-api/src/com_atproto/repo/list_records.rs index f0e617fa0..6f46d331d 100644 --- a/crates/jacquard-api/src/com_atproto/repo/list_records.rs +++ b/crates/jacquard-api/src/com_atproto/repo/list_records.rs @@ -86,7 +86,8 @@ impl jacquard_common::xrpc::XrpcEndpoint for ListRecordsRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Record<'a> { diff --git a/crates/jacquard-api/src/com_atproto/repo/put_record.rs b/crates/jacquard-api/src/com_atproto/repo/put_record.rs index a88d5f710..7da06b786 100644 --- a/crates/jacquard-api/src/com_atproto/repo/put_record.rs +++ b/crates/jacquard-api/src/com_atproto/repo/put_record.rs @@ -19,31 +19,34 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct PutRecord<'a> { - ///The NSID of the record collection. + /// The NSID of the record collection. #[serde(borrow)] pub collection: jacquard_common::types::string::Nsid<'a>, - ///The record to write. + /// The record to write. #[serde(borrow)] pub record: jacquard_common::types::value::Data<'a>, - ///The handle or DID of the repo (aka, current account). + /// The handle or DID of the repo (aka, current account). #[serde(borrow)] pub repo: jacquard_common::types::ident::AtIdentifier<'a>, - ///The Record Key. + /// The Record Key. #[serde(borrow)] pub rkey: jacquard_common::types::string::RecordKey< jacquard_common::types::string::Rkey<'a>, >, - ///Compare and swap with the previous commit by CID. + /// Compare and swap with the previous commit by CID. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub swap_commit: std::option::Option>, - ///Compare and swap with the previous record by CID. WARNING: nullable and optional field; may cause problems with golang implementation + pub swap_commit: Option>, + /// Compare and swap with the previous record by CID. WARNING: nullable and optional field; may cause problems with golang implementation #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub swap_record: std::option::Option>, - ///Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. + pub swap_record: Option>, + /// Can be set to 'false' to skip Lexicon schema validation of record data, 'true' to require it, or leave unset to validate only for known Lexicons. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub validate: std::option::Option, + #[builder(into)] + pub validate: Option, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/com_atproto/repo/strong_ref.rs b/crates/jacquard-api/src/com_atproto/repo/strong_ref.rs index 1ccb75573..b0314bb7a 100644 --- a/crates/jacquard-api/src/com_atproto/repo/strong_ref.rs +++ b/crates/jacquard-api/src/com_atproto/repo/strong_ref.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct StrongRef<'a> { diff --git a/crates/jacquard-api/src/com_atproto/server.rs b/crates/jacquard-api/src/com_atproto/server.rs index 29687161d..96e442940 100644 --- a/crates/jacquard-api/src/com_atproto/server.rs +++ b/crates/jacquard-api/src/com_atproto/server.rs @@ -39,18 +39,22 @@ pub mod update_email; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct InviteCode<'a> { pub available: i64, #[serde(borrow)] + #[builder(into)] pub code: jacquard_common::CowStr<'a>, pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] + #[builder(into)] pub created_by: jacquard_common::CowStr<'a>, pub disabled: bool, #[serde(borrow)] + #[builder(into)] pub for_account: jacquard_common::CowStr<'a>, #[serde(borrow)] pub uses: Vec>, @@ -64,7 +68,8 @@ pub struct InviteCode<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct InviteCodeUse<'a> { diff --git a/crates/jacquard-api/src/com_atproto/server/create_account.rs b/crates/jacquard-api/src/com_atproto/server/create_account.rs index 57af81f9e..52fcaf851 100644 --- a/crates/jacquard-api/src/com_atproto/server/create_account.rs +++ b/crates/jacquard-api/src/com_atproto/server/create_account.rs @@ -19,43 +19,45 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct CreateAccount<'a> { - ///Pre-existing atproto DID, being imported to a new account. + /// Pre-existing atproto DID, being imported to a new account. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub did: std::option::Option>, + pub did: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub email: std::option::Option>, - ///Requested handle for the account. + #[serde(borrow)] + pub email: Option>, + /// Requested handle for the account. #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub invite_code: std::option::Option>, - ///Initial account password. May need to meet instance-specific password strength requirements. - #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] - #[builder(into)] - pub password: std::option::Option>, - ///A signed DID PLC operation to be submitted as part of importing an existing account to this instance. NOTE: this optional field may be updated when full account migration is implemented. + pub invite_code: Option>, + /// Initial account password. May need to meet instance-specific password strength requirements. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub plc_op: std::option::Option>, - ///DID PLC rotation key (aka, recovery key) to be included in PLC creation operation. + pub password: Option>, + /// A signed DID PLC operation to be submitted as part of importing an existing account to this instance. NOTE: this optional field may be updated when full account migration is implemented. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub recovery_key: std::option::Option>, - #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] + pub plc_op: Option>, + /// DID PLC rotation key (aka, recovery key) to be included in PLC creation operation. + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub verification_code: std::option::Option>, + #[serde(borrow)] + pub recovery_key: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] + pub verification_code: Option>, + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub verification_phone: std::option::Option>, + #[serde(borrow)] + pub verification_phone: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] @@ -79,10 +81,10 @@ pub struct CreateAccount<'a> { pub struct CreateAccountOutput<'a> { #[serde(borrow)] pub access_jwt: jacquard_common::CowStr<'a>, - ///The DID of the new account. + /// The DID of the new account. #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///Complete DID document. + /// Complete DID document. #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub did_doc: std::option::Option>, diff --git a/crates/jacquard-api/src/com_atproto/server/create_app_password.rs b/crates/jacquard-api/src/com_atproto/server/create_app_password.rs index f1dedddc2..df88ce192 100644 --- a/crates/jacquard-api/src/com_atproto/server/create_app_password.rs +++ b/crates/jacquard-api/src/com_atproto/server/create_app_password.rs @@ -13,17 +13,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AppPassword<'a> { pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub password: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub privileged: std::option::Option, + #[builder(into)] + pub privileged: Option, } #[jacquard_derive::lexicon] @@ -40,13 +44,14 @@ pub struct AppPassword<'a> { #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct CreateAppPassword<'a> { - ///A short name for the App Password, to help distinguish them. + /// A short name for the App Password, to help distinguish them. #[serde(borrow)] #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///If an app password has 'privileged' access to possibly sensitive account state. Meant for use with trusted clients. + /// If an app password has 'privileged' access to possibly sensitive account state. Meant for use with trusted clients. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub privileged: std::option::Option, + #[builder(into)] + pub privileged: Option, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs b/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs index 4cea4e9b7..9025eaac3 100644 --- a/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs +++ b/crates/jacquard-api/src/com_atproto/server/create_invite_code.rs @@ -20,8 +20,9 @@ #[builder(start_fn = new)] pub struct CreateInviteCode<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub for_account: std::option::Option>, + pub for_account: Option>, pub use_count: i64, #[serde(flatten)] #[serde(borrow)] diff --git a/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs b/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs index 156c60432..19dfa1a96 100644 --- a/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs +++ b/crates/jacquard-api/src/com_atproto/server/create_invite_codes.rs @@ -13,11 +13,13 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AccountCodes<'a> { #[serde(borrow)] + #[builder(into)] pub account: jacquard_common::CowStr<'a>, #[serde(borrow)] pub codes: Vec>, @@ -39,8 +41,9 @@ pub struct AccountCodes<'a> { pub struct CreateInviteCodes<'a> { pub code_count: i64, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub for_accounts: std::option::Option>>, + pub for_accounts: Option>>, pub use_count: i64, #[serde(flatten)] #[serde(borrow)] diff --git a/crates/jacquard-api/src/com_atproto/server/create_session.rs b/crates/jacquard-api/src/com_atproto/server/create_session.rs index dff2c5782..dac9b440f 100644 --- a/crates/jacquard-api/src/com_atproto/server/create_session.rs +++ b/crates/jacquard-api/src/com_atproto/server/create_session.rs @@ -19,14 +19,15 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct CreateSession<'a> { - ///When true, instead of throwing error for takendown accounts, a valid response with a narrow scoped token will be returned + /// When true, instead of throwing error for takendown accounts, a valid response with a narrow scoped token will be returned #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub allow_takendown: std::option::Option, + #[builder(into)] + pub allow_takendown: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub auth_factor_token: std::option::Option>, - ///Handle or other identifier supported by the server for the authenticating user. + #[serde(borrow)] + pub auth_factor_token: Option>, + /// Handle or other identifier supported by the server for the authenticating user. #[serde(borrow)] #[builder(into)] pub identifier: jacquard_common::CowStr<'a>, @@ -74,7 +75,7 @@ pub struct CreateSessionOutput<'a> { pub handle: jacquard_common::types::string::Handle<'a>, #[serde(borrow)] pub refresh_jwt: jacquard_common::CowStr<'a>, - ///If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. + /// If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub status: std::option::Option>, diff --git a/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs b/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs index 03000b213..97f56fd01 100644 --- a/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs +++ b/crates/jacquard-api/src/com_atproto/server/deactivate_account.rs @@ -19,9 +19,10 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct DeactivateAccount<'a> { - ///A recommendation to server as to how long they should hold onto the deactivated account before deleting. + /// A recommendation to server as to how long they should hold onto the deactivated account before deleting. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub delete_after: std::option::Option, + #[builder(into)] + pub delete_after: Option, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/com_atproto/server/describe_server.rs b/crates/jacquard-api/src/com_atproto/server/describe_server.rs index de8ed8175..6a9ccb520 100644 --- a/crates/jacquard-api/src/com_atproto/server/describe_server.rs +++ b/crates/jacquard-api/src/com_atproto/server/describe_server.rs @@ -13,13 +13,15 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Contact<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub email: std::option::Option>, + pub email: Option>, } #[jacquard_derive::lexicon] @@ -30,16 +32,19 @@ pub struct Contact<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Links<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub privacy_policy: std::option::Option>, + pub privacy_policy: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub terms_of_service: std::option::Option>, + pub terms_of_service: Option>, } #[jacquard_derive::lexicon] @@ -54,23 +59,23 @@ pub struct Links<'a> { )] #[serde(rename_all = "camelCase")] pub struct DescribeServerOutput<'a> { - ///List of domain suffixes that can be used in account handles. + /// List of domain suffixes that can be used in account handles. #[serde(borrow)] pub available_user_domains: Vec>, - ///Contact information + /// Contact information #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub contact: std::option::Option>, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///If true, an invite code must be supplied to create an account on this instance. + /// If true, an invite code must be supplied to create an account on this instance. #[serde(skip_serializing_if = "std::option::Option::is_none")] pub invite_code_required: std::option::Option, - ///URLs of service policy documents. + /// URLs of service policy documents. #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub links: std::option::Option>, - ///If true, a phone verification token must be supplied to create an account on this instance. + /// If true, a phone verification token must be supplied to create an account on this instance. #[serde(skip_serializing_if = "std::option::Option::is_none")] pub phone_verification_required: std::option::Option, } diff --git a/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs b/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs index 7f0de148d..a2594434f 100644 --- a/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs +++ b/crates/jacquard-api/src/com_atproto/server/get_service_auth.rs @@ -58,7 +58,7 @@ pub struct GetServiceAuthOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum GetServiceAuthError<'a> { - ///Indicates that the requested expiration date is not a valid. May be in the past or may be reliant on the requested scopes. + /// Indicates that the requested expiration date is not a valid. May be in the past or may be reliant on the requested scopes. #[serde(rename = "BadExpiration")] BadExpiration(std::option::Option), } diff --git a/crates/jacquard-api/src/com_atproto/server/get_session.rs b/crates/jacquard-api/src/com_atproto/server/get_session.rs index 6eb9187c4..0c4ebb4c1 100644 --- a/crates/jacquard-api/src/com_atproto/server/get_session.rs +++ b/crates/jacquard-api/src/com_atproto/server/get_session.rs @@ -33,7 +33,7 @@ pub struct GetSessionOutput<'a> { pub email_confirmed: std::option::Option, #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, - ///If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. + /// If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub status: std::option::Option>, diff --git a/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs b/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs index 497eef497..d4611b3af 100644 --- a/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs +++ b/crates/jacquard-api/src/com_atproto/server/list_app_passwords.rs @@ -13,15 +13,18 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AppPassword<'a> { pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub privileged: std::option::Option, + #[builder(into)] + pub privileged: Option, } #[jacquard_derive::lexicon] diff --git a/crates/jacquard-api/src/com_atproto/server/refresh_session.rs b/crates/jacquard-api/src/com_atproto/server/refresh_session.rs index a1e25c265..2feeca643 100644 --- a/crates/jacquard-api/src/com_atproto/server/refresh_session.rs +++ b/crates/jacquard-api/src/com_atproto/server/refresh_session.rs @@ -30,7 +30,7 @@ pub struct RefreshSessionOutput<'a> { pub handle: jacquard_common::types::string::Handle<'a>, #[serde(borrow)] pub refresh_jwt: jacquard_common::CowStr<'a>, - ///Hosting status of the account. If not specified, then assume 'active'. + /// Hosting status of the account. If not specified, then assume 'active'. #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub status: std::option::Option>, diff --git a/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs b/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs index 052f335f5..3be968854 100644 --- a/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs +++ b/crates/jacquard-api/src/com_atproto/server/reserve_signing_key.rs @@ -19,10 +19,11 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct ReserveSigningKey<'a> { - ///The DID to reserve a key for. + /// The DID to reserve a key for. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub did: std::option::Option>, + pub did: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] @@ -44,7 +45,7 @@ pub struct ReserveSigningKey<'a> { )] #[serde(rename_all = "camelCase")] pub struct ReserveSigningKeyOutput<'a> { - ///The public key for the reserved signing key, in did:key serialization. + /// The public key for the reserved signing key, in did:key serialization. #[serde(borrow)] pub signing_key: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/com_atproto/server/update_email.rs b/crates/jacquard-api/src/com_atproto/server/update_email.rs index 82a68765b..039b12d9d 100644 --- a/crates/jacquard-api/src/com_atproto/server/update_email.rs +++ b/crates/jacquard-api/src/com_atproto/server/update_email.rs @@ -23,12 +23,13 @@ pub struct UpdateEmail<'a> { #[builder(into)] pub email: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub email_auth_factor: std::option::Option, - ///Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. + #[builder(into)] + pub email_auth_factor: Option, + /// Requires a token from com.atproto.sever.requestEmailUpdate if the account's email has been confirmed. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub token: std::option::Option>, + #[serde(borrow)] + pub token: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs b/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs index 6a43b1d89..cf0ba6578 100644 --- a/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs +++ b/crates/jacquard-api/src/com_atproto/sync/get_host_status.rs @@ -35,12 +35,12 @@ pub struct GetHostStatus<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetHostStatusOutput<'a> { - ///Number of accounts on the server which are associated with the upstream host. Note that the upstream may actually have more accounts. + /// Number of accounts on the server which are associated with the upstream host. Note that the upstream may actually have more accounts. #[serde(skip_serializing_if = "std::option::Option::is_none")] pub account_count: std::option::Option, #[serde(borrow)] pub hostname: jacquard_common::CowStr<'a>, - ///Recent repo stream event sequence number. May be delayed from actual stream processing (eg, persisted cursor not in-memory cursor). + /// Recent repo stream event sequence number. May be delayed from actual stream processing (eg, persisted cursor not in-memory cursor). #[serde(skip_serializing_if = "std::option::Option::is_none")] pub seq: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] diff --git a/crates/jacquard-api/src/com_atproto/sync/get_repo_status.rs b/crates/jacquard-api/src/com_atproto/sync/get_repo_status.rs index 738130535..e5c29a2d2 100644 --- a/crates/jacquard-api/src/com_atproto/sync/get_repo_status.rs +++ b/crates/jacquard-api/src/com_atproto/sync/get_repo_status.rs @@ -37,10 +37,10 @@ pub struct GetRepoStatusOutput<'a> { pub active: bool, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///Optional field, the current rev of the repo, if active=true + /// Optional field, the current rev of the repo, if active=true #[serde(skip_serializing_if = "std::option::Option::is_none")] pub rev: std::option::Option, - ///If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. + /// If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub status: std::option::Option>, diff --git a/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs b/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs index a2c238e79..0b1814538 100644 --- a/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs +++ b/crates/jacquard-api/src/com_atproto/sync/list_hosts.rs @@ -13,21 +13,26 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Host<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub account_count: std::option::Option, - ///hostname of server; not a URL (no scheme) + #[builder(into)] + pub account_count: Option, + /// hostname of server; not a URL (no scheme) #[serde(borrow)] + #[builder(into)] pub hostname: jacquard_common::CowStr<'a>, - ///Recent repo stream event sequence number. May be delayed from actual stream processing (eg, persisted cursor not in-memory cursor). + /// Recent repo stream event sequence number. May be delayed from actual stream processing (eg, persisted cursor not in-memory cursor). #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub seq: std::option::Option, + #[builder(into)] + pub seq: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option>, + pub status: Option>, } #[derive( @@ -67,7 +72,7 @@ pub struct ListHostsOutput<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, - ///Sort order is not formally specified. Recommended order is by time host was first seen by the server, with oldest first. + /// Sort order is not formally specified. Recommended order is by time host was first seen by the server, with oldest first. #[serde(borrow)] pub hosts: Vec>, } diff --git a/crates/jacquard-api/src/com_atproto/sync/list_repos.rs b/crates/jacquard-api/src/com_atproto/sync/list_repos.rs index 31064f305..2104c4025 100644 --- a/crates/jacquard-api/src/com_atproto/sync/list_repos.rs +++ b/crates/jacquard-api/src/com_atproto/sync/list_repos.rs @@ -80,20 +80,23 @@ impl jacquard_common::xrpc::XrpcEndpoint for ListReposRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Repo<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub active: std::option::Option, + #[builder(into)] + pub active: Option, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///Current repo commit CID + /// Current repo commit CID #[serde(borrow)] pub head: jacquard_common::types::string::Cid<'a>, pub rev: jacquard_common::types::string::Tid, - ///If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. + /// If active=false, this optional field indicates a possible reason for why the account is not active. If active=false and no status is supplied, then the host makes no claim for why the repository is no longer being hosted. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option>, + pub status: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs b/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs index 4cfc6ccf4..21e71fe2a 100644 --- a/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs +++ b/crates/jacquard-api/src/com_atproto/sync/list_repos_by_collection.rs @@ -82,7 +82,8 @@ impl jacquard_common::xrpc::XrpcEndpoint for ListReposByCollectionRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Repo<'a> { diff --git a/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs b/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs index e4e5e39c1..1f57e87d5 100644 --- a/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs +++ b/crates/jacquard-api/src/com_atproto/sync/notify_of_update.rs @@ -19,7 +19,7 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct NotifyOfUpdate<'a> { - ///Hostname of the current service (usually a PDS) that is notifying of update. + /// Hostname of the current service (usually a PDS) that is notifying of update. #[serde(borrow)] #[builder(into)] pub hostname: jacquard_common::CowStr<'a>, diff --git a/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs b/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs index 8620e2fe5..43176b489 100644 --- a/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs +++ b/crates/jacquard-api/src/com_atproto/sync/request_crawl.rs @@ -19,7 +19,7 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct RequestCrawl<'a> { - ///Hostname of the current service (eg, PDS) that is requesting to be crawled. + /// Hostname of the current service (eg, PDS) that is requesting to be crawled. #[serde(borrow)] #[builder(into)] pub hostname: jacquard_common::CowStr<'a>, diff --git a/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs b/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs index fff250119..f81232ac7 100644 --- a/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs +++ b/crates/jacquard-api/src/com_atproto/sync/subscribe_repos.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active. +/// Represents a change to an account's status on a host (eg, PDS or Relay). The semantics of this event are that the status is at the host which emitted the event, not necessarily that at the currently active PDS. Eg, a Relay takedown would emit a takedown with active=false, even if the PDS is still active. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,23 +14,25 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Account<'a> { - ///Indicates that the account has a repository which can be fetched from the host that emitted this event. + /// Indicates that the account has a repository which can be fetched from the host that emitted this event. pub active: bool, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, pub seq: i64, - ///If active=false, this optional field indicates a reason for why the account is not active. + /// If active=false, this optional field indicates a reason for why the account is not active. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option>, + pub status: Option>, pub time: jacquard_common::types::string::Datetime, } -///Represents an update of repository state. Note that empty commits are allowed, which include no repo data changes, but an update to rev and signature. +/// Represents an update of repository state. Note that empty commits are allowed, which include no repo data changes, but an update to rev and signature. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -39,41 +41,43 @@ pub struct Account<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Commit<'a> { #[serde(borrow)] pub blobs: Vec>, - ///CAR file containing relevant blocks, as a diff since the previous repo state. The commit must be included as a block, and the commit block CID must be the first entry in the CAR header 'roots' list. + /// CAR file containing relevant blocks, as a diff since the previous repo state. The commit must be included as a block, and the commit block CID must be the first entry in the CAR header 'roots' list. pub blocks: bytes::Bytes, - ///Repo commit object CID. + /// Repo commit object CID. #[serde(borrow)] pub commit: jacquard_common::types::cid::CidLink<'a>, #[serde(borrow)] pub ops: Vec>, - ///The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. + /// The root CID of the MST tree for the previous commit from this repo (indicated by the 'since' revision field in this message). Corresponds to the 'data' field in the repo commit object. NOTE: this field is effectively required for the 'inductive' version of firehose. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub prev_data: std::option::Option>, - ///DEPRECATED -- unused + pub prev_data: Option>, + /// DEPRECATED -- unused pub rebase: bool, - ///The repo this event comes from. Note that all other message types name this field 'did'. + /// The repo this event comes from. Note that all other message types name this field 'did'. #[serde(borrow)] pub repo: jacquard_common::types::string::Did<'a>, - ///The rev of the emitted commit. Note that this information is also in the commit object included in blocks, unless this is a tooBig event. + /// The rev of the emitted commit. Note that this information is also in the commit object included in blocks, unless this is a tooBig event. pub rev: jacquard_common::types::string::Tid, - ///The stream sequence number of this message. + /// The stream sequence number of this message. pub seq: i64, - ///The rev of the last emitted commit from this repo (if any). + /// The rev of the last emitted commit from this repo (if any). pub since: jacquard_common::types::string::Tid, - ///Timestamp of when this message was originally broadcast. + /// Timestamp of when this message was originally broadcast. pub time: jacquard_common::types::string::Datetime, - ///DEPRECATED -- replaced by #sync event and data limits. Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data. + /// DEPRECATED -- replaced by #sync event and data limits. Indicates that this commit contained too many ops, or data size was too large. Consumers will need to make a separate request to get missing data. pub too_big: bool, } -///Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. +/// Represents a change to an account's identity. Could be an updated handle, signing key, or pds hosting endpoint. Serves as a prod to all downstream services to refresh their identity cache. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -82,16 +86,18 @@ pub struct Commit<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Identity<'a> { #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///The current handle for the account, or 'handle.invalid' if validation fails. This field is optional, might have been validated or passed-through from an upstream source. Semantics and behaviors for PDS vs Relay may evolve in the future; see atproto specs for more details. + /// The current handle for the account, or 'handle.invalid' if validation fails. This field is optional, might have been validated or passed-through from an upstream source. Semantics and behaviors for PDS vs Relay may evolve in the future; see atproto specs for more details. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub handle: std::option::Option>, + pub handle: Option>, pub seq: i64, pub time: jacquard_common::types::string::Datetime, } @@ -104,14 +110,17 @@ pub struct Identity<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Info<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub message: std::option::Option>, + pub message: Option>, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } @@ -174,7 +183,7 @@ pub enum SubscribeReposMessage<'a> { pub enum SubscribeReposError<'a> { #[serde(rename = "FutureCursor")] FutureCursor(std::option::Option), - ///If the consumer of the stream can not keep up with events, and a backlog gets too large, the server will drop the connection. + /// If the consumer of the stream can not keep up with events, and a backlog gets too large, the server will drop the connection. #[serde(rename = "ConsumerTooSlow")] ConsumerTooSlow(std::option::Option), } @@ -201,7 +210,7 @@ impl std::fmt::Display for SubscribeReposError<'_> { } } -///A repo operation, ie a mutation of a single record. +/// A repo operation, ie a mutation of a single record. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -210,24 +219,28 @@ impl std::fmt::Display for SubscribeReposError<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RepoOp<'a> { #[serde(borrow)] + #[builder(into)] pub action: jacquard_common::CowStr<'a>, - ///For creates and updates, the new record CID. For deletions, null. + /// For creates and updates, the new record CID. For deletions, null. #[serde(borrow)] pub cid: jacquard_common::types::cid::CidLink<'a>, #[serde(borrow)] + #[builder(into)] pub path: jacquard_common::CowStr<'a>, - ///For updates and deletes, the previous record CID (required for inductive firehose). For creations, field should not be defined. + /// For updates and deletes, the previous record CID (required for inductive firehose). For creations, field should not be defined. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub prev: std::option::Option>, + pub prev: Option>, } -///Updates the repo to a new state, without necessarily including that state on the firehose. Used to recover from broken commit streams, data loss incidents, or in situations where upstream host does not know recent state of the repository. +/// Updates the repo to a new state, without necessarily including that state on the firehose. Used to recover from broken commit streams, data loss incidents, or in situations where upstream host does not know recent state of the repository. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -236,20 +249,22 @@ pub struct RepoOp<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Sync<'a> { - ///CAR file containing the commit, as a block. The CAR header must include the commit block CID as the first 'root'. + /// CAR file containing the commit, as a block. The CAR header must include the commit block CID as the first 'root'. pub blocks: bytes::Bytes, - ///The account this repo event corresponds to. Must match that in the commit object. + /// The account this repo event corresponds to. Must match that in the commit object. #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///The rev of the commit. This value must match that in the commit object. + /// The rev of the commit. This value must match that in the commit object. #[serde(borrow)] + #[builder(into)] pub rev: jacquard_common::CowStr<'a>, - ///The stream sequence number of this message. + /// The stream sequence number of this message. pub seq: i64, - ///Timestamp of when this message was originally broadcast. + /// Timestamp of when this message was originally broadcast. pub time: jacquard_common::types::string::Datetime, } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs b/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs index fab83724d..3c27693e7 100644 --- a/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs +++ b/crates/jacquard-api/src/com_atproto/temp/check_handle_availability.rs @@ -40,7 +40,7 @@ pub struct CheckHandleAvailability<'a> { )] #[serde(rename_all = "camelCase")] pub struct CheckHandleAvailabilityOutput<'a> { - ///Echo of the input handle. + /// Echo of the input handle. #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, #[serde(borrow)] @@ -85,7 +85,7 @@ pub enum CheckHandleAvailabilityOutputResult<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum CheckHandleAvailabilityError<'a> { - ///An invalid email was provided. + /// An invalid email was provided. #[serde(rename = "InvalidEmail")] InvalidEmail(std::option::Option), } @@ -131,7 +131,7 @@ impl jacquard_common::xrpc::XrpcEndpoint for CheckHandleAvailabilityRequest { type Response = CheckHandleAvailabilityResponse; } -///Indicates the provided handle is available. +/// Indicates the provided handle is available. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -140,11 +140,12 @@ impl jacquard_common::xrpc::XrpcEndpoint for CheckHandleAvailabilityRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ResultAvailable<'a> {} -///Indicates the provided handle is unavailable and gives suggestions of available handles. +/// Indicates the provided handle is unavailable and gives suggestions of available handles. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -153,11 +154,12 @@ pub struct ResultAvailable<'a> {} Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ResultUnavailable<'a> { - ///List of suggested handles based on the provided inputs. + /// List of suggested handles based on the provided inputs. #[serde(borrow)] pub suggestions: Vec< crate::com_atproto::temp::check_handle_availability::Suggestion<'a>, @@ -172,13 +174,15 @@ pub struct ResultUnavailable<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Suggestion<'a> { #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, - ///Method used to build this suggestion. Should be considered opaque to clients. Can be used for metrics. + /// Method used to build this suggestion. Should be considered opaque to clients. Can be used for metrics. #[serde(borrow)] + #[builder(into)] pub method: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs b/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs index 412dc5aa9..066231b89 100644 --- a/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs +++ b/crates/jacquard-api/src/com_atproto/temp/dereference_scope.rs @@ -35,7 +35,7 @@ pub struct DereferenceScope<'a> { )] #[serde(rename_all = "camelCase")] pub struct DereferenceScopeOutput<'a> { - ///The full oauth permission scope + /// The full oauth permission scope #[serde(borrow)] pub scope: jacquard_common::CowStr<'a>, } @@ -55,7 +55,7 @@ pub struct DereferenceScopeOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum DereferenceScopeError<'a> { - ///An invalid scope reference was provided. + /// An invalid scope reference was provided. #[serde(rename = "InvalidScopeReference")] InvalidScopeReference(std::option::Option), } diff --git a/crates/jacquard-api/src/com_bad_example/identity/resolve_mini_doc.rs b/crates/jacquard-api/src/com_bad_example/identity/resolve_mini_doc.rs index 31c8247eb..eac4d393f 100644 --- a/crates/jacquard-api/src/com_bad_example/identity/resolve_mini_doc.rs +++ b/crates/jacquard-api/src/com_bad_example/identity/resolve_mini_doc.rs @@ -34,17 +34,17 @@ pub struct ResolveMiniDoc<'a> { )] #[serde(rename_all = "camelCase")] pub struct ResolveMiniDocOutput<'a> { - ///DID, bi-directionally verified if a handle was provided in the query. + /// DID, bi-directionally verified if a handle was provided in the query. #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - /**The validated handle of the account or `handle.invalid` if the handle + /** The validated handle of the account or `handle.invalid` if the handle did not bi-directionally match the DID document.*/ #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, - ///The identity's PDS URL + /// The identity's PDS URL #[serde(borrow)] pub pds: jacquard_common::types::string::Uri<'a>, - /**The atproto signing key publicKeyMultibase + /** The atproto signing key publicKeyMultibase Legacy key encoding not supported. the key is returned directly; `id`, `type`, and `controller` are omitted.*/ diff --git a/crates/jacquard-api/src/com_crabdance/nandi/post.rs b/crates/jacquard-api/src/com_crabdance/nandi/post.rs index 024fb491f..1b7c8edf9 100644 --- a/crates/jacquard-api/src/com_crabdance/nandi/post.rs +++ b/crates/jacquard-api/src/com_crabdance/nandi/post.rs @@ -13,30 +13,37 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Post<'a> { - ///The main content of the blog post in markdown + /// The main content of the blog post in markdown #[serde(borrow)] + #[builder(into)] pub content: jacquard_common::CowStr<'a>, pub created_at: jacquard_common::types::string::Datetime, - ///Whether the post is published or draft + /// Whether the post is published or draft #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub published: std::option::Option, - ///Optional summary/excerpt of the post + #[builder(into)] + pub published: Option, + /// Optional summary/excerpt of the post #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub summary: std::option::Option>, - ///Tags for categorizing the post + pub summary: Option>, + /// Tags for categorizing the post #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>>, - ///The title of the blog post + pub tags: Option>>, + /// The title of the blog post #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs index a0c417051..e68715dbf 100644 --- a/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs +++ b/crates/jacquard-api/src/com_shinolabs/pinksea/app_view_defs.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///An author for an oekaki post +/// An author for an oekaki post #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,19 +14,20 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Author<'a> { - ///The DID of the author + /// The DID of the author #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///The handle of the author. + /// The handle of the author. #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, } -///A hydrated oekaki post returned from the PinkSea app view. +/// A hydrated oekaki post returned from the PinkSea app view. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -35,36 +36,39 @@ pub struct Author<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct HydratedOekaki<'a> { - ///Alt text description of the image, for accessibility. + /// Alt text description of the image, for accessibility. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub alt: std::option::Option>, - ///The AT protocol link. + pub alt: Option>, + /// The AT protocol link. #[serde(borrow)] pub at: jacquard_common::types::string::Uri<'a>, #[serde(borrow)] pub author: crate::com_shinolabs::pinksea::app_view_defs::Author<'a>, - ///The oekaki CID. + /// The oekaki CID. #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, - ///The creation time. + /// The creation time. pub creation_time: jacquard_common::types::string::Datetime, - ///The image link. + /// The image link. #[serde(borrow)] pub image: jacquard_common::types::string::Uri<'a>, - ///Is this oekaki NSFW? + /// Is this oekaki NSFW? pub nsfw: bool, - ///An array of tags this image had. + /// An array of tags this image had. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>>, + pub tags: Option>>, } -///A tombstone for a missing oekaki. +/// A tombstone for a missing oekaki. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -73,11 +77,12 @@ pub struct HydratedOekaki<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct OekakiTombstone<'a> { - ///The AT uri of the former oekaki. + /// The AT uri of the former oekaki. #[serde(borrow)] pub former_at: jacquard_common::types::string::AtUri<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/get_handle_from_did.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/get_handle_from_did.rs index 37b2f96f3..bb2ffb4d2 100644 --- a/crates/jacquard-api/src/com_shinolabs/pinksea/get_handle_from_did.rs +++ b/crates/jacquard-api/src/com_shinolabs/pinksea/get_handle_from_did.rs @@ -34,7 +34,7 @@ pub struct GetHandleFromDid<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetHandleFromDidOutput<'a> { - ///The handle. + /// The handle. #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, } diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/get_identity.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/get_identity.rs index 47c54a5f1..ce2a35c9c 100644 --- a/crates/jacquard-api/src/com_shinolabs/pinksea/get_identity.rs +++ b/crates/jacquard-api/src/com_shinolabs/pinksea/get_identity.rs @@ -30,10 +30,10 @@ pub struct GetIdentity {} )] #[serde(rename_all = "camelCase")] pub struct GetIdentityOutput<'a> { - ///The DID of the user. + /// The DID of the user. #[serde(borrow)] pub did: jacquard_common::types::ident::AtIdentifier<'a>, - ///The handle of the author. + /// The handle of the author. #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, } diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/get_parent_for_reply.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/get_parent_for_reply.rs index 1df0a79cc..52bb42e36 100644 --- a/crates/jacquard-api/src/com_shinolabs/pinksea/get_parent_for_reply.rs +++ b/crates/jacquard-api/src/com_shinolabs/pinksea/get_parent_for_reply.rs @@ -37,10 +37,10 @@ pub struct GetParentForReply<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetParentForReplyOutput<'a> { - ///The DID of the author. + /// The DID of the author. #[serde(borrow)] pub did: jacquard_common::types::ident::AtIdentifier<'a>, - ///The record key. + /// The record key. #[serde(borrow)] pub rkey: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs index 016728103..ba47b9c6e 100644 --- a/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs +++ b/crates/jacquard-api/src/com_shinolabs/pinksea/oekaki.rs @@ -13,18 +13,19 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Image<'a> { - ///The actual atproto image blob. + /// The actual atproto image blob. #[serde(borrow)] pub blob: jacquard_common::types::blob::Blob<'a>, #[serde(borrow)] pub image_link: crate::com_shinolabs::pinksea::oekaki::ImageLink<'a>, } -///A link to the image, it can be either directly to the PDS or to a CDN. +/// A link to the image, it can be either directly to the PDS or to a CDN. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -33,17 +34,19 @@ pub struct Image<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ImageLink<'a> { - ///Alt text description of the image, for accessibility. + /// Alt text description of the image, for accessibility. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub alt: std::option::Option>, + pub alt: Option>, } -///An oekaki post. +/// An oekaki post. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -52,27 +55,29 @@ pub struct ImageLink<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Oekaki<'a> { - ///The timestamp of creation. + /// The timestamp of creation. pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] pub image: crate::com_shinolabs::pinksea::oekaki::Image<'a>, - ///What this oekaki post is a response to. + /// What this oekaki post is a response to. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub in_response_to: std::option::Option< - crate::com_atproto::repo::strong_ref::StrongRef<'a>, - >, - ///Is this oekaki NSFW? + pub in_response_to: Option>, + /// Is this oekaki NSFW? #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub nsfw: std::option::Option, - ///An array of tags this image had. + #[builder(into)] + pub nsfw: Option, + /// An array of tags this image had. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>>, + pub tags: Option>>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs b/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs index e9f56c61a..fbf4edade 100644 --- a/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs +++ b/crates/jacquard-api/src/com_shinolabs/pinksea/profile.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A profile of a PinkSea user. +/// A profile of a PinkSea user. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,28 +14,31 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Profile<'a> { - ///The oekaki image that's the avatar of this profile. + /// The oekaki image that's the avatar of this profile. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, - ///The bio of the user. + pub avatar: Option>, + /// The bio of the user. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub bio: std::option::Option>, - ///The links to outside platforms for this user + pub bio: Option>, + /// The links to outside platforms for this user #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub links: std::option::Option< - Vec>, - >, - ///The display name of the user. + pub links: Option>>, + /// The display name of the user. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub nickname: std::option::Option>, + pub nickname: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. @@ -88,14 +91,16 @@ impl From> for Profile<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ProfileLink<'a> { - ///The URL of the link. + /// The URL of the link. #[serde(borrow)] pub link: jacquard_common::types::string::Uri<'a>, - ///The name of the link. + /// The name of the link. #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_whtwnd/blog.rs b/crates/jacquard-api/src/com_whtwnd/blog.rs index 902df0ad5..e70ce08f9 100644 --- a/crates/jacquard-api/src/com_whtwnd/blog.rs +++ b/crates/jacquard-api/src/com_whtwnd/blog.rs @@ -19,15 +19,17 @@ pub mod notify_of_new_entry; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct BlobMetadata<'a> { #[serde(borrow)] pub blobref: jacquard_common::types::blob::Blob<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, + pub name: Option>, } #[jacquard_derive::lexicon] @@ -38,14 +40,17 @@ pub struct BlobMetadata<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct BlogEntry<'a> { #[serde(borrow)] + #[builder(into)] pub content: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, } #[jacquard_derive::lexicon] @@ -56,11 +61,13 @@ pub struct BlogEntry<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Comment<'a> { #[serde(borrow)] + #[builder(into)] pub content: jacquard_common::CowStr<'a>, #[serde(borrow)] pub entry_uri: jacquard_common::types::string::AtUri<'a>, @@ -74,14 +81,17 @@ pub struct Comment<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Ogp<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub height: std::option::Option, + #[builder(into)] + pub height: Option, #[serde(borrow)] pub url: jacquard_common::types::string::Uri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub width: std::option::Option, + #[builder(into)] + pub width: Option, } \ No newline at end of file diff --git a/crates/jacquard-api/src/com_whtwnd/blog/entry.rs b/crates/jacquard-api/src/com_whtwnd/blog/entry.rs index 7c525bd6c..8d15a3760 100644 --- a/crates/jacquard-api/src/com_whtwnd/blog/entry.rs +++ b/crates/jacquard-api/src/com_whtwnd/blog/entry.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of a post. +/// A declaration of a post. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,36 +14,46 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Entry<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub blobs: std::option::Option>>, + pub blobs: Option>>, #[serde(borrow)] + #[builder(into)] pub content: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, - ///(DEPRECATED) Marks this entry as draft to tell AppViews not to show it to anyone except for the author + #[builder(into)] + pub created_at: Option, + /// (DEPRECATED) Marks this entry as draft to tell AppViews not to show it to anyone except for the author #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub is_draft: std::option::Option, + #[builder(into)] + pub is_draft: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub ogp: std::option::Option>, + pub ogp: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subtitle: std::option::Option>, + pub subtitle: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub theme: std::option::Option>, + pub theme: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub title: std::option::Option>, - ///Tells the visibility of the article to AppView. + pub title: Option>, + /// Tells the visibility of the article to AppView. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub visibility: std::option::Option>, + pub visibility: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/com_whtwnd/blog/get_entry_metadata_by_name.rs b/crates/jacquard-api/src/com_whtwnd/blog/get_entry_metadata_by_name.rs index f3b77561a..a1e8e6dd9 100644 --- a/crates/jacquard-api/src/com_whtwnd/blog/get_entry_metadata_by_name.rs +++ b/crates/jacquard-api/src/com_whtwnd/blog/get_entry_metadata_by_name.rs @@ -61,7 +61,7 @@ pub struct GetEntryMetadataByNameOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum GetEntryMetadataByNameError<'a> { - ///If the associated name isn't registered in the author's repo, this error is returned + /// If the associated name isn't registered in the author's repo, this error is returned #[serde(rename = "NotFound")] NotFound(std::option::Option), } diff --git a/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs b/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs index 51766ffa0..48cfc3b58 100644 --- a/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs +++ b/crates/jacquard-api/src/community_lexicon/bookmarks/bookmark.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record bookmarking a link to come back to later. +/// Record bookmarking a link to come back to later. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,17 +14,19 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Bookmark<'a> { pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] pub subject: jacquard_common::types::string::Uri<'a>, - ///Tags for content the bookmark may be related to, for example 'news' or 'funny videos' + /// Tags for content the bookmark may be related to, for example 'news' or 'funny videos' #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>>, + pub tags: Option>>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/community_lexicon/calendar/event.rs b/crates/jacquard-api/src/community_lexicon/calendar/event.rs index ecbcb0c29..bf984771d 100644 --- a/crates/jacquard-api/src/community_lexicon/calendar/event.rs +++ b/crates/jacquard-api/src/community_lexicon/calendar/event.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///The event has been cancelled. +/// The event has been cancelled. #[derive( serde::Serialize, serde::Deserialize, @@ -23,7 +23,7 @@ impl std::fmt::Display for Cancelled { } } -///A hybrid event that takes place both online and offline. +/// A hybrid event that takes place both online and offline. #[derive( serde::Serialize, serde::Deserialize, @@ -41,7 +41,7 @@ impl std::fmt::Display for Hybrid { } } -///An in-person event that takes place offline. +/// An in-person event that takes place offline. #[derive( serde::Serialize, serde::Deserialize, @@ -59,7 +59,7 @@ impl std::fmt::Display for Inperson { } } -///A calendar event. +/// A calendar event. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -68,45 +68,50 @@ impl std::fmt::Display for Inperson { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Event<'a> { - ///Client-declared timestamp when the event was created. + /// Client-declared timestamp when the event was created. pub created_at: jacquard_common::types::string::Datetime, - ///The description of the event. + /// The description of the event. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///Client-declared timestamp when the event ends. + pub description: Option>, + /// Client-declared timestamp when the event ends. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub ends_at: std::option::Option, - ///The locations where the event takes place. + #[builder(into)] + pub ends_at: Option, + /// The locations where the event takes place. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub locations: std::option::Option>>, - ///The attendance mode of the event. + pub locations: Option>>, + /// The attendance mode of the event. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub mode: std::option::Option>, - ///The name of the event. + pub mode: Option>, + /// The name of the event. #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Client-declared timestamp when the event starts. + /// Client-declared timestamp when the event starts. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub starts_at: std::option::Option, - ///The status of the event. + #[builder(into)] + pub starts_at: Option, + /// The status of the event. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option< - crate::community_lexicon::calendar::event::Status<'a>, - >, - ///URIs associated with the event. + pub status: Option>, + /// URIs associated with the event. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub uris: std::option::Option< - Vec>, - >, + pub uris: Option>>, } #[jacquard_derive::open_union] @@ -176,7 +181,7 @@ impl From> for Event<'_> { } } -///The mode of the event. +/// The mode of the event. #[derive(Debug, Clone, PartialEq, Eq, Hash)] pub enum Mode<'a> { CommunityLexiconCalendarEventHybrid, @@ -282,7 +287,7 @@ impl jacquard_common::IntoStatic for Mode<'_> { } } -///The event has been created, but not finalized. +/// The event has been created, but not finalized. #[derive( serde::Serialize, serde::Deserialize, @@ -300,7 +305,7 @@ impl std::fmt::Display for Planned { } } -///The event has been postponed and a new start date has not been set. +/// The event has been postponed and a new start date has not been set. #[derive( serde::Serialize, serde::Deserialize, @@ -318,7 +323,7 @@ impl std::fmt::Display for Postponed { } } -///The event has been rescheduled. +/// The event has been rescheduled. #[derive( serde::Serialize, serde::Deserialize, @@ -336,7 +341,7 @@ impl std::fmt::Display for Rescheduled { } } -///The event has been created and scheduled. +/// The event has been created and scheduled. #[derive( serde::Serialize, serde::Deserialize, @@ -354,7 +359,7 @@ impl std::fmt::Display for Scheduled { } } -///The status of the event. +/// The status of the event. #[derive(Debug, Clone, PartialEq, Eq, Hash)] pub enum Status<'a> { CommunityLexiconCalendarEventCancelled, @@ -486,7 +491,7 @@ impl jacquard_common::IntoStatic for Status<'_> { } } -///A URI associated with the event. +/// A URI associated with the event. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -495,19 +500,21 @@ impl jacquard_common::IntoStatic for Status<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Uri<'a> { - ///The display name of the URI. + /// The display name of the URI. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, + pub name: Option>, #[serde(borrow)] pub uri: jacquard_common::types::string::Uri<'a>, } -///A virtual event that takes place online. +/// A virtual event that takes place online. #[derive( serde::Serialize, serde::Deserialize, diff --git a/crates/jacquard-api/src/community_lexicon/calendar/rsvp.rs b/crates/jacquard-api/src/community_lexicon/calendar/rsvp.rs index c04031770..0c9d6a033 100644 --- a/crates/jacquard-api/src/community_lexicon/calendar/rsvp.rs +++ b/crates/jacquard-api/src/community_lexicon/calendar/rsvp.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Going to the event +/// Going to the event #[derive( serde::Serialize, serde::Deserialize, @@ -23,7 +23,7 @@ impl std::fmt::Display for Going { } } -///Interested in the event +/// Interested in the event #[derive( serde::Serialize, serde::Deserialize, @@ -41,7 +41,7 @@ impl std::fmt::Display for Interested { } } -///An RSVP for an event. +/// An RSVP for an event. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -50,11 +50,13 @@ impl std::fmt::Display for Interested { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Rsvp<'a> { #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, #[serde(borrow)] pub subject: crate::com_atproto::repo::strong_ref::StrongRef<'a>, @@ -102,7 +104,7 @@ impl From> for Rsvp<'_> { } } -///Not going to the event +/// Not going to the event #[derive( serde::Serialize, serde::Deserialize, diff --git a/crates/jacquard-api/src/community_lexicon/interaction/like.rs b/crates/jacquard-api/src/community_lexicon/interaction/like.rs index 7dec7e66a..c2ff9286a 100644 --- a/crates/jacquard-api/src/community_lexicon/interaction/like.rs +++ b/crates/jacquard-api/src/community_lexicon/interaction/like.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A 'like' interaction with another AT Protocol record. +/// A 'like' interaction with another AT Protocol record. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,7 +14,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Like<'a> { diff --git a/crates/jacquard-api/src/community_lexicon/location/address.rs b/crates/jacquard-api/src/community_lexicon/location/address.rs index 797e2f16f..522a8d784 100644 --- a/crates/jacquard-api/src/community_lexicon/location/address.rs +++ b/crates/jacquard-api/src/community_lexicon/location/address.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A physical location in the form of a street address. +/// A physical location in the form of a street address. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,31 +14,38 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Address<'a> { - ///The ISO 3166 country code. Preferably the 2-letter code. + /// The ISO 3166 country code. Preferably the 2-letter code. #[serde(borrow)] + #[builder(into)] pub country: jacquard_common::CowStr<'a>, - ///The locality of the region. For example, a city in the USA. + /// The locality of the region. For example, a city in the USA. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub locality: std::option::Option>, - ///The name of the location. + pub locality: Option>, + /// The name of the location. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, - ///The postal code of the location. + pub name: Option>, + /// The postal code of the location. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub postal_code: std::option::Option>, - ///The administrative region of the country. For example, a state in the USA. + pub postal_code: Option>, + /// The administrative region of the country. For example, a state in the USA. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub region: std::option::Option>, - ///The street address. + pub region: Option>, + /// The street address. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub street: std::option::Option>, + pub street: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/community_lexicon/location/fsq.rs b/crates/jacquard-api/src/community_lexicon/location/fsq.rs index 0ca8269ce..71e25197b 100644 --- a/crates/jacquard-api/src/community_lexicon/location/fsq.rs +++ b/crates/jacquard-api/src/community_lexicon/location/fsq.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A physical location contained in the Foursquare Open Source Places dataset. +/// A physical location contained in the Foursquare Open Source Places dataset. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,21 +14,26 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Fsq<'a> { - ///The unique identifier of a Foursquare POI. + /// The unique identifier of a Foursquare POI. #[serde(borrow)] + #[builder(into)] pub fsq_place_id: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub latitude: std::option::Option>, + pub latitude: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub longitude: std::option::Option>, - ///The name of the location. + pub longitude: Option>, + /// The name of the location. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, + pub name: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/community_lexicon/location/geo.rs b/crates/jacquard-api/src/community_lexicon/location/geo.rs index 48920d2ba..46999b155 100644 --- a/crates/jacquard-api/src/community_lexicon/location/geo.rs +++ b/crates/jacquard-api/src/community_lexicon/location/geo.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A physical location in the form of a WGS84 coordinate. +/// A physical location in the form of a WGS84 coordinate. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,19 +14,24 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Geo<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub altitude: std::option::Option>, + pub altitude: Option>, #[serde(borrow)] + #[builder(into)] pub latitude: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub longitude: jacquard_common::CowStr<'a>, - ///The name of the location. + /// The name of the location. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, + pub name: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/community_lexicon/location/hthree.rs b/crates/jacquard-api/src/community_lexicon/location/hthree.rs index 2df80ac8e..9a2d90022 100644 --- a/crates/jacquard-api/src/community_lexicon/location/hthree.rs +++ b/crates/jacquard-api/src/community_lexicon/location/hthree.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A physical location in the form of a H3 encoded location. +/// A physical location in the form of a H3 encoded location. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,15 +14,18 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Hthree<'a> { - ///The name of the location. + /// The name of the location. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, - ///The h3 encoded location. + pub name: Option>, + /// The h3 encoded location. #[serde(borrow)] + #[builder(into)] pub value: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs b/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs index 69df68978..3484cd1c8 100644 --- a/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs +++ b/crates/jacquard-api/src/community_lexicon/payments/web_monetization.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Web Monetization wallet. +/// Web Monetization wallet. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,17 +14,19 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct WebMonetization<'a> { - ///Wallet address. + /// Wallet address. #[serde(borrow)] pub address: jacquard_common::types::string::Uri<'a>, - ///Short, human-readable description of how this wallet is related to this account. + /// Short, human-readable description of how this wallet is related to this account. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub note: std::option::Option>, + pub note: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/dev_baileytownsend/health/calories.rs b/crates/jacquard-api/src/dev_baileytownsend/health/calories.rs index f1a59df40..ab6ef9bc3 100644 --- a/crates/jacquard-api/src/dev_baileytownsend/health/calories.rs +++ b/crates/jacquard-api/src/dev_baileytownsend/health/calories.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A record of daily intake and burned calories. +/// A record of daily intake and burned calories. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,7 +14,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Calories<'a> { diff --git a/crates/jacquard-api/src/dev_baileytownsend/health/rings.rs b/crates/jacquard-api/src/dev_baileytownsend/health/rings.rs index 01ba4ddb2..8365f4a1a 100644 --- a/crates/jacquard-api/src/dev_baileytownsend/health/rings.rs +++ b/crates/jacquard-api/src/dev_baileytownsend/health/rings.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A record of daily activity rings (Apple Fitness), including move, exercise, and stand goals. +/// A record of daily activity rings (Apple Fitness), including move, exercise, and stand goals. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,22 +14,23 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Rings<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///The total minutes of exercise completed. + /// The total minutes of exercise completed. pub exercise: i64, - ///The daily exercise goal in minutes. + /// The daily exercise goal in minutes. pub exercise_goal: i64, - ///The total active calories burned for the day. + /// The total active calories burned for the day. pub r#move: i64, - ///The daily move goal in calories. + /// The daily move goal in calories. pub move_goal: i64, - ///The daily stand goal in hours. + /// The daily stand goal in hours. pub stand_goal: i64, - ///The number of hours the user stood up and moved around. + /// The number of hours the user stood up and moved around. pub stand_hours: i64, } diff --git a/crates/jacquard-api/src/dev_baileytownsend/health/steps.rs b/crates/jacquard-api/src/dev_baileytownsend/health/steps.rs index 798b9b85e..c03140660 100644 --- a/crates/jacquard-api/src/dev_baileytownsend/health/steps.rs +++ b/crates/jacquard-api/src/dev_baileytownsend/health/steps.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Steps<'a> { diff --git a/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs b/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs index 9a35a5d79..75924b469 100644 --- a/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs +++ b/crates/jacquard-api/src/dev_baileytownsend/health/workout.rs @@ -13,22 +13,26 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Workout<'a> { - ///Type of activity. Walking, running, weights, etc. + /// Type of activity. Walking, running, weights, etc. #[serde(borrow)] + #[builder(into)] pub activity: jacquard_common::CowStr<'a>, - ///Active calories burned during the workout. + /// Active calories burned during the workout. pub calories_burned: i64, pub created_at: jacquard_common::types::string::Datetime, - ///Distance covered during the workout (optional). + /// Distance covered during the workout (optional). #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub distance: std::option::Option>, - ///How long the workout lasted in minutes. + pub distance: Option>, + /// How long the workout lasted in minutes. #[serde(borrow)] + #[builder(into)] pub duration: jacquard_common::CowStr<'a>, pub end_time: jacquard_common::types::string::Datetime, pub start_time: jacquard_common::types::string::Datetime, diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs index fc6b10dba..6f11964a8 100644 --- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs +++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/post.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///An initial post that starts a discussion +/// An initial post that starts a discussion #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,26 +14,31 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Post<'a> { #[serde(borrow)] pub category: jacquard_common::types::string::AtUri<'a>, #[serde(borrow)] + #[builder(into)] pub content: jacquard_common::CowStr<'a>, pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] pub forum: jacquard_common::types::ident::AtIdentifier<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub solution: std::option::Option>, + pub solution: Option>, #[serde(borrow)] pub tags: Vec>, #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs index 7a4f5c916..5687abb82 100644 --- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs +++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/feed/reply.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///An initial post that starts a discussion +/// An initial post that starts a discussion #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,17 +14,20 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Reply<'a> { #[serde(borrow)] + #[builder(into)] pub content: jacquard_common::CowStr<'a>, pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] pub root: jacquard_common::types::string::AtUri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/announcement.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/announcement.rs index 118f7a1ce..acc4432be 100644 --- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/announcement.rs +++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/announcement.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A forum-wide announcement +/// A forum-wide announcement #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,15 +14,18 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Announcement<'a> { #[serde(borrow)] + #[builder(into)] pub body: jacquard_common::CowStr<'a>, pub created_at: jacquard_common::types::string::Datetime, pub expires_at: jacquard_common::types::string::Datetime, #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs index c1441eb82..89fe225a2 100644 --- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs +++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/category.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A method of grouping posts into a single 'category' +/// A method of grouping posts into a single 'category' #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,18 +14,22 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Category<'a> { #[serde(borrow)] + #[builder(into)] pub category_type: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(borrow)] pub group: jacquard_common::types::string::AtUri<'a>, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs index e7a20ab0f..1d0f89da9 100644 --- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs +++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/group.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Defines a group of categories +/// Defines a group of categories #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,14 +14,17 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Group<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs index 664443a54..19c98c2a5 100644 --- a/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs +++ b/crates/jacquard-api/src/dev_fudgeu/experimental/atforumv1/forum/identity.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Defines what the forum is - name, description, etc. +/// Defines what the forum is - name, description, etc. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,17 +14,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Identity<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub accent: std::option::Option>, + pub accent: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/dev_ocbwoy3/blueboard/board.rs b/crates/jacquard-api/src/dev_ocbwoy3/blueboard/board.rs index a05ce7fc3..07dd8d78e 100644 --- a/crates/jacquard-api/src/dev_ocbwoy3/blueboard/board.rs +++ b/crates/jacquard-api/src/dev_ocbwoy3/blueboard/board.rs @@ -13,19 +13,22 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Board<'a> { - ///The date and time when the board was created + /// The date and time when the board was created pub created_at: jacquard_common::types::string::Datetime, - ///A short description of the board + /// A short description of the board #[serde(borrow)] + #[builder(into)] pub description: jacquard_common::CowStr<'a>, - ///Whether the board is NSFW + /// Whether the board is NSFW pub nsfw: bool, - ///The title of the board (e.g. /at/) + /// The title of the board (e.g. /at/) #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs b/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs index abd7e0e29..ee27fa106 100644 --- a/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs +++ b/crates/jacquard-api/src/dev_ocbwoy3/blueboard/post.rs @@ -13,21 +13,24 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Post<'a> { - ///The post's attachment blob. Must be present if parent is dev.ocbwoy3.blueboard.board, otherwise AppView will ignore it. + /// The post's attachment blob. Must be present if parent is dev.ocbwoy3.blueboard.board, otherwise AppView will ignore it. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub attachment: std::option::Option>, - ///The date and time when the post was created + pub attachment: Option>, + /// The date and time when the post was created pub created_at: jacquard_common::types::string::Datetime, - ///Determines the parent of the post. Must either be a `dev.ocbwoy3.blueboard.board` or a `dev.ocbwoy3.blueboard.post`. + /// Determines the parent of the post. Must either be a `dev.ocbwoy3.blueboard.board` or a `dev.ocbwoy3.blueboard.post`. #[serde(borrow)] pub parent: jacquard_common::types::string::AtUri<'a>, - ///The post's text + /// The post's text #[serde(borrow)] + #[builder(into)] pub text: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/dev_regnault/webfishing/savefile.rs b/crates/jacquard-api/src/dev_regnault/webfishing/savefile.rs index 53fb071bf..6fab20e89 100644 --- a/crates/jacquard-api/src/dev_regnault/webfishing/savefile.rs +++ b/crates/jacquard-api/src/dev_regnault/webfishing/savefile.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record declaring a savefile of Webfishing. +/// Record declaring a savefile of Webfishing. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,11 +14,13 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Savefile<'a> { #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, diff --git a/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs b/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs index 6ddef2d7a..42c4837e3 100644 --- a/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs +++ b/crates/jacquard-api/src/fyi_unravel/frontpage/comment.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record containing a Frontpage comment. +/// Record containing a Frontpage comment. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,18 +14,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Comment<'a> { - ///The content of the comment. + /// The content of the comment. #[serde(borrow)] + #[builder(into)] pub content: jacquard_common::CowStr<'a>, - ///Client-declared timestamp when this comment was originally created. + /// Client-declared timestamp when this comment was originally created. pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub parent: std::option::Option>, + pub parent: Option>, #[serde(borrow)] pub post: crate::com_atproto::repo::strong_ref::StrongRef<'a>, } diff --git a/crates/jacquard-api/src/fyi_unravel/frontpage/post.rs b/crates/jacquard-api/src/fyi_unravel/frontpage/post.rs index ffc4f0ade..f27a5f3ed 100644 --- a/crates/jacquard-api/src/fyi_unravel/frontpage/post.rs +++ b/crates/jacquard-api/src/fyi_unravel/frontpage/post.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record containing a Frontpage post. +/// Record containing a Frontpage post. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,16 +14,18 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Post<'a> { - ///Client-declared timestamp when this post was originally created. + /// Client-declared timestamp when this post was originally created. pub created_at: jacquard_common::types::string::Datetime, - ///The title of the post. + /// The title of the post. #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, - ///The URL of the post. + /// The URL of the post. #[serde(borrow)] pub url: jacquard_common::types::string::Uri<'a>, } diff --git a/crates/jacquard-api/src/fyi_unravel/frontpage/vote.rs b/crates/jacquard-api/src/fyi_unravel/frontpage/vote.rs index b5974cb53..b3e962932 100644 --- a/crates/jacquard-api/src/fyi_unravel/frontpage/vote.rs +++ b/crates/jacquard-api/src/fyi_unravel/frontpage/vote.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record containing a Frontpage vote. +/// Record containing a Frontpage vote. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,11 +14,12 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Vote<'a> { - ///Client-declared timestamp when this vote was originally created. + /// Client-declared timestamp when this vote was originally created. pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] pub subject: crate::com_atproto::repo::strong_ref::StrongRef<'a>, diff --git a/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs b/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs index 87948997d..705e92578 100644 --- a/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs +++ b/crates/jacquard-api/src/moe_karashiiro/kpaste/paste.rs @@ -13,26 +13,30 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Paste<'a> { - ///Blob reference to the paste content + /// Blob reference to the paste content #[serde(borrow)] pub content: jacquard_common::types::blob::Blob<'a>, - ///When the paste was created + /// When the paste was created pub created_at: jacquard_common::types::string::Datetime, - ///Programming language for syntax highlighting + /// Programming language for syntax highlighting #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub language: std::option::Option>, - ///Optional title for the paste + pub language: Option>, + /// Optional title for the paste #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub title: std::option::Option>, - ///When the paste was last modified (optional, defaults to createdAt) + pub title: Option>, + /// When the paste was last modified (optional, defaults to createdAt) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/my_skylights.rs b/crates/jacquard-api/src/my_skylights.rs index db90eccb8..85b80154b 100644 --- a/crates/jacquard-api/src/my_skylights.rs +++ b/crates/jacquard-api/src/my_skylights.rs @@ -17,12 +17,15 @@ pub mod rel; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Item<'a> { #[serde(borrow)] + #[builder(into)] pub r#ref: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub value: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/my_skylights/list.rs b/crates/jacquard-api/src/my_skylights/list.rs index 3f879ff3b..2b1edf4c9 100644 --- a/crates/jacquard-api/src/my_skylights/list.rs +++ b/crates/jacquard-api/src/my_skylights/list.rs @@ -13,18 +13,23 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct List<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub sort_by: std::option::Option>, + pub sort_by: Option>, #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/my_skylights/list_item.rs b/crates/jacquard-api/src/my_skylights/list_item.rs index 87cc52614..f64f2100b 100644 --- a/crates/jacquard-api/src/my_skylights/list_item.rs +++ b/crates/jacquard-api/src/my_skylights/list_item.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///User gave up on finishing the item +/// User gave up on finishing the item #[derive( serde::Serialize, serde::Deserialize, @@ -31,13 +31,15 @@ impl std::fmt::Display for Abandoned { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Builtin<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub r#type: std::option::Option>, + pub r#type: Option>, } #[jacquard_derive::open_union] @@ -65,7 +67,7 @@ pub enum BuiltinType<'a> { Wishlist(Box), } -///User is currently reading/watching/... the item +/// User is currently reading/watching/... the item #[derive( serde::Serialize, serde::Deserialize, @@ -91,20 +93,24 @@ impl std::fmt::Display for InProgress { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ListItem<'a> { pub added_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub item: std::option::Option>, + pub item: Option>, #[serde(borrow)] pub list: ListItemList<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub note: std::option::Option>, + pub note: Option>, #[serde(borrow)] + #[builder(into)] pub position: jacquard_common::CowStr<'a>, } @@ -127,7 +133,7 @@ pub enum ListItemList<'a> { Builtin(Box>), } -///User owns the item +/// User owns the item #[derive( serde::Serialize, serde::Deserialize, @@ -145,7 +151,7 @@ impl std::fmt::Display for Owned { } } -///User plans to read/watch/... the item +/// User plans to read/watch/... the item #[derive( serde::Serialize, serde::Deserialize, @@ -163,7 +169,7 @@ impl std::fmt::Display for Queue { } } -///User wants to own the item +/// User wants to own the item #[derive( serde::Serialize, serde::Deserialize, diff --git a/crates/jacquard-api/src/my_skylights/rel.rs b/crates/jacquard-api/src/my_skylights/rel.rs index b73cbc1fe..b2862eb1d 100644 --- a/crates/jacquard-api/src/my_skylights/rel.rs +++ b/crates/jacquard-api/src/my_skylights/rel.rs @@ -13,20 +13,24 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Rel<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub finished_at: std::option::Option>, + #[builder(into)] + pub finished_at: Option>, #[serde(borrow)] pub item: crate::my_skylights::Item<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub note: std::option::Option>, + pub note: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub rating: std::option::Option>, + pub rating: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. @@ -79,13 +83,15 @@ impl From> for Rel<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Note<'a> { pub created_at: jacquard_common::types::string::Datetime, pub updated_at: jacquard_common::types::string::Datetime, #[serde(borrow)] + #[builder(into)] pub value: jacquard_common::CowStr<'a>, } @@ -97,7 +103,8 @@ pub struct Note<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Rating<'a> { diff --git a/crates/jacquard-api/src/net_aftertheinter/coolthingtwo.rs b/crates/jacquard-api/src/net_aftertheinter/coolthingtwo.rs index bc36d6099..443237dd3 100644 --- a/crates/jacquard-api/src/net_aftertheinter/coolthingtwo.rs +++ b/crates/jacquard-api/src/net_aftertheinter/coolthingtwo.rs @@ -13,12 +13,14 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Coolthingtwo<'a> { pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/net_anisota/beta/game/collection.rs b/crates/jacquard-api/src/net_anisota/beta/game/collection.rs index 7784833c9..54b4f1676 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/collection.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/collection.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Beta version: Record representing a collected specimen in a player's collection +/// Beta version: Record representing a collected specimen in a player's collection #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,71 +14,86 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Collection<'a> { - ///When the specimen was first acquired + /// When the specimen was first acquired pub acquired_at: jacquard_common::types::string::Datetime, - ///Common name of the specimen + /// Common name of the specimen #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub common_name: std::option::Option>, - ///When the record was created + pub common_name: Option>, + /// When the record was created pub created_at: jacquard_common::types::string::Datetime, - ///Taxonomic family + /// Taxonomic family #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub family: std::option::Option>, - ///Taxonomic genus + pub family: Option>, + /// Taxonomic genus #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub genus: std::option::Option>, - ///When the record was last modified + pub genus: Option>, + /// When the record was last modified #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub last_modified: std::option::Option, - ///When the specimen was last encountered + #[builder(into)] + pub last_modified: Option, + /// When the specimen was last encountered #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub last_seen: std::option::Option, - ///URI of the game.log record that documents the acquisition of this specimen + #[builder(into)] + pub last_seen: Option, + /// URI of the game.log record that documents the acquisition of this specimen #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub log_record_uri: std::option::Option>, - ///Number of specimens collected + pub log_record_uri: Option>, + /// Number of specimens collected pub quantity: i64, - ///Rarity level of the specimen + /// Rarity level of the specimen #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub rarity: std::option::Option>, - ///Scientific name of the specimen + pub rarity: Option>, + /// Scientific name of the specimen #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub scientific_name: std::option::Option>, - ///How the specimen was acquired + pub scientific_name: Option>, + /// How the specimen was acquired #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub source: std::option::Option>, + pub source: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub source_details: std::option::Option< + pub source_details: Option< crate::net_anisota::beta::game::collection::SourceDetails<'a>, >, - ///Taxonomic species + /// Taxonomic species #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub species: std::option::Option>, + pub species: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub specimen_data: std::option::Option< + pub specimen_data: Option< crate::net_anisota::beta::game::collection::SpecimenData<'a>, >, - ///Unique identifier for the specimen + /// Unique identifier for the specimen #[serde(borrow)] + #[builder(into)] pub specimen_id: jacquard_common::CowStr<'a>, - ///Collection status of this specimen + /// Collection status of this specimen #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option>, + pub status: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. @@ -123,7 +138,7 @@ impl From> for Collection<'_> { } } -///Additional details about how the specimen was acquired +/// Additional details about how the specimen was acquired #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -132,28 +147,33 @@ impl From> for Collection<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SourceDetails<'a> { - ///Number of attempts before successful capture + /// Number of attempts before successful capture #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub attempts: std::option::Option, - ///Probability used when catching this specimen (decimal string, e.g. '0.75') + #[builder(into)] + pub attempts: Option, + /// Probability used when catching this specimen (decimal string, e.g. '0.75') #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub catch_probability: std::option::Option>, - ///URI of the game card that provided this specimen + pub catch_probability: Option>, + /// URI of the game card that provided this specimen #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub game_card_uri: std::option::Option>, - ///Location where specimen was found or observed + pub game_card_uri: Option>, + /// Location where specimen was found or observed #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub location: std::option::Option>, + pub location: Option>, } -///Complete specimen information +/// Complete specimen information #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -162,16 +182,19 @@ pub struct SourceDetails<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SpecimenData<'a> { - ///Scientific authorship of the species + /// Scientific authorship of the species #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub authorship: std::option::Option>, - ///Detailed description of the specimen + pub authorship: Option>, + /// Detailed description of the specimen #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs b/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs index 59c9428b4..600daaa13 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/inventory.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Beta version: Record representing an item in a player's game inventory +/// Beta version: Record representing an item in a player's game inventory #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,60 +14,73 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Inventory<'a> { - ///When the item was acquired + /// When the item was acquired pub acquired_at: jacquard_common::types::string::Datetime, - ///When the record was created + /// When the record was created pub created_at: jacquard_common::types::string::Datetime, - ///Unique identifier for the item from gameItems.json + /// Unique identifier for the item from gameItems.json #[serde(borrow)] + #[builder(into)] pub item_id: jacquard_common::CowStr<'a>, - ///Display name of the item + /// Display name of the item #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub item_name: std::option::Option>, - ///Type category of the item (consumable, tool, equipment, etc.) + pub item_name: Option>, + /// Type category of the item (consumable, tool, equipment, etc.) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub item_type: std::option::Option>, - ///Base value of the item in game currency + pub item_type: Option>, + /// Base value of the item in game currency #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub item_value: std::option::Option, - ///When the record was last modified + #[builder(into)] + pub item_value: Option, + /// When the record was last modified #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub last_modified: std::option::Option, - ///URI of the game.log record that documents the acquisition of this item + #[builder(into)] + pub last_modified: Option, + /// URI of the game.log record that documents the acquisition of this item #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub log_record_uri: std::option::Option>, - ///Maximum stack size for this item + pub log_record_uri: Option>, + /// Maximum stack size for this item #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub max_stack: std::option::Option, - ///Additional item-specific data (stats, attributes, enchantments, etc.) + #[builder(into)] + pub max_stack: Option, + /// Additional item-specific data (stats, attributes, enchantments, etc.) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub metadata: std::option::Option>, - ///Number of items in the stack + pub metadata: Option>, + /// Number of items in the stack pub quantity: i64, - ///Rarity level of the item + /// Rarity level of the item #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub rarity: std::option::Option>, - ///How the item was acquired + pub rarity: Option>, + /// How the item was acquired #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub source: std::option::Option>, + pub source: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub source_details: std::option::Option< + pub source_details: Option< crate::net_anisota::beta::game::inventory::SourceDetails<'a>, >, - ///Whether this item can be stacked with others of the same type + /// Whether this item can be stacked with others of the same type #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub stackable: std::option::Option, + #[builder(into)] + pub stackable: Option, } /// Typed wrapper for GetRecord response with this collection's record type. @@ -112,7 +125,7 @@ impl From> for Inventory<'_> { } } -///Additional details about how the item was acquired +/// Additional details about how the item was acquired #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -121,19 +134,23 @@ impl From> for Inventory<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SourceDetails<'a> { - ///URI of the game card that provided this item + /// URI of the game card that provided this item #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub game_card_uri: std::option::Option>, - ///ID of the quest that rewarded this item + pub game_card_uri: Option>, + /// ID of the quest that rewarded this item #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub quest_id: std::option::Option>, - ///Daily reward streak when item was acquired + pub quest_id: Option>, + /// Daily reward streak when item was acquired #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub reward_streak: std::option::Option, + #[builder(into)] + pub reward_streak: Option, } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/beta/game/log.rs b/crates/jacquard-api/src/net_anisota/beta/game/log.rs index 20242dd09..a71149d21 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/log.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/log.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Details about item/specimen collection +/// Details about item/specimen collection #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,38 +14,46 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct CollectionData<'a> { - ///Catch probability for specimens (decimal string between 0.0 and 1.0) + /// Catch probability for specimens (decimal string between 0.0 and 1.0) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub catch_probability: std::option::Option>, - ///URI of the created inventory record + pub catch_probability: Option>, + /// URI of the created inventory record #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub inventory_record_uri: std::option::Option>, - ///How the item was obtained + pub inventory_record_uri: Option>, + /// How the item was obtained #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub method: std::option::Option>, - ///URI of the created specimen record + pub method: Option>, + /// URI of the created specimen record #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub specimen_record_uri: std::option::Option>, - ///Whether collection was successful + pub specimen_record_uri: Option>, + /// Whether collection was successful #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub success: std::option::Option, - ///Milliseconds between card generation and collection + #[builder(into)] + pub success: Option, + /// Milliseconds between card generation and collection #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub time_since_generation: std::option::Option, - ///Milliseconds between card being viewed and collected + #[builder(into)] + pub time_since_generation: Option, + /// Milliseconds between card being viewed and collected #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub time_since_viewed: std::option::Option, + #[builder(into)] + pub time_since_viewed: Option, } -///Details about daily rewards claim +/// Details about daily rewards claim #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -54,27 +62,30 @@ pub struct CollectionData<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct DailyRewardsData<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reward_items: std::option::Option< - Vec>, - >, - ///Number of rewards claimed + pub reward_items: Option>>, + /// Number of rewards claimed #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub rewards_count: std::option::Option, - ///Current daily reward streak + #[builder(into)] + pub rewards_count: Option, + /// Current daily reward streak #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub streak: std::option::Option, - ///Milliseconds since last claim + #[builder(into)] + pub streak: Option, + /// Milliseconds since last claim #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub time_since_last_claim: std::option::Option, + #[builder(into)] + pub time_since_last_claim: Option, } -///Context about the feed when event occurred +/// Context about the feed when event occurred #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -83,26 +94,31 @@ pub struct DailyRewardsData<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct FeedContext<'a> { - ///URI of the feed being viewed + /// URI of the feed being viewed #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub feed_uri: std::option::Option>, - ///Number of game cards injected + pub feed_uri: Option>, + /// Number of game cards injected #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub game_card_count: std::option::Option, - ///Number of posts in the feed + #[builder(into)] + pub game_card_count: Option, + /// Number of posts in the feed #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub post_count: std::option::Option, - ///User's scroll position or card index + #[builder(into)] + pub post_count: Option, + /// User's scroll position or card index #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub scroll_position: std::option::Option, + #[builder(into)] + pub scroll_position: Option, } -///Details about game cards generated or interacted with +/// Details about game cards generated or interacted with #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -111,39 +127,47 @@ pub struct FeedContext<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct GameCardData<'a> { - ///Type of game card + /// Type of game card #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub card_type: std::option::Option>, - ///Unique identifier for the game card + pub card_type: Option>, + /// Unique identifier for the game card #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub card_uri: std::option::Option>, - ///Random seed used for generation (for verification) + pub card_uri: Option>, + /// Random seed used for generation (for verification) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub generation_seed: std::option::Option>, - ///Position where card was injected in feed + pub generation_seed: Option>, + /// Position where card was injected in feed #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub injection_position: std::option::Option, - ///ID of the item/specimen + #[builder(into)] + pub injection_position: Option, + /// ID of the item/specimen #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub item_id: std::option::Option>, - ///Quantity of items + pub item_id: Option>, + /// Quantity of items #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub quantity: std::option::Option, - ///Rarity of the item/specimen + #[builder(into)] + pub quantity: Option, + /// Rarity of the item/specimen #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub rarity: std::option::Option>, + pub rarity: Option>, } -///Details about item usage +/// Details about item usage #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -152,31 +176,37 @@ pub struct GameCardData<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ItemUsageData<'a> { - ///Effect that was applied + /// Effect that was applied #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub effect_applied: std::option::Option>, - ///URI of the modified inventory record + pub effect_applied: Option>, + /// URI of the modified inventory record #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub inventory_record_uri: std::option::Option>, - ///ID of the item used + pub inventory_record_uri: Option>, + /// ID of the item used #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub item_id: std::option::Option>, - ///Quantity of the item used + pub item_id: Option>, + /// Quantity of the item used #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub quantity_used: std::option::Option, - ///Remaining quantity after use + #[builder(into)] + pub quantity_used: Option, + /// Remaining quantity after use #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub remaining_quantity: std::option::Option, + #[builder(into)] + pub remaining_quantity: Option, } -///A log record for tracking game events and user actions for provenance and anti-bot analysis +/// A log record for tracking game events and user actions for provenance and anti-bot analysis #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -185,64 +215,70 @@ pub struct ItemUsageData<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Log<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub collection_data: std::option::Option< - crate::net_anisota::beta::game::log::CollectionData<'a>, - >, - ///When the log record was created + pub collection_data: Option>, + /// When the log record was created #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub daily_rewards_data: std::option::Option< + pub daily_rewards_data: Option< crate::net_anisota::beta::game::log::DailyRewardsData<'a>, >, - ///Type of event being logged + /// Type of event being logged #[serde(borrow)] + #[builder(into)] pub event_type: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub feed_context: std::option::Option< - crate::net_anisota::beta::game::log::FeedContext<'a>, - >, + pub feed_context: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub game_card_data: std::option::Option< - crate::net_anisota::beta::game::log::GameCardData<'a>, - >, - ///Unique ID of the game card this event relates to + pub game_card_data: Option>, + /// Unique ID of the game card this event relates to #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub game_card_id: std::option::Option>, + pub game_card_id: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub item_usage_data: std::option::Option< - crate::net_anisota::beta::game::log::ItemUsageData<'a>, - >, + pub item_usage_data: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub metadata: std::option::Option>, - ///URI of the parent log record that triggered this event + pub metadata: Option>, + /// URI of the parent log record that triggered this event #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub parent_log_uri: std::option::Option>, - ///URI of the root log record in this event chain + pub parent_log_uri: Option>, + /// URI of the root log record in this event chain #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub root_log_uri: std::option::Option>, - ///Unique session identifier to group related events + pub root_log_uri: Option>, + /// Unique session identifier to group related events #[serde(borrow)] + #[builder(into)] pub session_id: jacquard_common::CowStr<'a>, - ///URI of the session record this event belongs to (at://did/collection/rkey) + /// URI of the session record this event belongs to (at://did/collection/rkey) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub session_uri: std::option::Option>, - ///When the event occurred (ISO 8601) + pub session_uri: Option>, + /// When the event occurred (ISO 8601) pub timestamp: jacquard_common::types::string::Datetime, } @@ -288,7 +324,7 @@ impl From> for Log<'_> { } } -///Additional event-specific metadata +/// Additional event-specific metadata #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -297,30 +333,33 @@ impl From> for Log<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Metadata<'a> { - ///Version of the client application + /// Version of the client application #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub client_version: std::option::Option>, - ///Network latency in milliseconds + pub client_version: Option>, + /// Network latency in milliseconds #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub network_latency: std::option::Option, - ///Performance timing data + #[builder(into)] + pub network_latency: Option, + /// Performance timing data #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub performance_timings: std::option::Option< - jacquard_common::types::value::Data<'a>, - >, - ///Platform (web, mobile, etc.) + pub performance_timings: Option>, + /// Platform (web, mobile, etc.) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub platform: std::option::Option>, + pub platform: Option>, } -///Item received as a reward +/// Item received as a reward #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -329,16 +368,20 @@ pub struct Metadata<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RewardItem<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub item_id: std::option::Option>, + pub item_id: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub quantity: std::option::Option, + #[builder(into)] + pub quantity: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub rarity: std::option::Option>, + pub rarity: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/beta/game/pack.rs b/crates/jacquard-api/src/net_anisota/beta/game/pack.rs index 88af67a07..b1cca15d0 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/pack.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/pack.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Beta version: Record tracking daily pack openings and streak information +/// Beta version: Record tracking daily pack openings and streak information #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,29 +14,33 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Pack<'a> { - ///When the record was created + /// When the record was created pub created_at: jacquard_common::types::string::Datetime, - ///When the record was last modified + /// When the record was last modified #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub last_modified: std::option::Option, - ///When daily pack was last opened + #[builder(into)] + pub last_modified: Option, + /// When daily pack was last opened pub last_open_time: jacquard_common::types::string::Datetime, - ///Longest daily pack opening streak achieved + /// Longest daily pack opening streak achieved #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub longest_streak: std::option::Option, - ///History of the last few pack openings + #[builder(into)] + pub longest_streak: Option, + /// History of the last few pack openings #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pack_history: std::option::Option< + pub pack_history: Option< Vec>, >, - ///Current daily pack opening streak count + /// Current daily pack opening streak count pub streak: i64, - ///Total number of times daily packs have been opened + /// Total number of times daily packs have been opened pub total_opens: i64, } @@ -82,7 +86,7 @@ impl From> for Pack<'_> { } } -///A single pack opening entry in the history +/// A single pack opening entry in the history #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -91,25 +95,29 @@ impl From> for Pack<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PackHistoryEntry<'a> { - ///Items received from this pack + /// Items received from this pack #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub items_received: std::option::Option< + pub items_received: Option< Vec>, >, - ///When this pack was opened + /// When this pack was opened #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub open_time: std::option::Option, - ///Streak count at time of opening + #[builder(into)] + pub open_time: Option, + /// Streak count at time of opening #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub streak_count: std::option::Option, + #[builder(into)] + pub streak_count: Option, } -///An item received from a pack opening +/// An item received from a pack opening #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -118,19 +126,23 @@ pub struct PackHistoryEntry<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ReceivedItem<'a> { - ///ID of the item received + /// ID of the item received #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub item_id: std::option::Option>, - ///Quantity received + pub item_id: Option>, + /// Quantity received #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub quantity: std::option::Option, - ///Rarity of the item + #[builder(into)] + pub quantity: Option, + /// Rarity of the item #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub rarity: std::option::Option>, + pub rarity: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/beta/game/progress.rs b/crates/jacquard-api/src/net_anisota/beta/game/progress.rs index 0ee492011..d14adc2f3 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/progress.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/progress.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record representing a player's level progression and game statistics +/// Record representing a player's level progression and game statistics #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,58 +14,68 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Progress<'a> { - ///URI of the card that was advanced when triggerSource is card_advance + /// URI of the card that was advanced when triggerSource is card_advance #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub card_uri: std::option::Option>, - ///When the progress record was created + pub card_uri: Option>, + /// When the progress record was created pub created_at: jacquard_common::types::string::Datetime, - ///Current stamina level when this progress was recorded (decimal string, e.g. '85.5') + /// Current stamina level when this progress was recorded (decimal string, e.g. '85.5') #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub current_stamina: std::option::Option>, - ///Current player level + pub current_stamina: Option>, + /// Current player level pub level: i64, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub metadata: std::option::Option< - crate::net_anisota::beta::game::progress::Metadata<'a>, - >, - ///Previous level before this update (for tracking level progression) + pub metadata: Option>, + /// Previous level before this update (for tracking level progression) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub previous_level: std::option::Option, - ///Progress percentage to the next level (decimal string, e.g. '75.5') + #[builder(into)] + pub previous_level: Option, + /// Progress percentage to the next level (decimal string, e.g. '75.5') #[serde(borrow)] + #[builder(into)] pub progress_percentage: jacquard_common::CowStr<'a>, - ///URIs of related game log records that contributed to this progress + /// URIs of related game log records that contributed to this progress #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub related_log_uris: std::option::Option>>, - ///Session ID when this progress was recorded (for linking with log records) + pub related_log_uris: Option>>, + /// Session ID when this progress was recorded (for linking with log records) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub session_id: std::option::Option>, - ///URI of the session record when this progress was recorded + pub session_id: Option>, + /// URI of the session record when this progress was recorded #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub session_uri: std::option::Option>, + pub session_uri: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub stats: std::option::Option>, - ///Total experience points accumulated + pub stats: Option>, + /// Total experience points accumulated pub total_xp: i64, - ///What action triggered this progress save + /// What action triggered this progress save #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub trigger_source: std::option::Option>, - ///Experience points gained since the last progress save + pub trigger_source: Option>, + /// Experience points gained since the last progress save #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub xp_gained_since_last_save: std::option::Option, - ///Experience points needed to reach the next level + #[builder(into)] + pub xp_gained_since_last_save: Option, + /// Experience points needed to reach the next level pub xp_to_next_level: i64, } @@ -111,7 +121,7 @@ impl From> for Progress<'_> { } } -///Additional metadata about this progress update +/// Additional metadata about this progress update #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -120,21 +130,24 @@ impl From> for Progress<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Metadata<'a> { - ///Version of the client when this progress was recorded + /// Version of the client when this progress was recorded #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub client_version: std::option::Option>, - ///Platform where the level up occurred (web, mobile, etc.) + pub client_version: Option>, + /// Platform where the level up occurred (web, mobile, etc.) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub platform: std::option::Option>, + pub platform: Option>, } -///Game-specific statistics and metrics +/// Game-specific statistics and metrics #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -143,34 +156,41 @@ pub struct Metadata<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Stats<'a> { - ///Total daily rewards claimed + /// Total daily rewards claimed #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub daily_rewards_claimed: std::option::Option, - ///Total items collected + #[builder(into)] + pub daily_rewards_claimed: Option, + /// Total items collected #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub items_collected: std::option::Option, - ///Date when posts read today was last updated (for daily reset tracking) + #[builder(into)] + pub items_collected: Option, + /// Date when posts read today was last updated (for daily reset tracking) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub last_post_read_date: std::option::Option< - jacquard_common::types::string::Datetime, - >, - ///Posts read today (resets daily) + #[builder(into)] + pub last_post_read_date: Option, + /// Posts read today (resets daily) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub posts_read_today: std::option::Option, - ///Total posts read (all time, cumulative) + #[builder(into)] + pub posts_read_today: Option, + /// Total posts read (all time, cumulative) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub posts_read_total: std::option::Option, - ///Total posts viewed + #[builder(into)] + pub posts_read_total: Option, + /// Total posts viewed #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub posts_viewed: std::option::Option, - ///Total shuffles performed + #[builder(into)] + pub posts_viewed: Option, + /// Total shuffles performed #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub shuffles_performed: std::option::Option, - ///Total specimens collected + #[builder(into)] + pub shuffles_performed: Option, + /// Total specimens collected #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub specimens_collected: std::option::Option, + #[builder(into)] + pub specimens_collected: Option, } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/beta/game/session.rs b/crates/jacquard-api/src/net_anisota/beta/game/session.rs index addc5e1f5..c22ba0879 100644 --- a/crates/jacquard-api/src/net_anisota/beta/game/session.rs +++ b/crates/jacquard-api/src/net_anisota/beta/game/session.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Summary of activity during this session +/// Summary of activity during this session #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,34 +14,39 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ActivitySummary<'a> { - ///Player's current level at the time of this session update + /// Player's current level at the time of this session update #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub current_level: std::option::Option, - ///Player's total XP at the time of this session update + #[builder(into)] + pub current_level: Option, + /// Player's total XP at the time of this session update #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub current_xp: std::option::Option, + #[builder(into)] + pub current_xp: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub game_actions: std::option::Option< - crate::net_anisota::beta::game::session::GameActions<'a>, - >, - ///List of unique pages/routes visited + pub game_actions: Option>, + /// List of unique pages/routes visited #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pages_visited: std::option::Option>>, - ///Total number of events logged in this session + pub pages_visited: Option>>, + /// Total number of events logged in this session #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub total_events: std::option::Option, - ///Total XP gained during this specific session + #[builder(into)] + pub total_events: Option, + /// Total XP gained during this specific session #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub xp_gained_this_session: std::option::Option, + #[builder(into)] + pub xp_gained_this_session: Option, } -///Game-specific actions performed +/// Game-specific actions performed #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -50,25 +55,32 @@ pub struct ActivitySummary<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct GameActions<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub daily_rewards_claimed: std::option::Option, + #[builder(into)] + pub daily_rewards_claimed: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub feeds_loaded: std::option::Option, + #[builder(into)] + pub feeds_loaded: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub items_collected: std::option::Option, + #[builder(into)] + pub items_collected: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub level_ups: std::option::Option, + #[builder(into)] + pub level_ups: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub posts_viewed: std::option::Option, + #[builder(into)] + pub posts_viewed: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub specimens_collected: std::option::Option, + #[builder(into)] + pub specimens_collected: Option, } -///A game session record tracking a continuous period of user engagement with the application +/// A game session record tracking a continuous period of user engagement with the application #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -77,71 +89,86 @@ pub struct GameActions<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Session<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub activity_summary: std::option::Option< + pub activity_summary: Option< crate::net_anisota::beta::game::session::ActivitySummary<'a>, >, - ///Version of the client application + /// Version of the client application #[serde(borrow)] + #[builder(into)] pub client_version: jacquard_common::CowStr<'a>, - ///When the session record was created + /// When the session record was created #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, - ///Total session duration in milliseconds (calculated when session ends) + #[builder(into)] + pub created_at: Option, + /// Total session duration in milliseconds (calculated when session ends) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub duration: std::option::Option, - ///Why the session ended + #[builder(into)] + pub duration: Option, + /// Why the session ended #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub end_reason: std::option::Option>, - ///When the session ended (ISO 8601) + pub end_reason: Option>, + /// When the session ended (ISO 8601) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub ended_at: std::option::Option, - ///Timestamp of the last recorded activity in this session + #[builder(into)] + pub ended_at: Option, + /// Timestamp of the last recorded activity in this session #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub last_activity_at: std::option::Option, + #[builder(into)] + pub last_activity_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub metadata: std::option::Option< - crate::net_anisota::beta::game::session::Metadata<'a>, - >, - ///URI of the previous session if this is a continuation (e.g., after brief inactivity) + pub metadata: Option>, + /// URI of the previous session if this is a continuation (e.g., after brief inactivity) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub parent_session_uri: std::option::Option>, - ///Platform where the session occurred + pub parent_session_uri: Option>, + /// Platform where the session occurred #[serde(borrow)] + #[builder(into)] pub platform: jacquard_common::CowStr<'a>, - ///URIs of log records that occurred during this session + /// URIs of log records that occurred during this session #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub related_log_uris: std::option::Option>>, - ///URIs of progress records created during this session + pub related_log_uris: Option>>, + /// URIs of progress records created during this session #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub related_progress_uris: std::option::Option>>, - ///URIs of related sessions (e.g., same day, same device) + pub related_progress_uris: Option>>, + /// URIs of related sessions (e.g., same day, same device) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub related_session_uris: std::option::Option>>, + pub related_session_uris: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub session_context: std::option::Option< + pub session_context: Option< crate::net_anisota::beta::game::session::SessionContext<'a>, >, - ///When the session began (ISO 8601) + /// When the session began (ISO 8601) pub started_at: jacquard_common::types::string::Datetime, - ///Current status of the session + /// Current status of the session #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, - ///When the session record was last updated + /// When the session record was last updated #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, } /// Typed wrapper for GetRecord response with this collection's record type. @@ -186,7 +213,7 @@ impl From> for Session<'_> { } } -///Additional session metadata +/// Additional session metadata #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -195,26 +222,30 @@ impl From> for Session<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Metadata<'a> { - ///List of features used during the session + /// List of features used during the session #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub features: std::option::Option>>, - ///Network condition during session + pub features: Option>>, + /// Network condition during session #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub network_condition: std::option::Option>, + pub network_condition: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub performance_metrics: std::option::Option< + pub performance_metrics: Option< crate::net_anisota::beta::game::session::PerformanceMetrics<'a>, >, } -///Performance-related data +/// Performance-related data #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -223,19 +254,22 @@ pub struct Metadata<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PerformanceMetrics<'a> { - ///Average API response time in milliseconds (rounded to nearest integer) + /// Average API response time in milliseconds (rounded to nearest integer) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub average_response_time: std::option::Option, - ///Number of errors encountered + #[builder(into)] + pub average_response_time: Option, + /// Number of errors encountered #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub error_count: std::option::Option, + #[builder(into)] + pub error_count: Option, } -///Context about how the session started +/// Context about how the session started #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -244,23 +278,28 @@ pub struct PerformanceMetrics<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SessionContext<'a> { - ///How the user was authenticated + /// How the user was authenticated #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub authentication_method: std::option::Option>, - ///How the user entered the app + pub authentication_method: Option>, + /// How the user entered the app #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub entry_point: std::option::Option>, - ///Whether this was a new user's first session + pub entry_point: Option>, + /// Whether this was a new user's first session #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub is_new_user: std::option::Option, - ///Referrer URL if applicable + #[builder(into)] + pub is_new_user: Option, + /// Referrer URL if applicable #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub referrer: std::option::Option>, + pub referrer: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/net_anisota/feed/draft.rs b/crates/jacquard-api/src/net_anisota/feed/draft.rs index ebdcabd9a..5cc0797e0 100644 --- a/crates/jacquard-api/src/net_anisota/feed/draft.rs +++ b/crates/jacquard-api/src/net_anisota/feed/draft.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record containing a draft post that can be edited and later published as app.bsky.feed.post +/// Record containing a draft post that can be edited and later published as app.bsky.feed.post #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,39 +14,48 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Draft<'a> { - ///Client-declared timestamp when this draft was originally created. + /// Client-declared timestamp when this draft was originally created. pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub embed: std::option::Option>, - ///Annotations of text (mentions, URLs, hashtags, etc) + pub embed: Option>, + /// Annotations of text (mentions, URLs, hashtags, etc) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub facets: std::option::Option>>, - ///Self-label values for this post. Effectively content warnings. + pub facets: Option>>, + /// Self-label values for this post. Effectively content warnings. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>, - ///Indicates human language of post primary text content. + pub labels: Option>, + /// Indicates human language of post primary text content. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub langs: std::option::Option>, + #[builder(into)] + pub langs: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reply: std::option::Option>, - ///Additional hashtags, in addition to any included in post text and facets. + pub reply: Option>, + /// Additional hashtags, in addition to any included in post text and facets. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>>, - ///The primary post content. May be an empty string, if there are embeds. + pub tags: Option>>, + /// The primary post content. May be an empty string, if there are embeds. #[serde(borrow)] + #[builder(into)] pub text: jacquard_common::CowStr<'a>, - ///Client-declared timestamp when this draft was last updated. + /// Client-declared timestamp when this draft was last updated. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, } #[jacquard_derive::open_union] @@ -124,7 +133,8 @@ impl From> for Draft<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ReplyRef<'a> { diff --git a/crates/jacquard-api/src/net_anisota/feed/like.rs b/crates/jacquard-api/src/net_anisota/feed/like.rs index 2c4038d70..8431d131b 100644 --- a/crates/jacquard-api/src/net_anisota/feed/like.rs +++ b/crates/jacquard-api/src/net_anisota/feed/like.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record declaring a 'like' of a piece of content published in the Anisota feed. The target of the like is the 'subject' of the record. +/// Record declaring a 'like' of a piece of content published in the Anisota feed. The target of the like is the 'subject' of the record. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,13 +14,14 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Like<'a> { - ///Client-declared timestamp when this like was created. + /// Client-declared timestamp when this like was created. pub created_at: jacquard_common::types::string::Datetime, - ///The subject of the like. + /// The subject of the like. #[serde(borrow)] pub subject: crate::com_atproto::repo::strong_ref::StrongRef<'a>, } diff --git a/crates/jacquard-api/src/net_anisota/feed/list.rs b/crates/jacquard-api/src/net_anisota/feed/list.rs index 562a71ccf..6ee771734 100644 --- a/crates/jacquard-api/src/net_anisota/feed/list.rs +++ b/crates/jacquard-api/src/net_anisota/feed/list.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A list of posts for curation, bookmarking, or organization +/// A list of posts for curation, bookmarking, or organization #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,27 +14,32 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct List<'a> { - ///Optional avatar image for the list + /// Optional avatar image for the list #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, - ///When the list was created + pub avatar: Option>, + /// When the list was created pub created_at: jacquard_common::types::string::Datetime, - ///Optional description of the list + /// Optional description of the list #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///Display name for the list + pub description: Option>, + /// Display name for the list #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Tags for categorizing the list + /// Tags for categorizing the list #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>>, + pub tags: Option>>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/net_anisota/feed/list_item.rs b/crates/jacquard-api/src/net_anisota/feed/list_item.rs index e9dbe31a9..0032dca61 100644 --- a/crates/jacquard-api/src/net_anisota/feed/list_item.rs +++ b/crates/jacquard-api/src/net_anisota/feed/list_item.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record representing a post's inclusion on a specific list. The AppView will ignore duplicate listitem records. +/// Record representing a post's inclusion on a specific list. The AppView will ignore duplicate listitem records. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,16 +14,17 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ListItem<'a> { - ///Timestamp when the post was added to the list + /// Timestamp when the post was added to the list pub created_at: jacquard_common::types::string::Datetime, - ///Reference (AT-URI) to the list record (net.anisota.feed.list). + /// Reference (AT-URI) to the list record (net.anisota.feed.list). #[serde(borrow)] pub list: jacquard_common::types::string::AtUri<'a>, - ///The post URI which is included on the list. + /// The post URI which is included on the list. #[serde(borrow)] pub subject: jacquard_common::types::string::AtUri<'a>, } diff --git a/crates/jacquard-api/src/net_anisota/feed/post.rs b/crates/jacquard-api/src/net_anisota/feed/post.rs index f9925cbf5..90b6cabb1 100644 --- a/crates/jacquard-api/src/net_anisota/feed/post.rs +++ b/crates/jacquard-api/src/net_anisota/feed/post.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A post that can be created on the Anisota network +/// A post that can be created on the Anisota network #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,35 +14,43 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Post<'a> { - ///Client-declared timestamp when this post was created. + /// Client-declared timestamp when this post was created. pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub embed: std::option::Option>, - ///Annotations of text (mentions, URLs, hashtags, etc) + pub embed: Option>, + /// Annotations of text (mentions, URLs, hashtags, etc) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub facets: std::option::Option>>, - ///Self-label values for this post. Effectively content warnings. + pub facets: Option>>, + /// Self-label values for this post. Effectively content warnings. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>, - ///Indicates human language of post primary text content. + pub labels: Option>, + /// Indicates human language of post primary text content. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub langs: std::option::Option>, + #[builder(into)] + pub langs: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reply: std::option::Option>, - ///Additional hashtags, in addition to any included in post text and facets. + pub reply: Option>, + /// Additional hashtags, in addition to any included in post text and facets. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>>, - ///The primary post content. May be an empty string, if there are embeds. + pub tags: Option>>, + /// The primary post content. May be an empty string, if there are embeds. #[serde(borrow)] + #[builder(into)] pub text: jacquard_common::CowStr<'a>, } @@ -121,7 +129,8 @@ impl From> for Post<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ReplyRef<'a> { diff --git a/crates/jacquard-api/src/net_anisota/feed/repost.rs b/crates/jacquard-api/src/net_anisota/feed/repost.rs index 19b4bf713..54e5fb201 100644 --- a/crates/jacquard-api/src/net_anisota/feed/repost.rs +++ b/crates/jacquard-api/src/net_anisota/feed/repost.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record representing a 'repost' of an existing piece of content published in the Anisota feed. The target of the repost is the 'subject' of the record. +/// Record representing a 'repost' of an existing piece of content published in the Anisota feed. The target of the repost is the 'subject' of the record. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,13 +14,14 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Repost<'a> { - ///Client-declared timestamp when this repost was created. + /// Client-declared timestamp when this repost was created. pub created_at: jacquard_common::types::string::Datetime, - ///The subject of the repost. + /// The subject of the repost. #[serde(borrow)] pub subject: crate::com_atproto::repo::strong_ref::StrongRef<'a>, } diff --git a/crates/jacquard-api/src/net_anisota/graph/list_mute.rs b/crates/jacquard-api/src/net_anisota/graph/list_mute.rs index 59062ba13..e6e2b302e 100644 --- a/crates/jacquard-api/src/net_anisota/graph/list_mute.rs +++ b/crates/jacquard-api/src/net_anisota/graph/list_mute.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Configuration for which types of content to mute +/// Configuration for which types of content to mute #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,25 +14,30 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ContentTypes<'a> { - ///Mute regular posts from accounts on this list + /// Mute regular posts from accounts on this list #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub posts: std::option::Option, - ///Mute quote posts from accounts on this list + #[builder(into)] + pub posts: Option, + /// Mute quote posts from accounts on this list #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub quotes: std::option::Option, - ///Mute replies from accounts on this list + #[builder(into)] + pub quotes: Option, + /// Mute replies from accounts on this list #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub replies: std::option::Option, - ///Mute reposts from accounts on this list + #[builder(into)] + pub replies: Option, + /// Mute reposts from accounts on this list #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub reposts: std::option::Option, + #[builder(into)] + pub reposts: Option, } -///A record for muting content from all accounts on a list with fine-grained control over content types, duration, and feed targeting +/// A record for muting content from all accounts on a list with fine-grained control over content types, duration, and feed targeting #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -41,34 +46,35 @@ pub struct ContentTypes<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ListMute<'a> { - ///Types of content to mute from accounts on this list + /// Types of content to mute from accounts on this list #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub content_types: std::option::Option< - crate::net_anisota::graph::list_mute::ContentTypes<'a>, - >, - ///When the mute was created + pub content_types: Option>, + /// When the mute was created pub created_at: jacquard_common::types::string::Datetime, - ///When this mute expires. If not set, mute is permanent + /// When this mute expires. If not set, mute is permanent #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub expires_at: std::option::Option, - ///Optional reason for muting this list + #[builder(into)] + pub expires_at: Option, + /// Optional reason for muting this list #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reason: std::option::Option>, - ///AT-URI of the list to mute (app.bsky.graph.list record) + pub reason: Option>, + /// AT-URI of the list to mute (app.bsky.graph.list record) #[serde(borrow)] pub subject: jacquard_common::types::string::AtUri<'a>, - ///Specific feeds where this mute should apply. If empty, applies to all feeds + /// Specific feeds where this mute should apply. If empty, applies to all feeds #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub target_feeds: std::option::Option< - Vec>, - >, + pub target_feeds: Option>>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/net_anisota/graph/mute.rs b/crates/jacquard-api/src/net_anisota/graph/mute.rs index d60c69deb..01b9b8d08 100644 --- a/crates/jacquard-api/src/net_anisota/graph/mute.rs +++ b/crates/jacquard-api/src/net_anisota/graph/mute.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Configuration for which types of content to mute +/// Configuration for which types of content to mute #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,25 +14,30 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ContentTypes<'a> { - ///Mute regular posts from this account + /// Mute regular posts from this account #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub posts: std::option::Option, - ///Mute quote posts from this account + #[builder(into)] + pub posts: Option, + /// Mute quote posts from this account #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub quotes: std::option::Option, - ///Mute replies from this account + #[builder(into)] + pub quotes: Option, + /// Mute replies from this account #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub replies: std::option::Option, - ///Mute reposts from this account + #[builder(into)] + pub replies: Option, + /// Mute reposts from this account #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub reposts: std::option::Option, + #[builder(into)] + pub reposts: Option, } -///A record for muting content from a specific account with fine-grained control over content types and duration +/// A record for muting content from a specific account with fine-grained control over content types and duration #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -41,34 +46,35 @@ pub struct ContentTypes<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Mute<'a> { - ///Types of content to mute from this account + /// Types of content to mute from this account #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub content_types: std::option::Option< - crate::net_anisota::graph::mute::ContentTypes<'a>, - >, - ///When the mute was created + pub content_types: Option>, + /// When the mute was created pub created_at: jacquard_common::types::string::Datetime, - ///When this mute expires. If not set, mute is permanent + /// When this mute expires. If not set, mute is permanent #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub expires_at: std::option::Option, - ///Optional reason for muting this account + #[builder(into)] + pub expires_at: Option, + /// Optional reason for muting this account #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reason: std::option::Option>, - ///DID of the account to mute + pub reason: Option>, + /// DID of the account to mute #[serde(borrow)] pub subject: jacquard_common::types::string::Did<'a>, - ///Specific feeds where this mute should apply. If empty, applies to all feeds + /// Specific feeds where this mute should apply. If empty, applies to all feeds #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub target_feeds: std::option::Option< - Vec>, - >, + pub target_feeds: Option>>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs b/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs index ef4e20ca1..71993a46a 100644 --- a/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs +++ b/crates/jacquard-api/src/net_bnewbold/demo/mushies.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///it's a kind of fungus +/// it's a kind of fungus #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,17 +14,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Mushies<'a> { #[serde(borrow)] + #[builder(into)] pub common_name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub edible: std::option::Option, + #[builder(into)] + pub edible: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub species: std::option::Option>, + pub species: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs b/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs index c37354847..c88e127c3 100644 --- a/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs +++ b/crates/jacquard-api/src/net_bnewbold/demo/mushroom.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///it's a kind of fungus +/// it's a kind of fungus #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,17 +14,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Mushroom<'a> { #[serde(borrow)] + #[builder(into)] pub common_name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub edible: std::option::Option, + #[builder(into)] + pub edible: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub species: std::option::Option>, + pub species: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/net_bnewbold/m.rs b/crates/jacquard-api/src/net_bnewbold/m.rs index 0b0a71202..902664ca8 100644 --- a/crates/jacquard-api/src/net_bnewbold/m.rs +++ b/crates/jacquard-api/src/net_bnewbold/m.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///it's a kind of fungus +/// it's a kind of fungus #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,17 +14,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct M<'a> { #[serde(borrow)] + #[builder(into)] pub common_name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub edible: std::option::Option, + #[builder(into)] + pub edible: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub species: std::option::Option>, + pub species: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/net_mmatt/right/now.rs b/crates/jacquard-api/src/net_mmatt/right/now.rs index 0baf8cb37..1ebc1144f 100644 --- a/crates/jacquard-api/src/net_mmatt/right/now.rs +++ b/crates/jacquard-api/src/net_mmatt/right/now.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A personal lexicon for mmatt's statuslog. +/// A personal lexicon for mmatt's statuslog. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,18 +14,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Now<'a> { - ///The unix timestamp of when the status was recorded + /// The unix timestamp of when the status was recorded pub created_at: jacquard_common::types::string::Datetime, - ///The emoji of the status update + /// The emoji of the status update #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub emoji: std::option::Option>, - ///The text of the status update + pub emoji: Option>, + /// The text of the status update #[serde(borrow)] + #[builder(into)] pub text: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/net_mmatt/vitals/car.rs b/crates/jacquard-api/src/net_mmatt/vitals/car.rs index a195da013..a5d42a2ae 100644 --- a/crates/jacquard-api/src/net_mmatt/vitals/car.rs +++ b/crates/jacquard-api/src/net_mmatt/vitals/car.rs @@ -13,32 +13,38 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Car<'a> { - ///The car fuel amount remaining value (floating point string) + /// The car fuel amount remaining value (floating point string) #[serde(borrow)] + #[builder(into)] pub amount_remaining: jacquard_common::CowStr<'a>, - ///The car fuel range value in miles + /// The car fuel range value in miles pub car_fuel_range: i64, - ///The car make value + /// The car make value #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub car_make: std::option::Option>, - ///The car model value + pub car_make: Option>, + /// The car model value #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub car_model: std::option::Option>, - ///The car fuel level value in percentage (floating point string) + pub car_model: Option>, + /// The car fuel level value in percentage (floating point string) #[serde(borrow)] + #[builder(into)] pub car_percent_fuel_remaining: jacquard_common::CowStr<'a>, - ///The car traveled distance value + /// The car traveled distance value pub car_traveled_distance: i64, - ///The car year value + /// The car year value #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub car_year: std::option::Option, - ///The unix timestamp of when the vital was recorded + #[builder(into)] + pub car_year: Option, + /// The unix timestamp of when the vital was recorded pub created_at: jacquard_common::types::string::Datetime, } diff --git a/crates/jacquard-api/src/network_slices/actor.rs b/crates/jacquard-api/src/network_slices/actor.rs index 507494139..279c35c9b 100644 --- a/crates/jacquard-api/src/network_slices/actor.rs +++ b/crates/jacquard-api/src/network_slices/actor.rs @@ -15,22 +15,26 @@ pub mod profile; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ProfileViewBasic<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, - ///Free-form profile description text. + pub avatar: Option>, + /// Free-form profile description text. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display_name: std::option::Option>, + pub display_name: Option>, #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/network_slices/actor/profile.rs b/crates/jacquard-api/src/network_slices/actor/profile.rs index 6889837d5..63fa83be1 100644 --- a/crates/jacquard-api/src/network_slices/actor/profile.rs +++ b/crates/jacquard-api/src/network_slices/actor/profile.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of a basic account profile. +/// A declaration of a basic account profile. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,23 +14,28 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Profile<'a> { - ///Small image to be displayed next to posts from account. AKA, 'profile picture' + /// Small image to be displayed next to posts from account. AKA, 'profile picture' #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, + pub avatar: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, - ///Free-form profile description text. + #[builder(into)] + pub created_at: Option, + /// Free-form profile description text. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display_name: std::option::Option>, + pub display_name: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/network_slices/lexicon.rs b/crates/jacquard-api/src/network_slices/lexicon.rs index 700df0214..6a62daff4 100644 --- a/crates/jacquard-api/src/network_slices/lexicon.rs +++ b/crates/jacquard-api/src/network_slices/lexicon.rs @@ -13,31 +13,37 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Lexicon<'a> { - ///When the lexicon was created + /// When the lexicon was created pub created_at: jacquard_common::types::string::Datetime, - ///The lexicon schema definitions as JSON + /// The lexicon schema definitions as JSON #[serde(borrow)] + #[builder(into)] pub definitions: jacquard_common::CowStr<'a>, - ///Human-readable description of the lexicon + /// Human-readable description of the lexicon #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///Whether this lexicon should be excluded from sync operations + pub description: Option>, + /// Whether this lexicon should be excluded from sync operations #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub excluded_from_sync: std::option::Option, - ///Namespaced identifier for the lexicon + #[builder(into)] + pub excluded_from_sync: Option, + /// Namespaced identifier for the lexicon #[serde(borrow)] + #[builder(into)] pub nsid: jacquard_common::CowStr<'a>, - ///AT-URI reference to the slice this lexicon belongs to + /// AT-URI reference to the slice this lexicon belongs to #[serde(borrow)] pub slice: jacquard_common::types::string::AtUri<'a>, - ///When the lexicon was last updated + /// When the lexicon was last updated #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/network_slices/slice.rs b/crates/jacquard-api/src/network_slices/slice.rs index d890d84f5..2605a93e7 100644 --- a/crates/jacquard-api/src/network_slices/slice.rs +++ b/crates/jacquard-api/src/network_slices/slice.rs @@ -30,17 +30,20 @@ pub mod update_o_auth_client; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Slice<'a> { - ///When the slice was created + /// When the slice was created pub created_at: jacquard_common::types::string::Datetime, - ///Primary domain namespace for this slice (e.g. social.grain) + /// Primary domain namespace for this slice (e.g. social.grain) #[serde(borrow)] + #[builder(into)] pub domain: jacquard_common::CowStr<'a>, - ///Name of the slice + /// Name of the slice #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } @@ -94,45 +97,52 @@ impl From> for Slice<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SliceView<'a> { #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, pub created_at: jacquard_common::types::string::Datetime, - ///Profile of the slice creator + /// Profile of the slice creator #[serde(borrow)] pub creator: crate::network_slices::actor::ProfileViewBasic<'a>, - ///Primary domain namespace for this slice (e.g. social.grain) + /// Primary domain namespace for this slice (e.g. social.grain) #[serde(borrow)] + #[builder(into)] pub domain: jacquard_common::CowStr<'a>, - ///Total number of unique indexed actors in this slice + /// Total number of unique indexed actors in this slice #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub indexed_actor_count: std::option::Option, - ///Number of collections with indexed records + #[builder(into)] + pub indexed_actor_count: Option, + /// Number of collections with indexed records #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub indexed_collection_count: std::option::Option, - ///Total number of indexed records in this slice + #[builder(into)] + pub indexed_collection_count: Option, + /// Total number of indexed records in this slice #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub indexed_record_count: std::option::Option, - ///Display name of the slice + #[builder(into)] + pub indexed_record_count: Option, + /// Display name of the slice #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Recent activity sparkline data points for the last 24 hours + /// Recent activity sparkline data points for the last 24 hours #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub sparkline: std::option::Option< - Vec>, - >, + pub sparkline: Option>>, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, - ///Total number of waitlist invites for this slice + /// Total number of waitlist invites for this slice #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub waitlist_invite_count: std::option::Option, - ///Total number of waitlist requests for this slice + #[builder(into)] + pub waitlist_invite_count: Option, + /// Total number of waitlist requests for this slice #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub waitlist_request_count: std::option::Option, + #[builder(into)] + pub waitlist_request_count: Option, } #[jacquard_derive::lexicon] @@ -143,7 +153,8 @@ pub struct SliceView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SparklinePoint<'a> { diff --git a/crates/jacquard-api/src/network_slices/slice/clear_slice_records.rs b/crates/jacquard-api/src/network_slices/slice/clear_slice_records.rs index 35b14cd46..5e236d57e 100644 --- a/crates/jacquard-api/src/network_slices/slice/clear_slice_records.rs +++ b/crates/jacquard-api/src/network_slices/slice/clear_slice_records.rs @@ -19,7 +19,7 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct ClearSliceRecords<'a> { - ///AT-URI of the slice to clear + /// AT-URI of the slice to clear #[serde(borrow)] #[builder(into)] pub slice: jacquard_common::CowStr<'a>, @@ -44,7 +44,7 @@ pub struct ClearSliceRecords<'a> { )] #[serde(rename_all = "camelCase")] pub struct ClearSliceRecordsOutput<'a> { - ///Success message + /// Success message #[serde(borrow)] pub message: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/network_slices/slice/create_o_auth_client.rs b/crates/jacquard-api/src/network_slices/slice/create_o_auth_client.rs index 7fd4340c2..1e1c19db5 100644 --- a/crates/jacquard-api/src/network_slices/slice/create_o_auth_client.rs +++ b/crates/jacquard-api/src/network_slices/slice/create_o_auth_client.rs @@ -19,46 +19,52 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct CreateOAuthClient<'a> { - ///Human-readable name of the OAuth client + /// Human-readable name of the OAuth client #[serde(borrow)] #[builder(into)] pub client_name: jacquard_common::CowStr<'a>, - ///URI of the client application + /// URI of the client application #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub client_uri: std::option::Option>, - ///OAuth grant types + pub client_uri: Option>, + /// OAuth grant types #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub grant_types: std::option::Option>>, - ///URI of the client logo + pub grant_types: Option>>, + /// URI of the client logo #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub logo_uri: std::option::Option>, - ///URI of the privacy policy + pub logo_uri: Option>, + /// URI of the privacy policy #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub policy_uri: std::option::Option>, - ///Allowed redirect URIs for OAuth flow (must use HTTP or HTTPS) + pub policy_uri: Option>, + /// Allowed redirect URIs for OAuth flow (must use HTTP or HTTPS) #[serde(borrow)] pub redirect_uris: Vec>, - ///OAuth response types + /// OAuth response types #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub response_types: std::option::Option>>, - ///OAuth scope + pub response_types: Option>>, + /// OAuth scope #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub scope: std::option::Option>, - ///AT-URI of the slice to register the OAuth client for + #[serde(borrow)] + pub scope: Option>, + /// AT-URI of the slice to register the OAuth client for #[serde(borrow)] #[builder(into)] pub slice_uri: jacquard_common::CowStr<'a>, - ///URI of the terms of service + /// URI of the terms of service #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tos_uri: std::option::Option>, + pub tos_uri: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/network_slices/slice/delete_o_auth_client.rs b/crates/jacquard-api/src/network_slices/slice/delete_o_auth_client.rs index 0934ec9ec..fde970c09 100644 --- a/crates/jacquard-api/src/network_slices/slice/delete_o_auth_client.rs +++ b/crates/jacquard-api/src/network_slices/slice/delete_o_auth_client.rs @@ -19,7 +19,7 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct DeleteOAuthClient<'a> { - ///OAuth client ID to delete + /// OAuth client ID to delete #[serde(borrow)] #[builder(into)] pub client_id: jacquard_common::CowStr<'a>, @@ -44,7 +44,7 @@ pub struct DeleteOAuthClient<'a> { )] #[serde(rename_all = "camelCase")] pub struct DeleteOAuthClientOutput<'a> { - ///Success confirmation message + /// Success confirmation message #[serde(borrow)] pub message: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/network_slices/slice/get_actors.rs b/crates/jacquard-api/src/network_slices/slice/get_actors.rs index 26150bd1b..c304a818c 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_actors.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_actors.rs @@ -13,21 +13,24 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Actor<'a> { - ///Decentralized identifier of the actor + /// Decentralized identifier of the actor #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///Human-readable handle of the actor + /// Human-readable handle of the actor #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub handle: std::option::Option>, - ///When this actor was indexed + pub handle: Option>, + /// When this actor was indexed pub indexed_at: jacquard_common::types::string::Datetime, - ///AT-URI of the slice this actor is indexed in + /// AT-URI of the slice this actor is indexed in #[serde(borrow)] + #[builder(into)] pub slice_uri: jacquard_common::CowStr<'a>, } @@ -45,22 +48,24 @@ pub struct Actor<'a> { #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct GetActors<'a> { - ///Pagination cursor from previous response + /// Pagination cursor from previous response #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub cursor: std::option::Option>, - ///Maximum number of actors to return + #[serde(borrow)] + pub cursor: Option>, + /// Maximum number of actors to return #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub limit: std::option::Option, - ///AT-URI of the slice to query + #[builder(into)] + pub limit: Option, + /// AT-URI of the slice to query #[serde(borrow)] #[builder(into)] pub slice: jacquard_common::CowStr<'a>, - ///Flexible filtering conditions for querying actors + /// Flexible filtering conditions for querying actors #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub r#where: std::option::Option>, + pub r#where: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] @@ -84,7 +89,7 @@ pub struct GetActors<'a> { pub struct GetActorsOutput<'a> { #[serde(borrow)] pub actors: Vec>, - ///Pagination cursor for next page + /// Pagination cursor for next page #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, diff --git a/crates/jacquard-api/src/network_slices/slice/get_jetstream_status.rs b/crates/jacquard-api/src/network_slices/slice/get_jetstream_status.rs index 8e298c0ed..68bd2e6d5 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_jetstream_status.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_jetstream_status.rs @@ -30,7 +30,7 @@ pub struct GetJetstreamStatus {} )] #[serde(rename_all = "camelCase")] pub struct GetJetstreamStatusOutput<'a> { - ///Whether Jetstream is currently connected and receiving events + /// Whether Jetstream is currently connected and receiving events pub connected: bool, } diff --git a/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs b/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs index 292b000cf..f62d1c635 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_job_logs.rs @@ -13,39 +13,47 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LogEntry<'a> { - ///When the log entry was created + /// When the log entry was created pub created_at: jacquard_common::types::string::Datetime, - ///Log entry ID + /// Log entry ID pub id: i64, - ///UUID of related job if applicable + /// UUID of related job if applicable #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub job_id: std::option::Option>, - ///Log level + pub job_id: Option>, + /// Log level #[serde(borrow)] + #[builder(into)] pub level: jacquard_common::CowStr<'a>, - ///Type of log entry + /// Type of log entry #[serde(borrow)] + #[builder(into)] pub log_type: jacquard_common::CowStr<'a>, - ///Log message + /// Log message #[serde(borrow)] + #[builder(into)] pub message: jacquard_common::CowStr<'a>, - ///Additional metadata associated with the log entry + /// Additional metadata associated with the log entry #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub metadata: std::option::Option>, - ///AT-URI of related slice if applicable + pub metadata: Option>, + /// AT-URI of related slice if applicable #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub slice_uri: std::option::Option>, - ///DID of related user if applicable + pub slice_uri: Option>, + /// DID of related user if applicable #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub user_did: std::option::Option>, + pub user_did: Option>, } #[derive( diff --git a/crates/jacquard-api/src/network_slices/slice/get_job_status.rs b/crates/jacquard-api/src/network_slices/slice/get_job_status.rs index d97b42eba..51e1fc4da 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_job_status.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_job_status.rs @@ -13,35 +13,40 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct JobStatus<'a> { - ///When the job completed + /// When the job completed #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub completed_at: std::option::Option, - ///When the job was created + #[builder(into)] + pub completed_at: Option, + /// When the job was created pub created_at: jacquard_common::types::string::Datetime, - ///Error message if job failed + /// Error message if job failed #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub error: std::option::Option>, - ///UUID of the job + pub error: Option>, + /// UUID of the job #[serde(borrow)] + #[builder(into)] pub job_id: jacquard_common::CowStr<'a>, - ///Job result if completed successfully + /// Job result if completed successfully #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub result: std::option::Option< - crate::network_slices::slice::get_job_status::SyncJobResult<'a>, - >, - ///Number of times the job has been retried + pub result: Option>, + /// Number of times the job has been retried pub retry_count: i64, - ///When the job started executing + /// When the job started executing #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub started_at: std::option::Option, - ///Current status of the job + #[builder(into)] + pub started_at: Option, + /// Current status of the job #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, } @@ -114,20 +119,22 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetJobStatusRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SyncJobResult<'a> { - ///List of collection NSIDs that were synced + /// List of collection NSIDs that were synced #[serde(borrow)] pub collections_synced: Vec>, - ///Human-readable message about the job completion + /// Human-readable message about the job completion #[serde(borrow)] + #[builder(into)] pub message: jacquard_common::CowStr<'a>, - ///Number of repositories processed + /// Number of repositories processed pub repos_processed: i64, - ///Whether the sync job completed successfully + /// Whether the sync job completed successfully pub success: bool, - ///Total number of records synced + /// Total number of records synced pub total_records: i64, } \ No newline at end of file diff --git a/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs b/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs index ad7e85908..fcba147a5 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_o_auth_clients.rs @@ -73,52 +73,61 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetOAuthClientsRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct OauthClientDetails<'a> { - ///OAuth client ID + /// OAuth client ID #[serde(borrow)] + #[builder(into)] pub client_id: jacquard_common::CowStr<'a>, - ///Human-readable name of the OAuth client + /// Human-readable name of the OAuth client #[serde(borrow)] + #[builder(into)] pub client_name: jacquard_common::CowStr<'a>, - ///OAuth client secret (only returned on creation) + /// OAuth client secret (only returned on creation) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub client_secret: std::option::Option>, - ///URI of the client application + pub client_secret: Option>, + /// URI of the client application #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub client_uri: std::option::Option>, - ///When the OAuth client was created + pub client_uri: Option>, + /// When the OAuth client was created pub created_at: jacquard_common::types::string::Datetime, - ///DID of the user who created this client + /// DID of the user who created this client #[serde(borrow)] pub created_by_did: jacquard_common::types::string::Did<'a>, - ///Allowed OAuth grant types + /// Allowed OAuth grant types #[serde(borrow)] pub grant_types: Vec>, - ///URI of the client logo + /// URI of the client logo #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub logo_uri: std::option::Option>, - ///URI of the privacy policy + pub logo_uri: Option>, + /// URI of the privacy policy #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub policy_uri: std::option::Option>, - ///Allowed redirect URIs for OAuth flow + pub policy_uri: Option>, + /// Allowed redirect URIs for OAuth flow #[serde(borrow)] pub redirect_uris: Vec>, - ///Allowed OAuth response types + /// Allowed OAuth response types #[serde(borrow)] pub response_types: Vec>, - ///OAuth scope + /// OAuth scope #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub scope: std::option::Option>, - ///URI of the terms of service + pub scope: Option>, + /// URI of the terms of service #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tos_uri: std::option::Option>, + pub tos_uri: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/network_slices/slice/get_slice_records.rs b/crates/jacquard-api/src/network_slices/slice/get_slice_records.rs index 98d6fae97..a481c7658 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_slice_records.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_slice_records.rs @@ -13,25 +13,26 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct IndexedRecord<'a> { - ///Content identifier of the record + /// Content identifier of the record #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, - ///NSID of the collection this record belongs to + /// NSID of the collection this record belongs to #[serde(borrow)] pub collection: jacquard_common::types::string::Nsid<'a>, - ///DID of the record creator + /// DID of the record creator #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///When this record was indexed + /// When this record was indexed pub indexed_at: jacquard_common::types::string::Datetime, - ///AT-URI of the record + /// AT-URI of the record #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, - ///The record value/content + /// The record value/content #[serde(borrow)] pub value: jacquard_common::types::value::Data<'a>, } @@ -50,26 +51,29 @@ pub struct IndexedRecord<'a> { #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct GetSliceRecords<'a> { - ///Pagination cursor from previous response + /// Pagination cursor from previous response #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub cursor: std::option::Option>, - ///Maximum number of records to return + #[serde(borrow)] + pub cursor: Option>, + /// Maximum number of records to return #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub limit: std::option::Option, - ///AT-URI of the slice to query + #[builder(into)] + pub limit: Option, + /// AT-URI of the slice to query #[serde(borrow)] #[builder(into)] pub slice: jacquard_common::CowStr<'a>, - ///Sorting configuration for result ordering + /// Sorting configuration for result ordering #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub sort_by: std::option::Option>, - ///Flexible filtering conditions for querying records + pub sort_by: Option>, + /// Flexible filtering conditions for querying records #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub r#where: std::option::Option>, + pub r#where: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] @@ -91,7 +95,7 @@ pub struct GetSliceRecords<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetSliceRecordsOutput<'a> { - ///Pagination cursor for next page + /// Pagination cursor for next page #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, diff --git a/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs b/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs index 24997c140..7dd04d189 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_sparklines.rs @@ -19,17 +19,17 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct GetSparklines<'a> { - ///Time range to fetch data for + /// Time range to fetch data for #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub duration: std::option::Option>, - ///Time interval for data points - #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] + pub duration: Option>, + /// Time interval for data points + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub interval: std::option::Option>, - ///Array of slice AT-URIs to get sparkline data for + #[serde(borrow)] + pub interval: Option>, + /// Array of slice AT-URIs to get sparkline data for #[serde(borrow)] pub slices: Vec>, #[serde(flatten)] @@ -53,7 +53,7 @@ pub struct GetSparklines<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetSparklinesOutput<'a> { - ///Array of slice sparkline data entries + /// Array of slice sparkline data entries #[serde(borrow)] pub sparklines: Vec>, } @@ -96,14 +96,16 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetSparklinesRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SparklineEntry<'a> { - ///Array of sparkline data points + /// Array of sparkline data points #[serde(borrow)] pub points: Vec>, - ///AT-URI of the slice + /// AT-URI of the slice #[serde(borrow)] + #[builder(into)] pub slice_uri: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/network_slices/slice/get_sync_summary.rs b/crates/jacquard-api/src/network_slices/slice/get_sync_summary.rs index 61d26a620..8baf2372f 100644 --- a/crates/jacquard-api/src/network_slices/slice/get_sync_summary.rs +++ b/crates/jacquard-api/src/network_slices/slice/get_sync_summary.rs @@ -13,11 +13,13 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct CollectionSummary<'a> { #[serde(borrow)] + #[builder(into)] pub collection: jacquard_common::CowStr<'a>, pub estimated_repos: i64, pub is_external: bool, @@ -62,15 +64,15 @@ pub struct GetSyncSummary<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetSyncSummaryOutput<'a> { - ///The actual limit applied (user-specified or default) + /// The actual limit applied (user-specified or default) pub applied_limit: i64, - ///Number of repositories after applying limit + /// Number of repositories after applying limit pub capped_repos: i64, #[serde(borrow)] pub collections_summary: Vec>, - ///Total number of repositories that would be synced + /// Total number of repositories that would be synced pub total_repos: i64, - ///Whether the sync would be limited by maxRepos + /// Whether the sync would be limited by maxRepos pub would_be_capped: bool, } diff --git a/crates/jacquard-api/src/network_slices/slice/start_sync.rs b/crates/jacquard-api/src/network_slices/slice/start_sync.rs index 5b34f6669..0b115eb12 100644 --- a/crates/jacquard-api/src/network_slices/slice/start_sync.rs +++ b/crates/jacquard-api/src/network_slices/slice/start_sync.rs @@ -19,27 +19,30 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct StartSync<'a> { - ///List of collection NSIDs to sync (primary collections matching slice domain) + /// List of collection NSIDs to sync (primary collections matching slice domain) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub collections: std::option::Option>>, - ///List of external collection NSIDs to sync (collections outside slice domain) + pub collections: Option>>, + /// List of external collection NSIDs to sync (collections outside slice domain) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub external_collections: std::option::Option< - Vec>, - >, - ///Maximum number of records to sync per repository + pub external_collections: Option>>, + /// Maximum number of records to sync per repository #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub limit_per_repo: std::option::Option, - ///List of specific repository DIDs to sync from + #[builder(into)] + pub limit_per_repo: Option, + /// List of specific repository DIDs to sync from #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub repos: std::option::Option>>, - ///Skip lexicon validation during sync + pub repos: Option>>, + /// Skip lexicon validation during sync #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub skip_validation: std::option::Option, - ///AT-URI of the slice to sync data into + #[builder(into)] + pub skip_validation: Option, + /// AT-URI of the slice to sync data into #[serde(borrow)] #[builder(into)] pub slice: jacquard_common::CowStr<'a>, @@ -64,10 +67,10 @@ pub struct StartSync<'a> { )] #[serde(rename_all = "camelCase")] pub struct StartSyncOutput<'a> { - ///UUID of the enqueued sync job + /// UUID of the enqueued sync job #[serde(borrow)] pub job_id: jacquard_common::CowStr<'a>, - ///Success message confirming job enqueue + /// Success message confirming job enqueue #[serde(borrow)] pub message: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/network_slices/slice/stats.rs b/crates/jacquard-api/src/network_slices/slice/stats.rs index 8da66022e..7b988aaaf 100644 --- a/crates/jacquard-api/src/network_slices/slice/stats.rs +++ b/crates/jacquard-api/src/network_slices/slice/stats.rs @@ -13,16 +13,17 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct CollectionStats<'a> { - ///Collection NSID + /// Collection NSID #[serde(borrow)] pub collection: jacquard_common::types::string::Nsid<'a>, - ///Number of records in this collection + /// Number of records in this collection pub record_count: i64, - ///Number of unique actors with records in this collection + /// Number of unique actors with records in this collection pub unique_actors: i64, } @@ -56,17 +57,17 @@ pub struct Stats<'a> { )] #[serde(rename_all = "camelCase")] pub struct StatsOutput<'a> { - ///Per-collection statistics + /// Per-collection statistics #[serde(borrow)] pub collection_stats: Vec>, - ///List of collection NSIDs indexed in this slice + /// List of collection NSIDs indexed in this slice #[serde(borrow)] pub collections: Vec>, - ///Total number of unique actors indexed in this slice + /// Total number of unique actors indexed in this slice pub total_actors: i64, - ///Total number of lexicons defined for this slice + /// Total number of lexicons defined for this slice pub total_lexicons: i64, - ///Total number of records indexed in this slice + /// Total number of records indexed in this slice pub total_records: i64, } diff --git a/crates/jacquard-api/src/network_slices/slice/sync_user_collections.rs b/crates/jacquard-api/src/network_slices/slice/sync_user_collections.rs index 8af5e2e7d..b7e6c23eb 100644 --- a/crates/jacquard-api/src/network_slices/slice/sync_user_collections.rs +++ b/crates/jacquard-api/src/network_slices/slice/sync_user_collections.rs @@ -19,13 +19,14 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct SyncUserCollections<'a> { - ///AT-URI of the slice to sync user data into + /// AT-URI of the slice to sync user data into #[serde(borrow)] #[builder(into)] pub slice: jacquard_common::CowStr<'a>, - ///Timeout in seconds for the sync operation + /// Timeout in seconds for the sync operation #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub timeout_seconds: std::option::Option, + #[builder(into)] + pub timeout_seconds: Option, #[serde(flatten)] #[serde(borrow)] #[builder(default)] @@ -47,11 +48,11 @@ pub struct SyncUserCollections<'a> { )] #[serde(rename_all = "camelCase")] pub struct SyncUserCollectionsOutput<'a> { - ///Number of records successfully synced + /// Number of records successfully synced pub records_synced: i64, - ///Number of repositories processed during sync + /// Number of repositories processed during sync pub repos_processed: i64, - ///Whether the sync operation exceeded the timeout + /// Whether the sync operation exceeded the timeout pub timed_out: bool, } diff --git a/crates/jacquard-api/src/network_slices/slice/update_o_auth_client.rs b/crates/jacquard-api/src/network_slices/slice/update_o_auth_client.rs index 3351a7cf0..728846997 100644 --- a/crates/jacquard-api/src/network_slices/slice/update_o_auth_client.rs +++ b/crates/jacquard-api/src/network_slices/slice/update_o_auth_client.rs @@ -19,40 +19,45 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct UpdateOAuthClient<'a> { - ///OAuth client ID to update + /// OAuth client ID to update #[serde(borrow)] #[builder(into)] pub client_id: jacquard_common::CowStr<'a>, - ///New human-readable name of the OAuth client + /// New human-readable name of the OAuth client #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub client_name: std::option::Option>, - ///New URI of the client application - #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] - pub client_uri: std::option::Option>, - ///New URI of the client logo + pub client_name: Option>, + /// New URI of the client application #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub logo_uri: std::option::Option>, - ///New URI of the privacy policy + pub client_uri: Option>, + /// New URI of the client logo #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub policy_uri: std::option::Option>, - ///New allowed redirect URIs for OAuth flow + pub logo_uri: Option>, + /// New URI of the privacy policy #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub redirect_uris: std::option::Option>>, - ///New OAuth scope + pub policy_uri: Option>, + /// New allowed redirect URIs for OAuth flow #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] + pub redirect_uris: Option>>, + /// New OAuth scope + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub scope: std::option::Option>, - ///New URI of the terms of service + #[serde(borrow)] + pub scope: Option>, + /// New URI of the terms of service #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tos_uri: std::option::Option>, + pub tos_uri: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/network_slices/waitlist.rs b/crates/jacquard-api/src/network_slices/waitlist.rs index 5147e2379..1e2560387 100644 --- a/crates/jacquard-api/src/network_slices/waitlist.rs +++ b/crates/jacquard-api/src/network_slices/waitlist.rs @@ -8,7 +8,7 @@ pub mod invite; pub mod request; -///An invite granting a DID access with profile information +/// An invite granting a DID access with profile information #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -17,32 +17,36 @@ pub mod request; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct InviteView<'a> { - ///When this invitation was created + /// When this invitation was created pub created_at: jacquard_common::types::string::Datetime, - ///The DID being invited + /// The DID being invited #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///Optional expiration date for this invitation + /// Optional expiration date for this invitation #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub expires_at: std::option::Option, - ///Profile of the invitee + #[builder(into)] + pub expires_at: Option, + /// Profile of the invitee #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub profile: std::option::Option>, - ///The AT URI of the slice this invite is for + pub profile: Option>, + /// The AT URI of the slice this invite is for #[serde(borrow)] pub slice: jacquard_common::types::string::AtUri<'a>, - ///The AT URI of this invite record + /// The AT URI of this invite record #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub uri: std::option::Option>, + pub uri: Option>, } -///A request to join the waitlist with profile information +/// A request to join the waitlist with profile information #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -51,17 +55,19 @@ pub struct InviteView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RequestView<'a> { - ///When the user joined the waitlist + /// When the user joined the waitlist pub created_at: jacquard_common::types::string::Datetime, - ///Profile of the requester + /// Profile of the requester #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub profile: std::option::Option>, - ///The AT URI of the slice being requested access to + pub profile: Option>, + /// The AT URI of the slice being requested access to #[serde(borrow)] pub slice: jacquard_common::types::string::AtUri<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/network_slices/waitlist/invite.rs b/crates/jacquard-api/src/network_slices/waitlist/invite.rs index 02ec6381b..09ca1c43b 100644 --- a/crates/jacquard-api/src/network_slices/waitlist/invite.rs +++ b/crates/jacquard-api/src/network_slices/waitlist/invite.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///An invite granting a DID access, created by the slice owner +/// An invite granting a DID access, created by the slice owner #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,19 +14,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Invite<'a> { - ///When this invitation was created + /// When this invitation was created pub created_at: jacquard_common::types::string::Datetime, - ///The DID being invited + /// The DID being invited #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///Optional expiration date for this invitation + /// Optional expiration date for this invitation #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub expires_at: std::option::Option, - ///The AT URI of the slice this invite is for + #[builder(into)] + pub expires_at: Option, + /// The AT URI of the slice this invite is for #[serde(borrow)] pub slice: jacquard_common::types::string::AtUri<'a>, } diff --git a/crates/jacquard-api/src/network_slices/waitlist/request.rs b/crates/jacquard-api/src/network_slices/waitlist/request.rs index d43bd75be..d51fc9662 100644 --- a/crates/jacquard-api/src/network_slices/waitlist/request.rs +++ b/crates/jacquard-api/src/network_slices/waitlist/request.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A request to join the waitlist +/// A request to join the waitlist #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,13 +14,14 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Request<'a> { - ///When the user joined the waitlist + /// When the user joined the waitlist pub created_at: jacquard_common::types::string::Datetime, - ///The AT URI of the slice being requested access to + /// The AT URI of the slice being requested access to #[serde(borrow)] pub slice: jacquard_common::types::string::AtUri<'a>, } diff --git a/crates/jacquard-api/src/org_devcon/event/test.rs b/crates/jacquard-api/src/org_devcon/event/test.rs index 486e74312..bcd9f0514 100644 --- a/crates/jacquard-api/src/org_devcon/event/test.rs +++ b/crates/jacquard-api/src/org_devcon/event/test.rs @@ -13,31 +13,37 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Test<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, - ///Description of the event + #[builder(into)] + pub created_at: Option, + /// Description of the event #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///End time of the event + pub description: Option>, + /// End time of the event pub end: jacquard_common::types::string::Datetime, - ///Location of the event + /// Location of the event #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub location: std::option::Option>, - ///Start time of the event + pub location: Option>, + /// Start time of the event pub start: jacquard_common::types::string::Datetime, - ///Title of the event + /// Title of the event #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, - ///URL of the event + /// URL of the event #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub url: std::option::Option>, + pub url: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/org_robocracy/demo/fungus.rs b/crates/jacquard-api/src/org_robocracy/demo/fungus.rs index f0f14ce76..e37479f3c 100644 --- a/crates/jacquard-api/src/org_robocracy/demo/fungus.rs +++ b/crates/jacquard-api/src/org_robocracy/demo/fungus.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///it's a kind of fungus! +/// it's a kind of fungus! #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,17 +14,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Fungus<'a> { #[serde(borrow)] + #[builder(into)] pub common_name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub edible: std::option::Option, + #[builder(into)] + pub edible: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub species: std::option::Option>, + pub species: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/org_robocracy/demo/mushies.rs b/crates/jacquard-api/src/org_robocracy/demo/mushies.rs index 5eac0293c..f8bcb41db 100644 --- a/crates/jacquard-api/src/org_robocracy/demo/mushies.rs +++ b/crates/jacquard-api/src/org_robocracy/demo/mushies.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///it's a kind of fungus! +/// it's a kind of fungus! #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,17 +14,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Mushies<'a> { #[serde(borrow)] + #[builder(into)] pub common_name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub edible: std::option::Option, + #[builder(into)] + pub edible: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub species: std::option::Option>, + pub species: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/place_atwork/endorsement.rs b/crates/jacquard-api/src/place_atwork/endorsement.rs index 8b0a95436..0d9c92c42 100644 --- a/crates/jacquard-api/src/place_atwork/endorsement.rs +++ b/crates/jacquard-api/src/place_atwork/endorsement.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A cryptographically-verified professional endorsement between two identities. +/// A cryptographically-verified professional endorsement between two identities. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,26 +14,27 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Endorsement<'a> { - ///Timestamp when the endorsement was created. + /// Timestamp when the endorsement was created. pub created_at: jacquard_common::types::string::Datetime, - ///The DID of the identity giving the endorsement. + /// The DID of the identity giving the endorsement. #[serde(borrow)] pub giver: jacquard_common::types::string::Did<'a>, - ///The DID of the identity receiving the endorsement. + /// The DID of the identity receiving the endorsement. #[serde(borrow)] pub receiver: jacquard_common::types::string::Did<'a>, - ///Verified signatures from endorsement proofs (strong references). + /// Verified signatures from endorsement proofs (strong references). #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub signatures: std::option::Option< - Vec>, - >, - ///The endorsement text content. + pub signatures: Option>>, + /// The endorsement text content. #[serde(borrow)] + #[builder(into)] pub text: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/place_atwork/endorsement_proof.rs b/crates/jacquard-api/src/place_atwork/endorsement_proof.rs index e36b3e1e6..f2448a7ad 100644 --- a/crates/jacquard-api/src/place_atwork/endorsement_proof.rs +++ b/crates/jacquard-api/src/place_atwork/endorsement_proof.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A cryptographic proof record that validates an endorsement by containing the CID of the endorsement content. +/// A cryptographic proof record that validates an endorsement by containing the CID of the endorsement content. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,11 +14,12 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct EndorsementProof<'a> { - ///The CID (Content Identifier) of the endorsement content that this proof validates. The endorsement's signatures array references this proof record. + /// The CID (Content Identifier) of the endorsement content that this proof validates. The endorsement's signatures array references this proof record. #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, } diff --git a/crates/jacquard-api/src/place_atwork/get_listing.rs b/crates/jacquard-api/src/place_atwork/get_listing.rs index d886fb00e..f686a7697 100644 --- a/crates/jacquard-api/src/place_atwork/get_listing.rs +++ b/crates/jacquard-api/src/place_atwork/get_listing.rs @@ -37,14 +37,14 @@ pub struct GetListing<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetListingOutput<'a> { - ///CID of the listing record + /// CID of the listing record #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cid: std::option::Option>, - ///AT-URI of the listing + /// AT-URI of the listing #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, - ///The job listing record + /// The job listing record #[serde(borrow)] pub value: crate::place_atwork::listing::Listing<'a>, } @@ -64,13 +64,13 @@ pub struct GetListingOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum GetListingError<'a> { - ///The requested listing does not exist + /// The requested listing does not exist #[serde(rename = "ListingNotFound")] ListingNotFound(std::option::Option), - ///Failed to parse the listing data + /// Failed to parse the listing data #[serde(rename = "ListingParseFailed")] ListingParseFailed(std::option::Option), - ///Failed to fetch the listing from storage + /// Failed to fetch the listing from storage #[serde(rename = "ListingFetchFailed")] ListingFetchFailed(std::option::Option), } diff --git a/crates/jacquard-api/src/place_atwork/get_listings.rs b/crates/jacquard-api/src/place_atwork/get_listings.rs index 85872d7f4..bc79b3be4 100644 --- a/crates/jacquard-api/src/place_atwork/get_listings.rs +++ b/crates/jacquard-api/src/place_atwork/get_listings.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A job listing record with metadata for strong references +/// A job listing record with metadata for strong references #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,20 +14,22 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ListingRecord<'a> { - ///CID of the listing record + /// CID of the listing record #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, - ///AT-URI of the listing (at://did/place.atwork.listing/rkey) + /// AT-URI of the listing (at://did/place.atwork.listing/rkey) #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, - ///The full job listing record + /// The full job listing record #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub value: std::option::Option>, + pub value: Option>, } #[derive( diff --git a/crates/jacquard-api/src/place_atwork/listing.rs b/crates/jacquard-api/src/place_atwork/listing.rs index 9a20b22eb..489e6e675 100644 --- a/crates/jacquard-api/src/place_atwork/listing.rs +++ b/crates/jacquard-api/src/place_atwork/listing.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A job listing +/// A job listing #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,37 +14,42 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Listing<'a> { - ///URL where applicants can apply for the job. + /// URL where applicants can apply for the job. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub apply_link: std::option::Option>, - ///Larger horizontal image to display behind job listing view. + pub apply_link: Option>, + /// Larger horizontal image to display behind job listing view. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub banner: std::option::Option>, - ///The description of the job listing. + pub banner: Option>, + /// The description of the job listing. #[serde(borrow)] + #[builder(into)] pub description: jacquard_common::CowStr<'a>, - ///Annotations of text (mentions, URLs, hashtags, etc). + /// Annotations of text (mentions, URLs, hashtags, etc). #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub facets: std::option::Option>>, - ///Locations that are relevant to the job listing. + pub facets: Option>>, + /// Locations that are relevant to the job listing. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub locations: std::option::Option< - Vec>, - >, - ///Client-declared timestamp when the job listing expires. + pub locations: Option>>, + /// Client-declared timestamp when the job listing expires. pub not_after: jacquard_common::types::string::Datetime, - ///Client-declared timestamp when the job listing becomes visible. + /// Client-declared timestamp when the job listing becomes visible. pub not_before: jacquard_common::types::string::Datetime, - ///The title of the job listing. + /// The title of the job listing. #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/place_atwork/profile.rs b/crates/jacquard-api/src/place_atwork/profile.rs index 641674203..6f947f1c4 100644 --- a/crates/jacquard-api/src/place_atwork/profile.rs +++ b/crates/jacquard-api/src/place_atwork/profile.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Indicates the identity is available for hire +/// Indicates the identity is available for hire #[derive( serde::Serialize, serde::Deserialize, @@ -23,7 +23,7 @@ impl std::fmt::Display for Forhire { } } -///Indicates the identity is actively hiring +/// Indicates the identity is actively hiring #[derive( serde::Serialize, serde::Deserialize, @@ -41,7 +41,7 @@ impl std::fmt::Display for Hiring { } } -///A user profile for AT://Work.Place +/// A user profile for AT://Work.Place #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -50,42 +50,51 @@ impl std::fmt::Display for Hiring { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Profile<'a> { - ///Small image to be displayed next to job listings from account. AKA, 'profile picture' + /// Small image to be displayed next to job listings from account. AKA, 'profile picture' #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, - ///Larger horizontal image to display behind profile view. + pub avatar: Option>, + /// Larger horizontal image to display behind profile view. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub banner: std::option::Option>, - ///A free text description of the identity. + pub banner: Option>, + /// A free text description of the identity. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///The display name of the identity. + pub description: Option>, + /// The display name of the identity. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display_name: std::option::Option>, - ///Annotations of text (mentions, URLs, hashtags, etc) in the description. + pub display_name: Option>, + /// Annotations of text (mentions, URLs, hashtags, etc) in the description. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub facets: std::option::Option>>, - ///The service used for profile links + pub facets: Option>>, + /// The service used for profile links #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub profile_host: std::option::Option>, - ///The identity's resume. + pub profile_host: Option>, + /// The identity's resume. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub resume: std::option::Option>, - ///The current status of the identity. + pub resume: Option>, + /// The current status of the identity. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option>, + pub status: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/place_atwork/search_listings.rs b/crates/jacquard-api/src/place_atwork/search_listings.rs index 8a4218062..96f946199 100644 --- a/crates/jacquard-api/src/place_atwork/search_listings.rs +++ b/crates/jacquard-api/src/place_atwork/search_listings.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A job listing record with metadata for strong references +/// A job listing record with metadata for strong references #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,20 +14,22 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ListingRecord<'a> { - ///CID of the listing record + /// CID of the listing record #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, - ///AT-URI of the listing (at://did/place.atwork.listing/rkey) + /// AT-URI of the listing (at://did/place.atwork.listing/rkey) #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, - ///The full job listing record + /// The full job listing record #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub value: std::option::Option>, + pub value: Option>, } #[derive( @@ -79,7 +81,7 @@ pub struct SearchListingsOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum SearchListingsError<'a> { - ///Failed to search listings + /// Failed to search listings #[serde(rename = "SearchFailed")] SearchFailed(std::option::Option), } diff --git a/crates/jacquard-api/src/place_stream.rs b/crates/jacquard-api/src/place_stream.rs index a8a49bf8d..39dfc0ef0 100644 --- a/crates/jacquard-api/src/place_stream.rs +++ b/crates/jacquard-api/src/place_stream.rs @@ -22,7 +22,8 @@ pub mod server; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct BlockView<'a> { @@ -45,11 +46,13 @@ pub struct BlockView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Rendition<'a> { #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } @@ -61,7 +64,8 @@ pub struct Rendition<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Renditions<'a> { diff --git a/crates/jacquard-api/src/place_stream/chat.rs b/crates/jacquard-api/src/place_stream/chat.rs index 964806fc8..9d0d94105 100644 --- a/crates/jacquard-api/src/place_stream/chat.rs +++ b/crates/jacquard-api/src/place_stream/chat.rs @@ -17,28 +17,30 @@ pub mod profile; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct MessageView<'a> { #[serde(borrow)] pub author: crate::app_bsky::actor::ProfileViewBasic<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub chat_profile: std::option::Option< - crate::place_stream::chat::profile::Profile<'a>, - >, + pub chat_profile: Option>, #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, - ///If true, this message has been deleted or labeled and should be cleared from the cache + /// If true, this message has been deleted or labeled and should be cleared from the cache #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub deleted: std::option::Option, + #[builder(into)] + pub deleted: Option, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(borrow)] pub record: jacquard_common::types::value::Data<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reply_to: std::option::Option>, + pub reply_to: Option>, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, } diff --git a/crates/jacquard-api/src/place_stream/chat/gate.rs b/crates/jacquard-api/src/place_stream/chat/gate.rs index 8db93bc32..df365d46f 100644 --- a/crates/jacquard-api/src/place_stream/chat/gate.rs +++ b/crates/jacquard-api/src/place_stream/chat/gate.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record defining a single gated chat message. +/// Record defining a single gated chat message. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,11 +14,12 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Gate<'a> { - ///URI of the hidden chat message. + /// URI of the hidden chat message. #[serde(borrow)] pub hidden_message: jacquard_common::types::string::AtUri<'a>, } diff --git a/crates/jacquard-api/src/place_stream/chat/message.rs b/crates/jacquard-api/src/place_stream/chat/message.rs index b90234a56..f92e76afb 100644 --- a/crates/jacquard-api/src/place_stream/chat/message.rs +++ b/crates/jacquard-api/src/place_stream/chat/message.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record containing a Streamplace chat message. +/// Record containing a Streamplace chat message. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,26 +14,28 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Message<'a> { - ///Client-declared timestamp when this message was originally created. + /// Client-declared timestamp when this message was originally created. pub created_at: jacquard_common::types::string::Datetime, - ///Annotations of text (mentions, URLs, etc) + /// Annotations of text (mentions, URLs, etc) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub facets: std::option::Option< - Vec>, - >, + pub facets: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reply: std::option::Option>, - ///The DID of the streamer whose chat this is. + pub reply: Option>, + /// The DID of the streamer whose chat this is. #[serde(borrow)] pub streamer: jacquard_common::types::string::Did<'a>, - ///The primary message content. May be an empty string, if there are embeds. + /// The primary message content. May be an empty string, if there are embeds. #[serde(borrow)] + #[builder(into)] pub text: jacquard_common::CowStr<'a>, } @@ -87,7 +89,8 @@ impl From> for Message<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ReplyRef<'a> { diff --git a/crates/jacquard-api/src/place_stream/chat/profile.rs b/crates/jacquard-api/src/place_stream/chat/profile.rs index 7077b590a..b50ce4d89 100644 --- a/crates/jacquard-api/src/place_stream/chat/profile.rs +++ b/crates/jacquard-api/src/place_stream/chat/profile.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Customizations for the color of a user's name in chat +/// Customizations for the color of a user's name in chat #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,7 +14,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Color<'a> { @@ -23,7 +24,7 @@ pub struct Color<'a> { pub red: i64, } -///Record containing customizations for a user's chat profile. +/// Record containing customizations for a user's chat profile. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -32,13 +33,15 @@ pub struct Color<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Profile<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub color: std::option::Option>, + pub color: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/place_stream/key.rs b/crates/jacquard-api/src/place_stream/key.rs index 49da7d4cc..2ce7212bd 100644 --- a/crates/jacquard-api/src/place_stream/key.rs +++ b/crates/jacquard-api/src/place_stream/key.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record linking an atproto identity with a stream signing key +/// Record linking an atproto identity with a stream signing key #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,18 +14,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Key<'a> { - ///Client-declared timestamp when this key was created. + /// Client-declared timestamp when this key was created. pub created_at: jacquard_common::types::string::Datetime, - ///The name of the client that created this key. + /// The name of the client that created this key. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub created_by: std::option::Option>, - ///The did:key signing key for the stream. + pub created_by: Option>, + /// The did:key signing key for the stream. #[serde(borrow)] + #[builder(into)] pub signing_key: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/place_stream/livestream.rs b/crates/jacquard-api/src/place_stream/livestream.rs index 7ec0c1bb7..f637228b2 100644 --- a/crates/jacquard-api/src/place_stream/livestream.rs +++ b/crates/jacquard-api/src/place_stream/livestream.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LivestreamView<'a> { @@ -26,15 +27,14 @@ pub struct LivestreamView<'a> { pub record: jacquard_common::types::value::Data<'a>, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, - ///The number of viewers watching this livestream. Use when you can't reasonably use #viewerCount directly. + /// The number of viewers watching this livestream. Use when you can't reasonably use #viewerCount directly. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub viewer_count: std::option::Option< - crate::place_stream::livestream::ViewerCount<'a>, - >, + pub viewer_count: Option>, } -///Record announcing a livestream is happening +/// Record announcing a livestream is happening #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -43,34 +43,41 @@ pub struct LivestreamView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Livestream<'a> { - ///The source of the livestream, if available, in a User Agent format: ` / ` e.g. Streamplace/0.7.5 iOS + /// The source of the livestream, if available, in a User Agent format: ` / ` e.g. Streamplace/0.7.5 iOS #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub agent: std::option::Option>, - ///The primary URL where this livestream can be viewed, if available. + pub agent: Option>, + /// The primary URL where this livestream can be viewed, if available. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub canonical_url: std::option::Option>, - ///Client-declared timestamp when this livestream started. + pub canonical_url: Option>, + /// Client-declared timestamp when this livestream started. pub created_at: jacquard_common::types::string::Datetime, - ///The post that announced this livestream. + /// The post that announced this livestream. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub post: std::option::Option>, + pub post: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub thumb: std::option::Option>, - ///The title of the livestream, as it will be announced to followers. + pub thumb: Option>, + /// The title of the livestream, as it will be announced to followers. #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, - ///The URL where this stream can be found. This is primarily a hint for other Streamplace nodes to locate and replicate the stream. + /// The URL where this stream can be found. This is primarily a hint for other Streamplace nodes to locate and replicate the stream. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub url: std::option::Option>, + pub url: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. @@ -123,7 +130,8 @@ impl From> for Livestream<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct StreamplaceAnything<'a> { @@ -166,7 +174,8 @@ pub enum StreamplaceAnythingLivestream<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewerCount<'a> { diff --git a/crates/jacquard-api/src/place_stream/richtext/facet.rs b/crates/jacquard-api/src/place_stream/richtext/facet.rs index 3f5c56cfe..43893b760 100644 --- a/crates/jacquard-api/src/place_stream/richtext/facet.rs +++ b/crates/jacquard-api/src/place_stream/richtext/facet.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Annotation of a sub-string within rich text. +/// Annotation of a sub-string within rich text. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,7 +14,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Facet<'a> { diff --git a/crates/jacquard-api/src/place_stream/segment.rs b/crates/jacquard-api/src/place_stream/segment.rs index 231729b76..474de7546 100644 --- a/crates/jacquard-api/src/place_stream/segment.rs +++ b/crates/jacquard-api/src/place_stream/segment.rs @@ -13,12 +13,14 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Audio<'a> { pub channels: i64, #[serde(borrow)] + #[builder(into)] pub codec: jacquard_common::CowStr<'a>, pub rate: i64, } @@ -31,7 +33,8 @@ pub struct Audio<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Framerate<'a> { @@ -39,7 +42,7 @@ pub struct Framerate<'a> { pub num: i64, } -///Media file representing a segment of a livestream +/// Media file representing a segment of a livestream #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -48,32 +51,39 @@ pub struct Framerate<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Segment<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub audio: std::option::Option>>, + pub audio: Option>>, #[serde(borrow)] pub creator: jacquard_common::types::string::Did<'a>, - ///The duration of the segment in nanoseconds + /// The duration of the segment in nanoseconds #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub duration: std::option::Option, - ///Unique identifier for the segment + #[builder(into)] + pub duration: Option, + /// Unique identifier for the segment #[serde(borrow)] + #[builder(into)] pub id: jacquard_common::CowStr<'a>, - ///The DID of the signing key used for this segment + /// The DID of the signing key used for this segment #[serde(borrow)] + #[builder(into)] pub signing_key: jacquard_common::CowStr<'a>, - ///The size of the segment in bytes + /// The size of the segment in bytes #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub size: std::option::Option, - ///When this segment started + #[builder(into)] + pub size: Option, + /// When this segment started pub start_time: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub video: std::option::Option>>, + pub video: Option>>, } /// Typed wrapper for GetRecord response with this collection's record type. @@ -126,7 +136,8 @@ impl From> for Segment<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SegmentView<'a> { @@ -144,17 +155,21 @@ pub struct SegmentView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Video<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub bframes: std::option::Option, + #[builder(into)] + pub bframes: Option, #[serde(borrow)] + #[builder(into)] pub codec: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub framerate: std::option::Option>, + pub framerate: Option>, pub height: i64, pub width: i64, } \ No newline at end of file diff --git a/crates/jacquard-api/src/place_stream/server.rs b/crates/jacquard-api/src/place_stream/server.rs index 62054d607..ac9d4c13b 100644 --- a/crates/jacquard-api/src/place_stream/server.rs +++ b/crates/jacquard-api/src/place_stream/server.rs @@ -20,19 +20,22 @@ pub mod update_webhook; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RewriteRule<'a> { - ///Text to search for and replace. + /// Text to search for and replace. #[serde(borrow)] + #[builder(into)] pub from: jacquard_common::CowStr<'a>, - ///Text to replace with. + /// Text to replace with. #[serde(borrow)] + #[builder(into)] pub to: jacquard_common::CowStr<'a>, } -///A webhook configuration for receiving Streamplace events. +/// A webhook configuration for receiving Streamplace events. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -41,54 +44,65 @@ pub struct RewriteRule<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Webhook<'a> { - ///Whether this webhook is currently active. + /// Whether this webhook is currently active. pub active: bool, - ///When this webhook was created. + /// When this webhook was created. pub created_at: jacquard_common::types::string::Datetime, - ///A description of what this webhook is used for. + /// A description of what this webhook is used for. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///Number of consecutive errors for this webhook. + pub description: Option>, + /// Number of consecutive errors for this webhook. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub error_count: std::option::Option, - ///The types of events this webhook should receive. + #[builder(into)] + pub error_count: Option, + /// The types of events this webhook should receive. #[serde(borrow)] pub events: Vec>, - ///Unique identifier for this webhook. + /// Unique identifier for this webhook. #[serde(borrow)] + #[builder(into)] pub id: jacquard_common::CowStr<'a>, - ///When this webhook was last triggered. + /// When this webhook was last triggered. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub last_triggered: std::option::Option, - ///Words to filter out from chat messages. Messages containing any of these words will not be forwarded. + #[builder(into)] + pub last_triggered: Option, + /// Words to filter out from chat messages. Messages containing any of these words will not be forwarded. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub mute_words: std::option::Option>>, - ///A user-friendly name for this webhook. + pub mute_words: Option>>, + /// A user-friendly name for this webhook. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub name: std::option::Option>, - ///Text to prepend to webhook messages. + pub name: Option>, + /// Text to prepend to webhook messages. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub prefix: std::option::Option>, - ///Text replacement rules for webhook messages. + pub prefix: Option>, + /// Text replacement rules for webhook messages. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub rewrite: std::option::Option>>, - ///Text to append to webhook messages. + pub rewrite: Option>>, + /// Text to append to webhook messages. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub suffix: std::option::Option>, - ///When this webhook was last updated. + pub suffix: Option>, + /// When this webhook was last updated. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, - ///The webhook URL where events will be sent. + #[builder(into)] + pub updated_at: Option, + /// The webhook URL where events will be sent. #[serde(borrow)] pub url: jacquard_common::types::string::Uri<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/place_stream/server/create_webhook.rs b/crates/jacquard-api/src/place_stream/server/create_webhook.rs index 538638c97..5b86e134c 100644 --- a/crates/jacquard-api/src/place_stream/server/create_webhook.rs +++ b/crates/jacquard-api/src/place_stream/server/create_webhook.rs @@ -19,41 +19,44 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct CreateWebhook<'a> { - ///Whether this webhook should be active upon creation. + /// Whether this webhook should be active upon creation. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub active: std::option::Option, - ///A description of what this webhook is used for. + #[builder(into)] + pub active: Option, + /// A description of what this webhook is used for. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub description: std::option::Option>, - ///The types of events this webhook should receive. + #[serde(borrow)] + pub description: Option>, + /// The types of events this webhook should receive. #[serde(borrow)] pub events: Vec>, - ///Words to filter out from chat messages. Messages containing any of these words will not be forwarded. + /// Words to filter out from chat messages. Messages containing any of these words will not be forwarded. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub mute_words: std::option::Option>>, - ///A user-friendly name for this webhook. + pub mute_words: Option>>, + /// A user-friendly name for this webhook. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub name: std::option::Option>, - ///Text to prepend to webhook messages. - #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] - #[builder(into)] - pub prefix: std::option::Option>, - ///Text replacement rules for webhook messages. + pub name: Option>, + /// Text to prepend to webhook messages. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub rewrite: std::option::Option>>, - ///Text to append to webhook messages. + pub prefix: Option>, + /// Text replacement rules for webhook messages. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] + pub rewrite: Option>>, + /// Text to append to webhook messages. + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub suffix: std::option::Option>, - ///The webhook URL where events will be sent. + #[serde(borrow)] + pub suffix: Option>, + /// The webhook URL where events will be sent. #[serde(borrow)] pub url: jacquard_common::types::string::Uri<'a>, #[serde(flatten)] @@ -96,13 +99,13 @@ pub struct CreateWebhookOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum CreateWebhookError<'a> { - ///The provided webhook URL is invalid or unreachable. + /// The provided webhook URL is invalid or unreachable. #[serde(rename = "InvalidUrl")] InvalidUrl(std::option::Option), - ///A webhook with this URL already exists for this user. + /// A webhook with this URL already exists for this user. #[serde(rename = "DuplicateWebhook")] DuplicateWebhook(std::option::Option), - ///The user has reached their maximum number of webhooks. + /// The user has reached their maximum number of webhooks. #[serde(rename = "TooManyWebhooks")] TooManyWebhooks(std::option::Option), } diff --git a/crates/jacquard-api/src/place_stream/server/delete_webhook.rs b/crates/jacquard-api/src/place_stream/server/delete_webhook.rs index 0103ba45a..0203ac4e7 100644 --- a/crates/jacquard-api/src/place_stream/server/delete_webhook.rs +++ b/crates/jacquard-api/src/place_stream/server/delete_webhook.rs @@ -19,7 +19,7 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct DeleteWebhook<'a> { - ///The ID of the webhook to delete. + /// The ID of the webhook to delete. #[serde(borrow)] #[builder(into)] pub id: jacquard_common::CowStr<'a>, @@ -44,7 +44,7 @@ pub struct DeleteWebhook<'a> { )] #[serde(rename_all = "camelCase")] pub struct DeleteWebhookOutput<'a> { - ///Whether the webhook was successfully deleted. + /// Whether the webhook was successfully deleted. pub success: bool, } @@ -63,10 +63,10 @@ pub struct DeleteWebhookOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum DeleteWebhookError<'a> { - ///The specified webhook was not found. + /// The specified webhook was not found. #[serde(rename = "WebhookNotFound")] WebhookNotFound(std::option::Option), - ///The authenticated user does not have access to this webhook. + /// The authenticated user does not have access to this webhook. #[serde(rename = "Unauthorized")] Unauthorized(std::option::Option), } diff --git a/crates/jacquard-api/src/place_stream/server/get_webhook.rs b/crates/jacquard-api/src/place_stream/server/get_webhook.rs index d5e6e9aa8..8af5f3a0a 100644 --- a/crates/jacquard-api/src/place_stream/server/get_webhook.rs +++ b/crates/jacquard-api/src/place_stream/server/get_webhook.rs @@ -54,10 +54,10 @@ pub struct GetWebhookOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum GetWebhookError<'a> { - ///The specified webhook was not found. + /// The specified webhook was not found. #[serde(rename = "WebhookNotFound")] WebhookNotFound(std::option::Option), - ///The authenticated user does not have access to this webhook. + /// The authenticated user does not have access to this webhook. #[serde(rename = "Unauthorized")] Unauthorized(std::option::Option), } diff --git a/crates/jacquard-api/src/place_stream/server/list_webhooks.rs b/crates/jacquard-api/src/place_stream/server/list_webhooks.rs index d146da671..169b4a7bc 100644 --- a/crates/jacquard-api/src/place_stream/server/list_webhooks.rs +++ b/crates/jacquard-api/src/place_stream/server/list_webhooks.rs @@ -45,7 +45,7 @@ pub struct ListWebhooks<'a> { )] #[serde(rename_all = "camelCase")] pub struct ListWebhooksOutput<'a> { - ///A cursor for pagination, if there are more results. + /// A cursor for pagination, if there are more results. #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, @@ -68,7 +68,7 @@ pub struct ListWebhooksOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum ListWebhooksError<'a> { - ///The provided cursor is invalid or expired. + /// The provided cursor is invalid or expired. #[serde(rename = "InvalidCursor")] InvalidCursor(std::option::Option), } diff --git a/crates/jacquard-api/src/place_stream/server/settings.rs b/crates/jacquard-api/src/place_stream/server/settings.rs index f6ef5d92d..2400d67bc 100644 --- a/crates/jacquard-api/src/place_stream/server/settings.rs +++ b/crates/jacquard-api/src/place_stream/server/settings.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record containing user settings for a particular Streamplace node +/// Record containing user settings for a particular Streamplace node #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,13 +14,15 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Settings<'a> { - ///Whether this node may archive your livestream for improving the service + /// Whether this node may archive your livestream for improving the service #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub debug_recording: std::option::Option, + #[builder(into)] + pub debug_recording: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/place_stream/server/update_webhook.rs b/crates/jacquard-api/src/place_stream/server/update_webhook.rs index 1591b8a3c..7b8412915 100644 --- a/crates/jacquard-api/src/place_stream/server/update_webhook.rs +++ b/crates/jacquard-api/src/place_stream/server/update_webhook.rs @@ -19,49 +19,54 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct UpdateWebhook<'a> { - ///Whether this webhook should be active. + /// Whether this webhook should be active. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub active: std::option::Option, - ///A description of what this webhook is used for. + #[builder(into)] + pub active: Option, + /// A description of what this webhook is used for. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub description: std::option::Option>, - ///The types of events this webhook should receive. + #[serde(borrow)] + pub description: Option>, + /// The types of events this webhook should receive. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub events: std::option::Option>>, - ///The ID of the webhook to update. + pub events: Option>>, + /// The ID of the webhook to update. #[serde(borrow)] #[builder(into)] pub id: jacquard_common::CowStr<'a>, - ///Words to filter out from chat messages. Messages containing any of these words will not be forwarded. + /// Words to filter out from chat messages. Messages containing any of these words will not be forwarded. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub mute_words: std::option::Option>>, - ///A user-friendly name for this webhook. + pub mute_words: Option>>, + /// A user-friendly name for this webhook. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub name: std::option::Option>, - ///Text to prepend to webhook messages. - #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] - #[builder(into)] - pub prefix: std::option::Option>, - ///Text replacement rules for webhook messages. + pub name: Option>, + /// Text to prepend to webhook messages. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub rewrite: std::option::Option>>, - ///Text to append to webhook messages. + pub prefix: Option>, + /// Text replacement rules for webhook messages. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] + pub rewrite: Option>>, + /// Text to append to webhook messages. + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub suffix: std::option::Option>, - ///The webhook URL where events will be sent. + #[serde(borrow)] + pub suffix: Option>, + /// The webhook URL where events will be sent. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub url: std::option::Option>, + pub url: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] @@ -102,16 +107,16 @@ pub struct UpdateWebhookOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum UpdateWebhookError<'a> { - ///The specified webhook was not found. + /// The specified webhook was not found. #[serde(rename = "WebhookNotFound")] WebhookNotFound(std::option::Option), - ///The authenticated user does not have access to this webhook. + /// The authenticated user does not have access to this webhook. #[serde(rename = "Unauthorized")] Unauthorized(std::option::Option), - ///The provided webhook URL is invalid or unreachable. + /// The provided webhook URL is invalid or unreachable. #[serde(rename = "InvalidUrl")] InvalidUrl(std::option::Option), - ///A webhook with this URL already exists for this user. + /// A webhook with this URL already exists for this user. #[serde(rename = "DuplicateWebhook")] DuplicateWebhook(std::option::Option), } diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/blockquote.rs b/crates/jacquard-api/src/pub_leaflet/blocks/blockquote.rs index 517e97e9e..9c1385e48 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/blockquote.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/blockquote.rs @@ -13,13 +13,16 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Blockquote<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub facets: std::option::Option>>, + pub facets: Option>>, #[serde(borrow)] + #[builder(into)] pub plaintext: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/bsky_post.rs b/crates/jacquard-api/src/pub_leaflet/blocks/bsky_post.rs index 3bdfa2ffd..c046cc972 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/bsky_post.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/bsky_post.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct BskyPost<'a> { diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/code.rs b/crates/jacquard-api/src/pub_leaflet/blocks/code.rs index 2b12bcd75..9b441f2d0 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/code.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/code.rs @@ -13,16 +13,20 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Code<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub language: std::option::Option>, + pub language: Option>, #[serde(borrow)] + #[builder(into)] pub plaintext: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub syntax_highlighting_theme: std::option::Option>, + pub syntax_highlighting_theme: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/header.rs b/crates/jacquard-api/src/pub_leaflet/blocks/header.rs index 6bf4c1e1c..1b8fd521b 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/header.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/header.rs @@ -13,15 +13,19 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Header<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub facets: std::option::Option>>, + pub facets: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub level: std::option::Option, + #[builder(into)] + pub level: Option, #[serde(borrow)] + #[builder(into)] pub plaintext: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/horizontal_rule.rs b/crates/jacquard-api/src/pub_leaflet/blocks/horizontal_rule.rs index c3dbf31f3..a136b2fb6 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/horizontal_rule.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/horizontal_rule.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct HorizontalRule<'a> {} \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs b/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs index d76da059a..da713836e 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/iframe.rs @@ -13,12 +13,14 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Iframe<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub height: std::option::Option, + #[builder(into)] + pub height: Option, #[serde(borrow)] pub url: jacquard_common::types::string::Uri<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/image.rs b/crates/jacquard-api/src/pub_leaflet/blocks/image.rs index b8c4fefbd..6cbe7d050 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/image.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/image.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AspectRatio<'a> { @@ -29,14 +30,16 @@ pub struct AspectRatio<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Image<'a> { - ///Alt text description of the image, for accessibility. + /// Alt text description of the image, for accessibility. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub alt: std::option::Option>, + pub alt: Option>, #[serde(borrow)] pub aspect_ratio: crate::pub_leaflet::blocks::image::AspectRatio<'a>, #[serde(borrow)] diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/math.rs b/crates/jacquard-api/src/pub_leaflet/blocks/math.rs index b10afe127..f22918ce8 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/math.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/math.rs @@ -13,10 +13,12 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Math<'a> { #[serde(borrow)] + #[builder(into)] pub tex: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/text.rs b/crates/jacquard-api/src/pub_leaflet/blocks/text.rs index 3a1010d3e..341cdbd42 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/text.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/text.rs @@ -13,13 +13,16 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Text<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub facets: std::option::Option>>, + pub facets: Option>>, #[serde(borrow)] + #[builder(into)] pub plaintext: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs b/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs index 3a2592004..1fccd08b7 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/unordered_list.rs @@ -13,15 +13,15 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ListItem<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub children: std::option::Option< - Vec>, - >, + pub children: Option>>, #[serde(borrow)] pub content: ListItemContent<'a>, } @@ -55,7 +55,8 @@ pub enum ListItemContent<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct UnorderedList<'a> { diff --git a/crates/jacquard-api/src/pub_leaflet/blocks/website.rs b/crates/jacquard-api/src/pub_leaflet/blocks/website.rs index 524fd25fc..35fa8f5f2 100644 --- a/crates/jacquard-api/src/pub_leaflet/blocks/website.rs +++ b/crates/jacquard-api/src/pub_leaflet/blocks/website.rs @@ -13,19 +13,23 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Website<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub preview_image: std::option::Option>, + pub preview_image: Option>, #[serde(borrow)] pub src: jacquard_common::types::string::Uri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub title: std::option::Option>, + pub title: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/comment.rs b/crates/jacquard-api/src/pub_leaflet/comment.rs index d03ae2970..dab6263fd 100644 --- a/crates/jacquard-api/src/pub_leaflet/comment.rs +++ b/crates/jacquard-api/src/pub_leaflet/comment.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LinearDocumentQuote<'a> { @@ -23,7 +24,7 @@ pub struct LinearDocumentQuote<'a> { pub quote: crate::pub_leaflet::pages::linear_document::Quote<'a>, } -///Record containing a comment +/// Record containing a comment #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -32,24 +33,27 @@ pub struct LinearDocumentQuote<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Comment<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub attachment: std::option::Option< - crate::pub_leaflet::comment::LinearDocumentQuote<'a>, - >, + pub attachment: Option>, pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub facets: std::option::Option>>, + pub facets: Option>>, #[serde(borrow)] + #[builder(into)] pub plaintext: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reply: std::option::Option>, + pub reply: Option>, #[serde(borrow)] pub subject: jacquard_common::types::string::AtUri<'a>, } @@ -104,7 +108,8 @@ impl From> for Comment<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ReplyRef<'a> { diff --git a/crates/jacquard-api/src/pub_leaflet/document.rs b/crates/jacquard-api/src/pub_leaflet/document.rs index f71999508..64283a688 100644 --- a/crates/jacquard-api/src/pub_leaflet/document.rs +++ b/crates/jacquard-api/src/pub_leaflet/document.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record containing a document +/// Record containing a document #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,27 +14,30 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Document<'a> { #[serde(borrow)] pub author: jacquard_common::types::ident::AtIdentifier<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(borrow)] pub pages: Vec>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub post_ref: std::option::Option< - crate::com_atproto::repo::strong_ref::StrongRef<'a>, - >, + pub post_ref: Option>, #[serde(borrow)] pub publication: jacquard_common::types::string::AtUri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub published_at: std::option::Option, + #[builder(into)] + pub published_at: Option, #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/pub_leaflet/graph/subscription.rs b/crates/jacquard-api/src/pub_leaflet/graph/subscription.rs index f56b849b1..e730fa522 100644 --- a/crates/jacquard-api/src/pub_leaflet/graph/subscription.rs +++ b/crates/jacquard-api/src/pub_leaflet/graph/subscription.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record declaring a subscription to a publication +/// Record declaring a subscription to a publication #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,7 +14,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Subscription<'a> { diff --git a/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs b/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs index 2d13663e8..5067fee66 100644 --- a/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs +++ b/crates/jacquard-api/src/pub_leaflet/pages/linear_document.rs @@ -13,13 +13,15 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Block<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub alignment: std::option::Option>, + pub alignment: Option>, #[serde(borrow)] pub block: BlockBlock<'a>, } @@ -69,15 +71,15 @@ pub enum BlockBlock<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LinearDocument<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub blocks: std::option::Option< - Vec>, - >, + pub blocks: Option>>, } #[jacquard_derive::lexicon] @@ -88,7 +90,8 @@ pub struct LinearDocument<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Position<'a> { @@ -104,7 +107,8 @@ pub struct Position<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Quote<'a> { diff --git a/crates/jacquard-api/src/pub_leaflet/publication.rs b/crates/jacquard-api/src/pub_leaflet/publication.rs index 5822ae8dd..1b71e8563 100644 --- a/crates/jacquard-api/src/pub_leaflet/publication.rs +++ b/crates/jacquard-api/src/pub_leaflet/publication.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record declaring a publication +/// Record declaring a publication #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,29 +14,34 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Publication<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub base_path: std::option::Option>, + pub base_path: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub icon: std::option::Option>, + pub icon: Option>, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub preferences: std::option::Option< - crate::pub_leaflet::publication::Preferences<'a>, - >, + pub preferences: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub theme: std::option::Option>, + pub theme: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. @@ -89,14 +94,17 @@ impl From> for Publication<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Preferences<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub show_comments: std::option::Option, + #[builder(into)] + pub show_comments: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub show_in_discover: std::option::Option, + #[builder(into)] + pub show_in_discover: Option, } #[jacquard_derive::lexicon] @@ -107,32 +115,40 @@ pub struct Preferences<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Theme<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub accent_background: std::option::Option>, + pub accent_background: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub accent_text: std::option::Option>, + pub accent_text: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub background_color: std::option::Option>, + pub background_color: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub background_image: std::option::Option< + pub background_image: Option< crate::pub_leaflet::theme::background_image::BackgroundImage<'a>, >, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub page_background: std::option::Option>, + pub page_background: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub primary: std::option::Option>, + pub primary: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub show_page_background: std::option::Option, + #[builder(into)] + pub show_page_background: Option, } #[jacquard_derive::open_union] diff --git a/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs b/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs index 787123eea..e5d91d0ab 100644 --- a/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs +++ b/crates/jacquard-api/src/pub_leaflet/richtext/facet.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Facet feature for bold text +/// Facet feature for bold text #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,11 +14,12 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Bold<'a> {} -///Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. +/// Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -27,7 +28,8 @@ pub struct Bold<'a> {} Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ByteSlice<'a> { @@ -35,7 +37,7 @@ pub struct ByteSlice<'a> { pub byte_start: i64, } -///Facet feature for inline code. +/// Facet feature for inline code. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -44,11 +46,12 @@ pub struct ByteSlice<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Code<'a> {} -///Facet feature for highlighted text. +/// Facet feature for highlighted text. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -57,11 +60,12 @@ pub struct Code<'a> {} Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Highlight<'a> {} -///Facet feature for an identifier. Used for linking to a segment +/// Facet feature for an identifier. Used for linking to a segment #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -70,16 +74,18 @@ pub struct Highlight<'a> {} Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Id<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub id: std::option::Option>, + pub id: Option>, } -///Facet feature for italic text +/// Facet feature for italic text #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -88,11 +94,12 @@ pub struct Id<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Italic<'a> {} -///Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. +/// Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -101,7 +108,8 @@ pub struct Italic<'a> {} Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Link<'a> { @@ -109,7 +117,7 @@ pub struct Link<'a> { pub uri: jacquard_common::types::string::Uri<'a>, } -///Annotation of a sub-string within rich text. +/// Annotation of a sub-string within rich text. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -118,7 +126,8 @@ pub struct Link<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Facet<'a> { @@ -159,7 +168,7 @@ pub enum FacetFeaturesItem<'a> { Italic(Box>), } -///Facet feature for strikethrough markup +/// Facet feature for strikethrough markup #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -168,11 +177,12 @@ pub enum FacetFeaturesItem<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Strikethrough<'a> {} -///Facet feature for underline markup +/// Facet feature for underline markup #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -181,7 +191,8 @@ pub struct Strikethrough<'a> {} Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Underline<'a> {} \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs b/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs index 415bdb414..f959642c3 100644 --- a/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs +++ b/crates/jacquard-api/src/pub_leaflet/theme/background_image.rs @@ -13,14 +13,17 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct BackgroundImage<'a> { #[serde(borrow)] pub image: jacquard_common::types::blob::Blob<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub repeat: std::option::Option, + #[builder(into)] + pub repeat: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub width: std::option::Option, + #[builder(into)] + pub width: Option, } \ No newline at end of file diff --git a/crates/jacquard-api/src/pub_leaflet/theme/color.rs b/crates/jacquard-api/src/pub_leaflet/theme/color.rs index 91f4b323b..da9715617 100644 --- a/crates/jacquard-api/src/pub_leaflet/theme/color.rs +++ b/crates/jacquard-api/src/pub_leaflet/theme/color.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Rgb<'a> { @@ -30,7 +31,8 @@ pub struct Rgb<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Rgba<'a> { diff --git a/crates/jacquard-api/src/sh_tangled/actor/profile.rs b/crates/jacquard-api/src/sh_tangled/actor/profile.rs index 3694d5d27..f45544cee 100644 --- a/crates/jacquard-api/src/sh_tangled/actor/profile.rs +++ b/crates/jacquard-api/src/sh_tangled/actor/profile.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of a Tangled account profile. +/// A declaration of a Tangled account profile. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,32 +14,36 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Profile<'a> { - ///Include link to this account on Bluesky. + /// Include link to this account on Bluesky. pub bluesky: bool, - ///Free-form profile description text. + /// Free-form profile description text. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub links: std::option::Option>>, - ///Free-form location text. + pub links: Option>>, + /// Free-form location text. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub location: std::option::Option>, - ///Any ATURI, it is up to appviews to validate these fields. + pub location: Option>, + /// Any ATURI, it is up to appviews to validate these fields. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pinned_repositories: std::option::Option< - Vec>, - >, + pub pinned_repositories: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub stats: std::option::Option>>, + pub stats: Option>>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/sh_tangled/feed/reaction.rs b/crates/jacquard-api/src/sh_tangled/feed/reaction.rs index 8a650036e..791cba568 100644 --- a/crates/jacquard-api/src/sh_tangled/feed/reaction.rs +++ b/crates/jacquard-api/src/sh_tangled/feed/reaction.rs @@ -13,12 +13,14 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Reaction<'a> { pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] + #[builder(into)] pub reaction: jacquard_common::CowStr<'a>, #[serde(borrow)] pub subject: jacquard_common::types::string::AtUri<'a>, diff --git a/crates/jacquard-api/src/sh_tangled/feed/star.rs b/crates/jacquard-api/src/sh_tangled/feed/star.rs index 2329acaff..6ba9209eb 100644 --- a/crates/jacquard-api/src/sh_tangled/feed/star.rs +++ b/crates/jacquard-api/src/sh_tangled/feed/star.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Star<'a> { diff --git a/crates/jacquard-api/src/sh_tangled/git/ref_update.rs b/crates/jacquard-api/src/sh_tangled/git/ref_update.rs index 3b8324c67..d03b478d0 100644 --- a/crates/jacquard-api/src/sh_tangled/git/ref_update.rs +++ b/crates/jacquard-api/src/sh_tangled/git/ref_update.rs @@ -13,13 +13,15 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct CommitCountBreakdown<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub by_email: std::option::Option< + pub by_email: Option< Vec>, >, } @@ -32,12 +34,14 @@ pub struct CommitCountBreakdown<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct IndividualEmailCommitCount<'a> { pub count: i64, #[serde(borrow)] + #[builder(into)] pub email: jacquard_common::CowStr<'a>, } @@ -49,11 +53,13 @@ pub struct IndividualEmailCommitCount<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct IndividualLanguageSize<'a> { #[serde(borrow)] + #[builder(into)] pub lang: jacquard_common::CowStr<'a>, pub size: i64, } @@ -66,18 +72,20 @@ pub struct IndividualLanguageSize<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LangBreakdown<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub inputs: std::option::Option< + pub inputs: Option< Vec>, >, } -///An update to a git repository, emitted by knots. +/// An update to a git repository, emitted by knots. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -86,29 +94,34 @@ pub struct LangBreakdown<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RefUpdate<'a> { - ///did of the user that pushed this ref + /// did of the user that pushed this ref #[serde(borrow)] pub committer_did: jacquard_common::types::string::Did<'a>, #[serde(borrow)] pub meta: crate::sh_tangled::git::ref_update::Meta<'a>, - ///new SHA of this ref + /// new SHA of this ref #[serde(borrow)] + #[builder(into)] pub new_sha: jacquard_common::CowStr<'a>, - ///old SHA of this ref + /// old SHA of this ref #[serde(borrow)] + #[builder(into)] pub old_sha: jacquard_common::CowStr<'a>, - ///Ref being updated + /// Ref being updated #[serde(borrow)] + #[builder(into)] pub r#ref: jacquard_common::CowStr<'a>, - ///did of the owner of the repo + /// did of the owner of the repo #[serde(borrow)] pub repo_did: jacquard_common::types::string::Did<'a>, - ///name of the repo + /// name of the repo #[serde(borrow)] + #[builder(into)] pub repo_name: jacquard_common::CowStr<'a>, } @@ -162,7 +175,8 @@ impl From> for RefUpdate<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Meta<'a> { @@ -170,8 +184,7 @@ pub struct Meta<'a> { pub commit_count: crate::sh_tangled::git::ref_update::CommitCountBreakdown<'a>, pub is_default_ref: bool, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub lang_breakdown: std::option::Option< - crate::sh_tangled::git::ref_update::LangBreakdown<'a>, - >, + pub lang_breakdown: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/graph/follow.rs b/crates/jacquard-api/src/sh_tangled/graph/follow.rs index c41ae4d0a..8f5185ab1 100644 --- a/crates/jacquard-api/src/sh_tangled/graph/follow.rs +++ b/crates/jacquard-api/src/sh_tangled/graph/follow.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Follow<'a> { diff --git a/crates/jacquard-api/src/sh_tangled/knot.rs b/crates/jacquard-api/src/sh_tangled/knot.rs index b476a9236..a2200ee58 100644 --- a/crates/jacquard-api/src/sh_tangled/knot.rs +++ b/crates/jacquard-api/src/sh_tangled/knot.rs @@ -17,7 +17,8 @@ pub mod version; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Knot<'a> { diff --git a/crates/jacquard-api/src/sh_tangled/knot/list_keys.rs b/crates/jacquard-api/src/sh_tangled/knot/list_keys.rs index ef3c8ca53..be5809c17 100644 --- a/crates/jacquard-api/src/sh_tangled/knot/list_keys.rs +++ b/crates/jacquard-api/src/sh_tangled/knot/list_keys.rs @@ -39,7 +39,7 @@ pub struct ListKeys<'a> { )] #[serde(rename_all = "camelCase")] pub struct ListKeysOutput<'a> { - ///Pagination cursor for next page + /// Pagination cursor for next page #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, @@ -62,7 +62,7 @@ pub struct ListKeysOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum ListKeysError<'a> { - ///Failed to retrieve public keys + /// Failed to retrieve public keys #[serde(rename = "InternalServerError")] InternalServerError(std::option::Option), } @@ -116,16 +116,18 @@ impl jacquard_common::xrpc::XrpcEndpoint for ListKeysRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PublicKey<'a> { - ///Key upload timestamp + /// Key upload timestamp pub created_at: jacquard_common::types::string::Datetime, - ///DID associated with the public key + /// DID associated with the public key #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///Public key contents + /// Public key contents #[serde(borrow)] + #[builder(into)] pub key: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/knot/member.rs b/crates/jacquard-api/src/sh_tangled/knot/member.rs index 84b549c36..205de3efc 100644 --- a/crates/jacquard-api/src/sh_tangled/knot/member.rs +++ b/crates/jacquard-api/src/sh_tangled/knot/member.rs @@ -13,13 +13,15 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Member<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///domain that this member now belongs to + /// domain that this member now belongs to #[serde(borrow)] + #[builder(into)] pub domain: jacquard_common::CowStr<'a>, #[serde(borrow)] pub subject: jacquard_common::types::string::Did<'a>, diff --git a/crates/jacquard-api/src/sh_tangled/label/definition.rs b/crates/jacquard-api/src/sh_tangled/label/definition.rs index 3cddf36ea..7d602dcd4 100644 --- a/crates/jacquard-api/src/sh_tangled/label/definition.rs +++ b/crates/jacquard-api/src/sh_tangled/label/definition.rs @@ -13,25 +13,29 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Definition<'a> { - ///The hex value for the background color for the label. Appviews may choose to respect this. + /// The hex value for the background color for the label. Appviews may choose to respect this. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub color: std::option::Option>, + pub color: Option>, pub created_at: jacquard_common::types::string::Datetime, - ///Whether this label can be repeated for a given entity, eg.: [reviewer:foo, reviewer:bar] + /// Whether this label can be repeated for a given entity, eg.: [reviewer:foo, reviewer:bar] #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub multiple: std::option::Option, - ///The display name of this label. + #[builder(into)] + pub multiple: Option, + /// The display name of this label. #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///The areas of the repo this label may apply to, eg.: sh.tangled.repo.issue. Appviews may choose to respect this. + /// The areas of the repo this label may apply to, eg.: sh.tangled.repo.issue. Appviews may choose to respect this. #[serde(borrow)] pub scope: Vec>, - ///The type definition of this label. Appviews may allow sorting for certain types. + /// The type definition of this label. Appviews may allow sorting for certain types. #[serde(borrow)] pub value_type: crate::sh_tangled::label::definition::ValueType<'a>, } @@ -86,18 +90,22 @@ impl From> for Definition<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ValueType<'a> { - ///Closed set of values that this label can take. + /// Closed set of values that this label can take. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub r#enum: std::option::Option>>, - ///An optional constraint that can be applied on string concrete types. + pub r#enum: Option>>, + /// An optional constraint that can be applied on string concrete types. #[serde(borrow)] + #[builder(into)] pub format: jacquard_common::CowStr<'a>, - ///The concrete type of this label's value. + /// The concrete type of this label's value. #[serde(borrow)] + #[builder(into)] pub r#type: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/label/op.rs b/crates/jacquard-api/src/sh_tangled/label/op.rs index fe055a4d3..496510992 100644 --- a/crates/jacquard-api/src/sh_tangled/label/op.rs +++ b/crates/jacquard-api/src/sh_tangled/label/op.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Op<'a> { @@ -22,7 +23,7 @@ pub struct Op<'a> { #[serde(borrow)] pub delete: Vec>, pub performed_at: jacquard_common::types::string::Datetime, - ///The subject (task, pull or discussion) of this label. Appviews may apply a `scope` check and refuse this op. + /// The subject (task, pull or discussion) of this label. Appviews may apply a `scope` check and refuse this op. #[serde(borrow)] pub subject: jacquard_common::types::string::AtUri<'a>, } @@ -77,14 +78,16 @@ impl From> for Op<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Operand<'a> { - ///ATURI to the label definition + /// ATURI to the label definition #[serde(borrow)] pub key: jacquard_common::types::string::AtUri<'a>, - ///Stringified value of the label. This is first unstringed by appviews and then interpreted as a concrete value. + /// Stringified value of the label. This is first unstringed by appviews and then interpreted as a concrete value. #[serde(borrow)] + #[builder(into)] pub value: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/owner.rs b/crates/jacquard-api/src/sh_tangled/owner.rs index 4644a9ad5..3fc746aab 100644 --- a/crates/jacquard-api/src/sh_tangled/owner.rs +++ b/crates/jacquard-api/src/sh_tangled/owner.rs @@ -36,7 +36,7 @@ pub struct OwnerOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum OwnerError<'a> { - ///Owner is not set for this service + /// Owner is not set for this service #[serde(rename = "OwnerNotFound")] OwnerNotFound(std::option::Option), } diff --git a/crates/jacquard-api/src/sh_tangled/pipeline.rs b/crates/jacquard-api/src/sh_tangled/pipeline.rs index 04a0f9082..d12ea1007 100644 --- a/crates/jacquard-api/src/sh_tangled/pipeline.rs +++ b/crates/jacquard-api/src/sh_tangled/pipeline.rs @@ -15,7 +15,8 @@ pub mod status; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct CloneOpts<'a> { @@ -32,7 +33,8 @@ pub struct CloneOpts<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Pipeline<'a> { @@ -92,13 +94,15 @@ impl From> for Pipeline<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ManualTriggerData<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub inputs: std::option::Option>>, + pub inputs: Option>>, } #[jacquard_derive::lexicon] @@ -109,13 +113,16 @@ pub struct ManualTriggerData<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Pair<'a> { #[serde(borrow)] + #[builder(into)] pub key: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub value: jacquard_common::CowStr<'a>, } @@ -127,17 +134,22 @@ pub struct Pair<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PullRequestTriggerData<'a> { #[serde(borrow)] + #[builder(into)] pub action: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub source_branch: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub source_sha: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub target_branch: jacquard_common::CowStr<'a>, } @@ -149,15 +161,19 @@ pub struct PullRequestTriggerData<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PushTriggerData<'a> { #[serde(borrow)] + #[builder(into)] pub new_sha: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub old_sha: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub r#ref: jacquard_common::CowStr<'a>, } @@ -169,23 +185,26 @@ pub struct PushTriggerData<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct TriggerMetadata<'a> { #[serde(borrow)] + #[builder(into)] pub kind: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub manual: std::option::Option>, + pub manual: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pull_request: std::option::Option< - crate::sh_tangled::pipeline::PullRequestTriggerData<'a>, - >, + pub pull_request: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub push: std::option::Option>, + pub push: Option>, #[serde(borrow)] pub repo: crate::sh_tangled::pipeline::TriggerRepo<'a>, } @@ -198,17 +217,21 @@ pub struct TriggerMetadata<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct TriggerRepo<'a> { #[serde(borrow)] + #[builder(into)] pub default_branch: jacquard_common::CowStr<'a>, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(borrow)] + #[builder(into)] pub knot: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub repo: jacquard_common::CowStr<'a>, } @@ -220,16 +243,20 @@ pub struct TriggerRepo<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Workflow<'a> { #[serde(borrow)] pub clone: crate::sh_tangled::pipeline::CloneOpts<'a>, #[serde(borrow)] + #[builder(into)] pub engine: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub raw: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/pipeline/status.rs b/crates/jacquard-api/src/sh_tangled/pipeline/status.rs index 5b4f30be7..acc9f03e8 100644 --- a/crates/jacquard-api/src/sh_tangled/pipeline/status.rs +++ b/crates/jacquard-api/src/sh_tangled/pipeline/status.rs @@ -13,26 +13,30 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Status<'a> { - ///time of creation of this status update + /// time of creation of this status update pub created_at: jacquard_common::types::string::Datetime, - ///error message if failed + /// error message if failed #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub error: std::option::Option>, - ///exit code if failed + pub error: Option>, + /// exit code if failed #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub exit_code: std::option::Option, - ///ATURI of the pipeline + #[builder(into)] + pub exit_code: Option, + /// ATURI of the pipeline #[serde(borrow)] pub pipeline: jacquard_common::types::string::AtUri<'a>, - ///status of the workflow + /// status of the workflow #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, - ///name of the workflow within this pipeline + /// name of the workflow within this pipeline #[serde(borrow)] pub workflow: jacquard_common::types::string::AtUri<'a>, } diff --git a/crates/jacquard-api/src/sh_tangled/public_key.rs b/crates/jacquard-api/src/sh_tangled/public_key.rs index e9b44e766..75265033c 100644 --- a/crates/jacquard-api/src/sh_tangled/public_key.rs +++ b/crates/jacquard-api/src/sh_tangled/public_key.rs @@ -13,17 +13,20 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PublicKey<'a> { - ///key upload timestamp + /// key upload timestamp pub created_at: jacquard_common::types::string::Datetime, - ///public key contents + /// public key contents #[serde(borrow)] + #[builder(into)] pub key: jacquard_common::CowStr<'a>, - ///human-readable name for this key + /// human-readable name for this key #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/sh_tangled/repo.rs b/crates/jacquard-api/src/sh_tangled/repo.rs index 9edccde6c..bbed230bc 100644 --- a/crates/jacquard-api/src/sh_tangled/repo.rs +++ b/crates/jacquard-api/src/sh_tangled/repo.rs @@ -41,32 +41,39 @@ pub mod tree; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Repo<'a> { pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///knot where the repo was created + pub description: Option>, + /// knot where the repo was created #[serde(borrow)] + #[builder(into)] pub knot: jacquard_common::CowStr<'a>, - ///List of labels that this repo subscribes to + /// List of labels that this repo subscribes to #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, - ///name of the repo + pub labels: Option>>, + /// name of the repo #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///source of the repo + /// source of the repo #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub source: std::option::Option>, - ///CI runner to send jobs to and receive results from + pub source: Option>, + /// CI runner to send jobs to and receive results from #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub spindle: std::option::Option>, + pub spindle: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/sh_tangled/repo/archive.rs b/crates/jacquard-api/src/sh_tangled/repo/archive.rs index c2bb95ff2..567b9e600 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/archive.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/archive.rs @@ -35,7 +35,7 @@ pub struct Archive<'a> { pub repo: jacquard_common::CowStr<'a>, } -///Binary archive data +/// Binary archive data #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -63,16 +63,16 @@ pub struct ArchiveOutput<'a> {} #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum ArchiveError<'a> { - ///Repository not found or access denied + /// Repository not found or access denied #[serde(rename = "RepoNotFound")] RepoNotFound(std::option::Option), - ///Git reference not found + /// Git reference not found #[serde(rename = "RefNotFound")] RefNotFound(std::option::Option), - ///Invalid request parameters + /// Invalid request parameters #[serde(rename = "InvalidRequest")] InvalidRequest(std::option::Option), - ///Failed to create archive + /// Failed to create archive #[serde(rename = "ArchiveError")] ArchiveError(std::option::Option), } diff --git a/crates/jacquard-api/src/sh_tangled/repo/artifact.rs b/crates/jacquard-api/src/sh_tangled/repo/artifact.rs index c55a5842b..e87771d7c 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/artifact.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/artifact.rs @@ -13,22 +13,24 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Artifact<'a> { - ///the artifact + /// the artifact #[serde(borrow)] pub artifact: jacquard_common::types::blob::Blob<'a>, - ///time of creation of this artifact + /// time of creation of this artifact pub created_at: jacquard_common::types::string::Datetime, - ///name of the artifact + /// name of the artifact #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///repo that this artifact is being uploaded to + /// repo that this artifact is being uploaded to #[serde(borrow)] pub repo: jacquard_common::types::string::AtUri<'a>, - ///hash of the tag object that this artifact is attached to (only annotated tags are supported) + /// hash of the tag object that this artifact is attached to (only annotated tags are supported) pub tag: bytes::Bytes, } diff --git a/crates/jacquard-api/src/sh_tangled/repo/blob.rs b/crates/jacquard-api/src/sh_tangled/repo/blob.rs index ad49eebe9..200ea6ee1 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/blob.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/blob.rs @@ -13,24 +13,29 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LastCommit<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub author: std::option::Option>, - ///Commit hash + pub author: Option>, + /// Commit hash #[serde(borrow)] + #[builder(into)] pub hash: jacquard_common::CowStr<'a>, - ///Commit message + /// Commit message #[serde(borrow)] + #[builder(into)] pub message: jacquard_common::CowStr<'a>, - ///Short commit hash + /// Short commit hash #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub short_hash: std::option::Option>, - ///Commit timestamp + pub short_hash: Option>, + /// Commit timestamp pub when: jacquard_common::types::string::Datetime, } @@ -73,30 +78,30 @@ pub struct Blob<'a> { )] #[serde(rename_all = "camelCase")] pub struct BlobOutput<'a> { - ///File content (base64 encoded for binary files) + /// File content (base64 encoded for binary files) #[serde(borrow)] pub content: jacquard_common::CowStr<'a>, - ///Content encoding + /// Content encoding #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub encoding: std::option::Option>, - ///Whether the file is binary + /// Whether the file is binary #[serde(skip_serializing_if = "std::option::Option::is_none")] pub is_binary: std::option::Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub last_commit: std::option::Option>, - ///MIME type of the file + /// MIME type of the file #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub mime_type: std::option::Option>, - ///The file path + /// The file path #[serde(borrow)] pub path: jacquard_common::CowStr<'a>, - ///The git reference used + /// The git reference used #[serde(borrow)] pub r#ref: jacquard_common::CowStr<'a>, - ///File size in bytes + /// File size in bytes #[serde(skip_serializing_if = "std::option::Option::is_none")] pub size: std::option::Option, } @@ -116,16 +121,16 @@ pub struct BlobOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum BlobError<'a> { - ///Repository not found or access denied + /// Repository not found or access denied #[serde(rename = "RepoNotFound")] RepoNotFound(std::option::Option), - ///Git reference not found + /// Git reference not found #[serde(rename = "RefNotFound")] RefNotFound(std::option::Option), - ///File not found at the specified path + /// File not found at the specified path #[serde(rename = "FileNotFound")] FileNotFound(std::option::Option), - ///Invalid request parameters + /// Invalid request parameters #[serde(rename = "InvalidRequest")] InvalidRequest(std::option::Option), } @@ -200,16 +205,19 @@ impl jacquard_common::xrpc::XrpcEndpoint for BlobRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Signature<'a> { - ///Author email + /// Author email #[serde(borrow)] + #[builder(into)] pub email: jacquard_common::CowStr<'a>, - ///Author name + /// Author name #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Author timestamp + /// Author timestamp pub when: jacquard_common::types::string::Datetime, } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/repo/branch.rs b/crates/jacquard-api/src/sh_tangled/repo/branch.rs index bb5c21c88..bc5deb481 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/branch.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/branch.rs @@ -41,24 +41,24 @@ pub struct BranchOutput<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub author: std::option::Option>, - ///Latest commit hash on this branch + /// Latest commit hash on this branch #[serde(borrow)] pub hash: jacquard_common::CowStr<'a>, - ///Whether this is the default branch + /// Whether this is the default branch #[serde(skip_serializing_if = "std::option::Option::is_none")] pub is_default: std::option::Option, - ///Latest commit message + /// Latest commit message #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub message: std::option::Option>, - ///Branch name + /// Branch name #[serde(borrow)] pub name: jacquard_common::CowStr<'a>, - ///Short commit hash + /// Short commit hash #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub short_hash: std::option::Option>, - ///Timestamp of latest commit + /// Timestamp of latest commit pub when: jacquard_common::types::string::Datetime, } @@ -77,13 +77,13 @@ pub struct BranchOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum BranchError<'a> { - ///Repository not found or access denied + /// Repository not found or access denied #[serde(rename = "RepoNotFound")] RepoNotFound(std::option::Option), - ///Branch not found + /// Branch not found #[serde(rename = "BranchNotFound")] BranchNotFound(std::option::Option), - ///Invalid request parameters + /// Invalid request parameters #[serde(rename = "InvalidRequest")] InvalidRequest(std::option::Option), } @@ -151,16 +151,19 @@ impl jacquard_common::xrpc::XrpcEndpoint for BranchRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Signature<'a> { - ///Author email + /// Author email #[serde(borrow)] + #[builder(into)] pub email: jacquard_common::CowStr<'a>, - ///Author name + /// Author name #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Author timestamp + /// Author timestamp pub when: jacquard_common::types::string::Datetime, } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/repo/branches.rs b/crates/jacquard-api/src/sh_tangled/repo/branches.rs index 8369192ea..39f52b4aa 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/branches.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/branches.rs @@ -57,10 +57,10 @@ pub struct BranchesOutput<'a> {} #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum BranchesError<'a> { - ///Repository not found or access denied + /// Repository not found or access denied #[serde(rename = "RepoNotFound")] RepoNotFound(std::option::Option), - ///Invalid request parameters + /// Invalid request parameters #[serde(rename = "InvalidRequest")] InvalidRequest(std::option::Option), } diff --git a/crates/jacquard-api/src/sh_tangled/repo/collaborator.rs b/crates/jacquard-api/src/sh_tangled/repo/collaborator.rs index 7fa7637cd..3bbe917c8 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/collaborator.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/collaborator.rs @@ -13,12 +13,13 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Collaborator<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///repo to add this user to + /// repo to add this user to #[serde(borrow)] pub repo: jacquard_common::types::string::AtUri<'a>, #[serde(borrow)] diff --git a/crates/jacquard-api/src/sh_tangled/repo/compare.rs b/crates/jacquard-api/src/sh_tangled/repo/compare.rs index 09addc761..3ca51f2c6 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/compare.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/compare.rs @@ -29,7 +29,7 @@ pub struct Compare<'a> { pub rev2: jacquard_common::CowStr<'a>, } -///Compare output in application/json +/// Compare output in application/json #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -57,16 +57,16 @@ pub struct CompareOutput<'a> {} #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum CompareError<'a> { - ///Repository not found or access denied + /// Repository not found or access denied #[serde(rename = "RepoNotFound")] RepoNotFound(std::option::Option), - ///One or both revisions not found + /// One or both revisions not found #[serde(rename = "RevisionNotFound")] RevisionNotFound(std::option::Option), - ///Invalid request parameters + /// Invalid request parameters #[serde(rename = "InvalidRequest")] InvalidRequest(std::option::Option), - ///Failed to compare revisions + /// Failed to compare revisions #[serde(rename = "CompareError")] CompareError(std::option::Option), } diff --git a/crates/jacquard-api/src/sh_tangled/repo/create.rs b/crates/jacquard-api/src/sh_tangled/repo/create.rs index 5c74a3a04..0ce40b552 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/create.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/create.rs @@ -19,20 +19,20 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct Create<'a> { - ///Default branch to push to + /// Default branch to push to #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub default_branch: std::option::Option>, - ///Rkey of the repository record + #[serde(borrow)] + pub default_branch: Option>, + /// Rkey of the repository record #[serde(borrow)] #[builder(into)] pub rkey: jacquard_common::CowStr<'a>, - ///A source URL to clone from, populate this when forking or importing a repository. + /// A source URL to clone from, populate this when forking or importing a repository. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub source: std::option::Option>, + #[serde(borrow)] + pub source: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/sh_tangled/repo/delete.rs b/crates/jacquard-api/src/sh_tangled/repo/delete.rs index ea12f6748..cfa226046 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/delete.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/delete.rs @@ -19,14 +19,14 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct Delete<'a> { - ///DID of the repository owner + /// DID of the repository owner #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///Name of the repository to delete + /// Name of the repository to delete #[serde(borrow)] #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Rkey of the repository record + /// Rkey of the repository record #[serde(borrow)] #[builder(into)] pub rkey: jacquard_common::CowStr<'a>, diff --git a/crates/jacquard-api/src/sh_tangled/repo/diff.rs b/crates/jacquard-api/src/sh_tangled/repo/diff.rs index b7e4baeb5..5bb762fee 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/diff.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/diff.rs @@ -53,13 +53,13 @@ pub struct DiffOutput<'a> {} #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum DiffError<'a> { - ///Repository not found or access denied + /// Repository not found or access denied #[serde(rename = "RepoNotFound")] RepoNotFound(std::option::Option), - ///Git reference not found + /// Git reference not found #[serde(rename = "RefNotFound")] RefNotFound(std::option::Option), - ///Invalid request parameters + /// Invalid request parameters #[serde(rename = "InvalidRequest")] InvalidRequest(std::option::Option), } diff --git a/crates/jacquard-api/src/sh_tangled/repo/fork_status.rs b/crates/jacquard-api/src/sh_tangled/repo/fork_status.rs index f9ca653da..087401b54 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/fork_status.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/fork_status.rs @@ -19,22 +19,22 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct ForkStatus<'a> { - ///Branch to check status for + /// Branch to check status for #[serde(borrow)] #[builder(into)] pub branch: jacquard_common::CowStr<'a>, - ///DID of the fork owner + /// DID of the fork owner #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///Hidden ref to use for comparison + /// Hidden ref to use for comparison #[serde(borrow)] #[builder(into)] pub hidden_ref: jacquard_common::CowStr<'a>, - ///Name of the forked repository + /// Name of the forked repository #[serde(borrow)] #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Source repository URL + /// Source repository URL #[serde(borrow)] #[builder(into)] pub source: jacquard_common::CowStr<'a>, @@ -59,7 +59,7 @@ pub struct ForkStatus<'a> { )] #[serde(rename_all = "camelCase")] pub struct ForkStatusOutput<'a> { - ///Fork status: 0=UpToDate, 1=FastForwardable, 2=Conflict, 3=MissingBranch + /// Fork status: 0=UpToDate, 1=FastForwardable, 2=Conflict, 3=MissingBranch pub status: i64, } diff --git a/crates/jacquard-api/src/sh_tangled/repo/fork_sync.rs b/crates/jacquard-api/src/sh_tangled/repo/fork_sync.rs index b4c728ee6..73a7be785 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/fork_sync.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/fork_sync.rs @@ -19,18 +19,18 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct ForkSync<'a> { - ///Branch to sync + /// Branch to sync #[serde(borrow)] #[builder(into)] pub branch: jacquard_common::CowStr<'a>, - ///DID of the fork owner + /// DID of the fork owner #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///Name of the forked repository + /// Name of the forked repository #[serde(borrow)] #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///AT-URI of the source repository + /// AT-URI of the source repository #[serde(borrow)] pub source: jacquard_common::types::string::AtUri<'a>, #[serde(flatten)] diff --git a/crates/jacquard-api/src/sh_tangled/repo/get_default_branch.rs b/crates/jacquard-api/src/sh_tangled/repo/get_default_branch.rs index 38a130f80..168ab6a63 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/get_default_branch.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/get_default_branch.rs @@ -38,21 +38,21 @@ pub struct GetDefaultBranchOutput<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub author: std::option::Option>, - ///Latest commit hash on default branch + /// Latest commit hash on default branch #[serde(borrow)] pub hash: jacquard_common::CowStr<'a>, - ///Latest commit message + /// Latest commit message #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub message: std::option::Option>, - ///Default branch name + /// Default branch name #[serde(borrow)] pub name: jacquard_common::CowStr<'a>, - ///Short commit hash + /// Short commit hash #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub short_hash: std::option::Option>, - ///Timestamp of latest commit + /// Timestamp of latest commit pub when: jacquard_common::types::string::Datetime, } @@ -71,10 +71,10 @@ pub struct GetDefaultBranchOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum GetDefaultBranchError<'a> { - ///Repository not found or access denied + /// Repository not found or access denied #[serde(rename = "RepoNotFound")] RepoNotFound(std::option::Option), - ///Invalid request parameters + /// Invalid request parameters #[serde(rename = "InvalidRequest")] InvalidRequest(std::option::Option), } @@ -135,16 +135,19 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetDefaultBranchRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Signature<'a> { - ///Author email + /// Author email #[serde(borrow)] + #[builder(into)] pub email: jacquard_common::CowStr<'a>, - ///Author name + /// Author name #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Author timestamp + /// Author timestamp pub when: jacquard_common::types::string::Datetime, } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/repo/hidden_ref.rs b/crates/jacquard-api/src/sh_tangled/repo/hidden_ref.rs index 499114983..ad784e36e 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/hidden_ref.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/hidden_ref.rs @@ -19,15 +19,15 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct HiddenRef<'a> { - ///Fork reference name + /// Fork reference name #[serde(borrow)] #[builder(into)] pub fork_ref: jacquard_common::CowStr<'a>, - ///Remote reference name + /// Remote reference name #[serde(borrow)] #[builder(into)] pub remote_ref: jacquard_common::CowStr<'a>, - ///AT-URI of the repository + /// AT-URI of the repository #[serde(borrow)] pub repo: jacquard_common::types::string::AtUri<'a>, #[serde(flatten)] @@ -51,15 +51,15 @@ pub struct HiddenRef<'a> { )] #[serde(rename_all = "camelCase")] pub struct HiddenRefOutput<'a> { - ///Error message if creation failed + /// Error message if creation failed #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub error: std::option::Option>, - ///The created hidden ref name + /// The created hidden ref name #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub r#ref: std::option::Option>, - ///Whether the hidden ref was created successfully + /// Whether the hidden ref was created successfully pub success: bool, } diff --git a/crates/jacquard-api/src/sh_tangled/repo/issue.rs b/crates/jacquard-api/src/sh_tangled/repo/issue.rs index c7478a53e..a065be95a 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/issue.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/issue.rs @@ -16,17 +16,20 @@ pub mod state; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Issue<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub body: std::option::Option>, + pub body: Option>, pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] pub repo: jacquard_common::types::string::AtUri<'a>, #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs b/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs index 37304ea62..435ea69fb 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/issue/comment.rs @@ -13,18 +13,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Comment<'a> { #[serde(borrow)] + #[builder(into)] pub body: jacquard_common::CowStr<'a>, pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] pub issue: jacquard_common::types::string::AtUri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reply_to: std::option::Option>, + pub reply_to: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/sh_tangled/repo/issue/state.rs b/crates/jacquard-api/src/sh_tangled/repo/issue/state.rs index 450070493..f25c4f03c 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/issue/state.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/issue/state.rs @@ -16,14 +16,16 @@ pub mod open; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct State<'a> { #[serde(borrow)] pub issue: jacquard_common::types::string::AtUri<'a>, - ///state of the issue + /// state of the issue #[serde(borrow)] + #[builder(into)] pub state: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/sh_tangled/repo/issue/state/closed.rs b/crates/jacquard-api/src/sh_tangled/repo/issue/state/closed.rs index 27fad3fda..15a33ba73 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/issue/state/closed.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/issue/state/closed.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///closed issue +/// closed issue #[derive( serde::Serialize, serde::Deserialize, diff --git a/crates/jacquard-api/src/sh_tangled/repo/issue/state/open.rs b/crates/jacquard-api/src/sh_tangled/repo/issue/state/open.rs index 559e2f53c..514453885 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/issue/state/open.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/issue/state/open.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///open issue +/// open issue #[derive( serde::Serialize, serde::Deserialize, diff --git a/crates/jacquard-api/src/sh_tangled/repo/languages.rs b/crates/jacquard-api/src/sh_tangled/repo/languages.rs index 1a30d6fd4..ed8618a88 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/languages.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/languages.rs @@ -13,27 +13,32 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Language<'a> { - ///Hex color code for this language + /// Hex color code for this language #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub color: std::option::Option>, - ///File extensions associated with this language + pub color: Option>, + /// File extensions associated with this language #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub extensions: std::option::Option>>, - ///Number of files in this language + pub extensions: Option>>, + /// Number of files in this language #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub file_count: std::option::Option, - ///Programming language name + #[builder(into)] + pub file_count: Option, + /// Programming language name #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Percentage of total codebase (0-100) + /// Percentage of total codebase (0-100) pub percentage: i64, - ///Total size of files in this language (bytes) + /// Total size of files in this language (bytes) pub size: i64, } @@ -74,13 +79,13 @@ pub struct Languages<'a> { pub struct LanguagesOutput<'a> { #[serde(borrow)] pub languages: Vec>, - ///The git reference used + /// The git reference used #[serde(borrow)] pub r#ref: jacquard_common::CowStr<'a>, - ///Total number of files analyzed + /// Total number of files analyzed #[serde(skip_serializing_if = "std::option::Option::is_none")] pub total_files: std::option::Option, - ///Total size of all analyzed files in bytes + /// Total size of all analyzed files in bytes #[serde(skip_serializing_if = "std::option::Option::is_none")] pub total_size: std::option::Option, } @@ -100,13 +105,13 @@ pub struct LanguagesOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum LanguagesError<'a> { - ///Repository not found or access denied + /// Repository not found or access denied #[serde(rename = "RepoNotFound")] RepoNotFound(std::option::Option), - ///Git reference not found + /// Git reference not found #[serde(rename = "RefNotFound")] RefNotFound(std::option::Option), - ///Invalid request parameters + /// Invalid request parameters #[serde(rename = "InvalidRequest")] InvalidRequest(std::option::Option), } diff --git a/crates/jacquard-api/src/sh_tangled/repo/list_secrets.rs b/crates/jacquard-api/src/sh_tangled/repo/list_secrets.rs index 7877fee33..ce7aa4b8d 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/list_secrets.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/list_secrets.rs @@ -72,7 +72,8 @@ impl jacquard_common::xrpc::XrpcEndpoint for ListSecretsRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Secret<'a> { @@ -80,6 +81,7 @@ pub struct Secret<'a> { #[serde(borrow)] pub created_by: jacquard_common::types::string::Did<'a>, #[serde(borrow)] + #[builder(into)] pub key: jacquard_common::CowStr<'a>, #[serde(borrow)] pub repo: jacquard_common::types::string::AtUri<'a>, diff --git a/crates/jacquard-api/src/sh_tangled/repo/log.rs b/crates/jacquard-api/src/sh_tangled/repo/log.rs index 50f74f281..a5521e0c1 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/log.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/log.rs @@ -65,16 +65,16 @@ pub struct LogOutput<'a> {} #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum LogError<'a> { - ///Repository not found or access denied + /// Repository not found or access denied #[serde(rename = "RepoNotFound")] RepoNotFound(std::option::Option), - ///Git reference not found + /// Git reference not found #[serde(rename = "RefNotFound")] RefNotFound(std::option::Option), - ///Path not found in repository + /// Path not found in repository #[serde(rename = "PathNotFound")] PathNotFound(std::option::Option), - ///Invalid request parameters + /// Invalid request parameters #[serde(rename = "InvalidRequest")] InvalidRequest(std::option::Option), } diff --git a/crates/jacquard-api/src/sh_tangled/repo/merge.rs b/crates/jacquard-api/src/sh_tangled/repo/merge.rs index f1869e561..7d513a289 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/merge.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/merge.rs @@ -19,38 +19,38 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct Merge<'a> { - ///Author email for the merge commit + /// Author email for the merge commit #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub author_email: std::option::Option>, - ///Author name for the merge commit - #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] + pub author_email: Option>, + /// Author name for the merge commit + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub author_name: std::option::Option>, - ///Target branch to merge into + #[serde(borrow)] + pub author_name: Option>, + /// Target branch to merge into #[serde(borrow)] #[builder(into)] pub branch: jacquard_common::CowStr<'a>, - ///Additional commit message body + /// Additional commit message body #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub commit_body: std::option::Option>, - ///Merge commit message - #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] + pub commit_body: Option>, + /// Merge commit message + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub commit_message: std::option::Option>, - ///DID of the repository owner + #[serde(borrow)] + pub commit_message: Option>, + /// DID of the repository owner #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///Name of the repository + /// Name of the repository #[serde(borrow)] #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Patch content to merge + /// Patch content to merge #[serde(borrow)] #[builder(into)] pub patch: jacquard_common::CowStr<'a>, diff --git a/crates/jacquard-api/src/sh_tangled/repo/merge_check.rs b/crates/jacquard-api/src/sh_tangled/repo/merge_check.rs index cc3d02cd7..652caa629 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/merge_check.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/merge_check.rs @@ -13,15 +13,18 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ConflictInfo<'a> { - ///Name of the conflicted file + /// Name of the conflicted file #[serde(borrow)] + #[builder(into)] pub filename: jacquard_common::CowStr<'a>, - ///Reason for the conflict + /// Reason for the conflict #[serde(borrow)] + #[builder(into)] pub reason: jacquard_common::CowStr<'a>, } @@ -39,18 +42,18 @@ pub struct ConflictInfo<'a> { #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct MergeCheck<'a> { - ///Target branch to merge into + /// Target branch to merge into #[serde(borrow)] #[builder(into)] pub branch: jacquard_common::CowStr<'a>, - ///DID of the repository owner + /// DID of the repository owner #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///Name of the repository + /// Name of the repository #[serde(borrow)] #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Patch or pull request to check for merge conflicts + /// Patch or pull request to check for merge conflicts #[serde(borrow)] #[builder(into)] pub patch: jacquard_common::CowStr<'a>, @@ -75,17 +78,17 @@ pub struct MergeCheck<'a> { )] #[serde(rename_all = "camelCase")] pub struct MergeCheckOutput<'a> { - ///List of files with merge conflicts + /// List of files with merge conflicts #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub conflicts: std::option::Option>>, - ///Error message if check failed + /// Error message if check failed #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub error: std::option::Option>, - ///Whether the merge has conflicts + /// Whether the merge has conflicts pub is_conflicted: bool, - ///Additional message about the merge check + /// Additional message about the merge check #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub message: std::option::Option>, diff --git a/crates/jacquard-api/src/sh_tangled/repo/pull.rs b/crates/jacquard-api/src/sh_tangled/repo/pull.rs index 611a65a17..0bcaa0487 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/pull.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/pull.rs @@ -16,22 +16,27 @@ pub mod status; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Pull<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub body: std::option::Option>, + pub body: Option>, pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] + #[builder(into)] pub patch: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub source: std::option::Option>, + pub source: Option>, #[serde(borrow)] pub target: crate::sh_tangled::repo::pull::Target<'a>, #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, } @@ -85,16 +90,20 @@ impl From> for Pull<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Source<'a> { #[serde(borrow)] + #[builder(into)] pub branch: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub repo: std::option::Option>, + pub repo: Option>, #[serde(borrow)] + #[builder(into)] pub sha: jacquard_common::CowStr<'a>, } @@ -106,11 +115,13 @@ pub struct Source<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Target<'a> { #[serde(borrow)] + #[builder(into)] pub branch: jacquard_common::CowStr<'a>, #[serde(borrow)] pub repo: jacquard_common::types::string::AtUri<'a>, diff --git a/crates/jacquard-api/src/sh_tangled/repo/pull/comment.rs b/crates/jacquard-api/src/sh_tangled/repo/pull/comment.rs index a3d68dd0e..d7d90e9a7 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/pull/comment.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/pull/comment.rs @@ -13,11 +13,13 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Comment<'a> { #[serde(borrow)] + #[builder(into)] pub body: jacquard_common::CowStr<'a>, pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] diff --git a/crates/jacquard-api/src/sh_tangled/repo/pull/status.rs b/crates/jacquard-api/src/sh_tangled/repo/pull/status.rs index 35c16e9a8..0a9fa576a 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/pull/status.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/pull/status.rs @@ -17,14 +17,16 @@ pub mod open; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Status<'a> { #[serde(borrow)] pub pull: jacquard_common::types::string::AtUri<'a>, - ///status of the pull request + /// status of the pull request #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/sh_tangled/repo/pull/status/closed.rs b/crates/jacquard-api/src/sh_tangled/repo/pull/status/closed.rs index 3bc7b4abc..f3cc0706f 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/pull/status/closed.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/pull/status/closed.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///closed pull request +/// closed pull request #[derive( serde::Serialize, serde::Deserialize, diff --git a/crates/jacquard-api/src/sh_tangled/repo/pull/status/merged.rs b/crates/jacquard-api/src/sh_tangled/repo/pull/status/merged.rs index 2cb9e3377..00891b0e1 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/pull/status/merged.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/pull/status/merged.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///merged pull request +/// merged pull request #[derive( serde::Serialize, serde::Deserialize, diff --git a/crates/jacquard-api/src/sh_tangled/repo/pull/status/open.rs b/crates/jacquard-api/src/sh_tangled/repo/pull/status/open.rs index 8de1f3ffd..0a69f7bd9 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/pull/status/open.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/pull/status/open.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///open pull request +/// open pull request #[derive( serde::Serialize, serde::Deserialize, diff --git a/crates/jacquard-api/src/sh_tangled/repo/tags.rs b/crates/jacquard-api/src/sh_tangled/repo/tags.rs index 158807b61..9ef68f5c4 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/tags.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/tags.rs @@ -57,10 +57,10 @@ pub struct TagsOutput<'a> {} #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum TagsError<'a> { - ///Repository not found or access denied + /// Repository not found or access denied #[serde(rename = "RepoNotFound")] RepoNotFound(std::option::Option), - ///Invalid request parameters + /// Invalid request parameters #[serde(rename = "InvalidRequest")] InvalidRequest(std::option::Option), } diff --git a/crates/jacquard-api/src/sh_tangled/repo/tree.rs b/crates/jacquard-api/src/sh_tangled/repo/tree.rs index 731478322..d29e8afea 100644 --- a/crates/jacquard-api/src/sh_tangled/repo/tree.rs +++ b/crates/jacquard-api/src/sh_tangled/repo/tree.rs @@ -13,17 +13,20 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct LastCommit<'a> { - ///Commit hash + /// Commit hash #[serde(borrow)] + #[builder(into)] pub hash: jacquard_common::CowStr<'a>, - ///Commit message + /// Commit message #[serde(borrow)] + #[builder(into)] pub message: jacquard_common::CowStr<'a>, - ///Commit timestamp + /// Commit timestamp pub when: jacquard_common::types::string::Datetime, } @@ -65,21 +68,21 @@ pub struct Tree<'a> { )] #[serde(rename_all = "camelCase")] pub struct TreeOutput<'a> { - ///Parent directory path + /// Parent directory path #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub dotdot: std::option::Option>, #[serde(borrow)] pub files: Vec>, - ///The parent path in the tree + /// The parent path in the tree #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub parent: std::option::Option>, - ///Readme for this file tree + /// Readme for this file tree #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub readme: std::option::Option>, - ///The git reference used + /// The git reference used #[serde(borrow)] pub r#ref: jacquard_common::CowStr<'a>, } @@ -99,16 +102,16 @@ pub struct TreeOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum TreeError<'a> { - ///Repository not found or access denied + /// Repository not found or access denied #[serde(rename = "RepoNotFound")] RepoNotFound(std::option::Option), - ///Git reference not found + /// Git reference not found #[serde(rename = "RefNotFound")] RefNotFound(std::option::Option), - ///Path not found in repository tree + /// Path not found in repository tree #[serde(rename = "PathNotFound")] PathNotFound(std::option::Option), - ///Invalid request parameters + /// Invalid request parameters #[serde(rename = "InvalidRequest")] InvalidRequest(std::option::Option), } @@ -183,15 +186,18 @@ impl jacquard_common::xrpc::XrpcEndpoint for TreeRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Readme<'a> { - ///Contents of the readme file + /// Contents of the readme file #[serde(borrow)] + #[builder(into)] pub contents: jacquard_common::CowStr<'a>, - ///Name of the readme file + /// Name of the readme file #[serde(borrow)] + #[builder(into)] pub filename: jacquard_common::CowStr<'a>, } @@ -203,23 +209,27 @@ pub struct Readme<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct TreeEntry<'a> { - ///Whether this entry is a file + /// Whether this entry is a file pub is_file: bool, - ///Whether this entry is a directory/subtree + /// Whether this entry is a directory/subtree pub is_subtree: bool, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub last_commit: std::option::Option>, - ///File mode + pub last_commit: Option>, + /// File mode #[serde(borrow)] + #[builder(into)] pub mode: jacquard_common::CowStr<'a>, - ///Relative file or directory name + /// Relative file or directory name #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///File size in bytes + /// File size in bytes pub size: i64, } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_tangled/spindle.rs b/crates/jacquard-api/src/sh_tangled/spindle.rs index e11fb1a58..58febd6b2 100644 --- a/crates/jacquard-api/src/sh_tangled/spindle.rs +++ b/crates/jacquard-api/src/sh_tangled/spindle.rs @@ -15,7 +15,8 @@ pub mod member; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Spindle<'a> { diff --git a/crates/jacquard-api/src/sh_tangled/spindle/member.rs b/crates/jacquard-api/src/sh_tangled/spindle/member.rs index d689a9908..b366eeb2c 100644 --- a/crates/jacquard-api/src/sh_tangled/spindle/member.rs +++ b/crates/jacquard-api/src/sh_tangled/spindle/member.rs @@ -13,13 +13,15 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Member<'a> { pub created_at: jacquard_common::types::string::Datetime, - ///spindle instance that the subject is now a member of + /// spindle instance that the subject is now a member of #[serde(borrow)] + #[builder(into)] pub instance: jacquard_common::CowStr<'a>, #[serde(borrow)] pub subject: jacquard_common::types::string::Did<'a>, diff --git a/crates/jacquard-api/src/sh_tangled/string.rs b/crates/jacquard-api/src/sh_tangled/string.rs index 94bc545f6..ebbcdefea 100644 --- a/crates/jacquard-api/src/sh_tangled/string.rs +++ b/crates/jacquard-api/src/sh_tangled/string.rs @@ -13,16 +13,20 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct String<'a> { #[serde(borrow)] + #[builder(into)] pub contents: jacquard_common::CowStr<'a>, pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] + #[builder(into)] pub description: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub filename: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/sh_weaver/actor.rs b/crates/jacquard-api/src/sh_weaver/actor.rs index e71b26902..e3bebe1e9 100644 --- a/crates/jacquard-api/src/sh_weaver/actor.rs +++ b/crates/jacquard-api/src/sh_weaver/actor.rs @@ -8,7 +8,7 @@ pub mod get_profile; pub mod profile; -///A single author in a Weaver notebook. +/// A single author in a Weaver notebook. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -17,18 +17,21 @@ pub mod profile; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Author<'a> { #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display_name: std::option::Option>, + pub display_name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub handle: std::option::Option>, + pub handle: Option>, } #[jacquard_derive::lexicon] @@ -39,7 +42,8 @@ pub struct Author<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ProfileDataView<'a> { @@ -74,43 +78,51 @@ pub enum ProfileDataViewInner<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ProfileView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, + pub avatar: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display_name: std::option::Option>, + pub display_name: Option>, #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub indexed_at: std::option::Option, + #[builder(into)] + pub indexed_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub links: std::option::Option>>, - ///Free-form location text. + pub links: Option>>, + /// Free-form location text. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub location: std::option::Option>, - ///Pronouns to use in user-generated content. + pub location: Option>, + /// Pronouns to use in user-generated content. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pronouns: std::option::Option< - crate::sh_weaver::actor::profile::PronounsList<'a>, - >, + pub pronouns: Option>, } #[jacquard_derive::lexicon] @@ -121,34 +133,38 @@ pub struct ProfileView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct TangledProfileView<'a> { - ///Include link to this account on Bluesky. + /// Include link to this account on Bluesky. pub bluesky: bool, - ///Free-form profile description text. + /// Free-form profile description text. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub links: std::option::Option>>, - ///Free-form location text. + pub links: Option>>, + /// Free-form location text. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub location: std::option::Option>, - ///Any ATURI, it is up to appviews to validate these fields. + pub location: Option>, + /// Any ATURI, it is up to appviews to validate these fields. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pinned_repositories: std::option::Option< - Vec>, - >, + pub pinned_repositories: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub stats: std::option::Option>>, + pub stats: Option>>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_weaver/actor/profile.rs b/crates/jacquard-api/src/sh_weaver/actor/profile.rs index 3e45f126d..1f1774fff 100644 --- a/crates/jacquard-api/src/sh_weaver/actor/profile.rs +++ b/crates/jacquard-api/src/sh_weaver/actor/profile.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of a Weaver account profile. +/// A declaration of a Weaver account profile. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,47 +14,54 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Profile<'a> { - ///Small image to be displayed next to posts from account. AKA, 'profile picture' + /// Small image to be displayed next to posts from account. AKA, 'profile picture' #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, - ///Include link to this account on Bluesky. + pub avatar: Option>, + /// Include link to this account on Bluesky. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub bluesky: std::option::Option, + #[builder(into)] + pub bluesky: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, - ///Free-form profile description text. + #[builder(into)] + pub created_at: Option, + /// Free-form profile description text. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display_name: std::option::Option>, + pub display_name: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub links: std::option::Option>>, - ///Free-form location text. + pub links: Option>>, + /// Free-form location text. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub location: std::option::Option>, + pub location: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pinned_post: std::option::Option< - crate::com_atproto::repo::strong_ref::StrongRef<'a>, - >, - ///Pronouns to use in user-generated content. + pub pinned_post: Option>, + /// Pronouns to use in user-generated content. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pronouns: std::option::Option< - crate::sh_weaver::actor::profile::PronounsList<'a>, - >, - ///Include link to this account on Tangled. + pub pronouns: Option>, + /// Include link to this account on Tangled. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub tangled: std::option::Option, + #[builder(into)] + pub tangled: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/sh_weaver/edit.rs b/crates/jacquard-api/src/sh_weaver/edit.rs index 44fe44aee..db6a417b8 100644 --- a/crates/jacquard-api/src/sh_weaver/edit.rs +++ b/crates/jacquard-api/src/sh_weaver/edit.rs @@ -17,7 +17,8 @@ pub mod root; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct DocRef<'a> { @@ -52,7 +53,8 @@ pub enum DocRefValue<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct EntryRef<'a> { @@ -68,7 +70,8 @@ pub struct EntryRef<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct NotebookRef<'a> { diff --git a/crates/jacquard-api/src/sh_weaver/edit/cursor.rs b/crates/jacquard-api/src/sh_weaver/edit/cursor.rs index 3362d7bf3..31d5ff01c 100644 --- a/crates/jacquard-api/src/sh_weaver/edit/cursor.rs +++ b/crates/jacquard-api/src/sh_weaver/edit/cursor.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ContainerId<'a> { @@ -48,11 +49,12 @@ pub enum ContainerIdValue<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct CursorSide<'a> { - ///The side of an item the cursor is on (left = -1, right = 1, middle = 0) + /// The side of an item the cursor is on (left = -1, right = 1, middle = 0) pub value: i64, } @@ -64,7 +66,8 @@ pub struct CursorSide<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Id<'a> { @@ -72,7 +75,7 @@ pub struct Id<'a> { pub peer: i64, } -///An edit record for a notebook. +/// An edit record for a notebook. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -81,18 +84,21 @@ pub struct Id<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Cursor<'a> { #[serde(borrow)] pub container: crate::sh_weaver::edit::cursor::ContainerId<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub id: std::option::Option>, + pub id: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub side: std::option::Option>, + pub side: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. @@ -145,11 +151,13 @@ impl From> for Cursor<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct NormalContainerId<'a> { #[serde(borrow)] + #[builder(into)] pub container_type: jacquard_common::CowStr<'a>, pub counter: i64, pub peer: i64, @@ -163,12 +171,15 @@ pub struct NormalContainerId<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RootContainerId<'a> { #[serde(borrow)] + #[builder(into)] pub container_type: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_weaver/edit/diff.rs b/crates/jacquard-api/src/sh_weaver/edit/diff.rs index 8b607dc01..d2e700249 100644 --- a/crates/jacquard-api/src/sh_weaver/edit/diff.rs +++ b/crates/jacquard-api/src/sh_weaver/edit/diff.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///An edit record for a notebook. +/// An edit record for a notebook. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,7 +14,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Diff<'a> { diff --git a/crates/jacquard-api/src/sh_weaver/edit/root.rs b/crates/jacquard-api/src/sh_weaver/edit/root.rs index b9b87b619..f5bdc9921 100644 --- a/crates/jacquard-api/src/sh_weaver/edit/root.rs +++ b/crates/jacquard-api/src/sh_weaver/edit/root.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///The starting point for edit history on a notebook. +/// The starting point for edit history on a notebook. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,7 +14,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Root<'a> { diff --git a/crates/jacquard-api/src/sh_weaver/embed.rs b/crates/jacquard-api/src/sh_weaver/embed.rs index e0bd87ab9..2b006fb49 100644 --- a/crates/jacquard-api/src/sh_weaver/embed.rs +++ b/crates/jacquard-api/src/sh_weaver/embed.rs @@ -11,7 +11,7 @@ pub mod record_with_media; pub mod records; pub mod video; -///Proportional size of the embed relative to the viewport in larger windows. The dimensions are percentage out of 100. Could we use more granularity? Maybe, but come on. +/// Proportional size of the embed relative to the viewport in larger windows. The dimensions are percentage out of 100. Could we use more granularity? Maybe, but come on. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -20,7 +20,8 @@ pub mod video; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PercentSize<'a> { @@ -28,7 +29,7 @@ pub struct PercentSize<'a> { pub width: i64, } -///Pixel-exact embed size. The dimensions are logical pixels, subject to scaling, so 200px at X2 scale is 400px. +/// Pixel-exact embed size. The dimensions are logical pixels, subject to scaling, so 200px at X2 scale is 400px. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -37,7 +38,8 @@ pub struct PercentSize<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PixelSize<'a> { diff --git a/crates/jacquard-api/src/sh_weaver/embed/external.rs b/crates/jacquard-api/src/sh_weaver/embed/external.rs index 84d1afbb1..1e8a9849a 100644 --- a/crates/jacquard-api/src/sh_weaver/embed/external.rs +++ b/crates/jacquard-api/src/sh_weaver/embed/external.rs @@ -13,16 +13,20 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct External<'a> { #[serde(borrow)] + #[builder(into)] pub description: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub thumb: std::option::Option>, + pub thumb: Option>, #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, #[serde(borrow)] pub uri: jacquard_common::types::string::Uri<'a>, @@ -36,7 +40,8 @@ pub struct External<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ExternalRecord<'a> { @@ -52,7 +57,8 @@ pub struct ExternalRecord<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct View<'a> { @@ -68,16 +74,20 @@ pub struct View<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewExternal<'a> { #[serde(borrow)] + #[builder(into)] pub description: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub thumb: std::option::Option>, + pub thumb: Option>, #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, #[serde(borrow)] pub uri: jacquard_common::types::string::Uri<'a>, diff --git a/crates/jacquard-api/src/sh_weaver/embed/images.rs b/crates/jacquard-api/src/sh_weaver/embed/images.rs index 757a9818c..bbb39fb7b 100644 --- a/crates/jacquard-api/src/sh_weaver/embed/images.rs +++ b/crates/jacquard-api/src/sh_weaver/embed/images.rs @@ -13,20 +13,24 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Image<'a> { - ///alt text description of the image + /// alt text description of the image #[serde(borrow)] + #[builder(into)] pub alt: jacquard_common::CowStr<'a>, - ///Blurhash string for the image, used for low-resolution placeholders. This must be a valid Blurhash string. + /// Blurhash string for the image, used for low-resolution placeholders. This must be a valid Blurhash string. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub blurhash: std::option::Option>, + pub blurhash: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub dimensions: std::option::Option>, + pub dimensions: Option>, #[serde(borrow)] pub image: jacquard_common::types::blob::Blob<'a>, } @@ -60,7 +64,8 @@ pub enum ImageDimensions<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Images<'a> { diff --git a/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs b/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs index 8173aa9bb..b634608e6 100644 --- a/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs +++ b/crates/jacquard-api/src/sh_weaver/embed/record_with_media.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RecordWithMedia<'a> { @@ -75,7 +76,8 @@ pub enum RecordWithMediaRecord<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct View<'a> { diff --git a/crates/jacquard-api/src/sh_weaver/embed/records.rs b/crates/jacquard-api/src/sh_weaver/embed/records.rs index 00d9dc750..edf055e3a 100644 --- a/crates/jacquard-api/src/sh_weaver/embed/records.rs +++ b/crates/jacquard-api/src/sh_weaver/embed/records.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Records<'a> { @@ -29,7 +30,8 @@ pub struct Records<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct View<'a> { @@ -76,7 +78,8 @@ pub enum ViewUnionRecord<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewBlocked<'a> { @@ -95,7 +98,8 @@ pub struct ViewBlocked<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewDetached<'a> { @@ -112,7 +116,8 @@ pub struct ViewDetached<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewNotFound<'a> { @@ -129,7 +134,8 @@ pub struct ViewNotFound<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewRecord<'a> { @@ -138,23 +144,29 @@ pub struct ViewRecord<'a> { #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub embeds: std::option::Option>>, + pub embeds: Option>>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub like_count: std::option::Option, + #[builder(into)] + pub like_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub quote_count: std::option::Option, + #[builder(into)] + pub quote_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub reply_count: std::option::Option, + #[builder(into)] + pub reply_count: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub repost_count: std::option::Option, + #[builder(into)] + pub repost_count: Option, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, - ///The record data itself. + /// The record data itself. #[serde(borrow)] pub value: jacquard_common::types::value::Data<'a>, } diff --git a/crates/jacquard-api/src/sh_weaver/embed/video.rs b/crates/jacquard-api/src/sh_weaver/embed/video.rs index d359da5a9..d3e533003 100644 --- a/crates/jacquard-api/src/sh_weaver/embed/video.rs +++ b/crates/jacquard-api/src/sh_weaver/embed/video.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Caption<'a> { @@ -30,21 +31,25 @@ pub struct Caption<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Video<'a> { - ///Alt text description of the video, for accessibility. + /// Alt text description of the video, for accessibility. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub alt: std::option::Option>, + pub alt: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub aspect_ratio: std::option::Option>, + pub aspect_ratio: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub captions: std::option::Option>>, - ///The mp4 video file. May be up to 100mb, formerly limited to 50mb. + pub captions: Option>>, + /// The mp4 video file. May be up to 100mb, formerly limited to 50mb. #[serde(borrow)] pub video: jacquard_common::types::blob::Blob<'a>, } @@ -57,21 +62,25 @@ pub struct Video<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct View<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub alt: std::option::Option>, + pub alt: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub aspect_ratio: std::option::Option>, + pub aspect_ratio: Option>, #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, #[serde(borrow)] pub playlist: jacquard_common::types::string::Uri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub thumbnail: std::option::Option>, + pub thumbnail: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_weaver/notebook.rs b/crates/jacquard-api/src/sh_weaver/notebook.rs index 7df5ef5af..aae124e9d 100644 --- a/crates/jacquard-api/src/sh_weaver/notebook.rs +++ b/crates/jacquard-api/src/sh_weaver/notebook.rs @@ -18,20 +18,24 @@ pub mod entry; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AuthorListView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cid: std::option::Option>, + pub cid: Option>, pub index: i64, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub record: std::option::Option>, + pub record: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub uri: std::option::Option>, + pub uri: Option>, } #[jacquard_derive::lexicon] @@ -42,7 +46,8 @@ pub struct AuthorListView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct BookEntryRef<'a> { @@ -50,7 +55,7 @@ pub struct BookEntryRef<'a> { pub entry: crate::sh_weaver::notebook::EntryView<'a>, } -///An ordered entry in a Weaver notebook. +/// An ordered entry in a Weaver notebook. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -59,7 +64,8 @@ pub struct BookEntryRef<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct BookEntryView<'a> { @@ -67,14 +73,16 @@ pub struct BookEntryView<'a> { pub entry: crate::sh_weaver::notebook::EntryView<'a>, pub index: i64, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub next: std::option::Option>, + pub next: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub prev: std::option::Option>, + pub prev: Option>, } -///The format of the content. This is used to determine how to render the content. +/// The format of the content. This is used to determine how to render the content. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -83,14 +91,16 @@ pub struct BookEntryView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ContentFormat<'a> { - ///The format of the content. This is used to determine how to render the content. + /// The format of the content. This is used to determine how to render the content. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub markdown: std::option::Option>, + pub markdown: Option>, } #[jacquard_derive::lexicon] @@ -101,27 +111,32 @@ pub struct ContentFormat<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct EntryView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub authors: std::option::Option>, + pub authors: Option>, #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(borrow)] pub record: jacquard_common::types::value::Data<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub rendered_view: std::option::Option>, + pub rendered_view: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>, + pub tags: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub title: std::option::Option>, + pub title: Option>, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, } @@ -134,29 +149,33 @@ pub struct EntryView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct NotebookView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub authors: std::option::Option>, + pub authors: Option>, #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(borrow)] pub record: jacquard_common::types::value::Data<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>, + pub tags: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub title: std::option::Option>, + pub title: Option>, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, } -///View of a rendered and cached notebook entry +/// View of a rendered and cached notebook entry #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -165,18 +184,20 @@ pub struct NotebookView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RenderedView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub css: std::option::Option>, + pub css: Option>, #[serde(borrow)] pub html: jacquard_common::types::blob::Blob<'a>, } -///An array of tags associated with the notebook entry. Tags can help categorize and organize entries. +/// An array of tags associated with the notebook entry. Tags can help categorize and organize entries. pub type Tags<'a> = Vec>; -///The title of the notebook entry. +/// The title of the notebook entry. pub type Title<'a> = jacquard_common::CowStr<'a>; \ No newline at end of file diff --git a/crates/jacquard-api/src/sh_weaver/notebook/authors.rs b/crates/jacquard-api/src/sh_weaver/notebook/authors.rs index df0e6f817..befc3afc3 100644 --- a/crates/jacquard-api/src/sh_weaver/notebook/authors.rs +++ b/crates/jacquard-api/src/sh_weaver/notebook/authors.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A single author in a Weaver notebook. +/// A single author in a Weaver notebook. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,15 +14,18 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AuthorListItem<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub index: std::option::Option, + #[builder(into)] + pub index: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub profile: std::option::Option>, + pub profile: Option>, } #[jacquard_derive::open_union] @@ -44,7 +47,7 @@ pub enum AuthorListItemProfile<'a> { ProfileView(Box>), } -///Authors of a Weaver notebook. +/// Authors of a Weaver notebook. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -53,14 +56,16 @@ pub enum AuthorListItemProfile<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Authors<'a> { #[serde(borrow)] pub author_list: Vec>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/sh_weaver/notebook/book.rs b/crates/jacquard-api/src/sh_weaver/notebook/book.rs index 4ddff301e..a797fb016 100644 --- a/crates/jacquard-api/src/sh_weaver/notebook/book.rs +++ b/crates/jacquard-api/src/sh_weaver/notebook/book.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Authors of a Weaver notebook. +/// Authors of a Weaver notebook. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,23 +14,27 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Book<'a> { #[serde(borrow)] pub authors: Vec>, - ///Client-declared timestamp when this was originally created. + /// Client-declared timestamp when this was originally created. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, #[serde(borrow)] pub entry_list: Vec>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>, + pub tags: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub title: std::option::Option>, + pub title: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs b/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs index 09822cc49..5cdf36d67 100644 --- a/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs +++ b/crates/jacquard-api/src/sh_weaver/notebook/chapter.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A grouping of entries in a notebook, intended to be displayed as a single page. +/// A grouping of entries in a notebook, intended to be displayed as a single page. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,24 +14,28 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Chapter<'a> { - ///Client-declared timestamp when this was originally created. + /// Client-declared timestamp when this was originally created. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, #[serde(borrow)] pub entry_list: Vec>, - ///The notebook this page belongs to. + /// The notebook this page belongs to. #[serde(borrow)] pub notebook: crate::com_atproto::repo::strong_ref::StrongRef<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>, + pub tags: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub title: std::option::Option>, + pub title: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/sh_weaver/notebook/entry.rs b/crates/jacquard-api/src/sh_weaver/notebook/entry.rs index 009674167..9dd63a1bd 100644 --- a/crates/jacquard-api/src/sh_weaver/notebook/entry.rs +++ b/crates/jacquard-api/src/sh_weaver/notebook/entry.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A notebook entry +/// A notebook entry #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,22 +14,26 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Entry<'a> { - ///The content of the notebook entry. This should be some flavor of Markdown. + /// The content of the notebook entry. This should be some flavor of Markdown. #[serde(borrow)] + #[builder(into)] pub content: jacquard_common::CowStr<'a>, - ///Client-declared timestamp when this was originally created. + /// Client-declared timestamp when this was originally created. pub created_at: jacquard_common::types::string::Datetime, - ///The set of images, if any, embedded in the notebook entry. + /// The set of images, if any, embedded in the notebook entry. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub images: std::option::Option>, + pub images: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>, + pub tags: Option>, #[serde(borrow)] pub title: crate::sh_weaver::notebook::Title<'a>, } diff --git a/crates/jacquard-api/src/sh_weaver/publish/blob.rs b/crates/jacquard-api/src/sh_weaver/publish/blob.rs index 376e317f6..c9ff135eb 100644 --- a/crates/jacquard-api/src/sh_weaver/publish/blob.rs +++ b/crates/jacquard-api/src/sh_weaver/publish/blob.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A simple record referencing a file hosted on a PDS +/// A simple record referencing a file hosted on a PDS #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,11 +14,12 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Blob<'a> { - ///Reference to the uploaded file + /// Reference to the uploaded file #[serde(borrow)] pub upload: jacquard_common::types::blob::Blob<'a>, } diff --git a/crates/jacquard-api/src/social_clippr/actor.rs b/crates/jacquard-api/src/social_clippr/actor.rs index 4c1cd1592..e0046c13c 100644 --- a/crates/jacquard-api/src/social_clippr/actor.rs +++ b/crates/jacquard-api/src/social_clippr/actor.rs @@ -30,9 +30,9 @@ pub enum PreferencesItem<'a> { PublishingScopesPref(Box>), } -///An array of refs to various preferences. +/// An array of refs to various preferences. pub type Preferences<'a> = Vec>; -///A view of an actor's profile. +/// A view of an actor's profile. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -41,33 +41,38 @@ pub type Preferences<'a> = Vec>; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ProfileView<'a> { - ///A link to the profile's avatar + /// A link to the profile's avatar #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, - ///When the profile record was first created + pub avatar: Option>, + /// When the profile record was first created #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, - ///The biography associated to the profile + #[builder(into)] + pub created_at: Option, + /// The biography associated to the profile #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///The DID of the profile + pub description: Option>, + /// The DID of the profile #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///The display name associated to the profile + /// The display name associated to the profile #[serde(borrow)] + #[builder(into)] pub display_name: jacquard_common::CowStr<'a>, - ///The handle of the profile + /// The handle of the profile #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, } -///Preferences for an user's publishing scopes. +/// Preferences for an user's publishing scopes. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -76,11 +81,13 @@ pub struct ProfileView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PublishingScopesPref<'a> { - ///What publishing scope to mark a clip as by default + /// What publishing scope to mark a clip as by default #[serde(borrow)] + #[builder(into)] pub default_scope: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/social_clippr/actor/get_preferences.rs b/crates/jacquard-api/src/social_clippr/actor/get_preferences.rs index 3fb18130f..1e5a09a37 100644 --- a/crates/jacquard-api/src/social_clippr/actor/get_preferences.rs +++ b/crates/jacquard-api/src/social_clippr/actor/get_preferences.rs @@ -30,7 +30,7 @@ pub struct GetPreferences {} )] #[serde(rename_all = "camelCase")] pub struct GetPreferencesOutput<'a> { - ///A ref to the user's preferences + /// A ref to the user's preferences #[serde(borrow)] pub preferences: crate::social_clippr::actor::Preferences<'a>, } diff --git a/crates/jacquard-api/src/social_clippr/actor/profile.rs b/crates/jacquard-api/src/social_clippr/actor/profile.rs index 98972fbbe..2d5595255 100644 --- a/crates/jacquard-api/src/social_clippr/actor/profile.rs +++ b/crates/jacquard-api/src/social_clippr/actor/profile.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of a Clippr account's profile. +/// A declaration of a Clippr account's profile. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,22 +14,26 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Profile<'a> { - ///Image to show on user's profiles + /// Image to show on user's profiles #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, - ///The creation date of the profile + pub avatar: Option>, + /// The creation date of the profile pub created_at: jacquard_common::types::string::Datetime, - ///Text for user to describe themselves + /// Text for user to describe themselves #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///A display name to be shown on a profile + pub description: Option>, + /// A display name to be shown on a profile #[serde(borrow)] + #[builder(into)] pub display_name: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/social_clippr/actor/put_preferences.rs b/crates/jacquard-api/src/social_clippr/actor/put_preferences.rs index f0599a0ae..330e8e399 100644 --- a/crates/jacquard-api/src/social_clippr/actor/put_preferences.rs +++ b/crates/jacquard-api/src/social_clippr/actor/put_preferences.rs @@ -19,7 +19,7 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct PutPreferences<'a> { - ///A ref to the user's preferences + /// A ref to the user's preferences #[serde(borrow)] pub preferences: crate::social_clippr::actor::Preferences<'a>, #[serde(flatten)] diff --git a/crates/jacquard-api/src/social_clippr/actor/search_clips.rs b/crates/jacquard-api/src/social_clippr/actor/search_clips.rs index a63cedba8..bd1842ce1 100644 --- a/crates/jacquard-api/src/social_clippr/actor/search_clips.rs +++ b/crates/jacquard-api/src/social_clippr/actor/search_clips.rs @@ -45,10 +45,10 @@ pub struct SearchClips<'a> { )] #[serde(rename_all = "camelCase")] pub struct SearchClipsOutput<'a> { - ///A list of clips and their associated details + /// A list of clips and their associated details #[serde(borrow)] pub clips: Vec>, - ///A parameter to paginate results + /// A parameter to paginate results #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, diff --git a/crates/jacquard-api/src/social_clippr/actor/search_profiles.rs b/crates/jacquard-api/src/social_clippr/actor/search_profiles.rs index c2c60f284..0806eb527 100644 --- a/crates/jacquard-api/src/social_clippr/actor/search_profiles.rs +++ b/crates/jacquard-api/src/social_clippr/actor/search_profiles.rs @@ -45,7 +45,7 @@ pub struct SearchProfiles<'a> { pub struct SearchProfilesOutput<'a> { #[serde(borrow)] pub actors: Vec>, - ///A parameter used for pagination + /// A parameter used for pagination #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, diff --git a/crates/jacquard-api/src/social_clippr/actor/search_tags.rs b/crates/jacquard-api/src/social_clippr/actor/search_tags.rs index 276c77a54..b5ed32900 100644 --- a/crates/jacquard-api/src/social_clippr/actor/search_tags.rs +++ b/crates/jacquard-api/src/social_clippr/actor/search_tags.rs @@ -45,11 +45,11 @@ pub struct SearchTags<'a> { )] #[serde(rename_all = "camelCase")] pub struct SearchTagsOutput<'a> { - ///A parameter to paginate results + /// A parameter to paginate results #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, - ///A list of tags and their associated details + /// A list of tags and their associated details #[serde(borrow)] pub tags: Vec>, } diff --git a/crates/jacquard-api/src/social_clippr/feed.rs b/crates/jacquard-api/src/social_clippr/feed.rs index 4fc73e31b..20a4642db 100644 --- a/crates/jacquard-api/src/social_clippr/feed.rs +++ b/crates/jacquard-api/src/social_clippr/feed.rs @@ -13,7 +13,7 @@ pub mod get_tag_list; pub mod get_tags; pub mod tag; -///A view of a single bookmark (or 'clip'). +/// A view of a single bookmark (or 'clip'). #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -22,27 +22,28 @@ pub mod tag; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ClipView<'a> { - ///A reference to the actor's profile + /// A reference to the actor's profile #[serde(borrow)] pub author: crate::social_clippr::actor::ProfileView<'a>, - ///The CID of the clip + /// The CID of the clip #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, - ///When the tag was first indexed by the AppView + /// When the tag was first indexed by the AppView pub indexed_at: jacquard_common::types::string::Datetime, - ///The raw record of the clip + /// The raw record of the clip #[serde(borrow)] pub record: jacquard_common::types::value::Data<'a>, - ///The AT-URI of the clip + /// The AT-URI of the clip #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, } -///A view of a single tag. +/// A view of a single tag. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -51,22 +52,23 @@ pub struct ClipView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct TagView<'a> { - ///A reference to the actor's profile + /// A reference to the actor's profile #[serde(borrow)] pub author: crate::social_clippr::actor::ProfileView<'a>, - ///The CID of the tag + /// The CID of the tag #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, - ///When the tag was first indexed by the AppView + /// When the tag was first indexed by the AppView pub indexed_at: jacquard_common::types::string::Datetime, - ///The raw record of the tag + /// The raw record of the tag #[serde(borrow)] pub record: jacquard_common::types::value::Data<'a>, - ///The AT-URI to the tag + /// The AT-URI to the tag #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/social_clippr/feed/clip.rs b/crates/jacquard-api/src/social_clippr/feed/clip.rs index b705243b7..baf803715 100644 --- a/crates/jacquard-api/src/social_clippr/feed/clip.rs +++ b/crates/jacquard-api/src/social_clippr/feed/clip.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record containing a bookmarked item, or 'clip'. +/// Record containing a bookmarked item, or 'clip'. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,37 +14,42 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Clip<'a> { - ///Client-declared timestamp when the bookmark is created + /// Client-declared timestamp when the bookmark is created pub created_at: jacquard_common::types::string::Datetime, - ///A description of the bookmark's content. This should be ripped from the URL metadata and be static for all records using the URL. + /// A description of the bookmark's content. This should be ripped from the URL metadata and be static for all records using the URL. #[serde(borrow)] + #[builder(into)] pub description: jacquard_common::CowStr<'a>, - ///Indicates human language of the given URL + /// Indicates human language of the given URL #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub languages: std::option::Option>, - ///User-written notes for the bookmark. Public and personal. + #[builder(into)] + pub languages: Option>, + /// User-written notes for the bookmark. Public and personal. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub notes: std::option::Option>, - ///An array of tags. A format of solely alphanumeric characters and dashes should be used. + pub notes: Option>, + /// An array of tags. A format of solely alphanumeric characters and dashes should be used. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option< - Vec>, - >, - ///The title of the bookmark. If left empty, reuse the URL. + pub tags: Option>>, + /// The title of the bookmark. If left empty, reuse the URL. #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, - ///Whether the bookmark can be used for feed indexing and aggregation + /// Whether the bookmark can be used for feed indexing and aggregation pub unlisted: bool, - ///Whether the bookmark has been read by the user + /// Whether the bookmark has been read by the user #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub unread: std::option::Option, - ///The URL of the bookmark. Cannot be left empty or be modified after creation. + #[builder(into)] + pub unread: Option, + /// The URL of the bookmark. Cannot be left empty or be modified after creation. #[serde(borrow)] pub url: jacquard_common::types::string::Uri<'a>, } diff --git a/crates/jacquard-api/src/social_clippr/feed/get_clips.rs b/crates/jacquard-api/src/social_clippr/feed/get_clips.rs index 35f4586d5..47a80a142 100644 --- a/crates/jacquard-api/src/social_clippr/feed/get_clips.rs +++ b/crates/jacquard-api/src/social_clippr/feed/get_clips.rs @@ -34,7 +34,7 @@ pub struct GetClips<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetClipsOutput<'a> { - ///An array of hydrated clip views + /// An array of hydrated clip views #[serde(borrow)] pub clips: Vec>, } diff --git a/crates/jacquard-api/src/social_clippr/feed/get_tag_list.rs b/crates/jacquard-api/src/social_clippr/feed/get_tag_list.rs index 9ac64c613..855515ba4 100644 --- a/crates/jacquard-api/src/social_clippr/feed/get_tag_list.rs +++ b/crates/jacquard-api/src/social_clippr/feed/get_tag_list.rs @@ -35,7 +35,7 @@ pub struct GetTagList<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetTagListOutput<'a> { - ///A list of tags and their associated details + /// A list of tags and their associated details #[serde(borrow)] pub tags: Vec>, } diff --git a/crates/jacquard-api/src/social_clippr/feed/get_tags.rs b/crates/jacquard-api/src/social_clippr/feed/get_tags.rs index d25a0e742..6130a83a5 100644 --- a/crates/jacquard-api/src/social_clippr/feed/get_tags.rs +++ b/crates/jacquard-api/src/social_clippr/feed/get_tags.rs @@ -34,7 +34,7 @@ pub struct GetTags<'a> { )] #[serde(rename_all = "camelCase")] pub struct GetTagsOutput<'a> { - ///An array of hydrated tag views + /// An array of hydrated tag views #[serde(borrow)] pub tags: Vec>, } diff --git a/crates/jacquard-api/src/social_clippr/feed/tag.rs b/crates/jacquard-api/src/social_clippr/feed/tag.rs index c480322f1..55deadca0 100644 --- a/crates/jacquard-api/src/social_clippr/feed/tag.rs +++ b/crates/jacquard-api/src/social_clippr/feed/tag.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A record containing a bookmark tag for organization. +/// A record containing a bookmark tag for organization. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,22 +14,26 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Tag<'a> { - ///A hexadecimal color code + /// A hexadecimal color code #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub color: std::option::Option>, - ///A client-defined timestamp for the creation of the tag + pub color: Option>, + /// A client-defined timestamp for the creation of the tag pub created_at: jacquard_common::types::string::Datetime, - ///A description of the tag for additional context + /// A description of the tag for additional context #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///A de-duplicated string containing the name of the tag + pub description: Option>, + /// A de-duplicated string containing the name of the tag #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/social_grain.rs b/crates/jacquard-api/src/social_grain.rs index 07d27d45d..069461aef 100644 --- a/crates/jacquard-api/src/social_grain.rs +++ b/crates/jacquard-api/src/social_grain.rs @@ -10,7 +10,7 @@ pub mod favorite; pub mod gallery; pub mod photo; -///width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. +/// width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -19,7 +19,8 @@ pub mod photo; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AspectRatio<'a> { diff --git a/crates/jacquard-api/src/social_grain/actor.rs b/crates/jacquard-api/src/social_grain/actor.rs index 8aeb758a8..3d528a9b7 100644 --- a/crates/jacquard-api/src/social_grain/actor.rs +++ b/crates/jacquard-api/src/social_grain/actor.rs @@ -15,26 +15,32 @@ pub mod profile; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ProfileView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, + pub avatar: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display_name: std::option::Option>, + pub display_name: Option>, #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/social_grain/actor/profile.rs b/crates/jacquard-api/src/social_grain/actor/profile.rs index 9c0bb0556..80d98ddfe 100644 --- a/crates/jacquard-api/src/social_grain/actor/profile.rs +++ b/crates/jacquard-api/src/social_grain/actor/profile.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of a basic account profile. +/// A declaration of a basic account profile. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,23 +14,28 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Profile<'a> { - ///Small image to be displayed next to posts from account. AKA, 'profile picture' + /// Small image to be displayed next to posts from account. AKA, 'profile picture' #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub avatar: std::option::Option>, + pub avatar: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, - ///Free-form profile description text. + #[builder(into)] + pub created_at: Option, + /// Free-form profile description text. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub display_name: std::option::Option>, + pub display_name: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/social_grain/favorite.rs b/crates/jacquard-api/src/social_grain/favorite.rs index 49e548a45..00ad8f8b9 100644 --- a/crates/jacquard-api/src/social_grain/favorite.rs +++ b/crates/jacquard-api/src/social_grain/favorite.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Favorite<'a> { diff --git a/crates/jacquard-api/src/social_grain/gallery.rs b/crates/jacquard-api/src/social_grain/gallery.rs index 7bc7f6f81..f98f342d0 100644 --- a/crates/jacquard-api/src/social_grain/gallery.rs +++ b/crates/jacquard-api/src/social_grain/gallery.rs @@ -15,19 +15,23 @@ pub mod item; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Gallery<'a> { pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///Self-label values for this post. Effectively content warnings. + pub description: Option>, + /// Self-label values for this post. Effectively content warnings. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>, + pub labels: Option>, #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, } @@ -81,7 +85,8 @@ impl From> for Gallery<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct GalleryView<'a> { @@ -91,11 +96,13 @@ pub struct GalleryView<'a> { pub creator: crate::social_grain::actor::ProfileView<'a>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub items: std::option::Option>>, + pub items: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(borrow)] pub record: jacquard_common::types::value::Data<'a>, #[serde(borrow)] diff --git a/crates/jacquard-api/src/social_grain/gallery/item.rs b/crates/jacquard-api/src/social_grain/gallery/item.rs index 591c6c017..62fa9337e 100644 --- a/crates/jacquard-api/src/social_grain/gallery/item.rs +++ b/crates/jacquard-api/src/social_grain/gallery/item.rs @@ -13,7 +13,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Item<'a> { @@ -23,7 +24,8 @@ pub struct Item<'a> { #[serde(borrow)] pub item: jacquard_common::types::string::AtUri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub position: std::option::Option, + #[builder(into)] + pub position: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/social_grain/photo.rs b/crates/jacquard-api/src/social_grain/photo.rs index 7472fa7c8..2a635bfbc 100644 --- a/crates/jacquard-api/src/social_grain/photo.rs +++ b/crates/jacquard-api/src/social_grain/photo.rs @@ -15,18 +15,22 @@ pub mod exif; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Photo<'a> { - ///Alt text description of the image, for accessibility. + /// Alt text description of the image, for accessibility. #[serde(borrow)] + #[builder(into)] pub alt: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub aspect_ratio: std::option::Option>, + pub aspect_ratio: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, #[serde(borrow)] pub photo: jacquard_common::types::blob::Blob<'a>, } @@ -81,48 +85,61 @@ impl From> for Photo<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ExifView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cid: std::option::Option>, + pub cid: Option>, pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub date_time_original: std::option::Option>, + pub date_time_original: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub exposure_time: std::option::Option>, + pub exposure_time: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub f_number: std::option::Option>, + pub f_number: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub flash: std::option::Option>, + pub flash: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub focal_length_in35mm_format: std::option::Option>, + pub focal_length_in35mm_format: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub i_so: std::option::Option, + #[builder(into)] + pub i_so: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub lens_make: std::option::Option>, + pub lens_make: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub lens_model: std::option::Option>, + pub lens_model: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub make: std::option::Option>, + pub make: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub model: std::option::Option>, + pub model: Option>, #[serde(borrow)] pub photo: jacquard_common::types::string::AtUri<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub uri: std::option::Option>, + pub uri: Option>, } #[jacquard_derive::lexicon] @@ -133,26 +150,30 @@ pub struct ExifView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PhotoView<'a> { - ///Alt text description of the image, for accessibility. + /// Alt text description of the image, for accessibility. #[serde(borrow)] + #[builder(into)] pub alt: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub aspect_ratio: std::option::Option>, + pub aspect_ratio: Option>, #[serde(borrow)] pub cid: jacquard_common::types::string::Cid<'a>, - ///EXIF metadata for the photo, if available. + /// EXIF metadata for the photo, if available. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub exif: std::option::Option>, - ///Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View. + pub exif: Option>, + /// Fully-qualified URL where a large version of the image can be fetched. May or may not be the exact original blob. For example, CDN location provided by the App View. #[serde(borrow)] pub fullsize: jacquard_common::types::string::Uri<'a>, - ///Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View. + /// Fully-qualified URL where a thumbnail of the image can be fetched. For example, CDN location provided by the App View. #[serde(borrow)] pub thumb: jacquard_common::types::string::Uri<'a>, #[serde(borrow)] diff --git a/crates/jacquard-api/src/social_grain/photo/exif.rs b/crates/jacquard-api/src/social_grain/photo/exif.rs index a18bc16e6..d389d9b84 100644 --- a/crates/jacquard-api/src/social_grain/photo/exif.rs +++ b/crates/jacquard-api/src/social_grain/photo/exif.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Basic EXIF metadata for a photo. Integers are scaled by 1000000 to accommodate decimal values and potentially other tags in the future. +/// Basic EXIF metadata for a photo. Integers are scaled by 1000000 to accommodate decimal values and potentially other tags in the future. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,38 +14,47 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Exif<'a> { pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub date_time_original: std::option::Option< - jacquard_common::types::string::Datetime, - >, + #[builder(into)] + pub date_time_original: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub exposure_time: std::option::Option, + #[builder(into)] + pub exposure_time: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub f_number: std::option::Option, + #[builder(into)] + pub f_number: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub flash: std::option::Option>, + pub flash: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub focal_length_in35mm_format: std::option::Option, + #[builder(into)] + pub focal_length_in35mm_format: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub i_so: std::option::Option, + #[builder(into)] + pub i_so: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub lens_make: std::option::Option>, + pub lens_make: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub lens_model: std::option::Option>, + pub lens_model: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub make: std::option::Option>, + pub make: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub model: std::option::Option>, + pub model: Option>, #[serde(borrow)] pub photo: jacquard_common::types::string::AtUri<'a>, } diff --git a/crates/jacquard-api/src/social_pmsky/proposal.rs b/crates/jacquard-api/src/social_pmsky/proposal.rs index 98d7349d2..4289f8547 100644 --- a/crates/jacquard-api/src/social_pmsky/proposal.rs +++ b/crates/jacquard-api/src/social_pmsky/proposal.rs @@ -13,46 +13,55 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Proposal<'a> { - ///The persistent, anonymous identifier for the user creating the proposal. + /// The persistent, anonymous identifier for the user creating the proposal. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub aid: std::option::Option>, - ///Optionally, CID specifying the specific version of 'uri' resource this proposal applies to. + pub aid: Option>, + /// Optionally, CID specifying the specific version of 'uri' resource this proposal applies to. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cid: std::option::Option>, - ///Timestamp when this proposal was created. + pub cid: Option>, + /// Timestamp when this proposal was created. pub cts: jacquard_common::types::string::Datetime, - ///For 'label' proposals where 'val' is 'needs-context', the full text of any proposed annotation (e.g. community note) to be shown below the post. + /// For 'label' proposals where 'val' is 'needs-context', the full text of any proposed annotation (e.g. community note) to be shown below the post. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub note: std::option::Option>, - ///An optional array of predefined reasons justifying the moderation action. + pub note: Option>, + /// An optional array of predefined reasons justifying the moderation action. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reasons: std::option::Option>>, - ///Signature of dag-cbor encoded proposal. + pub reasons: Option>>, + /// Signature of dag-cbor encoded proposal. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub sig: std::option::Option, - ///DID of the actor who created this proposal. + #[builder(into)] + pub sig: Option, + /// DID of the actor who created this proposal. #[serde(borrow)] pub src: jacquard_common::types::string::Did<'a>, - ///The type of moderation action being proposed. Currently expected values are 'allowed_user' or 'label' + /// The type of moderation action being proposed. Currently expected values are 'allowed_user' or 'label' #[serde(borrow)] + #[builder(into)] pub typ: jacquard_common::CowStr<'a>, - ///AT URI of the record, repository (account), or other resource that this proposal applies to. + /// AT URI of the record, repository (account), or other resource that this proposal applies to. #[serde(borrow)] pub uri: jacquard_common::types::string::Uri<'a>, - ///For 'label' proposals, the short string name of the value of the proposed label. + /// For 'label' proposals, the short string name of the value of the proposed label. #[serde(borrow)] + #[builder(into)] pub val: jacquard_common::CowStr<'a>, - ///The AT Protocol version of the proposal object. + /// The AT Protocol version of the proposal object. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub ver: std::option::Option, + #[builder(into)] + pub ver: Option, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/social_pmsky/vote.rs b/crates/jacquard-api/src/social_pmsky/vote.rs index b31f8cbcf..da11dcb8c 100644 --- a/crates/jacquard-api/src/social_pmsky/vote.rs +++ b/crates/jacquard-api/src/social_pmsky/vote.rs @@ -13,34 +13,39 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Vote<'a> { - ///The persistent, anonymous identifier for the user casting the vote. + /// The persistent, anonymous identifier for the user casting the vote. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub aid: std::option::Option>, - ///Optionally, CID specifying the specific version of 'uri' resource this vote applies to. + pub aid: Option>, + /// Optionally, CID specifying the specific version of 'uri' resource this vote applies to. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cid: std::option::Option>, - ///Timestamp when this vote was created. + pub cid: Option>, + /// Timestamp when this vote was created. pub cts: jacquard_common::types::string::Datetime, - ///An optional array of predefined reasons justifying the vote. + /// An optional array of predefined reasons justifying the vote. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reasons: std::option::Option>>, - ///Signature of dag-cbor encoded vote. + pub reasons: Option>>, + /// Signature of dag-cbor encoded vote. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub sig: std::option::Option, - ///the account creating the vote, not necessarily the same as the user who voted + #[builder(into)] + pub sig: Option, + /// the account creating the vote, not necessarily the same as the user who voted #[serde(borrow)] pub src: jacquard_common::types::string::Did<'a>, - ///AT URI of the record, repository (account), or other resource that this vote applies to. + /// AT URI of the record, repository (account), or other resource that this vote applies to. #[serde(borrow)] pub uri: jacquard_common::types::string::Uri<'a>, - ///The value of the vote. The exact meaning depends on what is being voted on, but generally '+1' means 'approval', -1 means 'disapproval', and 0 indicates 'neutrality'. + /// The value of the vote. The exact meaning depends on what is being voted on, but generally '+1' means 'approval', -1 means 'disapproval', and 0 indicates 'neutrality'. pub val: i64, } diff --git a/crates/jacquard-api/src/social_psky/actor/profile.rs b/crates/jacquard-api/src/social_psky/actor/profile.rs index 3befbc701..fbf4bb197 100644 --- a/crates/jacquard-api/src/social_psky/actor/profile.rs +++ b/crates/jacquard-api/src/social_psky/actor/profile.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of a Picosky account profile. +/// A declaration of a Picosky account profile. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,13 +14,15 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Profile<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub nickname: std::option::Option>, + pub nickname: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/social_psky/chat/message.rs b/crates/jacquard-api/src/social_psky/chat/message.rs index 7de3c3510..fdde3fc3e 100644 --- a/crates/jacquard-api/src/social_psky/chat/message.rs +++ b/crates/jacquard-api/src/social_psky/chat/message.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A Picosky message containing at most 2048 graphemes. +/// A Picosky message containing at most 2048 graphemes. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,20 +14,24 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Message<'a> { - ///Text content. + /// Text content. #[serde(borrow)] + #[builder(into)] pub content: jacquard_common::CowStr<'a>, - ///Annotations of text (mentions, URLs, hashtags, etc) + /// Annotations of text (mentions, URLs, hashtags, etc) #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub facets: std::option::Option>>, + pub facets: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub reply: std::option::Option>, + pub reply: Option>, #[serde(borrow)] pub room: jacquard_common::types::string::AtUri<'a>, } diff --git a/crates/jacquard-api/src/social_psky/chat/room.rs b/crates/jacquard-api/src/social_psky/chat/room.rs index 19ef88cb3..2c55477c9 100644 --- a/crates/jacquard-api/src/social_psky/chat/room.rs +++ b/crates/jacquard-api/src/social_psky/chat/room.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A Picosky room belonging to the user. +/// A Picosky room belonging to the user. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,29 +14,36 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Room<'a> { - ///List of users allowed to send messages in the room. + /// List of users allowed to send messages in the room. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub allowlist: std::option::Option>, - ///List of users disallowed to send messages in the room. + pub allowlist: Option>, + /// List of users disallowed to send messages in the room. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub denylist: std::option::Option>, + pub denylist: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub languages: std::option::Option>, + #[builder(into)] + pub languages: Option>, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>>, - ///Topic title of the room. + pub tags: Option>>, + /// Topic title of the room. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub topic: std::option::Option>, + pub topic: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. @@ -89,7 +96,8 @@ impl From> for Room<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModlistRef<'a> { diff --git a/crates/jacquard-api/src/social_psky/richtext/facet.rs b/crates/jacquard-api/src/social_psky/richtext/facet.rs index b50ad0984..75d090f0e 100644 --- a/crates/jacquard-api/src/social_psky/richtext/facet.rs +++ b/crates/jacquard-api/src/social_psky/richtext/facet.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. +/// Specifies the sub-string range a facet feature applies to. Start index is inclusive, end index is exclusive. Indices are zero-indexed, counting bytes of the UTF-8 encoded text. NOTE: some languages, like Javascript, use UTF-16 or Unicode codepoints for string slice indexing; in these languages, convert to byte arrays before working with facets. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,7 +14,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ByteSlice<'a> { @@ -22,7 +23,7 @@ pub struct ByteSlice<'a> { pub byte_start: i64, } -///Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. +/// Facet feature for a URL. The text URL may have been simplified or truncated, but the facet reference should be a complete URL. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -31,7 +32,8 @@ pub struct ByteSlice<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Link<'a> { @@ -39,7 +41,7 @@ pub struct Link<'a> { pub uri: jacquard_common::types::string::Uri<'a>, } -///Annotation of a sub-string within rich text. +/// Annotation of a sub-string within rich text. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -48,7 +50,8 @@ pub struct Link<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Facet<'a> { @@ -79,7 +82,7 @@ pub enum FacetFeaturesItem<'a> { Room(Box>), } -///Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. +/// Facet feature for mention of another account. The text is usually a handle, including a '@' prefix, but the facet reference is a DID. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -88,7 +91,8 @@ pub enum FacetFeaturesItem<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Mention<'a> { @@ -96,7 +100,7 @@ pub struct Mention<'a> { pub did: jacquard_common::types::string::Did<'a>, } -///Facet feature for a room. The text usually includes a '#' prefix, but the facet reference should not (except in the case of a room tag that includes a '#' prefix) - TODO: update when rooms are actually implemented +/// Facet feature for a room. The text usually includes a '#' prefix, but the facet reference should not (except in the case of a room tag that includes a '#' prefix) - TODO: update when rooms are actually implemented #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -105,10 +109,12 @@ pub struct Mention<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Room<'a> { #[serde(borrow)] + #[builder(into)] pub room: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/communication.rs b/crates/jacquard-api/src/tools_ozone/communication.rs index bf0af64be..cff3d5e5e 100644 --- a/crates/jacquard-api/src/tools_ozone/communication.rs +++ b/crates/jacquard-api/src/tools_ozone/communication.rs @@ -18,29 +18,35 @@ pub mod update_template; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct TemplateView<'a> { - ///Subject of the message, used in emails. + /// Subject of the message, used in emails. #[serde(borrow)] + #[builder(into)] pub content_markdown: jacquard_common::CowStr<'a>, pub created_at: jacquard_common::types::string::Datetime, pub disabled: bool, #[serde(borrow)] + #[builder(into)] pub id: jacquard_common::CowStr<'a>, - ///Message language. + /// Message language. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub lang: std::option::Option, - ///DID of the user who last updated the template. + #[builder(into)] + pub lang: Option, + /// DID of the user who last updated the template. #[serde(borrow)] pub last_updated_by: jacquard_common::types::string::Did<'a>, - ///Name of the template. + /// Name of the template. #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Content of the template, can contain markdown and variable placeholders. + /// Content of the template, can contain markdown and variable placeholders. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subject: std::option::Option>, + pub subject: Option>, pub updated_at: jacquard_common::types::string::Datetime, } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/communication/create_template.rs b/crates/jacquard-api/src/tools_ozone/communication/create_template.rs index d865300d3..1daec06a5 100644 --- a/crates/jacquard-api/src/tools_ozone/communication/create_template.rs +++ b/crates/jacquard-api/src/tools_ozone/communication/create_template.rs @@ -19,22 +19,24 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct CreateTemplate<'a> { - ///Content of the template, markdown supported, can contain variable placeholders. + /// Content of the template, markdown supported, can contain variable placeholders. #[serde(borrow)] #[builder(into)] pub content_markdown: jacquard_common::CowStr<'a>, - ///DID of the user who is creating the template. + /// DID of the user who is creating the template. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub created_by: std::option::Option>, - ///Message language. + pub created_by: Option>, + /// Message language. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub lang: std::option::Option, - ///Name of the template. + #[builder(into)] + pub lang: Option, + /// Name of the template. #[serde(borrow)] #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Subject of the message, used in emails. + /// Subject of the message, used in emails. #[serde(borrow)] #[builder(into)] pub subject: jacquard_common::CowStr<'a>, diff --git a/crates/jacquard-api/src/tools_ozone/communication/update_template.rs b/crates/jacquard-api/src/tools_ozone/communication/update_template.rs index e4b87107c..5eb4eea40 100644 --- a/crates/jacquard-api/src/tools_ozone/communication/update_template.rs +++ b/crates/jacquard-api/src/tools_ozone/communication/update_template.rs @@ -19,34 +19,37 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct UpdateTemplate<'a> { - ///Content of the template, markdown supported, can contain variable placeholders. + /// Content of the template, markdown supported, can contain variable placeholders. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub content_markdown: std::option::Option>, + #[serde(borrow)] + pub content_markdown: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub disabled: std::option::Option, - ///ID of the template to be updated. + #[builder(into)] + pub disabled: Option, + /// ID of the template to be updated. #[serde(borrow)] #[builder(into)] pub id: jacquard_common::CowStr<'a>, - ///Message language. + /// Message language. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub lang: std::option::Option, - ///Name of the template. - #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub name: std::option::Option>, - ///Subject of the message, used in emails. + pub lang: Option, + /// Name of the template. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] + pub name: Option>, + /// Subject of the message, used in emails. + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub subject: std::option::Option>, - ///DID of the user who is updating the template. + #[serde(borrow)] + pub subject: Option>, + /// DID of the user who is updating the template. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub updated_by: std::option::Option>, + pub updated_by: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] diff --git a/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs b/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs index d12f36222..c37bc93db 100644 --- a/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs +++ b/crates/jacquard-api/src/tools_ozone/hosting/get_account_history.rs @@ -13,16 +13,19 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AccountCreated<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub email: std::option::Option>, + pub email: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub handle: std::option::Option>, + pub handle: Option>, } #[jacquard_derive::lexicon] @@ -33,11 +36,13 @@ pub struct AccountCreated<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct EmailConfirmed<'a> { #[serde(borrow)] + #[builder(into)] pub email: jacquard_common::CowStr<'a>, } @@ -49,11 +54,13 @@ pub struct EmailConfirmed<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct EmailUpdated<'a> { #[serde(borrow)] + #[builder(into)] pub email: jacquard_common::CowStr<'a>, } @@ -65,12 +72,14 @@ pub struct EmailUpdated<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Event<'a> { pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] + #[builder(into)] pub created_by: jacquard_common::CowStr<'a>, #[serde(borrow)] pub details: EventDetails<'a>, @@ -119,7 +128,8 @@ pub enum EventDetails<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct HandleUpdated<'a> { @@ -207,7 +217,8 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetAccountHistoryRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct PasswordUpdated<'a> {} \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/moderation.rs b/crates/jacquard-api/src/tools_ozone/moderation.rs index c2f980abf..d1020be5e 100644 --- a/crates/jacquard-api/src/tools_ozone/moderation.rs +++ b/crates/jacquard-api/src/tools_ozone/moderation.rs @@ -21,7 +21,7 @@ pub mod query_statuses; pub mod schedule_action; pub mod search_repos; -///Logs account status related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. +/// Logs account status related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -30,18 +30,21 @@ pub mod search_repos; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AccountEvent<'a> { - ///Indicates that the account has a repository which can be fetched from the host that emitted this event. + /// Indicates that the account has a repository which can be fetched from the host that emitted this event. pub active: bool, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option>, + pub status: Option>, pub timestamp: jacquard_common::types::string::Datetime, } @@ -53,25 +56,32 @@ pub struct AccountEvent<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AccountHosting<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub deactivated_at: std::option::Option, + #[builder(into)] + pub deactivated_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub deleted_at: std::option::Option, + #[builder(into)] + pub deleted_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub reactivated_at: std::option::Option, + #[builder(into)] + pub reactivated_at: Option, #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, } -///Statistics about a particular account subject +/// Statistics about a particular account subject #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -80,28 +90,34 @@ pub struct AccountHosting<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AccountStats<'a> { - ///Total number of appeals against a moderation action on the account + /// Total number of appeals against a moderation action on the account #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub appeal_count: std::option::Option, - ///Number of times the account was escalated + #[builder(into)] + pub appeal_count: Option, + /// Number of times the account was escalated #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub escalate_count: std::option::Option, - ///Total number of reports on the account + #[builder(into)] + pub escalate_count: Option, + /// Total number of reports on the account #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub report_count: std::option::Option, - ///Number of times the account was suspended + #[builder(into)] + pub report_count: Option, + /// Number of times the account was suspended #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub suspend_count: std::option::Option, - ///Number of times the account was taken down + #[builder(into)] + pub suspend_count: Option, + /// Number of times the account was taken down #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub takedown_count: std::option::Option, + #[builder(into)] + pub takedown_count: Option, } -///Age assurance info coming directly from users. Only works on DID subjects. +/// Age assurance info coming directly from users. Only works on DID subjects. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -110,37 +126,44 @@ pub struct AccountStats<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AgeAssuranceEvent<'a> { - ///The unique identifier for this instance of the age assurance flow, in UUID format. + /// The unique identifier for this instance of the age assurance flow, in UUID format. #[serde(borrow)] + #[builder(into)] pub attempt_id: jacquard_common::CowStr<'a>, - ///The IP address used when completing the AA flow. + /// The IP address used when completing the AA flow. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub complete_ip: std::option::Option>, - ///The user agent used when completing the AA flow. + pub complete_ip: Option>, + /// The user agent used when completing the AA flow. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub complete_ua: std::option::Option>, - ///The date and time of this write operation. + pub complete_ua: Option>, + /// The date and time of this write operation. pub created_at: jacquard_common::types::string::Datetime, - ///The IP address used when initiating the AA flow. + /// The IP address used when initiating the AA flow. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub init_ip: std::option::Option>, - ///The user agent used when initiating the AA flow. + pub init_ip: Option>, + /// The user agent used when initiating the AA flow. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub init_ua: std::option::Option>, - ///The status of the age assurance process. + pub init_ua: Option>, + /// The status of the age assurance process. #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, } -///Age assurance status override by moderators. Only works on DID subjects. +/// Age assurance status override by moderators. Only works on DID subjects. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -149,15 +172,18 @@ pub struct AgeAssuranceEvent<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AgeAssuranceOverrideEvent<'a> { - ///Comment describing the reason for the override. + /// Comment describing the reason for the override. #[serde(borrow)] + #[builder(into)] pub comment: jacquard_common::CowStr<'a>, - ///The status to be set for the user decided by a moderator, overriding whatever value the user had previously. Use reset to default to original state. + /// The status to be set for the user decided by a moderator, overriding whatever value the user had previously. Use reset to default to original state. #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, } @@ -169,7 +195,8 @@ pub struct AgeAssuranceOverrideEvent<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct BlobView<'a> { @@ -177,13 +204,16 @@ pub struct BlobView<'a> { pub cid: jacquard_common::types::string::Cid<'a>, pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub details: std::option::Option>, + pub details: Option>, #[serde(borrow)] + #[builder(into)] pub mime_type: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub moderation: std::option::Option>, + pub moderation: Option>, pub size: i64, } @@ -206,7 +236,7 @@ pub enum BlobViewDetails<'a> { VideoDetails(Box>), } -///Logs cancellation of a scheduled takedown action for an account. +/// Logs cancellation of a scheduled takedown action for an account. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -215,16 +245,18 @@ pub enum BlobViewDetails<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct CancelScheduledTakedownEvent<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, } -///Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. +/// Logs identity related events on a repo subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -233,22 +265,27 @@ pub struct CancelScheduledTakedownEvent<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct IdentityEvent<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub handle: std::option::Option>, + pub handle: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub pds_host: std::option::Option>, + pub pds_host: Option>, pub timestamp: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub tombstone: std::option::Option, + #[builder(into)] + pub tombstone: Option, } #[jacquard_derive::lexicon] @@ -259,7 +296,8 @@ pub struct IdentityEvent<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ImageDetails<'a> { @@ -275,19 +313,22 @@ pub struct ImageDetails<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventAcknowledge<'a> { - ///If true, all other reports on content authored by this account will be resolved (acknowledged). + /// If true, all other reports on content authored by this account will be resolved (acknowledged). #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub acknowledge_account_subjects: std::option::Option, + #[builder(into)] + pub acknowledge_account_subjects: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, } -///Add a comment to a subject. An empty comment will clear any previously set sticky comment. +/// Add a comment to a subject. An empty comment will clear any previously set sticky comment. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -296,19 +337,22 @@ pub struct ModEventAcknowledge<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventComment<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, - ///Make the comment persistent on the subject + pub comment: Option>, + /// Make the comment persistent on the subject #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub sticky: std::option::Option, + #[builder(into)] + pub sticky: Option, } -///Divert a record's blobs to a 3rd party service for further scanning/tagging +/// Divert a record's blobs to a 3rd party service for further scanning/tagging #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -317,16 +361,18 @@ pub struct ModEventComment<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventDivert<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, } -///Keep a log of outgoing email to a user +/// Keep a log of outgoing email to a user #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -335,20 +381,24 @@ pub struct ModEventDivert<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventEmail<'a> { - ///Additional comment about the outgoing comm. + /// Additional comment about the outgoing comm. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, - ///The content of the email sent to the user. + pub comment: Option>, + /// The content of the email sent to the user. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub content: std::option::Option>, - ///The subject line of the email sent to the user. + pub content: Option>, + /// The subject line of the email sent to the user. #[serde(borrow)] + #[builder(into)] pub subject_line: jacquard_common::CowStr<'a>, } @@ -360,16 +410,18 @@ pub struct ModEventEmail<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventEscalate<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, } -///Apply/Negate labels on a subject +/// Apply/Negate labels on a subject #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -378,23 +430,26 @@ pub struct ModEventEscalate<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventLabel<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, #[serde(borrow)] pub create_label_vals: Vec>, - ///Indicates how long the label will remain on the subject. Only applies on labels that are being added. + /// Indicates how long the label will remain on the subject. Only applies on labels that are being added. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub duration_in_hours: std::option::Option, + #[builder(into)] + pub duration_in_hours: Option, #[serde(borrow)] pub negate_label_vals: Vec>, } -///Mute incoming reports on a subject +/// Mute incoming reports on a subject #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -403,18 +458,20 @@ pub struct ModEventLabel<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventMute<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, - ///Indicates how long the subject should remain muted. + pub comment: Option>, + /// Indicates how long the subject should remain muted. pub duration_in_hours: i64, } -///Mute incoming reports from an account +/// Mute incoming reports from an account #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -423,19 +480,22 @@ pub struct ModEventMute<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventMuteReporter<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, - ///Indicates how long the account should remain muted. Falsy value here means a permanent mute. + pub comment: Option>, + /// Indicates how long the account should remain muted. Falsy value here means a permanent mute. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub duration_in_hours: std::option::Option, + #[builder(into)] + pub duration_in_hours: Option, } -///Set priority score of the subject. Higher score means higher priority. +/// Set priority score of the subject. Higher score means higher priority. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -444,17 +504,19 @@ pub struct ModEventMuteReporter<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventPriorityScore<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, pub score: i64, } -///Report a subject +/// Report a subject #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -463,21 +525,24 @@ pub struct ModEventPriorityScore<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventReport<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, - ///Set to true if the reporter was muted from reporting at the time of the event. These reports won't impact the reviewState of the subject. + pub comment: Option>, + /// Set to true if the reporter was muted from reporting at the time of the event. These reports won't impact the reviewState of the subject. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub is_reporter_muted: std::option::Option, + #[builder(into)] + pub is_reporter_muted: Option, #[serde(borrow)] pub report_type: crate::com_atproto::moderation::ReasonType<'a>, } -///Resolve appeal on a subject +/// Resolve appeal on a subject #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -486,17 +551,19 @@ pub struct ModEventReport<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventResolveAppeal<'a> { - ///Describe resolution. + /// Describe resolution. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, } -///Revert take down action on a subject +/// Revert take down action on a subject #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -505,17 +572,19 @@ pub struct ModEventResolveAppeal<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventReverseTakedown<'a> { - ///Describe reasoning behind the reversal. + /// Describe reasoning behind the reversal. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, } -///Add/Remove a tag on a subject +/// Add/Remove a tag on a subject #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -524,23 +593,25 @@ pub struct ModEventReverseTakedown<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventTag<'a> { - ///Tags to be added to the subject. If already exists, won't be duplicated. + /// Tags to be added to the subject. If already exists, won't be duplicated. #[serde(borrow)] pub add: Vec>, - ///Additional comment about added/removed tags. + /// Additional comment about added/removed tags. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, - ///Tags to be removed to the subject. Ignores a tag If it doesn't exist, won't be duplicated. + pub comment: Option>, + /// Tags to be removed to the subject. Ignores a tag If it doesn't exist, won't be duplicated. #[serde(borrow)] pub remove: Vec>, } -///Take down a subject permanently or temporarily +/// Take down a subject permanently or temporarily #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -549,26 +620,31 @@ pub struct ModEventTag<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventTakedown<'a> { - ///If true, all other reports on content authored by this account will be resolved (acknowledged). + /// If true, all other reports on content authored by this account will be resolved (acknowledged). #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub acknowledge_account_subjects: std::option::Option, + #[builder(into)] + pub acknowledge_account_subjects: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, - ///Indicates how long the takedown should be in effect before automatically expiring. + pub comment: Option>, + /// Indicates how long the takedown should be in effect before automatically expiring. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub duration_in_hours: std::option::Option, - ///Names/Keywords of the policies that drove the decision. + #[builder(into)] + pub duration_in_hours: Option, + /// Names/Keywords of the policies that drove the decision. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub policies: std::option::Option>>, + pub policies: Option>>, } -///Unmute action on a subject +/// Unmute action on a subject #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -577,17 +653,19 @@ pub struct ModEventTakedown<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventUnmute<'a> { - ///Describe reasoning behind the reversal. + /// Describe reasoning behind the reversal. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, } -///Unmute incoming reports from an account +/// Unmute incoming reports from an account #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -596,14 +674,16 @@ pub struct ModEventUnmute<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventUnmuteReporter<'a> { - ///Describe reasoning behind the reversal. + /// Describe reasoning behind the reversal. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, } #[jacquard_derive::lexicon] @@ -614,7 +694,8 @@ pub struct ModEventUnmuteReporter<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventView<'a> { @@ -622,21 +703,24 @@ pub struct ModEventView<'a> { #[serde(borrow)] pub created_by: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub creator_handle: std::option::Option>, + pub creator_handle: Option>, #[serde(borrow)] pub event: ModEventViewEvent<'a>, pub id: i64, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub mod_tool: std::option::Option>, + pub mod_tool: Option>, #[serde(borrow)] pub subject: ModEventViewSubject<'a>, #[serde(borrow)] pub subject_blob_cids: Vec>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subject_handle: std::option::Option>, + pub subject_handle: Option>, } #[jacquard_derive::open_union] @@ -747,7 +831,8 @@ pub enum ModEventViewSubject<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModEventViewDetail<'a> { @@ -758,8 +843,9 @@ pub struct ModEventViewDetail<'a> { pub event: ModEventViewDetailEvent<'a>, pub id: i64, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub mod_tool: std::option::Option>, + pub mod_tool: Option>, #[serde(borrow)] pub subject: ModEventViewDetailSubject<'a>, #[serde(borrow)] @@ -868,7 +954,7 @@ pub enum ModEventViewDetailSubject<'a> { RecordViewNotFound(Box>), } -///Moderation tool information for tracing the source of the action +/// Moderation tool information for tracing the source of the action #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -877,16 +963,19 @@ pub enum ModEventViewDetailSubject<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModTool<'a> { - ///Additional arbitrary metadata about the source + /// Additional arbitrary metadata about the source #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub meta: std::option::Option>, - ///Name/identifier of the source (e.g., 'automod', 'ozone/workspace') + pub meta: Option>, + /// Name/identifier of the source (e.g., 'automod', 'ozone/workspace') #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } @@ -898,15 +987,15 @@ pub struct ModTool<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Moderation<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subject_status: std::option::Option< - crate::tools_ozone::moderation::SubjectStatusView<'a>, - >, + pub subject_status: Option>, } #[jacquard_derive::lexicon] @@ -917,18 +1006,18 @@ pub struct Moderation<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ModerationDetail<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subject_status: std::option::Option< - crate::tools_ozone::moderation::SubjectStatusView<'a>, - >, + pub subject_status: Option>, } -///Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. +/// Logs lifecycle event on a record subject. Normally captured by automod from the firehose and emitted to ozone for historical tracking. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -937,17 +1026,21 @@ pub struct ModerationDetail<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RecordEvent<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub cid: std::option::Option>, + pub cid: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, #[serde(borrow)] + #[builder(into)] pub op: jacquard_common::CowStr<'a>, pub timestamp: jacquard_common::types::string::Datetime, } @@ -960,18 +1053,23 @@ pub struct RecordEvent<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RecordHosting<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub deleted_at: std::option::Option, + #[builder(into)] + pub deleted_at: Option, #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, } #[jacquard_derive::lexicon] @@ -982,7 +1080,8 @@ pub struct RecordHosting<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RecordView<'a> { @@ -1009,7 +1108,8 @@ pub struct RecordView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RecordViewDetail<'a> { @@ -1019,8 +1119,9 @@ pub struct RecordViewDetail<'a> { pub cid: jacquard_common::types::string::Cid<'a>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(borrow)] pub moderation: crate::tools_ozone::moderation::ModerationDetail<'a>, #[serde(borrow)] @@ -1039,7 +1140,8 @@ pub struct RecordViewDetail<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RecordViewNotFound<'a> { @@ -1047,7 +1149,7 @@ pub struct RecordViewNotFound<'a> { pub uri: jacquard_common::types::string::AtUri<'a>, } -///Statistics about a set of record subject items +/// Statistics about a set of record subject items #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -1056,34 +1158,43 @@ pub struct RecordViewNotFound<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RecordsStats<'a> { - ///Number of items that were appealed at least once + /// Number of items that were appealed at least once #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub appealed_count: std::option::Option, - ///Number of items that were escalated at least once + #[builder(into)] + pub appealed_count: Option, + /// Number of items that were escalated at least once #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub escalated_count: std::option::Option, - ///Number of item currently in "reviewOpen" or "reviewEscalated" state + #[builder(into)] + pub escalated_count: Option, + /// Number of item currently in "reviewOpen" or "reviewEscalated" state #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub pending_count: std::option::Option, - ///Number of item currently in "reviewNone" or "reviewClosed" state + #[builder(into)] + pub pending_count: Option, + /// Number of item currently in "reviewNone" or "reviewClosed" state #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub processed_count: std::option::Option, - ///Number of items that were reported at least once + #[builder(into)] + pub processed_count: Option, + /// Number of items that were reported at least once #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub reported_count: std::option::Option, - ///Total number of item in the set + #[builder(into)] + pub reported_count: Option, + /// Total number of item in the set #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub subject_count: std::option::Option, - ///Number of item currently taken down + #[builder(into)] + pub subject_count: Option, + /// Number of item currently taken down #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub takendown_count: std::option::Option, - ///Cumulative sum of the number of reports on the items in the set + #[builder(into)] + pub takendown_count: Option, + /// Cumulative sum of the number of reports on the items in the set #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub total_reports: std::option::Option, + #[builder(into)] + pub total_reports: Option, } #[jacquard_derive::lexicon] @@ -1094,37 +1205,42 @@ pub struct RecordsStats<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RepoView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub deactivated_at: std::option::Option, + #[builder(into)] + pub deactivated_at: Option, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub email: std::option::Option>, + pub email: Option>, #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub invite_note: std::option::Option>, + pub invite_note: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub invited_by: std::option::Option>, + pub invited_by: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub invites_disabled: std::option::Option, + #[builder(into)] + pub invites_disabled: Option, #[serde(borrow)] pub moderation: crate::tools_ozone::moderation::Moderation<'a>, #[serde(borrow)] pub related_records: Vec>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub threat_signatures: std::option::Option< - Vec>, - >, + pub threat_signatures: Option>>, } #[jacquard_derive::lexicon] @@ -1135,47 +1251,53 @@ pub struct RepoView<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RepoViewDetail<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub deactivated_at: std::option::Option, + #[builder(into)] + pub deactivated_at: Option, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub email: std::option::Option>, + pub email: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub email_confirmed_at: std::option::Option< - jacquard_common::types::string::Datetime, - >, + #[builder(into)] + pub email_confirmed_at: Option, #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, pub indexed_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub invite_note: std::option::Option>, + pub invite_note: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub invited_by: std::option::Option>, + pub invited_by: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub invites: std::option::Option>>, + pub invites: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub invites_disabled: std::option::Option, + #[builder(into)] + pub invites_disabled: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub labels: std::option::Option>>, + pub labels: Option>>, #[serde(borrow)] pub moderation: crate::tools_ozone::moderation::ModerationDetail<'a>, #[serde(borrow)] pub related_records: Vec>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub threat_signatures: std::option::Option< - Vec>, - >, + pub threat_signatures: Option>>, } #[jacquard_derive::lexicon] @@ -1186,7 +1308,8 @@ pub struct RepoViewDetail<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RepoViewNotFound<'a> { @@ -1202,31 +1325,32 @@ pub struct RepoViewNotFound<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ReporterStats<'a> { - ///The total number of reports made by the user on accounts. + /// The total number of reports made by the user on accounts. pub account_report_count: i64, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///The total number of accounts labeled as a result of the user's reports. + /// The total number of accounts labeled as a result of the user's reports. pub labeled_account_count: i64, - ///The total number of records labeled as a result of the user's reports. + /// The total number of records labeled as a result of the user's reports. pub labeled_record_count: i64, - ///The total number of reports made by the user on records. + /// The total number of reports made by the user on records. pub record_report_count: i64, - ///The total number of accounts reported by the user. + /// The total number of accounts reported by the user. pub reported_account_count: i64, - ///The total number of records reported by the user. + /// The total number of records reported by the user. pub reported_record_count: i64, - ///The total number of accounts taken down as a result of the user's reports. + /// The total number of accounts taken down as a result of the user's reports. pub takendown_account_count: i64, - ///The total number of records taken down as a result of the user's reports. + /// The total number of records taken down as a result of the user's reports. pub takendown_record_count: i64, } -///Moderator review status of a subject: Closed. Indicates that the subject was already reviewed and resolved by a moderator +/// Moderator review status of a subject: Closed. Indicates that the subject was already reviewed and resolved by a moderator #[derive( serde::Serialize, serde::Deserialize, @@ -1244,7 +1368,7 @@ impl std::fmt::Display for ReviewClosed { } } -///Moderator review status of a subject: Escalated. Indicates that the subject was escalated for review by a moderator +/// Moderator review status of a subject: Escalated. Indicates that the subject was escalated for review by a moderator #[derive( serde::Serialize, serde::Deserialize, @@ -1262,7 +1386,7 @@ impl std::fmt::Display for ReviewEscalated { } } -///Moderator review status of a subject: Unnecessary. Indicates that the subject does not need a review at the moment but there is probably some moderation related metadata available for it +/// Moderator review status of a subject: Unnecessary. Indicates that the subject does not need a review at the moment but there is probably some moderation related metadata available for it #[derive( serde::Serialize, serde::Deserialize, @@ -1280,7 +1404,7 @@ impl std::fmt::Display for ReviewNone { } } -///Moderator review status of a subject: Open. Indicates that the subject needs to be reviewed by a moderator +/// Moderator review status of a subject: Open. Indicates that the subject needs to be reviewed by a moderator #[derive( serde::Serialize, serde::Deserialize, @@ -1298,7 +1422,7 @@ impl std::fmt::Display for ReviewOpen { } } -///Account credentials revocation by moderators. Only works on DID subjects. +/// Account credentials revocation by moderators. Only works on DID subjects. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -1307,16 +1431,18 @@ impl std::fmt::Display for ReviewOpen { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RevokeAccountCredentialsEvent<'a> { - ///Comment describing the reason for the revocation. + /// Comment describing the reason for the revocation. #[serde(borrow)] + #[builder(into)] pub comment: jacquard_common::CowStr<'a>, } -///Logs a scheduled takedown action for an account. +/// Logs a scheduled takedown action for an account. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -1325,22 +1451,27 @@ pub struct RevokeAccountCredentialsEvent<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ScheduleTakedownEvent<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub execute_after: std::option::Option, + #[builder(into)] + pub execute_after: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub execute_at: std::option::Option, + #[builder(into)] + pub execute_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub execute_until: std::option::Option, + #[builder(into)] + pub execute_until: Option, } -///View of a scheduled moderation action +/// View of a scheduled moderation action #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -1349,55 +1480,67 @@ pub struct ScheduleTakedownEvent<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ScheduledActionView<'a> { - ///Type of action to be executed + /// Type of action to be executed #[serde(borrow)] + #[builder(into)] pub action: jacquard_common::CowStr<'a>, - ///When the scheduled action was created + /// When the scheduled action was created pub created_at: jacquard_common::types::string::Datetime, - ///DID of the user who created this scheduled action + /// DID of the user who created this scheduled action #[serde(borrow)] pub created_by: jacquard_common::types::string::Did<'a>, - ///Subject DID for the action + /// Subject DID for the action #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, - ///Serialized event object that will be propagated to the event when performed + /// Serialized event object that will be propagated to the event when performed #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub event_data: std::option::Option>, - ///Earliest time to execute the action (for randomized scheduling) + pub event_data: Option>, + /// Earliest time to execute the action (for randomized scheduling) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub execute_after: std::option::Option, - ///Exact time to execute the action + #[builder(into)] + pub execute_after: Option, + /// Exact time to execute the action #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub execute_at: std::option::Option, - ///Latest time to execute the action (for randomized scheduling) + #[builder(into)] + pub execute_at: Option, + /// Latest time to execute the action (for randomized scheduling) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub execute_until: std::option::Option, - ///ID of the moderation event created when action was successfully executed + #[builder(into)] + pub execute_until: Option, + /// ID of the moderation event created when action was successfully executed #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub execution_event_id: std::option::Option, - ///Auto-incrementing row ID + #[builder(into)] + pub execution_event_id: Option, + /// Auto-incrementing row ID pub id: i64, - ///When the action was last attempted to be executed + /// When the action was last attempted to be executed #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub last_executed_at: std::option::Option, - ///Reason for the last execution failure + #[builder(into)] + pub last_executed_at: Option, + /// Reason for the last execution failure #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub last_failure_reason: std::option::Option>, - ///Whether execution time should be randomized within the specified range + pub last_failure_reason: Option>, + /// Whether execution time should be randomized within the specified range #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub randomize_execution: std::option::Option, - ///Current status of the scheduled action + #[builder(into)] + pub randomize_execution: Option, + /// Current status of the scheduled action #[serde(borrow)] + #[builder(into)] pub status: jacquard_common::CowStr<'a>, - ///When the scheduled action was last updated + /// When the scheduled action was last updated #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, } #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -1494,82 +1637,94 @@ impl jacquard_common::IntoStatic for SubjectReviewState<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SubjectStatusView<'a> { - ///Statistics related to the account subject + /// Statistics related to the account subject #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub account_stats: std::option::Option< - crate::tools_ozone::moderation::AccountStats<'a>, - >, - ///Current age assurance state of the subject. + pub account_stats: Option>, + /// Current age assurance state of the subject. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub age_assurance_state: std::option::Option>, - ///Whether or not the last successful update to age assurance was made by the user or admin. + pub age_assurance_state: Option>, + /// Whether or not the last successful update to age assurance was made by the user or admin. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub age_assurance_updated_by: std::option::Option>, - ///True indicates that the a previously taken moderator action was appealed against, by the author of the content. False indicates last appeal was resolved by moderators. + pub age_assurance_updated_by: Option>, + /// True indicates that the a previously taken moderator action was appealed against, by the author of the content. False indicates last appeal was resolved by moderators. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub appealed: std::option::Option, - ///Sticky comment on the subject. + #[builder(into)] + pub appealed: Option, + /// Sticky comment on the subject. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, - ///Timestamp referencing the first moderation status impacting event was emitted on the subject + pub comment: Option>, + /// Timestamp referencing the first moderation status impacting event was emitted on the subject pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub hosting: std::option::Option>, + pub hosting: Option>, pub id: i64, - ///Timestamp referencing when the author of the subject appealed a moderation action + /// Timestamp referencing when the author of the subject appealed a moderation action #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub last_appealed_at: std::option::Option, + #[builder(into)] + pub last_appealed_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub last_reported_at: std::option::Option, + #[builder(into)] + pub last_reported_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub last_reviewed_at: std::option::Option, + #[builder(into)] + pub last_reviewed_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub last_reviewed_by: std::option::Option>, + pub last_reviewed_by: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub mute_reporting_until: std::option::Option< - jacquard_common::types::string::Datetime, - >, + #[builder(into)] + pub mute_reporting_until: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub mute_until: std::option::Option, - ///Numeric value representing the level of priority. Higher score means higher priority. + #[builder(into)] + pub mute_until: Option, + /// Numeric value representing the level of priority. Higher score means higher priority. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub priority_score: std::option::Option, - ///Statistics related to the record subjects authored by the subject's account + #[builder(into)] + pub priority_score: Option, + /// Statistics related to the record subjects authored by the subject's account #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub records_stats: std::option::Option< - crate::tools_ozone::moderation::RecordsStats<'a>, - >, + pub records_stats: Option>, #[serde(borrow)] pub review_state: crate::tools_ozone::moderation::SubjectReviewState<'a>, #[serde(borrow)] pub subject: SubjectStatusViewSubject<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subject_blob_cids: std::option::Option< - Vec>, - >, + pub subject_blob_cids: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subject_repo_handle: std::option::Option>, + pub subject_repo_handle: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub suspend_until: std::option::Option, + #[builder(into)] + pub suspend_until: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>>, + pub tags: Option>>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub takendown: std::option::Option, - ///Timestamp referencing when the last update was made to the moderation status of the subject + #[builder(into)] + pub takendown: Option, + /// Timestamp referencing when the last update was made to the moderation status of the subject pub updated_at: jacquard_common::types::string::Datetime, } @@ -1613,7 +1768,7 @@ pub enum SubjectStatusViewSubject<'a> { MessageRef(Box>), } -///Detailed view of a subject. For record subjects, the author's repo and profile will be returned. +/// Detailed view of a subject. For record subjects, the author's repo and profile will be returned. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -1622,33 +1777,35 @@ pub enum SubjectStatusViewSubject<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SubjectView<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub profile: std::option::Option>, + pub profile: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub record: std::option::Option< - crate::tools_ozone::moderation::RecordViewDetail<'a>, - >, + pub record: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub repo: std::option::Option>, + pub repo: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub status: std::option::Option< - crate::tools_ozone::moderation::SubjectStatusView<'a>, - >, + pub status: Option>, #[serde(borrow)] + #[builder(into)] pub subject: jacquard_common::CowStr<'a>, #[serde(borrow)] pub r#type: crate::com_atproto::moderation::SubjectType<'a>, } -///Moderation event timeline event for a PLC create operation +/// Moderation event timeline event for a PLC create operation #[derive( serde::Serialize, serde::Deserialize, @@ -1666,7 +1823,7 @@ impl std::fmt::Display for TimelineEventPlcCreate { } } -///Moderation event timeline event for generic PLC operation +/// Moderation event timeline event for generic PLC operation #[derive( serde::Serialize, serde::Deserialize, @@ -1684,7 +1841,7 @@ impl std::fmt::Display for TimelineEventPlcOperation { } } -///Moderation event timeline event for a PLC tombstone operation +/// Moderation event timeline event for a PLC tombstone operation #[derive( serde::Serialize, serde::Deserialize, @@ -1710,7 +1867,8 @@ impl std::fmt::Display for TimelineEventPlcTombstone { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct VideoDetails<'a> { diff --git a/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs b/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs index 8aa18a620..3b4c7776c 100644 --- a/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs +++ b/crates/jacquard-api/src/tools_ozone/moderation/cancel_scheduled_actions.rs @@ -13,16 +13,17 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct CancellationResults<'a> { - ///DIDs for which cancellation failed with error details + /// DIDs for which cancellation failed with error details #[serde(borrow)] pub failed: Vec< crate::tools_ozone::moderation::cancel_scheduled_actions::FailedCancellation<'a>, >, - ///DIDs for which all pending scheduled actions were successfully cancelled + /// DIDs for which all pending scheduled actions were successfully cancelled #[serde(borrow)] pub succeeded: Vec>, } @@ -35,17 +36,20 @@ pub struct CancellationResults<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct FailedCancellation<'a> { #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(borrow)] + #[builder(into)] pub error: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub error_code: std::option::Option>, + pub error_code: Option>, } #[jacquard_derive::lexicon] @@ -62,12 +66,12 @@ pub struct FailedCancellation<'a> { #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct CancelScheduledActions<'a> { - ///Optional comment describing the reason for cancellation + /// Optional comment describing the reason for cancellation #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub comment: std::option::Option>, - ///Array of DID subjects to cancel scheduled actions for + #[serde(borrow)] + pub comment: Option>, + /// Array of DID subjects to cancel scheduled actions for #[serde(borrow)] pub subjects: Vec>, #[serde(flatten)] diff --git a/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs b/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs index 0afbe5a24..ba2ca6002 100644 --- a/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs +++ b/crates/jacquard-api/src/tools_ozone/moderation/emit_event.rs @@ -23,21 +23,21 @@ pub struct EmitEvent<'a> { pub created_by: jacquard_common::types::string::Did<'a>, #[serde(borrow)] pub event: EmitEventEvent<'a>, - ///An optional external ID for the event, used to deduplicate events from external systems. Fails when an event of same type with the same external ID exists for the same subject. + /// An optional external ID for the event, used to deduplicate events from external systems. Fails when an event of same type with the same external ID exists for the same subject. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub external_id: std::option::Option>, + #[serde(borrow)] + pub external_id: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub mod_tool: std::option::Option>, + pub mod_tool: Option>, #[serde(borrow)] pub subject: EmitEventSubject<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subject_blob_cids: std::option::Option< - Vec>, - >, + pub subject_blob_cids: Option>>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] @@ -179,7 +179,7 @@ pub struct EmitEventOutput<'a> { pub enum EmitEventError<'a> { #[serde(rename = "SubjectHasAction")] SubjectHasAction(std::option::Option), - ///An event with the same external ID already exists for the subject. + /// An event with the same external ID already exists for the subject. #[serde(rename = "DuplicateExternalId")] DuplicateExternalId(std::option::Option), } diff --git a/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs b/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs index 16723e13c..d7786e469 100644 --- a/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs +++ b/crates/jacquard-api/src/tools_ozone/moderation/get_account_timeline.rs @@ -106,11 +106,13 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetAccountTimelineRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct TimelineItem<'a> { #[serde(borrow)] + #[builder(into)] pub day: jacquard_common::CowStr<'a>, #[serde(borrow)] pub summary: Vec< @@ -126,13 +128,16 @@ pub struct TimelineItem<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct TimelineItemSummary<'a> { pub count: i64, #[serde(borrow)] + #[builder(into)] pub event_subject_type: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub event_type: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/moderation/list_scheduled_actions.rs b/crates/jacquard-api/src/tools_ozone/moderation/list_scheduled_actions.rs index b98e1bf2d..5a1a41ac9 100644 --- a/crates/jacquard-api/src/tools_ozone/moderation/list_scheduled_actions.rs +++ b/crates/jacquard-api/src/tools_ozone/moderation/list_scheduled_actions.rs @@ -19,27 +19,31 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct ListScheduledActions<'a> { - ///Cursor for pagination + /// Cursor for pagination #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub cursor: std::option::Option>, - ///Filter actions scheduled to execute before this time + #[serde(borrow)] + pub cursor: Option>, + /// Filter actions scheduled to execute before this time #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub ends_before: std::option::Option, - ///Maximum number of results to return + #[builder(into)] + pub ends_before: Option, + /// Maximum number of results to return #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub limit: std::option::Option, - ///Filter actions scheduled to execute after this time + #[builder(into)] + pub limit: Option, + /// Filter actions scheduled to execute after this time #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub starts_after: std::option::Option, - ///Filter actions by status + #[builder(into)] + pub starts_after: Option, + /// Filter actions by status #[serde(borrow)] pub statuses: Vec>, - ///Filter actions for specific DID subjects + /// Filter actions for specific DID subjects #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subjects: std::option::Option>>, + pub subjects: Option>>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] @@ -63,7 +67,7 @@ pub struct ListScheduledActions<'a> { pub struct ListScheduledActionsOutput<'a> { #[serde(borrow)] pub actions: Vec>, - ///Cursor for next page of results + /// Cursor for next page of results #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, diff --git a/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs b/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs index c02d69c12..30a3585f0 100644 --- a/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs +++ b/crates/jacquard-api/src/tools_ozone/moderation/schedule_action.rs @@ -13,15 +13,18 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct FailedScheduling<'a> { #[serde(borrow)] + #[builder(into)] pub error: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub error_code: std::option::Option>, + pub error_code: Option>, #[serde(borrow)] pub subject: jacquard_common::types::string::Did<'a>, } @@ -44,13 +47,14 @@ pub struct ScheduleAction<'a> { pub action: jacquard_common::types::value::Data<'a>, #[serde(borrow)] pub created_by: jacquard_common::types::string::Did<'a>, - ///This will be propagated to the moderation event when it is applied + /// This will be propagated to the moderation event when it is applied #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub mod_tool: std::option::Option>, + pub mod_tool: Option>, #[serde(borrow)] pub scheduling: jacquard_common::types::value::Data<'a>, - ///Array of DID subjects to schedule the action for + /// Array of DID subjects to schedule the action for #[serde(borrow)] pub subjects: Vec>, #[serde(flatten)] @@ -117,7 +121,8 @@ impl jacquard_common::xrpc::XrpcEndpoint for ScheduleActionRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ScheduledActionResults<'a> { @@ -129,7 +134,7 @@ pub struct ScheduledActionResults<'a> { pub succeeded: Vec>, } -///Configuration for when the action should be executed +/// Configuration for when the action should be executed #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -138,22 +143,26 @@ pub struct ScheduledActionResults<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SchedulingConfig<'a> { - ///Earliest time to execute the action (for randomized scheduling) + /// Earliest time to execute the action (for randomized scheduling) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub execute_after: std::option::Option, - ///Exact time to execute the action + #[builder(into)] + pub execute_after: Option, + /// Exact time to execute the action #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub execute_at: std::option::Option, - ///Latest time to execute the action (for randomized scheduling) + #[builder(into)] + pub execute_at: Option, + /// Latest time to execute the action (for randomized scheduling) #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub execute_until: std::option::Option, + #[builder(into)] + pub execute_until: Option, } -///Schedule a takedown action +/// Schedule a takedown action #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -162,21 +171,26 @@ pub struct SchedulingConfig<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Takedown<'a> { - ///If true, all other reports on content authored by this account will be resolved (acknowledged). + /// If true, all other reports on content authored by this account will be resolved (acknowledged). #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub acknowledge_account_subjects: std::option::Option, + #[builder(into)] + pub acknowledge_account_subjects: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, - ///Indicates how long the takedown should be in effect before automatically expiring. + pub comment: Option>, + /// Indicates how long the takedown should be in effect before automatically expiring. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub duration_in_hours: std::option::Option, - ///Names/Keywords of the policies that drove the decision. + #[builder(into)] + pub duration_in_hours: Option, + /// Names/Keywords of the policies that drove the decision. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub policies: std::option::Option>>, + pub policies: Option>>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/report.rs b/crates/jacquard-api/src/tools_ozone/report.rs index 3d592b9d4..20d899f78 100644 --- a/crates/jacquard-api/src/tools_ozone/report.rs +++ b/crates/jacquard-api/src/tools_ozone/report.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Appeal a previously taken moderation action +/// Appeal a previously taken moderation action #[derive( serde::Serialize, serde::Deserialize, @@ -23,7 +23,7 @@ impl std::fmt::Display for ReasonAppeal { } } -///Child sexual abuse material (CSAM). These reports will be sent only be sent to the application's Moderation Authority. +/// Child sexual abuse material (CSAM). These reports will be sent only be sent to the application's Moderation Authority. #[derive( serde::Serialize, serde::Deserialize, @@ -41,7 +41,7 @@ impl std::fmt::Display for ReasonChildSafetyCsam { } } -///Grooming or predatory behavior. These reports will be sent only be sent to the application's Moderation Authority. +/// Grooming or predatory behavior. These reports will be sent only be sent to the application's Moderation Authority. #[derive( serde::Serialize, serde::Deserialize, @@ -59,7 +59,7 @@ impl std::fmt::Display for ReasonChildSafetyGroom { } } -///Harassment or bullying of minors +/// Harassment or bullying of minors #[derive( serde::Serialize, serde::Deserialize, @@ -77,7 +77,7 @@ impl std::fmt::Display for ReasonChildSafetyHarassment { } } -///Other child safety. These reports will be sent only be sent to the application's Moderation Authority. +/// Other child safety. These reports will be sent only be sent to the application's Moderation Authority. #[derive( serde::Serialize, serde::Deserialize, @@ -95,7 +95,7 @@ impl std::fmt::Display for ReasonChildSafetyOther { } } -///Privacy violation involving a minor +/// Privacy violation involving a minor #[derive( serde::Serialize, serde::Deserialize, @@ -113,7 +113,7 @@ impl std::fmt::Display for ReasonChildSafetyPrivacy { } } -///Doxxing +/// Doxxing #[derive( serde::Serialize, serde::Deserialize, @@ -131,7 +131,7 @@ impl std::fmt::Display for ReasonHarassmentDoxxing { } } -///Hate speech +/// Hate speech #[derive( serde::Serialize, serde::Deserialize, @@ -149,7 +149,7 @@ impl std::fmt::Display for ReasonHarassmentHateSpeech { } } -///Other harassing or hateful content +/// Other harassing or hateful content #[derive( serde::Serialize, serde::Deserialize, @@ -167,7 +167,7 @@ impl std::fmt::Display for ReasonHarassmentOther { } } -///Targeted harassment +/// Targeted harassment #[derive( serde::Serialize, serde::Deserialize, @@ -185,7 +185,7 @@ impl std::fmt::Display for ReasonHarassmentTargeted { } } -///Trolling +/// Trolling #[derive( serde::Serialize, serde::Deserialize, @@ -203,7 +203,7 @@ impl std::fmt::Display for ReasonHarassmentTroll { } } -///Fake account or bot +/// Fake account or bot #[derive( serde::Serialize, serde::Deserialize, @@ -221,7 +221,7 @@ impl std::fmt::Display for ReasonMisleadingBot { } } -///False information about elections +/// False information about elections #[derive( serde::Serialize, serde::Deserialize, @@ -239,7 +239,7 @@ impl std::fmt::Display for ReasonMisleadingElections { } } -///Impersonation +/// Impersonation #[derive( serde::Serialize, serde::Deserialize, @@ -257,7 +257,7 @@ impl std::fmt::Display for ReasonMisleadingImpersonation { } } -///Other misleading content +/// Other misleading content #[derive( serde::Serialize, serde::Deserialize, @@ -275,7 +275,7 @@ impl std::fmt::Display for ReasonMisleadingOther { } } -///Scam +/// Scam #[derive( serde::Serialize, serde::Deserialize, @@ -293,7 +293,7 @@ impl std::fmt::Display for ReasonMisleadingScam { } } -///Spam +/// Spam #[derive( serde::Serialize, serde::Deserialize, @@ -311,7 +311,7 @@ impl std::fmt::Display for ReasonMisleadingSpam { } } -///An issue not included in these options +/// An issue not included in these options #[derive( serde::Serialize, serde::Deserialize, @@ -329,7 +329,7 @@ impl std::fmt::Display for ReasonOther { } } -///Banned user returning +/// Banned user returning #[derive( serde::Serialize, serde::Deserialize, @@ -347,7 +347,7 @@ impl std::fmt::Display for ReasonRuleBanEvasion { } } -///Other +/// Other #[derive( serde::Serialize, serde::Deserialize, @@ -365,7 +365,7 @@ impl std::fmt::Display for ReasonRuleOther { } } -///Promoting or selling prohibited items or services +/// Promoting or selling prohibited items or services #[derive( serde::Serialize, serde::Deserialize, @@ -383,7 +383,7 @@ impl std::fmt::Display for ReasonRuleProhibitedSales { } } -///Hacking or system attacks +/// Hacking or system attacks #[derive( serde::Serialize, serde::Deserialize, @@ -401,7 +401,7 @@ impl std::fmt::Display for ReasonRuleSiteSecurity { } } -///Content promoting or depicting self-harm +/// Content promoting or depicting self-harm #[derive( serde::Serialize, serde::Deserialize, @@ -419,7 +419,7 @@ impl std::fmt::Display for ReasonSelfHarmContent { } } -///Eating disorders +/// Eating disorders #[derive( serde::Serialize, serde::Deserialize, @@ -437,7 +437,7 @@ impl std::fmt::Display for ReasonSelfHarmEd { } } -///Other dangerous content +/// Other dangerous content #[derive( serde::Serialize, serde::Deserialize, @@ -455,7 +455,7 @@ impl std::fmt::Display for ReasonSelfHarmOther { } } -///Dangerous challenges or activities +/// Dangerous challenges or activities #[derive( serde::Serialize, serde::Deserialize, @@ -473,7 +473,7 @@ impl std::fmt::Display for ReasonSelfHarmStunts { } } -///Dangerous substances or drug abuse +/// Dangerous substances or drug abuse #[derive( serde::Serialize, serde::Deserialize, @@ -491,7 +491,7 @@ impl std::fmt::Display for ReasonSelfHarmSubstances { } } -///Adult sexual abuse content +/// Adult sexual abuse content #[derive( serde::Serialize, serde::Deserialize, @@ -509,7 +509,7 @@ impl std::fmt::Display for ReasonSexualAbuseContent { } } -///Animal sexual abuse +/// Animal sexual abuse #[derive( serde::Serialize, serde::Deserialize, @@ -527,7 +527,7 @@ impl std::fmt::Display for ReasonSexualAnimal { } } -///Deepfake adult content +/// Deepfake adult content #[derive( serde::Serialize, serde::Deserialize, @@ -545,7 +545,7 @@ impl std::fmt::Display for ReasonSexualDeepfake { } } -///Non-consensual intimate imagery +/// Non-consensual intimate imagery #[derive( serde::Serialize, serde::Deserialize, @@ -563,7 +563,7 @@ impl std::fmt::Display for ReasonSexualNcii { } } -///Other sexual violence content +/// Other sexual violence content #[derive( serde::Serialize, serde::Deserialize, @@ -581,7 +581,7 @@ impl std::fmt::Display for ReasonSexualOther { } } -///Unlabelled adult content +/// Unlabelled adult content #[derive( serde::Serialize, serde::Deserialize, @@ -1185,7 +1185,7 @@ impl jacquard_common::IntoStatic for ReasonType<'_> { } } -///Animal welfare violations +/// Animal welfare violations #[derive( serde::Serialize, serde::Deserialize, @@ -1203,7 +1203,7 @@ impl std::fmt::Display for ReasonViolenceAnimal { } } -///Extremist content. These reports will be sent only be sent to the application's Moderation Authority. +/// Extremist content. These reports will be sent only be sent to the application's Moderation Authority. #[derive( serde::Serialize, serde::Deserialize, @@ -1221,7 +1221,7 @@ impl std::fmt::Display for ReasonViolenceExtremistContent { } } -///Glorification of violence +/// Glorification of violence #[derive( serde::Serialize, serde::Deserialize, @@ -1239,7 +1239,7 @@ impl std::fmt::Display for ReasonViolenceGlorification { } } -///Graphic violent content +/// Graphic violent content #[derive( serde::Serialize, serde::Deserialize, @@ -1257,7 +1257,7 @@ impl std::fmt::Display for ReasonViolenceGraphicContent { } } -///Other violent content +/// Other violent content #[derive( serde::Serialize, serde::Deserialize, @@ -1275,7 +1275,7 @@ impl std::fmt::Display for ReasonViolenceOther { } } -///Threats or incitement +/// Threats or incitement #[derive( serde::Serialize, serde::Deserialize, @@ -1293,7 +1293,7 @@ impl std::fmt::Display for ReasonViolenceThreats { } } -///Human trafficking +/// Human trafficking #[derive( serde::Serialize, serde::Deserialize, diff --git a/crates/jacquard-api/src/tools_ozone/safelink.rs b/crates/jacquard-api/src/tools_ozone/safelink.rs index 3e5bd023a..d88fcc080 100644 --- a/crates/jacquard-api/src/tools_ozone/safelink.rs +++ b/crates/jacquard-api/src/tools_ozone/safelink.rs @@ -92,7 +92,7 @@ impl jacquard_common::IntoStatic for ActionType<'_> { } } -///An event for URL safety decisions +/// An event for URL safety decisions #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -101,30 +101,33 @@ impl jacquard_common::IntoStatic for ActionType<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Event<'a> { #[serde(borrow)] pub action: crate::tools_ozone::safelink::ActionType<'a>, - ///Optional comment about the decision + /// Optional comment about the decision #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, + pub comment: Option>, pub created_at: jacquard_common::types::string::Datetime, - ///DID of the user who created this rule + /// DID of the user who created this rule #[serde(borrow)] pub created_by: jacquard_common::types::string::Did<'a>, #[serde(borrow)] pub event_type: crate::tools_ozone::safelink::EventType<'a>, - ///Auto-incrementing row ID + /// Auto-incrementing row ID pub id: i64, #[serde(borrow)] pub pattern: crate::tools_ozone::safelink::PatternType<'a>, #[serde(borrow)] pub reason: crate::tools_ozone::safelink::ReasonType<'a>, - ///The URL that this rule applies to + /// The URL that this rule applies to #[serde(borrow)] + #[builder(into)] pub url: jacquard_common::CowStr<'a>, } @@ -371,7 +374,7 @@ impl jacquard_common::IntoStatic for ReasonType<'_> { } } -///Input for creating a URL safety rule +/// Input for creating a URL safety rule #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -380,28 +383,31 @@ impl jacquard_common::IntoStatic for ReasonType<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct UrlRule<'a> { #[serde(borrow)] pub action: crate::tools_ozone::safelink::ActionType<'a>, - ///Optional comment about the decision + /// Optional comment about the decision #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub comment: std::option::Option>, - ///Timestamp when the rule was created + pub comment: Option>, + /// Timestamp when the rule was created pub created_at: jacquard_common::types::string::Datetime, - ///DID of the user added the rule. + /// DID of the user added the rule. #[serde(borrow)] pub created_by: jacquard_common::types::string::Did<'a>, #[serde(borrow)] pub pattern: crate::tools_ozone::safelink::PatternType<'a>, #[serde(borrow)] pub reason: crate::tools_ozone::safelink::ReasonType<'a>, - ///Timestamp when the rule was last updated + /// Timestamp when the rule was last updated pub updated_at: jacquard_common::types::string::Datetime, - ///The URL or domain to apply the rule to + /// The URL or domain to apply the rule to #[serde(borrow)] + #[builder(into)] pub url: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs b/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs index 5b679b8a2..3f875177e 100644 --- a/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs +++ b/crates/jacquard-api/src/tools_ozone/safelink/add_rule.rs @@ -21,20 +21,21 @@ pub struct AddRule<'a> { #[serde(borrow)] pub action: crate::tools_ozone::safelink::ActionType<'a>, - ///Optional comment about the decision + /// Optional comment about the decision #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub comment: std::option::Option>, - ///Author DID. Only respected when using admin auth + #[serde(borrow)] + pub comment: Option>, + /// Author DID. Only respected when using admin auth #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub created_by: std::option::Option>, + pub created_by: Option>, #[serde(borrow)] pub pattern: crate::tools_ozone::safelink::PatternType<'a>, #[serde(borrow)] pub reason: crate::tools_ozone::safelink::ReasonType<'a>, - ///The URL or domain to apply the rule to + /// The URL or domain to apply the rule to #[serde(borrow)] #[builder(into)] pub url: jacquard_common::CowStr<'a>, @@ -79,10 +80,10 @@ pub struct AddRuleOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum AddRuleError<'a> { - ///The provided URL is invalid + /// The provided URL is invalid #[serde(rename = "InvalidUrl")] InvalidUrl(std::option::Option), - ///A rule for this URL/domain already exists + /// A rule for this URL/domain already exists #[serde(rename = "RuleAlreadyExists")] RuleAlreadyExists(std::option::Option), } diff --git a/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs b/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs index 72684983a..217246ded 100644 --- a/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs +++ b/crates/jacquard-api/src/tools_ozone/safelink/query_events.rs @@ -19,28 +19,30 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct QueryEvents<'a> { - ///Cursor for pagination + /// Cursor for pagination #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub cursor: std::option::Option>, - ///Maximum number of results to return - #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub limit: std::option::Option, - ///Filter by pattern type - #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] + pub cursor: Option>, + /// Maximum number of results to return + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub pattern_type: std::option::Option>, - ///Sort direction + pub limit: Option, + /// Filter by pattern type #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] + pub pattern_type: Option>, + /// Sort direction + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub sort_direction: std::option::Option>, - ///Filter by specific URLs or domains + #[serde(borrow)] + pub sort_direction: Option>, + /// Filter by specific URLs or domains #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub urls: std::option::Option>>, + pub urls: Option>>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] @@ -62,7 +64,7 @@ pub struct QueryEvents<'a> { )] #[serde(rename_all = "camelCase")] pub struct QueryEventsOutput<'a> { - ///Next cursor for pagination. Only present if there are more results. + /// Next cursor for pagination. Only present if there are more results. #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, diff --git a/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs b/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs index feab92c27..7ac434ad8 100644 --- a/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs +++ b/crates/jacquard-api/src/tools_ozone/safelink/query_rules.rs @@ -19,41 +19,45 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct QueryRules<'a> { - ///Filter by action types + /// Filter by action types #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub actions: std::option::Option>>, - ///Filter by rule creator + pub actions: Option>>, + /// Filter by rule creator #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub created_by: std::option::Option>, - ///Cursor for pagination + pub created_by: Option>, + /// Cursor for pagination #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub cursor: std::option::Option>, - ///Maximum number of results to return - #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub limit: std::option::Option, - ///Filter by pattern type - #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] + pub cursor: Option>, + /// Maximum number of results to return + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub pattern_type: std::option::Option>, - ///Filter by reason type + pub limit: Option, + /// Filter by pattern type #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub reason: std::option::Option>, - ///Sort direction + #[serde(borrow)] + pub pattern_type: Option>, + /// Filter by reason type #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] + pub reason: Option>, + /// Sort direction + #[serde(skip_serializing_if = "std::option::Option::is_none")] #[builder(into)] - pub sort_direction: std::option::Option>, - ///Filter by specific URLs or domains + #[serde(borrow)] + pub sort_direction: Option>, + /// Filter by specific URLs or domains #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub urls: std::option::Option>>, + pub urls: Option>>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] @@ -75,7 +79,7 @@ pub struct QueryRules<'a> { )] #[serde(rename_all = "camelCase")] pub struct QueryRulesOutput<'a> { - ///Next cursor for pagination. Only present if there are more results. + /// Next cursor for pagination. Only present if there are more results. #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub cursor: std::option::Option>, diff --git a/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs b/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs index 73def9bba..79f125b7b 100644 --- a/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs +++ b/crates/jacquard-api/src/tools_ozone/safelink/remove_rule.rs @@ -19,18 +19,19 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct RemoveRule<'a> { - ///Optional comment about why the rule is being removed + /// Optional comment about why the rule is being removed #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub comment: std::option::Option>, - ///Optional DID of the user. Only respected when using admin auth. + #[serde(borrow)] + pub comment: Option>, + /// Optional DID of the user. Only respected when using admin auth. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub created_by: std::option::Option>, + pub created_by: Option>, #[serde(borrow)] pub pattern: crate::tools_ozone::safelink::PatternType<'a>, - ///The URL or domain to remove the rule for + /// The URL or domain to remove the rule for #[serde(borrow)] #[builder(into)] pub url: jacquard_common::CowStr<'a>, @@ -75,7 +76,7 @@ pub struct RemoveRuleOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum RemoveRuleError<'a> { - ///No active rule found for this URL/domain + /// No active rule found for this URL/domain #[serde(rename = "RuleNotFound")] RuleNotFound(std::option::Option), } diff --git a/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs b/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs index c4232fcd4..db93b4308 100644 --- a/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs +++ b/crates/jacquard-api/src/tools_ozone/safelink/update_rule.rs @@ -21,20 +21,21 @@ pub struct UpdateRule<'a> { #[serde(borrow)] pub action: crate::tools_ozone::safelink::ActionType<'a>, - ///Optional comment about the update + /// Optional comment about the update #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub comment: std::option::Option>, - ///Optional DID to credit as the creator. Only respected for admin_token authentication. + #[serde(borrow)] + pub comment: Option>, + /// Optional DID to credit as the creator. Only respected for admin_token authentication. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub created_by: std::option::Option>, + pub created_by: Option>, #[serde(borrow)] pub pattern: crate::tools_ozone::safelink::PatternType<'a>, #[serde(borrow)] pub reason: crate::tools_ozone::safelink::ReasonType<'a>, - ///The URL or domain to update the rule for + /// The URL or domain to update the rule for #[serde(borrow)] #[builder(into)] pub url: jacquard_common::CowStr<'a>, @@ -79,7 +80,7 @@ pub struct UpdateRuleOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum UpdateRuleError<'a> { - ///No active rule found for this URL/domain + /// No active rule found for this URL/domain #[serde(rename = "RuleNotFound")] RuleNotFound(std::option::Option), } diff --git a/crates/jacquard-api/src/tools_ozone/server/get_config.rs b/crates/jacquard-api/src/tools_ozone/server/get_config.rs index 4c0487a89..0cba1e254 100644 --- a/crates/jacquard-api/src/tools_ozone/server/get_config.rs +++ b/crates/jacquard-api/src/tools_ozone/server/get_config.rs @@ -29,7 +29,7 @@ pub struct GetConfigOutput<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub pds: std::option::Option>, - ///The did of the verifier used for verification. + /// The did of the verifier used for verification. #[serde(skip_serializing_if = "std::option::Option::is_none")] #[serde(borrow)] pub verifier_did: std::option::Option>, @@ -84,13 +84,15 @@ impl jacquard_common::xrpc::XrpcEndpoint for GetConfigRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ServiceConfig<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub url: std::option::Option>, + pub url: Option>, } #[jacquard_derive::lexicon] @@ -101,11 +103,13 @@ pub struct ServiceConfig<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct ViewerConfig<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub role: std::option::Option>, + pub role: Option>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/set.rs b/crates/jacquard-api/src/tools_ozone/set.rs index ee25cf098..30221dafc 100644 --- a/crates/jacquard-api/src/tools_ozone/set.rs +++ b/crates/jacquard-api/src/tools_ozone/set.rs @@ -20,14 +20,17 @@ pub mod upsert_set; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Set<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } @@ -39,15 +42,18 @@ pub struct Set<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SetView<'a> { pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, + pub description: Option>, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, pub set_size: i64, pub updated_at: jacquard_common::types::string::Datetime, diff --git a/crates/jacquard-api/src/tools_ozone/set/add_values.rs b/crates/jacquard-api/src/tools_ozone/set/add_values.rs index 2df662826..1fe354f08 100644 --- a/crates/jacquard-api/src/tools_ozone/set/add_values.rs +++ b/crates/jacquard-api/src/tools_ozone/set/add_values.rs @@ -19,11 +19,11 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct AddValues<'a> { - ///Name of the set to add values to + /// Name of the set to add values to #[serde(borrow)] #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Array of string values to add to the set + /// Array of string values to add to the set #[serde(borrow)] pub values: Vec>, #[serde(flatten)] diff --git a/crates/jacquard-api/src/tools_ozone/set/delete_set.rs b/crates/jacquard-api/src/tools_ozone/set/delete_set.rs index 33c38058c..8505c6cd5 100644 --- a/crates/jacquard-api/src/tools_ozone/set/delete_set.rs +++ b/crates/jacquard-api/src/tools_ozone/set/delete_set.rs @@ -19,7 +19,7 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct DeleteSet<'a> { - ///Name of the set to delete + /// Name of the set to delete #[serde(borrow)] #[builder(into)] pub name: jacquard_common::CowStr<'a>, @@ -59,7 +59,7 @@ pub struct DeleteSetOutput<'a> {} #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum DeleteSetError<'a> { - ///set with the given name does not exist + /// set with the given name does not exist #[serde(rename = "SetNotFound")] SetNotFound(std::option::Option), } diff --git a/crates/jacquard-api/src/tools_ozone/set/delete_values.rs b/crates/jacquard-api/src/tools_ozone/set/delete_values.rs index a011e3396..bbfc6dc96 100644 --- a/crates/jacquard-api/src/tools_ozone/set/delete_values.rs +++ b/crates/jacquard-api/src/tools_ozone/set/delete_values.rs @@ -19,11 +19,11 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct DeleteValues<'a> { - ///Name of the set to delete values from + /// Name of the set to delete values from #[serde(borrow)] #[builder(into)] pub name: jacquard_common::CowStr<'a>, - ///Array of string values to delete from the set + /// Array of string values to delete from the set #[serde(borrow)] pub values: Vec>, #[serde(flatten)] @@ -50,7 +50,7 @@ pub struct DeleteValues<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum DeleteValuesError<'a> { - ///set with the given name does not exist + /// set with the given name does not exist #[serde(rename = "SetNotFound")] SetNotFound(std::option::Option), } diff --git a/crates/jacquard-api/src/tools_ozone/set/get_values.rs b/crates/jacquard-api/src/tools_ozone/set/get_values.rs index b03a2dfb0..7807f453d 100644 --- a/crates/jacquard-api/src/tools_ozone/set/get_values.rs +++ b/crates/jacquard-api/src/tools_ozone/set/get_values.rs @@ -66,7 +66,7 @@ pub struct GetValuesOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum GetValuesError<'a> { - ///set with the given name does not exist + /// set with the given name does not exist #[serde(rename = "SetNotFound")] SetNotFound(std::option::Option), } diff --git a/crates/jacquard-api/src/tools_ozone/setting.rs b/crates/jacquard-api/src/tools_ozone/setting.rs index f84b17294..d6eba80b1 100644 --- a/crates/jacquard-api/src/tools_ozone/setting.rs +++ b/crates/jacquard-api/src/tools_ozone/setting.rs @@ -11,13 +11,7 @@ pub mod upsert_option; #[jacquard_derive::lexicon] #[derive( - serde::Serialize, - serde::Deserialize, - Debug, - Clone, - PartialEq, - Eq, - jacquard_derive::IntoStatic + serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic, )] #[serde(rename_all = "camelCase")] pub struct Option<'a> { @@ -43,4 +37,4 @@ pub struct Option<'a> { pub updated_at: std::option::Option, #[serde(borrow)] pub value: jacquard_common::types::value::Data<'a>, -} \ No newline at end of file +} diff --git a/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs b/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs index 80f435670..cd03efa7b 100644 --- a/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs +++ b/crates/jacquard-api/src/tools_ozone/setting/upsert_option.rs @@ -20,15 +20,15 @@ #[builder(start_fn = new)] pub struct UpsertOption<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub description: std::option::Option>, + #[serde(borrow)] + pub description: Option>, #[serde(borrow)] pub key: jacquard_common::types::string::Nsid<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub manager_role: std::option::Option>, + #[serde(borrow)] + pub manager_role: Option>, #[serde(borrow)] #[builder(into)] pub scope: jacquard_common::CowStr<'a>, diff --git a/crates/jacquard-api/src/tools_ozone/signature.rs b/crates/jacquard-api/src/tools_ozone/signature.rs index d56751a7c..e8b416fdc 100644 --- a/crates/jacquard-api/src/tools_ozone/signature.rs +++ b/crates/jacquard-api/src/tools_ozone/signature.rs @@ -17,12 +17,15 @@ pub mod search_accounts; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct SigDetail<'a> { #[serde(borrow)] + #[builder(into)] pub property: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub value: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs b/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs index 082ed2c16..a6b8a6086 100644 --- a/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs +++ b/crates/jacquard-api/src/tools_ozone/signature/find_related_accounts.rs @@ -82,15 +82,15 @@ impl jacquard_common::xrpc::XrpcEndpoint for FindRelatedAccountsRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RelatedAccount<'a> { #[serde(borrow)] pub account: crate::com_atproto::admin::AccountView<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub similarities: std::option::Option< - Vec>, - >, + pub similarities: Option>>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/team.rs b/crates/jacquard-api/src/tools_ozone/team.rs index 03d675daa..48c8945a3 100644 --- a/crates/jacquard-api/src/tools_ozone/team.rs +++ b/crates/jacquard-api/src/tools_ozone/team.rs @@ -18,29 +18,36 @@ pub mod update_member; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Member<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, + #[builder(into)] + pub created_at: Option, #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub disabled: std::option::Option, + #[builder(into)] + pub disabled: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub last_updated_by: std::option::Option>, + pub last_updated_by: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub profile: std::option::Option>, + pub profile: Option>, #[serde(borrow)] + #[builder(into)] pub role: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub updated_at: std::option::Option, + #[builder(into)] + pub updated_at: Option, } -///Admin role. Highest level of access, can perform all actions. +/// Admin role. Highest level of access, can perform all actions. #[derive( serde::Serialize, serde::Deserialize, @@ -58,7 +65,7 @@ impl std::fmt::Display for RoleAdmin { } } -///Moderator role. Can perform most actions. +/// Moderator role. Can perform most actions. #[derive( serde::Serialize, serde::Deserialize, @@ -76,7 +83,7 @@ impl std::fmt::Display for RoleModerator { } } -///Triage role. Mostly intended for monitoring and escalating issues. +/// Triage role. Mostly intended for monitoring and escalating issues. #[derive( serde::Serialize, serde::Deserialize, @@ -94,7 +101,7 @@ impl std::fmt::Display for RoleTriage { } } -///Verifier role. Only allowed to issue verifications. +/// Verifier role. Only allowed to issue verifications. #[derive( serde::Serialize, serde::Deserialize, diff --git a/crates/jacquard-api/src/tools_ozone/team/add_member.rs b/crates/jacquard-api/src/tools_ozone/team/add_member.rs index db9f5add3..5067973c3 100644 --- a/crates/jacquard-api/src/tools_ozone/team/add_member.rs +++ b/crates/jacquard-api/src/tools_ozone/team/add_member.rs @@ -65,7 +65,7 @@ pub struct AddMemberOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum AddMemberError<'a> { - ///Member already exists in the team. + /// Member already exists in the team. #[serde(rename = "MemberAlreadyExists")] MemberAlreadyExists(std::option::Option), } diff --git a/crates/jacquard-api/src/tools_ozone/team/delete_member.rs b/crates/jacquard-api/src/tools_ozone/team/delete_member.rs index 149597225..97f6bfc03 100644 --- a/crates/jacquard-api/src/tools_ozone/team/delete_member.rs +++ b/crates/jacquard-api/src/tools_ozone/team/delete_member.rs @@ -45,10 +45,10 @@ pub struct DeleteMember<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum DeleteMemberError<'a> { - ///The member being deleted does not exist + /// The member being deleted does not exist #[serde(rename = "MemberNotFound")] MemberNotFound(std::option::Option), - ///You can not delete yourself from the team + /// You can not delete yourself from the team #[serde(rename = "CannotDeleteSelf")] CannotDeleteSelf(std::option::Option), } diff --git a/crates/jacquard-api/src/tools_ozone/team/update_member.rs b/crates/jacquard-api/src/tools_ozone/team/update_member.rs index ad15392bc..976d213c7 100644 --- a/crates/jacquard-api/src/tools_ozone/team/update_member.rs +++ b/crates/jacquard-api/src/tools_ozone/team/update_member.rs @@ -22,11 +22,12 @@ pub struct UpdateMember<'a> { #[serde(borrow)] pub did: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub disabled: std::option::Option, + #[builder(into)] + pub disabled: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub role: std::option::Option>, + #[serde(borrow)] + pub role: Option>, #[serde(flatten)] #[serde(borrow)] #[builder(default)] @@ -68,7 +69,7 @@ pub struct UpdateMemberOutput<'a> { #[serde(tag = "error", content = "message")] #[serde(bound(deserialize = "'de: 'a"))] pub enum UpdateMemberError<'a> { - ///The member being updated does not exist in the team + /// The member being updated does not exist in the team #[serde(rename = "MemberNotFound")] MemberNotFound(std::option::Option), } diff --git a/crates/jacquard-api/src/tools_ozone/verification.rs b/crates/jacquard-api/src/tools_ozone/verification.rs index 1f91cc8cf..39a2d85e6 100644 --- a/crates/jacquard-api/src/tools_ozone/verification.rs +++ b/crates/jacquard-api/src/tools_ozone/verification.rs @@ -9,7 +9,7 @@ pub mod grant_verifications; pub mod list_verifications; pub mod revoke_verifications; -///Verification data for the associated subject. +/// Verification data for the associated subject. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -18,48 +18,57 @@ pub mod revoke_verifications; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct VerificationView<'a> { - ///Timestamp when the verification was created. + /// Timestamp when the verification was created. pub created_at: jacquard_common::types::string::Datetime, - ///Display name of the subject the verification applies to at the moment of verifying, which might not be the same at the time of viewing. The verification is only valid if the current displayName matches the one at the time of verifying. + /// Display name of the subject the verification applies to at the moment of verifying, which might not be the same at the time of viewing. The verification is only valid if the current displayName matches the one at the time of verifying. #[serde(borrow)] + #[builder(into)] pub display_name: jacquard_common::CowStr<'a>, - ///Handle of the subject the verification applies to at the moment of verifying, which might not be the same at the time of viewing. The verification is only valid if the current handle matches the one at the time of verifying. + /// Handle of the subject the verification applies to at the moment of verifying, which might not be the same at the time of viewing. The verification is only valid if the current handle matches the one at the time of verifying. #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, - ///The user who issued this verification. + /// The user who issued this verification. #[serde(borrow)] pub issuer: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub issuer_profile: std::option::Option>, + pub issuer_profile: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub issuer_repo: std::option::Option>, - ///Describes the reason for revocation, also indicating that the verification is no longer valid. + pub issuer_repo: Option>, + /// Describes the reason for revocation, also indicating that the verification is no longer valid. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub revoke_reason: std::option::Option>, - ///Timestamp when the verification was revoked. + pub revoke_reason: Option>, + /// Timestamp when the verification was revoked. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub revoked_at: std::option::Option, - ///The user who revoked this verification. + #[builder(into)] + pub revoked_at: Option, + /// The user who revoked this verification. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub revoked_by: std::option::Option>, - ///The subject of the verification. + pub revoked_by: Option>, + /// The subject of the verification. #[serde(borrow)] pub subject: jacquard_common::types::string::Did<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subject_profile: std::option::Option>, + pub subject_profile: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub subject_repo: std::option::Option>, - ///The AT-URI of the verification record. + pub subject_repo: Option>, + /// The AT-URI of the verification record. #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, } diff --git a/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs b/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs index ebb037c5f..098db436e 100644 --- a/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs +++ b/crates/jacquard-api/src/tools_ozone/verification/grant_verifications.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Error object for failed verifications. +/// Error object for failed verifications. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,14 +14,16 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct GrantError<'a> { - ///Error message describing the reason for failure. + /// Error message describing the reason for failure. #[serde(borrow)] + #[builder(into)] pub error: jacquard_common::CowStr<'a>, - ///The did of the subject being verified + /// The did of the subject being verified #[serde(borrow)] pub subject: jacquard_common::types::string::Did<'a>, } @@ -40,7 +42,7 @@ pub struct GrantError<'a> { #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct GrantVerifications<'a> { - ///Array of verification requests to process + /// Array of verification requests to process #[serde(borrow)] pub verifications: Vec>, #[serde(flatten)] @@ -108,20 +110,23 @@ impl jacquard_common::xrpc::XrpcEndpoint for GrantVerificationsRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct VerificationInput<'a> { - ///Timestamp for verification record. Defaults to current time when not specified. + /// Timestamp for verification record. Defaults to current time when not specified. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub created_at: std::option::Option, - ///Display name of the subject the verification applies to at the moment of verifying. + #[builder(into)] + pub created_at: Option, + /// Display name of the subject the verification applies to at the moment of verifying. #[serde(borrow)] + #[builder(into)] pub display_name: jacquard_common::CowStr<'a>, - ///Handle of the subject the verification applies to at the moment of verifying. + /// Handle of the subject the verification applies to at the moment of verifying. #[serde(borrow)] pub handle: jacquard_common::types::string::Handle<'a>, - ///The did of the subject being verified + /// The did of the subject being verified #[serde(borrow)] pub subject: jacquard_common::types::string::Did<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs b/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs index 97e78419f..dda8cda8c 100644 --- a/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs +++ b/crates/jacquard-api/src/tools_ozone/verification/revoke_verifications.rs @@ -19,12 +19,12 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct RevokeVerifications<'a> { - ///Reason for revoking the verification. This is optional and can be omitted if not needed. + /// Reason for revoking the verification. This is optional and can be omitted if not needed. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub revoke_reason: std::option::Option>, - ///Array of verification record uris to revoke + #[serde(borrow)] + pub revoke_reason: Option>, + /// Array of verification record uris to revoke #[serde(borrow)] pub uris: Vec>, #[serde(flatten)] @@ -48,10 +48,10 @@ pub struct RevokeVerifications<'a> { )] #[serde(rename_all = "camelCase")] pub struct RevokeVerificationsOutput<'a> { - ///List of verification uris that couldn't be revoked, including failure reasons + /// List of verification uris that couldn't be revoked, including failure reasons #[serde(borrow)] pub failed_revocations: Vec>, - ///List of verification uris successfully revoked + /// List of verification uris successfully revoked #[serde(borrow)] pub revoked_verifications: Vec>, } @@ -86,7 +86,7 @@ impl jacquard_common::xrpc::XrpcEndpoint for RevokeVerificationsRequest { type Response = RevokeVerificationsResponse; } -///Error object for failed revocations +/// Error object for failed revocations #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -95,14 +95,16 @@ impl jacquard_common::xrpc::XrpcEndpoint for RevokeVerificationsRequest { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct RevokeError<'a> { - ///Description of the error that occurred during revocation. + /// Description of the error that occurred during revocation. #[serde(borrow)] + #[builder(into)] pub error: jacquard_common::CowStr<'a>, - ///The AT-URI of the verification record that failed to revoke. + /// The AT-URI of the verification record that failed to revoke. #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs b/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs index cc81cdb1f..33c134f93 100644 --- a/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs +++ b/crates/jacquard-api/src/tools_smokesignal/blahg/content/post.rs @@ -13,19 +13,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Attachment<'a> { - ///Alt text description of the content, for accessibility. + /// Alt text description of the content, for accessibility. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub alt: std::option::Option>, + pub alt: Option>, #[serde(borrow)] pub content: jacquard_common::types::blob::Blob<'a>, } -///A blagh post +/// A blagh post #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -34,27 +36,33 @@ pub struct Attachment<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Post<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub attachments: std::option::Option< + pub attachments: Option< Vec>, >, - ///The content of the post + /// The content of the post #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub content: std::option::Option>, - ///Indicates human language of text content. + pub content: Option>, + /// Indicates human language of text content. #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub langs: std::option::Option>, + #[builder(into)] + pub langs: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] - pub published_at: std::option::Option, + #[builder(into)] + pub published_at: Option, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub title: std::option::Option>, + pub title: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/uk_ewancroft/now.rs b/crates/jacquard-api/src/uk_ewancroft/now.rs index 5d8d2c422..a0cbd6ab1 100644 --- a/crates/jacquard-api/src/uk_ewancroft/now.rs +++ b/crates/jacquard-api/src/uk_ewancroft/now.rs @@ -13,14 +13,16 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Now<'a> { - ///The ISO 8601 date and time when the status was created. + /// The ISO 8601 date and time when the status was created. pub created_at: jacquard_common::types::string::Datetime, - ///The status text formatted as plain text. + /// The status text formatted as plain text. #[serde(borrow)] + #[builder(into)] pub text: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/uk_skyblur/post.rs b/crates/jacquard-api/src/uk_skyblur/post.rs index bec8c1109..e79b686ec 100644 --- a/crates/jacquard-api/src/uk_skyblur/post.rs +++ b/crates/jacquard-api/src/uk_skyblur/post.rs @@ -9,7 +9,7 @@ pub mod decrypt_by_cid; pub mod encrypt; pub mod get_post; -///Record containing a Skyblur post. +/// Record containing a Skyblur post. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -18,27 +18,32 @@ pub mod get_post; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Post<'a> { - ///The post additional contents. + /// The post additional contents. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub additional: std::option::Option>, - ///Created date assigned by client + pub additional: Option>, + /// Created date assigned by client pub created_at: jacquard_common::types::string::Datetime, - ///Encrypted post body. It shoud be decrypted by the client with AES-256. + /// Encrypted post body. It shoud be decrypted by the client with AES-256. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub encrypt_body: std::option::Option>, - ///The post main contents. Blurred text must be enclosed in brackets []. + pub encrypt_body: Option>, + /// The post main contents. Blurred text must be enclosed in brackets []. #[serde(borrow)] + #[builder(into)] pub text: jacquard_common::CowStr<'a>, #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, - ///For 'password', the text only contains blurred text, and additional is always empty. The unblurred text and additional are included in the encryptBody. + /// For 'password', the text only contains blurred text, and additional is always empty. The unblurred text and additional are included in the encryptBody. #[serde(borrow)] + #[builder(into)] pub visibility: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/uk_skyblur/post/decrypt_by_cid.rs b/crates/jacquard-api/src/uk_skyblur/post/decrypt_by_cid.rs index e54b0f8ce..6e128ccd6 100644 --- a/crates/jacquard-api/src/uk_skyblur/post/decrypt_by_cid.rs +++ b/crates/jacquard-api/src/uk_skyblur/post/decrypt_by_cid.rs @@ -37,7 +37,7 @@ pub struct DecryptByCid<'a> { >, } -///Returns the encrypted result. +/// Returns the encrypted result. #[jacquard_derive::lexicon] #[derive( serde::Serialize, diff --git a/crates/jacquard-api/src/uk_skyblur/post/encrypt.rs b/crates/jacquard-api/src/uk_skyblur/post/encrypt.rs index 9c093b420..4aa910364 100644 --- a/crates/jacquard-api/src/uk_skyblur/post/encrypt.rs +++ b/crates/jacquard-api/src/uk_skyblur/post/encrypt.rs @@ -34,7 +34,7 @@ pub struct Encrypt<'a> { >, } -///Returns the encrypted result. +/// Returns the encrypted result. #[jacquard_derive::lexicon] #[derive( serde::Serialize, diff --git a/crates/jacquard-api/src/uk_skyblur/post/get_post.rs b/crates/jacquard-api/src/uk_skyblur/post/get_post.rs index b0584b4c8..c7d43d167 100644 --- a/crates/jacquard-api/src/uk_skyblur/post/get_post.rs +++ b/crates/jacquard-api/src/uk_skyblur/post/get_post.rs @@ -19,12 +19,12 @@ #[serde(rename_all = "camelCase")] #[builder(start_fn = new)] pub struct GetPost<'a> { - ///If the specified uri is password-protected, please provide the password. If no password is specified, the non-protected content will be returned. + /// If the specified uri is password-protected, please provide the password. If no password is specified, the non-protected content will be returned. #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(borrow)] #[builder(into)] - pub password: std::option::Option>, - ///Skyblur post at-uri. It shoud be uk.skyblur.post collection. + #[serde(borrow)] + pub password: Option>, + /// Skyblur post at-uri. It shoud be uk.skyblur.post collection. #[serde(borrow)] pub uri: jacquard_common::types::string::AtUri<'a>, #[serde(flatten)] diff --git a/crates/jacquard-api/src/uk_skyblur/preference.rs b/crates/jacquard-api/src/uk_skyblur/preference.rs index 66c71b2fd..7e2088fee 100644 --- a/crates/jacquard-api/src/uk_skyblur/preference.rs +++ b/crates/jacquard-api/src/uk_skyblur/preference.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///A declaration of a Skyblur account. +/// A declaration of a Skyblur account. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,7 +14,8 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Preference<'a> { @@ -72,14 +73,16 @@ impl From> for Preference<'_> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct MyPage<'a> { - ///Define the description displayed on MyPage. + /// Define the description displayed on MyPage. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub description: std::option::Option>, - ///If this item is true, MyPage will be displayed. + pub description: Option>, + /// If this item is true, MyPage will be displayed. pub is_use_my_page: bool, } \ No newline at end of file diff --git a/crates/jacquard-api/src/us_polhem/blog.rs b/crates/jacquard-api/src/us_polhem/blog.rs index 11f969569..e65eda6d0 100644 --- a/crates/jacquard-api/src/us_polhem/blog.rs +++ b/crates/jacquard-api/src/us_polhem/blog.rs @@ -9,7 +9,7 @@ pub mod content; pub mod post; pub mod tag; -///width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. +/// width:height represents an aspect ratio. It may be approximate, and may not correspond to absolute dimensions in any given unit. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -18,7 +18,8 @@ pub mod tag; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct AspectRatio<'a> { diff --git a/crates/jacquard-api/src/us_polhem/blog/content.rs b/crates/jacquard-api/src/us_polhem/blog/content.rs index 31d502010..5029d1c09 100644 --- a/crates/jacquard-api/src/us_polhem/blog/content.rs +++ b/crates/jacquard-api/src/us_polhem/blog/content.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record describing a page content block. +/// Record describing a page content block. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,17 +14,21 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Content<'a> { #[serde(borrow)] + #[builder(into)] pub content: jacquard_common::CowStr<'a>, pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub images: std::option::Option>>, + pub images: Option>>, #[serde(borrow)] + #[builder(into)] pub slug: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/us_polhem/blog/post.rs b/crates/jacquard-api/src/us_polhem/blog/post.rs index c0f25fcd6..e74ef93f4 100644 --- a/crates/jacquard-api/src/us_polhem/blog/post.rs +++ b/crates/jacquard-api/src/us_polhem/blog/post.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record describing a blog post. +/// Record describing a blog post. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,33 +14,42 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Post<'a> { #[serde(borrow)] + #[builder(into)] pub content: jacquard_common::CowStr<'a>, pub created_at: jacquard_common::types::string::Datetime, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub excerpt: std::option::Option>, + pub excerpt: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub featured_image: std::option::Option>, + pub featured_image: Option>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub images: std::option::Option>>, + pub images: Option>>, #[serde(borrow)] + #[builder(into)] pub slug: jacquard_common::CowStr<'a>, #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub tags: std::option::Option>>, + pub tags: Option>>, #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, - ///Tells the visibility of the article to AppView. + /// Tells the visibility of the article to AppView. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub visibility: std::option::Option>, + pub visibility: Option>, } /// Typed wrapper for GetRecord response with this collection's record type. diff --git a/crates/jacquard-api/src/us_polhem/blog/tag.rs b/crates/jacquard-api/src/us_polhem/blog/tag.rs index bda14c1f2..a96e75d05 100644 --- a/crates/jacquard-api/src/us_polhem/blog/tag.rs +++ b/crates/jacquard-api/src/us_polhem/blog/tag.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///Record describing a blog tag. +/// Record describing a blog tag. #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,16 +14,20 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Tag<'a> { pub created_at: jacquard_common::types::string::Datetime, #[serde(borrow)] + #[builder(into)] pub description: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, #[serde(borrow)] + #[builder(into)] pub slug: jacquard_common::CowStr<'a>, } diff --git a/crates/jacquard-api/src/win_tomo_x/pushat.rs b/crates/jacquard-api/src/win_tomo_x/pushat.rs index 21be828c3..06fe19a40 100644 --- a/crates/jacquard-api/src/win_tomo_x/pushat.rs +++ b/crates/jacquard-api/src/win_tomo_x/pushat.rs @@ -17,13 +17,15 @@ pub type DeviceList<'a> = Vec>; Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct DeviceListItem<'a> { pub current: bool, pub id: jacquard_common::types::string::Tid, #[serde(borrow)] + #[builder(into)] pub name: jacquard_common::CowStr<'a>, } @@ -35,22 +37,27 @@ pub struct DeviceListItem<'a> { Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct NotifyBody<'a> { - ///Body text of the notification. + /// Body text of the notification. #[serde(borrow)] + #[builder(into)] pub body: jacquard_common::CowStr<'a>, - ///The URI of the icon displayed in the notification. + /// The URI of the icon displayed in the notification. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub icon: std::option::Option>, - ///Experimental — do not use. The URI to open when the notification is clicked. + pub icon: Option>, + /// Experimental — do not use. The URI to open when the notification is clicked. #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub link: std::option::Option>, - ///Title text of the notification. + pub link: Option>, + /// Title text of the notification. #[serde(borrow)] + #[builder(into)] pub title: jacquard_common::CowStr<'a>, } \ No newline at end of file diff --git a/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs b/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs index d1ec1050f..daafa3d13 100644 --- a/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs +++ b/crates/jacquard-api/src/win_tomo_x/pushat/allow.rs @@ -5,7 +5,7 @@ // This file was automatically generated from Lexicon schemas. // Any manual changes will be overwritten on the next regeneration. -///allow service to push. key must be did +/// allow service to push. key must be did #[jacquard_derive::lexicon] #[derive( serde::Serialize, @@ -14,13 +14,15 @@ Clone, PartialEq, Eq, - jacquard_derive::IntoStatic + jacquard_derive::IntoStatic, + bon::Builder )] #[serde(rename_all = "camelCase")] pub struct Allow<'a> { #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[builder(into)] #[serde(borrow)] - pub config: std::option::Option>, + pub config: Option>, pub created_at: jacquard_common::types::string::Datetime, } diff --git a/crates/jacquard-api/src/win_tomo_x/pushat/push_notify.rs b/crates/jacquard-api/src/win_tomo_x/pushat/push_notify.rs index 5e9b3cc87..f29a117e2 100644 --- a/crates/jacquard-api/src/win_tomo_x/pushat/push_notify.rs +++ b/crates/jacquard-api/src/win_tomo_x/pushat/push_notify.rs @@ -21,7 +21,7 @@ pub struct PushNotify<'a> { #[serde(borrow)] pub body: crate::win_tomo_x::pushat::NotifyBody<'a>, - ///The DID of the target user to whom the notification will be sent. + /// The DID of the target user to whom the notification will be sent. #[serde(borrow)] pub target: jacquard_common::types::string::Did<'a>, #[serde(flatten)] diff --git a/crates/jacquard-axum/Cargo.toml b/crates/jacquard-axum/Cargo.toml index 3bc654099..95bc21d3b 100644 --- a/crates/jacquard-axum/Cargo.toml +++ b/crates/jacquard-axum/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "jacquard-axum" edition.workspace = true -version = "0.5.1" +version = "0.5.2" authors.workspace = true repository.workspace = true keywords.workspace = true @@ -24,7 +24,7 @@ axum = "0.8.6" bytes.workspace = true jacquard = { version = "0.5", path = "../jacquard" } jacquard-common = { version = "0.5", path = "../jacquard-common", features = ["reqwest-client"] } -jacquard-derive = { version = "0.5.1", path = "../jacquard-derive" } +jacquard-derive = { version = "0.5.2", path = "../jacquard-derive" } jacquard-identity = { version = "0.5", path = "../jacquard-identity", optional = true } miette.workspace = true multibase = { version = "0.9.1", optional = true } diff --git a/crates/jacquard-common/Cargo.toml b/crates/jacquard-common/Cargo.toml index 54b37fb09..d7a1ee1aa 100644 --- a/crates/jacquard-common/Cargo.toml +++ b/crates/jacquard-common/Cargo.toml @@ -2,7 +2,7 @@ name = "jacquard-common" description = "Core AT Protocol types and utilities for Jacquard" edition.workspace = true -version = "0.5.1" +version = "0.5.2" authors.workspace = true repository.workspace = true keywords.workspace = true diff --git a/crates/jacquard-derive/src/lib.rs b/crates/jacquard-derive/src/lib.rs index 9f7f184de..680143188 100644 --- a/crates/jacquard-derive/src/lib.rs +++ b/crates/jacquard-derive/src/lib.rs @@ -78,11 +78,39 @@ //! ``` use proc_macro::TokenStream; -use quote::{quote, format_ident}; -use syn::{ - Data, DeriveInput, Fields, GenericParam, parse_macro_input, - Attribute, Ident, LitStr, -}; +use quote::{format_ident, quote}; +use syn::{Attribute, Data, DeriveInput, Fields, GenericParam, Ident, LitStr, parse_macro_input}; + +/// Helper function to check if a struct derives bon::Builder or Builder +fn has_derive_builder(attrs: &[Attribute]) -> bool { + attrs.iter().any(|attr| { + if !attr.path().is_ident("derive") { + return false; + } + + // Parse the derive attribute to check its contents + if let Ok(list) = attr.parse_args_with( + syn::punctuated::Punctuated::::parse_terminated, + ) { + list.iter().any(|path| { + // Check for "Builder" or "bon::Builder" + path.segments + .last() + .map(|seg| seg.ident == "Builder") + .unwrap_or(false) + }) + } else { + false + } + }) +} + +/// Check if struct name conflicts with types referenced by bon::Builder macro. +/// bon::Builder generates code that uses unqualified `Option` and `Result`, +/// so structs with these names cause compilation errors. +fn conflicts_with_builder_macro(ident: &Ident) -> bool { + matches!(ident.to_string().as_str(), "Option" | "Result") +} /// Attribute macro that adds an `extra_data` field to structs to capture unknown fields /// during deserialization. @@ -114,6 +142,10 @@ pub fn lexicon(_attr: TokenStream, item: TokenStream) -> TokenStream { .any(|f| f.ident.as_ref().map(|i| i == "extra_data").unwrap_or(false)); if !has_extra_data { + // Check if the struct derives bon::Builder and doesn't conflict with builder macro + let has_bon_builder = has_derive_builder(&input.attrs) + && !conflicts_with_builder_macro(&input.ident); + // Determine the lifetime parameter to use let lifetime = if let Some(lt) = input.generics.lifetimes().next() { quote! { #lt } @@ -123,24 +155,49 @@ pub fn lexicon(_attr: TokenStream, item: TokenStream) -> TokenStream { // Add the extra_data field with serde(borrow) if there's a lifetime let new_field: syn::Field = if input.generics.lifetimes().next().is_some() { - syn::parse_quote! { - #[serde(flatten)] - #[serde(borrow)] - pub extra_data: ::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<#lifetime> - > + if has_bon_builder { + syn::parse_quote! { + #[serde(flatten)] + #[serde(borrow)] + #[builder(default)] + pub extra_data: ::std::collections::BTreeMap< + ::jacquard_common::smol_str::SmolStr, + ::jacquard_common::types::value::Data<#lifetime> + > + } + } else { + syn::parse_quote! { + #[serde(flatten)] + #[serde(borrow)] + pub extra_data: ::std::collections::BTreeMap< + ::jacquard_common::smol_str::SmolStr, + ::jacquard_common::types::value::Data<#lifetime> + > + } } } else { // For types without lifetimes, make it optional to avoid lifetime conflicts - syn::parse_quote! { - #[serde(flatten)] - #[serde(skip_serializing_if = "std::option::Option::is_none")] - #[serde(default)] - pub extra_data: std::option::Option<::std::collections::BTreeMap< - ::jacquard_common::smol_str::SmolStr, - ::jacquard_common::types::value::Data<'static> - >> + if has_bon_builder { + syn::parse_quote! { + #[serde(flatten)] + #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[serde(default)] + #[builder(default)] + pub extra_data: Option<::std::collections::BTreeMap< + ::jacquard_common::smol_str::SmolStr, + ::jacquard_common::types::value::Data<'static> + >> + } + } else { + syn::parse_quote! { + #[serde(flatten)] + #[serde(skip_serializing_if = "std::option::Option::is_none")] + #[serde(default)] + pub extra_data:Option<::std::collections::BTreeMap< + ::jacquard_common::smol_str::SmolStr, + ::jacquard_common::types::value::Data<'static> + >> + } } }; fields.named.push(new_field); @@ -421,7 +478,9 @@ fn xrpc_request_impl(input: &DeriveInput) -> syn::Result syn::Result { method = Some(XrpcMethod::Procedure); Ok(()) } - other => Err(meta.error(format!("unknown method: {}, use Query or Procedure", other))) + other => { + Err(meta + .error(format!("unknown method: {}, use Query or Procedure", other))) + } } } else if meta.path.is_ident("output") { let value = meta.value()?; @@ -539,18 +601,24 @@ fn parse_xrpc_attrs(attrs: &[Attribute]) -> syn::Result { })?; } - let nsid = nsid.ok_or_else(|| syn::Error::new( - proc_macro2::Span::call_site(), - "missing required `nsid` attribute" - ))?; - let method = method.ok_or_else(|| syn::Error::new( - proc_macro2::Span::call_site(), - "missing required `method` attribute" - ))?; - let output = output.ok_or_else(|| syn::Error::new( - proc_macro2::Span::call_site(), - "missing required `output` attribute" - ))?; + let nsid = nsid.ok_or_else(|| { + syn::Error::new( + proc_macro2::Span::call_site(), + "missing required `nsid` attribute", + ) + })?; + let method = method.ok_or_else(|| { + syn::Error::new( + proc_macro2::Span::call_site(), + "missing required `method` attribute", + ) + })?; + let output = output.ok_or_else(|| { + syn::Error::new( + proc_macro2::Span::call_site(), + "missing required `output` attribute", + ) + })?; Ok(XrpcAttrs { nsid, @@ -564,6 +632,8 @@ fn parse_xrpc_attrs(attrs: &[Attribute]) -> syn::Result { fn method_expr(method: &XrpcMethod) -> proc_macro2::TokenStream { match method { XrpcMethod::Query => quote! { ::jacquard_common::xrpc::XrpcMethod::Query }, - XrpcMethod::Procedure => quote! { ::jacquard_common::xrpc::XrpcMethod::Procedure("application/json") }, + XrpcMethod::Procedure => { + quote! { ::jacquard_common::xrpc::XrpcMethod::Procedure("application/json") } + } } } diff --git a/crates/jacquard-identity/Cargo.toml b/crates/jacquard-identity/Cargo.toml index 29ad49686..e1ba879fc 100644 --- a/crates/jacquard-identity/Cargo.toml +++ b/crates/jacquard-identity/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "jacquard-identity" edition.workspace = true -version = "0.5.1" +version = "0.5.2" authors.workspace = true repository.workspace = true keywords.workspace = true diff --git a/crates/jacquard-lexicon/src/codegen/structs.rs b/crates/jacquard-lexicon/src/codegen/structs.rs index 51fbb5c6f..a7ab3908a 100644 --- a/crates/jacquard-lexicon/src/codegen/structs.rs +++ b/crates/jacquard-lexicon/src/codegen/structs.rs @@ -18,6 +18,13 @@ pub(super) enum EnumVariantKind { Struct(Vec), } +/// Check if a type name conflicts with types referenced by bon::Builder macro. +/// bon::Builder generates code that uses unqualified `Option` and `Result`, +/// so structs with these names cause compilation errors. +fn conflicts_with_builder_macro(type_name: &str) -> bool { + matches!(type_name, "Option" | "Result") +} + impl<'c> CodeGenerator<'c> { pub(super) fn generate_record( &self, @@ -30,19 +37,34 @@ impl<'c> CodeGenerator<'c> { let type_name = self.def_to_type_name(nsid, def_name); let ident = syn::Ident::new(&type_name, proc_macro2::Span::call_site()); + // Records always get a lifetime since they have the #[lexicon] attribute + // which adds extra_data: BTreeMap<..., Data<'a>> + // Skip bon::Builder for types that conflict with the macro's unqualified type references + let has_builder = !conflicts_with_builder_macro(&type_name); + // Generate main struct fields - let fields = self.generate_object_fields(nsid, &type_name, obj, false)?; + let fields = self.generate_object_fields(nsid, &type_name, obj, has_builder)?; let doc = self.generate_doc_comment(record.description.as_ref()); - // Records always get a lifetime since they have the #[lexicon] attribute - // which adds extra_data: BTreeMap<..., Data<'a>> - let struct_def = quote! { - #doc - #[jacquard_derive::lexicon] - #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic)] - #[serde(rename_all = "camelCase")] - pub struct #ident<'a> { - #fields + let struct_def = if has_builder { + quote! { + #doc + #[jacquard_derive::lexicon] + #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic, bon::Builder)] + #[serde(rename_all = "camelCase")] + pub struct #ident<'a> { + #fields + } + } + } else { + quote! { + #doc + #[jacquard_derive::lexicon] + #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic)] + #[serde(rename_all = "camelCase")] + pub struct #ident<'a> { + #fields + } } }; @@ -175,18 +197,33 @@ impl<'c> CodeGenerator<'c> { let type_name = self.def_to_type_name(nsid, def_name); let ident = syn::Ident::new(&type_name, proc_macro2::Span::call_site()); - let fields = self.generate_object_fields(nsid, &type_name, obj, false)?; - let doc = self.generate_doc_comment(obj.description.as_ref()); - // Objects always get a lifetime since they have the #[lexicon] attribute // which adds extra_data: BTreeMap<..., Data<'a>> - let struct_def = quote! { - #doc - #[jacquard_derive::lexicon] - #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic)] - #[serde(rename_all = "camelCase")] - pub struct #ident<'a> { - #fields + // Skip bon::Builder for types that conflict with the macro's unqualified type references + let has_builder = !conflicts_with_builder_macro(&type_name); + + let fields = self.generate_object_fields(nsid, &type_name, obj, has_builder)?; + let doc = self.generate_doc_comment(obj.description.as_ref()); + + let struct_def = if has_builder { + quote! { + #doc + #[jacquard_derive::lexicon] + #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic, bon::Builder)] + #[serde(rename_all = "camelCase")] + pub struct #ident<'a> { + #fields + } + } + } else { + quote! { + #doc + #[jacquard_derive::lexicon] + #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq, jacquard_derive::IntoStatic)] + #[serde(rename_all = "camelCase")] + pub struct #ident<'a> { + #fields + } } }; @@ -292,7 +329,12 @@ impl<'c> CodeGenerator<'c> { let rust_type = if is_required { rust_type } else { - quote! { std::option::Option<#rust_type> } + // Use std::option::Option for non-builder structs to avoid name collision + if is_builder { + quote! { Option<#rust_type> } + } else { + quote! { std::option::Option<#rust_type> } + } }; // Extract description from field type @@ -317,13 +359,17 @@ impl<'c> CodeGenerator<'c> { attrs.push(quote! { #[serde(skip_serializing_if = "std::option::Option::is_none")] }); } + if is_builder && !is_required { + attrs.push(quote! { #[builder(into)] }); + } + // Add serde(borrow) to all fields with lifetimes if needs_lifetime { attrs.push(quote! { #[serde(borrow)] }); } // Add builder(into) for CowStr fields to allow String, &str, etc., but only for builder structs - if is_builder && is_cowstr { + if is_builder && is_cowstr && is_required { attrs.push(quote! { #[builder(into)] }); } diff --git a/crates/jacquard-lexicon/src/codegen/utils.rs b/crates/jacquard-lexicon/src/codegen/utils.rs index 7b65bb2b8..03adc6780 100644 --- a/crates/jacquard-lexicon/src/codegen/utils.rs +++ b/crates/jacquard-lexicon/src/codegen/utils.rs @@ -77,7 +77,7 @@ pub(super) fn make_ident(s: &str) -> syn::Ident { /// Generate doc comment from optional description pub(super) fn generate_doc_comment(desc: Option<&CowStr>) -> TokenStream { if let Some(description) = desc { - let desc_str = description.as_ref(); + let desc_str = format!(" {description}"); quote! { #[doc = #desc_str] } diff --git a/crates/jacquard-oauth/Cargo.toml b/crates/jacquard-oauth/Cargo.toml index 998b0eaab..eaf214ecb 100644 --- a/crates/jacquard-oauth/Cargo.toml +++ b/crates/jacquard-oauth/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "jacquard-oauth" -version = "0.5.1" +version = "0.5.2" edition.workspace = true description = "AT Protocol OAuth 2.1 core types and helpers for Jacquard" authors.workspace = true -- 2.51.2