From 488bd929c5911718f19f9c30798f3ad1d909e7db Mon Sep 17 00:00:00 2001
From: Bat <baptiste@gelez.xyz>
Date: Wed, 18 Jul 2018 16:02:21 +0200
Subject: [PATCH] Try to fix the Hubzilla issue (#107) again

---
 src/inbox.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/inbox.rs b/src/inbox.rs
index 5081357f..3c020fc3 100644
--- a/src/inbox.rs
+++ b/src/inbox.rs
@@ -16,7 +16,7 @@ use plume_models::{
 
 pub trait Inbox {
     fn received(&self, conn: &PgConnection, act: serde_json::Value) -> Result<(), Error> {
-        let actor_id = Id::new(act["actor"].as_str().unwrap());
+        let actor_id = Id::new(act["actor"].as_str().unwrap_or(act["actor"]["id"].as_str().expect("No actor ID for incoming activity")));
         match act["type"].as_str() {
             Some(t) => {
                 match t {