From fdfb917066e6d6c4693c2da856a5e84f1a3676d1 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Fri, 30 Nov 2018 20:32:22 -0100
Subject: [PATCH] fixing

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 appinfo/database.xml            | 40 +++++----------------------------
 appinfo/info.xml                |  2 +-
 lib/Model/ActivityPub/ACore.php |  4 ++--
 3 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/appinfo/database.xml b/appinfo/database.xml
index c4c3184f..d2783dc0 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -120,34 +120,6 @@
 		</declaration>
 	</table>
 
-	<table>
-		<name>*dbprefix*social_server_activities</name>
-		<declaration>
-
-			<field>
-				<name>id</name>
-				<type>text</type>
-				<length>127</length>
-				<notnull>true</notnull>
-			</field>
-
-			<field>
-				<name>activity</name>
-				<type>text</type>
-				<length>6000</length>
-				<notnull>true</notnull>
-			</field>
-
-			<field>
-				<name>object</name>
-				<type>text</type>
-				<length>127</length>
-				<notnull>true</notnull>
-			</field>
-
-		</declaration>
-	</table>
-
 	<table>
 		<name>*dbprefix*social_server_notes</name>
 		<declaration>
@@ -160,12 +132,12 @@
 				<primary>true</primary>
 			</field>
 
-			<!--<field>-->
-			<!--<name>type</name>-->
-			<!--<type>text</type>-->
-			<!--<length>15</length>-->
-			<!--<notnull>true</notnull>-->
-			<!--</field>-->
+			<field>
+				<name>type</name>
+				<type>text</type>
+				<length>31</length>
+				<notnull>true</notnull>
+			</field>
 
 			<field>
 				<name>to</name>
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 7972342a..452e8938 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -15,7 +15,7 @@
 
 **🕸 Open standards:** We use the established ActivityPub standard!
 	]]></description>
-	<version>0.0.60</version>
+	<version>0.0.62</version>
 	<licence>agpl</licence>
 	<author mail="maxence@artificial-owl.com">Maxence Lange</author>
 	<author mail="jus@bitgrid.net">Julius Härtl</author>
diff --git a/lib/Model/ActivityPub/ACore.php b/lib/Model/ActivityPub/ACore.php
index 80f134a4..1d02fd2f 100644
--- a/lib/Model/ActivityPub/ACore.php
+++ b/lib/Model/ActivityPub/ACore.php
@@ -886,8 +886,8 @@ abstract class ACore implements JsonSerializable {
 		$this->setToArray($this->getArray('to', $data, []));
 		$this->setCcArray($this->getArray('cc', $data, []));
 		$this->setPublished($this->get('published', $data, ''));
-		$this->setActorId($this->get('actor', $data, ''));
-		$this->setObjectId($this->get('object', $data, ''));
+		$this->setActorId($this->get('actor_id', $data, ''));
+		$this->setObjectId($this->get('object_id', $data, ''));
 		$this->setSource($this->get('source', $data, ''));
 		$this->setLocal(($this->getInt('local', $data, 0) === 1));
 	}