verify incoming pushed objects

2 files changed, 4 insertions, 2 deletions

diff --git a/Digitigrade/Model/Note.php b/Digitigrade/Model/Note.php
index 94b8b60..f3c0901 100644
--- a/Digitigrade/Model/Note.php
+++ b/Digitigrade/Model/Note.php
@@ -9,7 +9,6 @@ use Digitigrade\Model\HomeTimelineItem;
 use Digitigrade\Notification\Notifyable;
 use Digitigrade\Timeline\TimelineIncludeable;
 use Digitigrade\Timeline\TimelineItem;
-use JsonMapper;
 
 class Note extends PushableModel implements TimelineIncludeable, Notifyable {
     public const EXTENSION_LINK_PREVIEWS = 'https://pawpub.entities.org.uk/extension/link-previews';
@@ -277,7 +276,7 @@ class Note extends PushableModel implements TimelineIncludeable, Notifyable {
         if (($this->extensions[self::EXTENSION_LINK_PREVIEWS] ?? []) == []) {
             return [];
         }
-        $mapper = new JsonMapper();
+        $mapper = new \JsonMapper();
         $results = [];
         foreach ($this->extensions[self::EXTENSION_LINK_PREVIEWS] as $preview) {
             $results[] = $mapper->map($preview, LinkPreview::class);
diff --git a/Digitigrade/Model/PushableModel.php b/Digitigrade/Model/PushableModel.php
index 4df90c8..271b313 100644
--- a/Digitigrade/Model/PushableModel.php
+++ b/Digitigrade/Model/PushableModel.php
@@ -20,6 +20,9 @@ abstract class PushableModel extends FetchableModel implements \JsonSerializable
         }
 
         $obj = static::createFromJson($data, $autoSave);
+        if (!$obj->validate()) {
+            return null; // and don't save
+        }
         if ($autoSave) {
             $obj->save();
             $obj->finaliseAfterSave();