Feature: User Activity for #15

app/Database/Models/Post.php

@@ -12,72 +12,155 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use McCool\LaravelAutoPresenter\HasPresenter;
+use MyBB\Core\Likes\Contracts\LikeableInterface;
+use MyBB\Core\UserActivity\Contracts\ActivityStoreableInterface;
+use MyBB\Core\UserActivity\Traits\UserActivityTrait;
 use MyBB\Core\Likes\Traits\LikeableTrait;
 
-class Post extends Model implements HasPresenter
+class Post extends Model implements HasPresenter, LikeableInterface, ActivityStoreableInterface
 {
-	use SoftDeletes;
+    use SoftDeletes;
+    use UserActivityTrait;
     use LikeableTrait;
 
-	/**
-	 * Indicates if the model should be timestamped.
-	 *
-	 * @var bool
-	 */
-	public $timestamps = true;
-	/**
-	 * The table associated with the model.
-	 *
-	 * @var string
-	 */
-	protected $table = 'posts';
-	/**
-	 * The relations to eager load on every query.
-	 *
-	 * @var array
-	 */
-	protected $with = array();
-	/**
-	 * The attributes that aren't mass assignable.
-	 *
-	 * @var array
-	 */
-	protected $guarded = array();
-
-	/**
-	 * The date attributes.
-	 *
-	 * @var array
-	 */
-	protected $dates = ['deleted_at', 'created_at', 'updated_at'];
-
-	/**
-	 * Get the presenter class.
-	 *
-	 * @return string
-	 */
-	public function getPresenterClass()
-	{
-		return 'MyBB\Core\Presenters\Post';
-	}
-
-	/**
-	 * A post belongs to a thread.
-	 *
-	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-	 */
-	public function topic()
-	{
-		return $this->belongsTo('MyBB\\Core\\Database\\Models\\Topic')->withTrashed();
-	}
-
-	/**
-	 * A post is created by (and belongs to) a user/author.
-	 *
-	 * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
-	 */
-	public function author()
-	{
-		return $this->belongsTo('MyBB\\Core\\Database\\Models\\User', 'user_id');
-	}
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = true;
+    /**
+     * The table associated with the model.
+     *
+     * @var string
+     */
+    protected $table = 'posts';
+    /**
+     * The relations to eager load on every query.
+     *
+     * @var array
+     */
+    protected $with = array();
+    /**
+     * The attributes that aren't mass assignable.
+     *
+     * @var array
+     */
+    protected $guarded = array();
+
+    /**
+     * The date attributes.
+     *
+     * @var array
+     */
+    protected $dates = ['deleted_at', 'created_at', 'updated_at'];
+
+    /**
+     * Get the presenter class.
+     *
+     * @return string
+     */
+    public function getPresenterClass()
+    {
+        return 'MyBB\Core\Presenters\Post';
+    }
+
+    /**
+     * A post belongs to a thread.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function topic()
+    {
+        return $this->belongsTo('MyBB\\Core\\Database\\Models\\Topic')->withTrashed();
+    }
+
+    /**
+     * A post is created by (and belongs to) a user/author.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function author()
+    {
+        return $this->belongsTo('MyBB\\Core\\Database\\Models\\User', 'user_id');
+    }
+
+    /**
+     * Get the ID of the model.
+     *
+     * @return int
+     */
+    public function getContentId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Get extra details about a model.
+     *
+     * @return array The extra details to store.
+     */
+    public function getExtraDetails()
+    {
+        return [
+            'topic_id' => $this->topic_id,
+            'topic_slug' => $this->topic->slug,
+            'topic_title' => $this->topic->title,
+            'content' => $this->content_parsed,
+        ];
+    }
+
+    /**
+     * Get the title of the content being liked.
+     *
+     * @return string
+     */
+    public function getContentTitle()
+    {
+        if (!isset($this->topic)) {
+            $this->load(['topic', 'topic.author']);
+        }
+
+        return $this->topic->title;
+    }
+
+    /**
+     * Get the author of the content being liked.
+     *
+     * @return \MyBB\Core\Database\Models\User
+     */
+    public function getContentAuthor()
+    {
+        if (!isset($this->topic) || !isset($this->topic->author)) {
+            $this->load(['topic', 'topic.author']);
+        }
+
+        return $this->topic->author;
+    }
+
+    /**
+     * Get the short name of the content being liked.
+     *
+     * For example: "post".
+     *
+     * @return string
+     */
+    public function getContentTypeShortName()
+    {
+        return "post";
+    }
+
+    /**
+     * Get the URL to view this content.
+     *
+     * @return string
+     */
+    public function getViewUrl()
+    {
+        return route('topics.showPost', [
+           'slug' => $this->topic->slug,
+           'id' => $this->topic_id,
+           'postId' => $this->id,
+        ]);
+    }
 }

