Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regenerating atrium-api and Dirty Fixing label/defs #138

Merged
merged 3 commits into from
Mar 14, 2024

Conversation

Sanhajio
Copy link
Contributor

I don't think I have implemented the right solution.

@Sanhajio
Copy link
Contributor Author

The main issue here is I manually added a change to a generated file I guess.

@sugyan sugyan self-requested a review March 14, 2024 09:02
Copy link
Owner

@sugyan sugyan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Sanhajio Thanks for the fix suggestions! I have submitted the codegen fix to your repository, can you merge it?
Sanhajio#1

Fix codegen, and regenerating atrium-api
@Sanhajio
Copy link
Contributor Author

Done, do you need to remove the manually added commit, or should we regen and it would be ok ?

@Sanhajio
Copy link
Contributor Author

It's weird, I get this change when I regen:

  diff --git a/atrium-api/src/com/atproto/server/describe_server.rs b/atrium-api/src/com/atproto/server/describe_server.rs
  index 392ed1f..5472bf4 100644
  --- a/atrium-api/src/com/atproto/server/describe_server.rs
  +++ b/atrium-api/src/com/atproto/server/describe_server.rs
  @@ -5,9 +5,6 @@
   pub struct Output {
       ///List of domain suffixes that can be used in account handles.
       pub available_user_domains: Vec<String>,
  -    ///Contact information
  -    #[serde(skip_serializing_if = "Option::is_none")]
  -    pub contact: Option<Contact>,
       pub did: crate::types::string::Did,
       ///If true, an invite code must be supplied to create an account on this instance.
       #[serde(skip_serializing_if = "Option::is_none")]
  @@ -24,12 +21,6 @@ pub struct Output {
   pub enum Error {}
   #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq)]
   #[serde(rename_all = "camelCase")]
  -pub struct Contact {
  -    #[serde(skip_serializing_if = "Option::is_none")]
  -    pub email: Option<String>,
  -}
  -#[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Eq)]
  -#[serde(rename_all = "camelCase")]
   pub struct Links {
       #[serde(skip_serializing_if = "Option::is_none")]
       pub privacy_policy: Option<String>,

@sugyan
Copy link
Owner

sugyan commented Mar 14, 2024

Thanks for merging!
The change in describe_server.rs is due to the most recent lexicon change, and the current state of your branch should be correct.

@sugyan sugyan self-requested a review March 14, 2024 15:11
@sugyan sugyan merged commit 4bae693 into sugyan:main Mar 14, 2024
7 checks passed
@github-actions github-actions bot mentioned this pull request Mar 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants