Actually implement blocks

This commit is contained in:
Bat
2018-09-08 22:05:48 +01:00
parent 0a70ff2594
commit f66ddf6ef2
3 changed files with 28 additions and 1 deletions
+7
View File
@@ -282,6 +282,13 @@ fn outbox(name: String, conn: DbConn) -> ActivityStream<OrderedCollection> {
fn inbox(name: String, conn: DbConn, data: String) -> String {
let user = User::find_local(&*conn, name).unwrap();
let act: serde_json::Value = serde_json::from_str(&data[..]).unwrap();
let activity = act.clone();
let actor_id = activity["actor"].as_str()
.unwrap_or_else(|| activity["actor"]["id"].as_str().expect("User: No actor ID for incoming activity, blocks by panicking"));
if Instance::is_blocked(&*conn, actor_id.to_string()) {
return String::new();
}
match user.received(&*conn, act) {
Ok(_) => String::new(),
Err(e) => {