Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refact : cleanup activities #66

Open
wants to merge 1 commit into
base: 0.1
Choose a base branch
from
Open

refact : cleanup activities #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/Follow.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

declare(strict_types=1);

namespace Kanvas\Social;

use Baka\Contracts\Auth\UserInterface;
Expand Down Expand Up @@ -221,12 +222,13 @@ public static function addToFeed(
}

/**
* fillActivity
* fillActivity.
*
* @param UserMessages $feed
* @return void
*
* @return array
*/
public static function fillActivity(UserMessages $feed): array
public static function fillActivity(UserMessages $feed) : array
{
$lastActivity = UserMessagesActivities::findFirst([
'conditions' => 'user_messages_id = :feedId: AND is_deleted = 0',
Expand All @@ -238,7 +240,7 @@ public static function fillActivity(UserMessages $feed): array
if (!$lastActivity) {
return [];
}
$countActivty = $feed->countActivities([
$countActivity = $feed->countActivities([
'conditions' => 'type = :type:',
'bind' => [
'type' => $lastActivity->type
Expand All @@ -251,7 +253,7 @@ public static function fillActivity(UserMessages $feed): array
$username = $username ?? '';
$userMessageActivity = [
'notes' => $feed->notes,
'message_activity_count' => $countActivty,
'message_activity_count' => $countActivity,
'message_type_activity' => $lastActivity->type,
'message_activity_username' => $username,
'message_activity_text' => $lastActivity->text
Expand Down
1 change: 1 addition & 0 deletions src/Models/UserMessagesActivities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

declare(strict_types=1);

namespace Kanvas\Social\Models;

class UserMessagesActivities extends BaseModel
Expand Down