Skip to content
Snippets Groups Projects
Commit 3cd3bc54 authored by insert's avatar insert
Browse files

New Feature: Settings sync to server.

parent 5aa9624d
Branches
Tags
No related merge requests found
Pipeline #1149 passed with stage
in 2 minutes and 34 seconds
#!/bin/bash #!/bin/bash
export version=0.4.2-alpha.0 export version=0.4.2-alpha.1
echo "pub const VERSION: &str = \"${version}\";" > src/version.rs echo "pub const VERSION: &str = \"${version}\";" > src/version.rs
use std::collections::HashMap;
use hive_pubsub::PubSub; use hive_pubsub::PubSub;
use rauth::auth::Session; use rauth::auth::Session;
use rocket_contrib::json::JsonValue; use rocket_contrib::json::JsonValue;
...@@ -100,6 +102,10 @@ pub enum ClientboundNotification { ...@@ -100,6 +102,10 @@ pub enum ClientboundNotification {
id: String, id: String,
online: bool, online: bool,
}, },
UserSettingsUpdate {
id: String,
update: HashMap<String, String>
}
} }
impl ClientboundNotification { impl ClientboundNotification {
......
...@@ -8,6 +8,7 @@ mod onboard; ...@@ -8,6 +8,7 @@ mod onboard;
mod push; mod push;
mod root; mod root;
mod users; mod users;
mod sync;
pub fn mount(rocket: Rocket) -> Rocket { pub fn mount(rocket: Rocket) -> Rocket {
rocket rocket
...@@ -17,4 +18,5 @@ pub fn mount(rocket: Rocket) -> Rocket { ...@@ -17,4 +18,5 @@ pub fn mount(rocket: Rocket) -> Rocket {
.mount("/channels", channels::routes()) .mount("/channels", channels::routes())
.mount("/guild", guild::routes()) .mount("/guild", guild::routes())
.mount("/push", push::routes()) .mount("/push", push::routes())
.mount("/sync", sync::routes())
} }
use crate::database::*;
use crate::util::result::{Error, Result};
use mongodb::bson::doc;
use serde::{Deserialize, Serialize};
use mongodb::options::FindOneOptions;
use rocket_contrib::json::{Json, JsonValue};
#[derive(Serialize, Deserialize)]
pub struct Options {
keys: Vec<String>
}
#[post("/settings/fetch", data = "<options>")]
pub async fn req(user: User, options: Json<Options>) -> Result<JsonValue> {
let options = options.into_inner();
let mut projection = doc! {
"_id": 0,
};
for key in options.keys {
projection.insert(key, 1);
}
if let Some(doc) = get_collection("user_settings")
.find_one(
doc! {
"_id": user.id
},
FindOneOptions::builder()
.projection(projection)
.build()
)
.await
.map_err(|_| Error::DatabaseError { operation: "find_one", with: "user_settings" })? {
Ok(json!(doc))
} else {
Ok(json!({ }))
}
}
use rocket::Route;
mod get_settings;
mod set_settings;
pub fn routes() -> Vec<Route> {
routes![
get_settings::req,
set_settings::req
]
}
use crate::database::*;
use crate::notifications::events::ClientboundNotification;
use crate::util::result::{Error, Result};
use chrono::prelude::*;
use std::collections::HashMap;
use rocket_contrib::json::Json;
use mongodb::bson::{doc, to_bson};
use mongodb::options::UpdateOptions;
type Data = HashMap<String, String>;
#[post("/settings/set", data = "<data>")]
pub async fn req(user: User, data: Json<Data>) -> Result<()> {
let data = data.into_inner();
let mut set = doc! {};
for (key, data) in &data {
set.insert(
key.clone(),
vec! [
to_bson(&Utc::now().timestamp_millis()).unwrap(),
to_bson(&data.clone()).unwrap()
]
);
}
if set.len() > 0 {
get_collection("user_settings")
.update_one(
doc! {
"_id": &user.id
},
doc! {
"$set": set
},
UpdateOptions::builder()
.upsert(true)
.build()
)
.await
.map_err(|_| Error::DatabaseError { operation: "update_one", with: "user_settings" })?;
}
ClientboundNotification::UserSettingsUpdate {
id: user.id.clone(),
update: data
}
.publish(user.id);
Ok(())
}
pub const VERSION: &str = "0.4.2-alpha.0"; pub const VERSION: &str = "0.4.2-alpha.1";
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment