cleaning and renaming

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

2 files changed, 12 insertions, 6 deletions

diff --git a/lib/Model/ActivityPub/Internal/SocialAppNotification.php b/lib/Model/ActivityPub/Internal/SocialAppNotification.php
index 489de9f4..c76965d1 100644
--- a/lib/Model/ActivityPub/Internal/SocialAppNotification.php
+++ b/lib/Model/ActivityPub/Internal/SocialAppNotification.php
@@ -30,11 +30,12 @@ declare(strict_types=1);
 namespace OCA\Social\Model\ActivityPub\Internal;
 
 
+use Exception;
 use JsonSerializable;
-use OCA\Social\Model\ActivityPub\ACore;
+use OCA\Social\Model\ActivityPub\Stream;
 
 
-class SocialAppNotification extends ACore implements JsonSerializable {
+class SocialAppNotification extends Stream implements JsonSerializable {
 
 
 	const TYPE = 'SocialAppNotification';
@@ -54,6 +55,8 @@ class SocialAppNotification extends ACore implements JsonSerializable {
 
 	/**
 	 * @param array $data
+	 *
+	 * @throws Exception
 	 */
 	public function import(array $data) {
 		parent::import($data);
@@ -62,6 +65,8 @@ class SocialAppNotification extends ACore implements JsonSerializable {
 
 	/**
 	 * @param array $data
+	 *
+	 * @throws Exception
 	 */
 	public function importFromDatabase(array $data) {
 		parent::importFromDatabase($data);
diff --git a/lib/Model/ActivityPub/Stream.php b/lib/Model/ActivityPub/Stream.php
index dc0ff248..42ac756b 100644
--- a/lib/Model/ActivityPub/Stream.php
+++ b/lib/Model/ActivityPub/Stream.php
@@ -307,17 +307,18 @@ class Stream extends ACore implements JsonSerializable {
 
 	/**
 	 * @param array $data
-	 *
-	 * @throws Exception
 	 */
 	public function importFromDatabase(array $data) {
 		parent::importFromDatabase($data);
 
-		$dTime = new DateTime($this->get('published_time', $data, 'yesterday'));
+		try {
+			$dTime = new DateTime($this->get('published_time', $data, 'yesterday'));
+			$this->setPublishedTime($dTime->getTimestamp());
+		} catch (Exception $e) {
+		}
 
 		$this->setActivityId($this->validate(self::AS_ID, 'activity_id', $data, ''));
 		$this->setContent($this->validate(self::AS_STRING, 'content', $data, ''));
-		$this->setPublishedTime($dTime->getTimestamp());
 		$this->setObjectId($this->validate(self::AS_ID, 'object_id', $data, ''));
 		$this->setAttributedTo($this->validate(self::AS_ID, 'attributed_to', $data, ''));
 		$this->setInReplyTo($this->validate(self::AS_ID, 'in_reply_to', $data));