Radish alpha
r
Radicle CI broker
Radicle
Git (anonymous pull)
Log in to clone via SSH
refactor: simplify how common fields Repository is created
Lars Wirzenius committed 1 year ago
commit 5fa43fc325bc72ccae0dfa10671db78bca2f8f15
parent a216b84bd1b10a2148cc3b8c0b765d0a5ff79d9f
1 file changed +11 -9
modified src/msg.rs
@@ -137,13 +137,22 @@ impl<'a> RequestBuilder<'a> {
        let storage = &profile.storage;
        let repo = radicle_surf::Repository::open(paths::repository(storage, rid))?;
        let repo_project = repository.project()?;
-
        let repo_identity = repository.identity()?;
+
        let msg_repository = Repository {
+
            id: *rid,
+
            name: repo_project.name().to_string(),
+
            description: repo_project.description().to_string(),
+
            private: !repository.identity()?.visibility.is_public(),
+
            default_branch: repo_project.default_branch().to_string(),
+
            delegates: repository.delegates()?.iter().copied().collect(),
+
        };
+

        let author = match extract_author(profile, event) {
            Ok(author) => author,
            Err(err) => {
                return Err(err);
            }
        };
+

        let push_info: Option<PushEvent>;
        let patch_info: Option<PatchEvent>;
        let event_type: EventType;
@@ -242,14 +251,7 @@ impl<'a> RequestBuilder<'a> {
            let common = EventCommonFields {
                version: PROTOCOL_VERSION,
                event_type,
-
                repository: Repository {
-
                    id: *rid,
-
                    name: repo_project.name().to_string(),
-
                    description: repo_project.description().to_string(),
-
                    private: !repo_identity.visibility.is_public(),
-
                    default_branch: repo_project.default_branch().to_string(),
-
                    delegates: repository.delegates()?.iter().copied().collect(),
-
                },
+
                repository: msg_repository,
            };

            Ok(Request::Trigger {