|
@@ -11,6 +11,7 @@ namespace App\Http\Controllers\V1;
|
|
|
use App\Models\Post;
|
|
|
use App\Repositories\PostRepositories;
|
|
|
use App\Traits\CmsTrait;
|
|
|
+use App\Traits\FollowStatusTrait;
|
|
|
use App\Traits\UserTrait;
|
|
|
use App\Transformers\Post\CommentTransformer;
|
|
|
use App\Transformers\Post\DetailTransformer;
|
|
@@ -36,6 +37,7 @@ class PostController extends Controller
|
|
|
{
|
|
|
use UserTrait;
|
|
|
use CmsTrait;
|
|
|
+ use FollowStatusTrait;
|
|
|
|
|
|
public function __construct(PostRepositories $postRepositories)
|
|
|
{
|
|
@@ -203,21 +205,31 @@ class PostController extends Controller
|
|
|
'data' => $bannerData,
|
|
|
];
|
|
|
} elseif ($floor[$key + 1]['show_type'] == 'user') {
|
|
|
- $uidArray = array_column($floor[$key + 1]['data'], 'uid');
|
|
|
- $followMembersStatus = $this->getFollowMembersStatus(implode(',', $uidArray));
|
|
|
- if ($followMembersStatus) {
|
|
|
- $userData = [];
|
|
|
- foreach ($floor[$key + 1]['data'] as $item) {
|
|
|
- if (!isset($followMembersStatus[$item['uid']])) continue;
|
|
|
- $userData[] = array_merge($item, ['follow_status' => $followMembersStatus[$item['uid']]['follow_status']]);
|
|
|
- }
|
|
|
- if ($userData) {
|
|
|
- $newData[] = [
|
|
|
- 'show_type' => 'user',
|
|
|
- 'data' => $userData,
|
|
|
- ];
|
|
|
- }
|
|
|
+ $userData = [];
|
|
|
+ foreach ($floor[$key + 1]['data'] as $item) {
|
|
|
+ $userData[] = array_merge($item, ['follow_status' => $this->followStatus($userInfo['uid'], $item['uid'])]);
|
|
|
+ }
|
|
|
+ if ($userData) {
|
|
|
+ $newData[] = [
|
|
|
+ 'show_type' => 'user',
|
|
|
+ 'data' => $userData,
|
|
|
+ ];
|
|
|
}
|
|
|
+// $uidArray = array_column($floor[$key + 1]['data'], 'uid');
|
|
|
+// $followMembersStatus = $this->getFollowMembersStatus(implode(',', $uidArray));
|
|
|
+// if ($followMembersStatus) {
|
|
|
+// $userData = [];
|
|
|
+// foreach ($floor[$key + 1]['data'] as $item) {
|
|
|
+// if (!isset($followMembersStatus[$item['uid']])) continue;
|
|
|
+// $userData[] = array_merge($item, ['follow_status' => $followMembersStatus[$item['uid']]['follow_status']]);
|
|
|
+// }
|
|
|
+// if ($userData) {
|
|
|
+// $newData[] = [
|
|
|
+// 'show_type' => 'user',
|
|
|
+// 'data' => $userData,
|
|
|
+// ];
|
|
|
+// }
|
|
|
+// }
|
|
|
} elseif ($floor[$key + 1]['show_type'] == 'video') {
|
|
|
$newData[] = [
|
|
|
'show_type' => 'video',
|