Controllers/api/v1/blog.php

@@ -362,7 +362,7 @@ class blog implements Interfaces\Api
         }
 
         if ($saved) {
-            if ($blog->isPublished() && $blog->getAccessId() == Access::PUBLIC) {
+            if ($blog->isPublished() && in_array($blog->getAccessId(), [Access::PUBLIC, Access::LOGGED_IN], false)) {
                 if (!$editing || ($editing && !$alreadyPublished) || ($editing && $oldAccessId == Access::UNLISTED)) {
                     (new CreateActivity())->save($blog);
                 }

Controllers/api/v1/newsfeed.php

@@ -514,9 +514,6 @@ class newsfeed implements Interfaces\Api
                     $activity->indexes = ["activity:$activity->owner_guid:edits"]; //don't re-index on edit
                     (new Core\Translation\Storage())->purge($activity->guid);
 
-                    $attachmentPaywallDelegate = new Core\Feeds\Activity\Delegates\AttachmentPaywallDelegate();
-                    $attachmentPaywallDelegate->onUpdate($activity);
-
                     if (isset($_POST['time_created']) && ($_POST['time_created'] != $activity->getTimeCreated())) {
                         try {
                             $timeCreatedDelegate = new Core\Feeds\Activity\Delegates\TimeCreatedDelegate();
@@ -532,6 +529,8 @@ class newsfeed implements Interfaces\Api
                     $save->setEntity($activity)
                         ->save();
 
+                    (new Core\Entities\PropagateProperties())->from($activity);
+
                     $activity->setExportContext(true);
                     return Factory::response(['guid' => $activity->guid, 'activity' => $activity->export(), 'edited' => true]);
                 }

Core/Blogs/Delegates/PropagateProperties.php

+<?php
+
+namespace Minds\Core\Blogs\Delegates;
+
+use Minds\Core\Entities\Propagator\Properties;
+use Minds\Entities\Activity;
+
+/**
+ * Class PropagateProperties
+ * @package Minds\Core\Blogs\Delegates
+ */
+class PropagateProperties extends Properties
+{
+    protected $actsOnSubtype = ['blog'];
+
+    /**
+     * Propagate Entity properties to activity
+     * @param $from
+     * @param Activity $to
+     * @return Activity
+     */
+    public function toActivity($from, Activity $to): Activity
+    {
+        if ($this->valueHasChanged($from->getTitle(), $to->get('title'))) {
+            $to->set('title', $from->getTitle());
+        }
+
+        $blurb = strip_tags($from->getBody());
+        if ($this->valueHasChanged($blurb, $to->get('blurb'))) {
+            $to->set('blurb', $blurb);
+        }
+
+        if ($this->valueHasChanged($from->getUrl(), $to->getURL())) {
+            $to->setURL($from->getUrl());
+        }
+
+        if ($this->valueHasChanged($from->getIconUrl(), $to->get('thumbnail_src'))) {
+            $to->set('thumbnail_src', $from->getIconUrl());
+        }
+
+        return $to;
+    }
+
+    /**
+     * Propagate activity properties to entity
+     * @param Activity $from
+     * @param $to
+     * @return mixed
+     */
+    public function fromActivity(Activity $from, $to)
+    {
+        return $to;
+    }
+}

Core/Blogs/Manager.php

@@ -9,6 +9,7 @@
 namespace Minds\Core\Blogs;
 
 use Minds\Core\Di\Di;
+use Minds\Core\Entities\PropagateProperties;
 use Minds\Core\Security\Spam;
 
 class Manager
@@ -31,6 +32,9 @@ class Manager
     /** @var Delegates\Search */
     protected $search;
 
+    /** @var PropagateProperties */
+    protected $propagateProperties;
+
     /**
      * Manager constructor.
      * @param null $repository
@@ -39,6 +43,7 @@ class Manager
      * @param null $feeds
      * @param null $spam
      * @param null $search
+     * @param PropagateProperties $propagateProperties
      * @throws \Exception
      */
     public function __construct(
@@ -47,7 +52,8 @@ class Manager
         $slug = null,
         $feeds = null,
         $spam = null,
-        $search = null
+        $search = null,
+        PropagateProperties $propagateProperties = null
     ) {
         $this->repository = $repository ?: new Repository();
         $this->paywallReview = $paywallReview ?: new Delegates\PaywallReview();
@@ -55,6 +61,7 @@ class Manager
         $this->feeds = $feeds ?: new Delegates\Feeds();
         $this->spam = $spam ?: Di::_()->get('Security\Spam');
         $this->search = $search ?: new Delegates\Search();
+        $this->propagateProperties = $propagateProperties ?? Di::_()->get('PropagateProperties');
     }
 
     /**
@@ -170,6 +177,7 @@ class Manager
             }
 
             $this->paywallReview->queue($blog);
+            $this->propagateProperties->from($blog);
         }
 
         return $saved;

Core/Entities/Actions/Save.php

@@ -14,8 +14,6 @@ use Minds\Helpers\MagicAttributes;
 
 /**
  * Save Action
- * @method Save setEntity($entity)
- * @method bool save(...$args)
  */
 class Save
 {

Core/Entities/Delegates/PropagateProperties.php

+<?php
+
+namespace Minds\Core\Entities\Delegates;
+
+use Minds\Core\Entities\Propagator\Properties;
+use Minds\Entities\Activity;
+
+/**
+ * Class PropagateProperties
+ * @package Minds\Core\Entities\Delegates
+ */
+class PropagateProperties extends Properties
+{
+    /**
+     * Propagate Entity properties to activity
+     * @param $from
+     * @param Activity $to
+     * @return Activity
+     */
+    public function toActivity($from, Activity $to): Activity
+    {
+        if ($this->valueHasChanged($from->getNsfw(), $to->getNsfw())) {
+            $to->setNsfw($from->getNsfw());
+        }
+
+        if ($this->valueHasChanged($from->getNsfwLock(), $to->getNsfwLock())) {
+            $to->setNsfwLock($from->getNsfwLock());
+        }
+
+        return $to;
+    }
+
+    /**
+     * Propagate activity properties to entity
+     * @param Activity $from
+     * @param $to
+     * @return mixed
+     */
+    public function fromActivity(Activity $from, $to)
+    {
+        if ($this->valueHasChanged($from->getNsfw(), $to->getNsfw())) {
+            $to->setNsfw($from->getNsfw());
+        }
+
+        if ($this->valueHasChanged($from->getNsfwLock(), $to->getNsfwLock())) {
+            $to->setNsfwLock($from->getNsfwLock());
+        }
+
+        return $to;
+    }
+}

Core/Entities/PropagateProperties.php

+<?php
+
+namespace Minds\Core\Entities;
+
+use Minds\Core\Data\Call;
+use Minds\Core\Di\Di;
+use Minds\Core\Entities\Actions\Save;
+use Minds\Core\Entities\Propagator\Properties;
+use Minds\Core\EntitiesBuilder;
+use Minds\Entities\Activity;
+use Minds\Core;
+
+/**
+ * Class PropagateProperties
+ * @package Minds\Core\Entities
+ */
+class PropagateProperties
+{
+    /**  @var Properties[] */
+    protected $propagators;
+    /** @var Call */
+    private $db;
+    /** @var Save */
+    private $save;
+    /** @var EntitiesBuilder */
+    private $entitiesBuilder;
+    /** @var bool */
+    private $changed = false;
+
+    /**
+     * PropagateProperties constructor.
+     * @param Call|null $db
+     * @param Save|null $save
+     * @param EntitiesBuilder|null $entitiesBuilder
+     */
+    public function __construct(Call $db = null, Save $save = null, EntitiesBuilder $entitiesBuilder = null)
+    {
+        $this->db = $db ?? new Call('entities_by_time');
+        $this->save = $save ?? new Save();
+        $this->entitiesBuilder = $entitiesBuilder ?? Di::_()->get('EntitiesBuilder');
+        $this->registerPropagators();
+    }
+
+    /**
+     * Register PropagateProperties classes
+     * @throws \Exception
+     */
+    protected function registerPropagators(): void
+    {
+        $this->addPropagator(Core\Blogs\Delegates\PropagateProperties::class);
+        $this->addPropagator(Core\Feeds\Delegates\PropagateProperties::class);
+        $this->addPropagator(Core\Media\Delegates\PropagateProperties::class);
+        $this->addPropagator(Core\Entities\Delegates\PropagateProperties::class);
+        $this->addPropagator(Core\Permissions\Delegates\PropagateProperties::class);
+    }
+
+    public function clearPropogators(): void
+    {
+        $this->propagators = [];
+    }
+
+    /**
+     * Add a propagator to be called in the chain
+     * @param string $class
+     * @throws \Exception
+     */
+    protected function addPropagator(string $class): void
+    {
+        $obj = new $class();
+        if (!$obj instanceof Properties) {
+            throw new \Exception('Propagator class is not a Property Propagator');
+        }
+
+        $this->propagators[] = $obj;
+    }
+
+    /**
+     * Propagate the properties from the passed entity
+     * @param $entity
+     */
+    public function from($entity): void
+    {
+        if ($entity instanceof Activity) {
+            $this->fromActivity($entity);
+        } else {
+            $this->toActivities($entity);
+        }
+    }
+
+    /**
+     * Propagate properties from an Activity to to it's attachment
+     * @param Activity $activity
+     * @throws \Minds\Exceptions\StopEventException
+     * @throws \Exception
+     */
+    protected function fromActivity(Activity $activity): void
+    {
+        $this->changed = false;
+        $attachment = $this->entitiesBuilder->single($activity->get('entity_guid'));
+        if ($attachment === false) {
+            return;
+        }
+
+        foreach ($this->propagators as $propagator) {
+            if ($propagator->willActOnEntity($attachment)) {
+                $attachment = $propagator->fromActivity($activity, $attachment);
+                $this->changed |= $propagator->changed();
+                if (!is_object($attachment)) {
+                    throw new \Exception(get_class($propagator) . ' fromActivity method did not return a modified object');
+                }
+            }
+        }
+
+        if ($this->changed) {
+            $this->save->setEntity($attachment)->save();
+        }
+    }
+
+    /**
+     * Propagate properties from an Entity to it's activities
+     * @param $entity
+     * @throws \Minds\Exceptions\StopEventException
+     */
+    protected function toActivities($entity): void
+    {
+        $activities = $this->getActivitiesForEntity($entity->getGuid());
+        foreach ($activities as $activity) {
+            $this->propagateToActivity($entity, $activity);
+            if ($this->changed) {
+                $this->save->setEntity($activity)->save();
+            }
+        }
+    }
+
+    /**
+     * Get activities for an entity
+     * @param string $entityGuid
+     * @return Activity[]
+     */
+    private function getActivitiesForEntity(string $entityGuid): array
+    {
+        $activities = [];
+
+        foreach ($this->db->getRow("activity:entitylink:{$entityGuid}") as $activityGuid => $ts) {
+            $activities[] = $this->entitiesBuilder->single($activityGuid);
+        }
+
+        return $activities;
+    }
+
+    /**
+     * Propagate properties from and entity to an activity
+     * @param $entity
+     * @param Activity $activity
+     */
+    public function propagateToActivity($entity, Activity &$activity): void
+    {
+        $this->changed = false;
+        foreach ($this->propagators as $propagator) {
+            if ($propagator->willActOnEntity($entity)) {
+                $activity = $propagator->toActivity($entity, $activity);
+                $this->changed |= $propagator->changed();
+            }
+        }
+    }
+}

Core/Entities/Propagator/Properties.php

+<?php
+
+namespace Minds\Core\Entities\Propagator;
+
+use Minds\Entities\Activity;
+
+/**
+ * Properties class that all PropagateProperties delegates should inherit
+ * @package Minds\Core\Entities\Propagator
+ */
+abstract class Properties
+{
+    /**
+     * @var array
+     */
+    protected $actsOnType = [];
+    /**
+     * @var array
+     */
+    protected $actsOnSubtype = [];
+    /**
+     * @var bool
+     */
+    protected $changed = false;
+
+    /**
+     * @return array
+     */
+    public function actsOnType(): array
+    {
+        return $this->actsOnType;
+    }
+
+    /**
+     * @return array
+     */
+    public function actsOnSubType(): array
+    {
+        return $this->actsOnSubtype;
+    }
+
+    /**
+     * @param $entity
+     * @return bool
+     * @throws \Exception
+     */
+    public function willActOnEntity($entity): bool
+    {
+        if (!is_array($this->actsOnType)) {
+            throw new \Exception('actsOnType must be an array');
+        }
+
+        if (!is_array($this->actsOnSubtype)) {
+            throw new \Exception('actsOnSubType must be an array');
+        }
+
+        if ($this->actsOnType === [] || in_array($entity->getType(), $this->actsOnType, true)) {
+            return $this->actsOnSubtype === [] || in_array($entity->getSubtype(), $this->actsOnSubtype, true);
+        }
+
+        return false;
+    }
+
+    /**
+     * @param $from
+     * @param $to
+     * @return bool
+     */
+    protected function valueHasChanged($from, $to): bool
+    {
+        $changed = $from !== $to;
+        $this->changed |= $changed;
+        return $changed;
+    }
+
+    /**
+     * @return bool
+     */
+    public function changed(): bool
+    {
+        return $this->changed;
+    }
+
+    /**
+     * @param $from
+     * @param Activity $to
+     * @return Activity
+     */
+    abstract public function toActivity($from, Activity $to): Activity;
+
+    /**
+     * @param Activity $from
+     * @param $to
+     * @return mixed
+     */
+    abstract public function fromActivity(Activity $from, $to);
+}

Core/Feeds/Activity/Delegates/ActivityDelegateInterface.php

-<?php
-/**
- * ActivityDelegateInterface
- * @author edgebal
- */
-
-namespace Minds\Core\Feeds\Activity\Delegates;
-
-use Minds\Entities\Activity;
-
-interface ActivityDelegateInterface
-{
-    public function onAdd();
-
-    public function onUpdate(Activity $activity);
-}

Core/Feeds/Activity/Delegates/AttachmentPaywallDelegate.php

-<?php
-/**
- * AttachmentPaywallDelegate
- * @author edgebal
- */
-
-namespace Minds\Core\Feeds\Activity\Delegates;
-
-use Minds\Core\Di\Di;
-use Minds\Core\Entities\Actions\Save;
-use Minds\Core\EntitiesBuilder;
-use Minds\Entities\Activity;
-
-class AttachmentPaywallDelegate implements ActivityDelegateInterface
-{
-    /** @var EntitiesBuilder */
-    protected $entitiesBuilder;
-
-    /** @var Save */
-    protected $save;
-
-    /**
-     * AttachmentPaywallDelegate constructor.
-     * @param EntitiesBuilder $entitiesBuilder
-     * @param Save $save
-     */
-    public function __construct(
-        $entitiesBuilder = null,
-        $save = null
-    ) {
-        $this->entitiesBuilder = $entitiesBuilder ?: Di::_()->get('EntitiesBuilder');
-        $this->save = $save ?: new Save();
-    }
-
-    /**
-     * @throws \NotImplementedException
-     */
-    public function onAdd()
-    {
-        throw new \NotImplementedException();
-    }
-
-    /**
-     * @param Activity $activity
-     * @return bool
-     */
-    public function onUpdate(Activity $activity)
-    {
-        if ($activity->entity_guid) {
-            $attachment = $this->entitiesBuilder->single($activity->entity_guid);
-
-            if ($attachment->owner_guid == $activity->owner_guid) {
-                $attachment->access_id = $activity->isPaywall() ? 0 : 2;
-           
-                if ($attachment->getSubtype() === 'blog') {
-                    $attachment->setHidden($activity->isPaywall());
-                } else {
-                    $attachment->hidden = $activity->isPaywall();
-                }
-
-                if (method_exists($attachment, 'setFlag')) {
-                    $attachment->setFlag('paywall', (bool) $activity->isPaywall());
-                }
-
-                if (method_exists($attachment, 'setWireThreshold')) {
-                    $attachment->setWireThreshold($activity->getWireThreshold() ?: false);
-                }
-
-                $this->save
-                    ->setEntity($attachment)
-                    ->save();
-            }
-        }
-
-        return true;
-    }
-}

Core/Feeds/Delegates/PropagateProperties.php

+<?php
+
+namespace Minds\Core\Feeds\Delegates;
+
+use Minds\Core\Blogs\Blog;
+use Minds\Core\Entities\Propagator\Properties;
+use Minds\Entities\Activity;
+use Minds\Entities\Entity;
+
+/**
+ * Class PropagateProperties
+ * @package Minds\Core\Feeds\Delegates
+ */
+class PropagateProperties extends Properties
+{
+    /**
+     * Propagate Entity properties to activity
+     * @param $from
+     * @param Activity $to
+     * @return Activity
+     */
+    public function toActivity($from, Activity $to): Activity
+    {
+        if ($this->valueHasChanged((int)$from->getModeratorGuid(), (int)$to->getModeratorGuid())) {
+            $to->setModeratorGuid((int)$from->getModeratorGuid());
+        }
+
+        if ($this->valueHasChanged((int)$from->getTimeModerated(), (int)$to->getTimeModerated())) {
+            $to->setTimeModerated((int)$from->getTimeModerated());
+        }
+
+        return $to;
+    }
+
+    /**
+     * Propagate activity properties to entity
+     * @param Activity $from
+     * @param Entity|Blog $to
+     * @return mixed
+     */
+    public function fromActivity(Activity $from, $to)
+    {
+        if ($this->valueHasChanged((int)$from->getModeratorGuid(), (int)$to->getModeratorGuid())) {
+            $to->setModeratorGuid((int)$from->getModeratorGuid());
+        }
+
+        if ($this->valueHasChanged((int)$from->getTimeModerated(), (int)$to->getTimeModerated())) {
+            $to->setTimeModerated((int)$from->getTimeModerated());
+        }
+
+        $to = $this->propagateAttachmentPaywallProperties($from, $to);
+        return $to;
+    }
+
+    /**
+     * @param Activity $from
+     * @param Entity $to
+     * @return mixed
+     */
+    private function propagateAttachmentPaywallProperties(Activity $from, $to)
+    {
+        if ($to->owner_guid == $from->owner_guid) {
+            $newAccessId = $from->isPaywall() ? 0 : 2;
+            if ($this->valueHasChanged($to->access_id, $from->access_id)) {
+                $to->access_id = $newAccessId;
+            }
+
+            $newHidden = $from->isPayWall();
+            if ($to->getSubtype() === 'blog') {
+                /** @var $to Blog */
+                if ($this->valueHasChanged($to->getHidden(), $newHidden)) {
+                    $to->setHidden($newHidden);
+                }
+            } else {
+                if ($this->valueHasChanged($to->hidden, $newHidden)) {
+                    $to->hidden = $newHidden;
+                }
+            }
+
+            if (method_exists($to, 'setFlag')) {
+                if ($this->valueHasChanged($to->getFlag('paywall'), (bool)$from->isPaywall())) {
+                    $to->setFlag('paywall', (bool)$from->isPaywall());
+                }
+            }
+
+            if (method_exists($to, 'setWireThreshold')) {
+                if ($this->valueHasChanged($to->getWireThreshold(), $from->getWireThreshold())) {
+                    $to->setWireThreshold($from->getWireThreshold() ?: false);
+                }
+            }
+        }
+
+        return $to;
+    }
+}

Core/Feeds/Firehose/Manager.php

@@ -3,12 +3,10 @@
 namespace Minds\Core\Feeds\Firehose;
 
 use Minds\Entities\User;
-use Minds\Entities\Entity;
-use Minds\Core\EntitiesBuilder;
-use Minds\Core\Data\Call;
 use Minds\Core\Entities\Actions\Save;
 use Minds\Core\Di\Di;
 use Minds\Core\Feeds\Top\Manager as TopFeedsManager;
+use Minds\Core\Entities\PropagateProperties;
 
 class Manager
 {
@@ -16,25 +14,21 @@ class Manager
     protected $topFeedsManager;
     /** @var ModerationCache */
     protected $moderationCache;
-    /** @var EntitiesBuilder $entitiesBuilder */
-    protected $entitiesBuilder;
-    /** @var Call */
-    protected $db;
     /** @var Save */
     protected $save;
+    /** @var PropagateProperties */
+    protected $propagateProperties;
 
     public function __construct(
         TopFeedsManager $topFeedsManager = null,
         ModerationCache $moderationCache = null,
-        EntitiesBuilder $entitiesBuilder = null,
-        Call $db = null,
-        Save $save = null
+        Save $save = null,
+        PropagateProperties $propagateProperties = null
     ) {
         $this->topFeedsManager = $topFeedsManager ?: Di::_()->get('Feeds\Top\Manager');
         $this->moderationCache = $moderationCache ?: new ModerationCache();
-        $this->entitiesBuilder = $entitiesBuilder ?: Di::_()->get('EntitiesBuilder');
-        $this->db = $db ?: new Call('entities_by_time');
-        $this->save = $save ?: new Save(); //Mockable, else instantiate a new one on save.
+        $this->save = $save ?: new Save();
+        $this->propagateProperties = $propagateProperties ?? Di::_()->get('PropagateProperties');
     }
 
     /**
@@ -79,7 +73,7 @@ class Manager
      * Marks an entity as moderated.
      *
      * @param $entity the entity to mark as moderated, typeless because images do not inherit entity
-     * @param User $user the moderator
+     * @param User $moderator the moderator
      * @param int  $time
      */
     public function save(
@@ -91,22 +85,8 @@ class Manager
             $time = time();
         }
 
-        //Save the entity
         $this->saveEntity($entity, $moderator, $time);
-
-        if (method_exists($entity, 'getType')
-            && $entity->getType() == 'activity'
-            && $entity->get('entity_guid')
-        ) {
-            $attachment = $this->entitiesBuilder->single($entity->get('entity_guid'));
-            $this->saveEntity($attachment, $moderator, $time);
-        }
-
-        //Moderate parents
-        foreach ($this->db->getRow('activity:entitylink:'.$entity->getGUID()) as $parentGuid => $ts) {
-            $activity = $this->entitiesBuilder->single($parentGuid);
-            $this->saveEntity($activity, $moderator, $time);
-        }
+        $this->propagateProperties->from($entity);
     }
 
     private function saveEntity(

Core/Media/Delegates/PropagateProperties.php

+<?php
+
+namespace Minds\Core\Media\Delegates;
+
+use Minds\Core\Entities\Propagator\Properties;
+use Minds\Entities\Activity;
+
+/**
+ * Class PropagateProperties
+ * @package Minds\Core\Media\Delegates
+ */
+class PropagateProperties extends Properties
+{
+    protected $actsOnType = ['object'];
+    protected $actsOnSubtype = ['image', 'video'];
+
+    /**
+     * Propagate Entity properties to activity
+     * @param $from
+     * @param Activity $to
+     * @return Activity
+     */
+    public function toActivity($from, Activity $to): Activity
+    {
+        if ($this->valueHasChanged($from->title, $to->getMessage())) {
+            $to->setMessage($from->title);
+        }
+
+        $fromData = $from->getActivityParameters();
+        $toData = $to->getCustom();
+        if ((!isset($toData[1])) || (isset($toData[1]) && $this->valueHasChanged($fromData[1], $toData[1]))) {
+            $to->setCustom($fromData[0], $fromData[1]);
+        }
+
+        return $to;
+    }
+
+    /**
+     * Propagate activity properties to entity
+     * @param Activity $from
+     * @param $to
+     * @return mixed
+     */
+    public function fromActivity(Activity $from, $to)
+    {
+        if ($this->valueHasChanged($from->getMessage(), $to->title)) {
+            $to->title = $from->getMessage();
+        }
+
+        return $to;
+    }
+}

Core/Media/Delegates/UpdateActivities.php

-<?php
-/**
- * @author: eiennohi.
- */
-
-namespace Minds\Core\Media\Delegates;
-
-use Minds\Core\Data\Call;
-use Minds\Entities\Image;
-use Minds\Entities\Video;
-
-class UpdateActivities
-{
-    /** @var Call */
-    private $indexDb;
-    private $entityDb;
-
-
-    public function __construct($indexDb = null, $entityDb = null)
-    {
-        $this->indexDb = $indexDb ?: new Call('entities_by_time');
-        $this->entityDb = $entityDb ?: new Call('entities');
-    }
-
-    /**
-     * @param Image|Video $entity
-     */
-    public function updateActivities($entity)
-    {
-        foreach ($this->indexDb->getRow("activity:entitylink:{$entity->guid}") as $guid => $ts) {
-            $this->entityDb->insert($guid, ['message' => $entity->title]);
-
-            $parameters = $entity->getActivityParameters();
-            $this->entityDb->insert($guid, ['custom_type' => $parameters[0]]);
-            $this->entityDb->insert($guid, ['custom_data' => json_encode($parameters[1])]);
-        }
-    }
-}

Core/Media/Feeds.php

@@ -5,17 +5,15 @@ namespace Minds\Core\Media;
 use Minds\Core;
 use Minds\Entities;
 use Minds\Helpers;
-use Minds\Core\Media;
 
 class Feeds
 {
-    private $updateActivitiesDelegate;
-
     protected $entity;
+    protected $propagateProperties;
 
-    public function __construct($updateActivitiesDelegate = null)
+    public function __construct(Core\Entities\PropagateProperties $propagateProperties = null)
     {
-        $this->updateActivitiesDelegate = $updateActivitiesDelegate ?: new Delegates\UpdateActivities();
+        $this->propagateProperties = $propagateProperties ?? Core\Di\Di::_()->get('PropagateProperties');
     }
 
     public function setEntity($entity)
@@ -25,7 +23,7 @@ class Feeds
         return $this;
     }
 
-    public function createActivity()
+    public function createActivity(): Entities\Activity
     {
         if (!$this->entity) {
             throw new \Exception('Entity not set');
@@ -54,7 +52,7 @@ class Feeds
             throw new \Exception('Entity not set');
         }
 
-        $this->updateActivitiesDelegate->updateActivities($this->entity);
+        $this->propagateProperties->from($this->entity);
     }
 
     public function dispatch(array $targets = [])

Core/Permissions/Delegates/PropagateProperties.php

+<?php
+
+namespace Minds\Core\Permissions\Delegates;
+
+use Minds\Core\Entities\Propagator\Properties;
+use Minds\Entities\Activity;
+
+/**
+ * Class PropagateProperties
+ * @package Minds\Core\Permissions\Delegates
+ */
+class PropagateProperties extends Properties
+{
+    /**
+     * Propagate Entity properties to activity
+     * @param $from
+     * @param Activity $to
+     * @return Activity
+     */
+    public function toActivity($from, Activity $to): Activity
+    {
+        if ($this->valueHasChanged($from->getAllowComments(), $to->getAllowComments())) {
+            $to->setAllowComments($from->getAllowComments());
+        }
+
+        return $to;
+    }
+
+    /**
+     * Propagate activity properties to entity
+     * @param Activity $from
+     * @param $to
+     * @return mixed
+     */
+    public function fromActivity(Activity $from, $to)
+    {
+        if ($this->valueHasChanged($from->getAllowComments(), $to->getAllowComments())) {
+            $to->setAllowComments($from->getAllowComments());
+        }
+
+        return $to;
+    }
+}

Entities/Activity.php

@@ -343,6 +343,15 @@ class Activity extends Entity
         return $this;
     }
 
+    /**
+     * Set the message
+     * @return string
+     */
+    public function getMessage(): string
+    {
+        return $this->message;
+    }
+
     /**
      * Sets the title
      * @param string $title
@@ -440,6 +449,18 @@ class Activity extends Entity
         return $this;
     }
 
+    /**
+     * Get the custom data
+     * @return array
+     */
+    public function getCustom(): array
+    {
+        return [
+            $this->custom_type,
+            $this->custom_data
+        ];
+    }
+
     /**
      * Set the to_guid
      * @param int $guid

Entities/EntitiesProvider.php

@@ -23,5 +23,8 @@ class EntitiesProvider extends Provider
         $this->di->bind('Entities\Factory', function ($di) {
             return new EntitiesFactory();
         }, ['useFactory' => true]);
+        $this->di->bind('PropagateProperties', function ($di) {
+            return new Entities\PropagateProperties();
+        }, ['useFactory' => true]);
     }
 }

Entities/File.php

@@ -8,14 +8,6 @@ use Minds\Interfaces\Flaggable;
  * File Entity
  * @todo Do not inherit from ElggFile
  * @package Minds\Entities\File
- * @method array getExportableValues()
- * @method mixed|null getFlag(string $flag)
- * @method File setFlag(string $flag, mixed $value)
- * @method void save(bool $index)
- * @method array getWireTotals()
- * @method mixed getWireThreshold()
- * @method File setWireThreshold(int $wire_threshold)
- * @method int getModeratorGUID()
  */
 class File extends \ElggFile implements Flaggable
 {

Spec/Core/Blogs/Delegates/PropagatePropertiesSpec.php

+<?php
+
+namespace Spec\Minds\Core\Blogs\Delegates;
+
+use Minds\Core\Blogs\Blog;
+use Minds\Entities\Activity;
+use Minds\Entities\Entity;
+use PhpSpec\ObjectBehavior;
+
+class PropagatePropertiesSpec extends ObjectBehavior
+{
+    /** @var Blog */
+    protected $blog;
+    /** @var Activity */
+    protected $activity;
+
+    public function let(
+        Blog $blog,
+        Activity $activity
+    ) {
+        $this->blog = $blog;
+        $this->activity = $activity;
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType('Minds\Core\Blogs\Delegates\PropagateProperties');
+    }
+
+    public function it_should_propagate_changes_to_activity()
+    {
+        $this->blog->getTitle()->shouldBeCalled()->willReturn('New Title');
+        $this->activity->get('title')->shouldBeCalled()->willReturn('Old Title');
+        $this->activity->set('title', 'New Title')->shouldBeCalled();
+
+        $this->blog->getBody()->shouldBeCalled()->willReturn('body');
+        $this->activity->get('blurb')->shouldBeCalled()->willReturn('body');
+
+        $this->blog->getUrl()->shouldBeCalled()->willReturn('some url');
+        $this->activity->getURL()->shouldBeCalled()->willReturn('some url');
+
+        $this->blog->getIconUrl()->shouldBeCalled()->willReturn('some icon url');
+        $this->activity->get('thumbnail_src')->shouldBeCalled()->willReturn('some other url');
+        $this->activity->set('thumbnail_src', 'some icon url')->shouldBeCalled();
+
+        $this->toActivity($this->blog, $this->activity);
+    }
+}