magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

abstract account-data deserializations for serde_json::from_elim

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-10-02 07:57:18 +00:00 • committed by strawberry
parent 48a767d52c
commit da34b43302
12 changed files with 133 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/service/globals/migrations.rs
View file

@ -215,13 +215,12 @@ async fn db_lt_12(services: &Services) -> Result<()> {
},
};
let raw_rules_list = services
let mut account_data: PushRulesEvent = services
.account_data
.get(None, &user, GlobalAccountDataEventType::PushRules.to_string().into())
.get_global(&user, GlobalAccountDataEventType::PushRules)
.await
.expect("Username is invalid");
let mut account_data = serde_json::from_str::<PushRulesEvent>(raw_rules_list.get()).unwrap();
let rules_list = &mut account_data.content.global;
//content rule
@ -294,14 +293,12 @@ async fn db_lt_13(services: &Services) -> Result<()> {
},
};
let raw_rules_list = services
let mut account_data: PushRulesEvent = services
.account_data
.get(None, &user, GlobalAccountDataEventType::PushRules.to_string().into())
.get_global(&user, GlobalAccountDataEventType::PushRules)
.await
.expect("Username is invalid");
let mut account_data = serde_json::from_str::<PushRulesEvent>(raw_rules_list.get()).unwrap();
let user_default_rules = Ruleset::server_default(&user);
account_data
.content