Re-enable zaps if disabled

benthecarman · benthecarman · commit d1eb90c303ea · 2024-06-10T14:20:08.000-05:00
diff --git a/mutiny-core/src/hermes.rs b/mutiny-core/src/hermes.rs
@@ -184,10 +184,10 @@ impl<S: MutinyStorage> HermesClient<S> {
 
                         // check that federation is still the same
                         if let Some(f) = first_federation {
-                            // if a registered federation exists and is what we have
+                            // if a registered federation exists and is what we have and zaps are enabled
                             // then there is no reason to update
-                            if o.federation_id.is_some()
-                                && f.federation_id == o.federation_id.unwrap()
+                            if o.federation_id.is_some_and(|id| id == f.federation_id)
+                                && !o.disabled_zaps
                             {
                                 break;
                             }

Original file line number	Diff line number	Diff line change
`@@ -184,10 +184,10 @@ impl<S: MutinyStorage> HermesClient<S> {`
`184`	`184`
`185`	`185`	`// check that federation is still the same`
`186`	`186`	`if let Some(f) = first_federation {`
`187`		`- // if a registered federation exists and is what we have`
	`187`	`+ // if a registered federation exists and is what we have and zaps are enabled`
`188`	`188`	`// then there is no reason to update`
`189`		`- if o.federation_id.is_some()`
`190`		`- && f.federation_id == o.federation_id.unwrap()`
	`189`	`+ if o.federation_id.is_some_and(\|id\| id == f.federation_id)`
	`190`	`+ && !o.disabled_zaps`
`191`	`191`	`{`
`192`	`192`	`break;`
`193`	`193`	`}`