app/Database/Repositories/Eloquent/SearchRepository.php

@@ -15,71 +15,73 @@
 
 class SearchRepository implements SearchRepositoryInterface
 {
-	/**
-	 * @var Search $searchModel
-	 * @access protected
-	 */
-	protected $searchModel;
-	/**
-	 * @var Guard $guard ;
-	 * @access protected
-	 */
-	protected $guard;
+    /**
+     * @var Search $searchModel
+     * @access protected
+     */
+    protected $searchModel;
+    /**
+     * @var Guard $guard ;
+     * @access protected
+     */
+    protected $guard;
 
-	/**
-	 * @param Search		  $searchModel    The model to use for search logs.
-	 * @param Guard           $guard          Laravel guard instance, used to get user ID.
-	 */
-	public function __construct(
-		Search $searchModel,
-		Guard $guard
-	)
-	{
-		$this->searchModel = $searchModel;
-		$this->guard = $guard;
-	}
+    /**
+     * @param Search $searchModel The model to use for search logs.
+     * @param Guard  $guard       Laravel guard instance, used to get user ID.
+     */
+    public function __construct(
+        Search $searchModel,
+        Guard $guard
+    ) {
+        $this->searchModel = $searchModel;
+        $this->guard = $guard;
+    }
 
-	/**
-	 * Find a single searchlog by ID.
-	 *
-	 * @param string $id The ID of the search to find.
-	 *
-	 * @return mixed
-	 */
-	public function find($id)
-	{
-		$userId = $this->guard->user()->id;
-		if($userId <= 0)
-		{
-			$userId = null;
-		}
-		return $this->searchModel->where('user_id', $userId)->find($id);
-	}
+    /**
+     * Find a single searchlog by ID.
+     *
+     * @param string $id The ID of the search to find.
+     *
+     * @return mixed
+     */
+    public function find($id)
+    {
+        $userId = $this->guard->user()->id;
+        if ($userId <= 0) {
+            $userId = null;
+        }
 
-	/**
-	 * Create a new searchlog
-	 *
-	 * @param array $details Details about the searchlog.
-	 *
-	 * @return mixed
-	 */
-	public function create(array $details = [])
-	{
-		$details = array_merge([
-			'id' => md5(uniqid(microtime(), true)),
-			'keywords' => '',
-			'as_topics' => true,
-			'user_id' => $this->guard->user()->id,
-			'topics' => '',
-			'posts' => ''
-		], $details);
+        return $this->searchModel->where('user_id', $userId)->find($id);
+    }
 
-		if($details['user_id'] < 0)
-		{
-			$details['user_id'] = null;
-		}
+    /**
+     * Create a new searchlog
+     *
+     * @param array $details Details about the searchlog.
+     *
+     * @return mixed
+     */
+    public function create(array $details = [])
+    {
+        $details = array_merge(
+            [
+                'id'        => md5(uniqid(microtime(), true)),
+                'keywords'  => '',
+                'as_topics' => true,
+                'user_id'   => $this->guard->user()->id,
+                'topics'    => '',
+                'posts'     => ''
+            ],
+            $details
+        );
 
-		$searchlog = $this->searchModel->create($details);
-		return $searchlog;
-	}
+        if ($details['user_id'] < 0) {
+            $details['user_id'] = null;
+        }
+
+        $searchlog = $this->searchModel->create($details);
+
+        return $searchlog;
+    }
 }

app/Database/Repositories/SearchRepositoryInterface.php

@@ -12,22 +12,21 @@
 interface SearchRepositoryInterface
 {
 
-	/**
-	 * Find a single search log by ID.
-	 *
-	 * @param string $id The ID of the search log to find.
-	 *
-	 * @return mixed
-	 */
-	public function find($id);
-
-	/**
-	 * Create a new searchlog
-	 *
-	 * @param array $details Details about the searchlog.
-	 *
-	 * @return mixed
-	 */
-	public function create(array $details = []);
+    /**
+     * Find a single search log by ID.
+     *
+     * @param string $id The ID of the search log to find.
+     *
+     * @return mixed
+     */
+    public function find($id);
 
+    /**
+     * Create a new searchlog
+     *
+     * @param array $details Details about the searchlog.
+     *
+     * @return mixed
+     */
+    public function create(array $details = []);
 }