|
@@ -14,6 +14,7 @@ use App\Models\Feed;
|
|
|
use App\Models\PostComment;
|
|
|
use Carbon\Carbon;
|
|
|
use Illuminate\Support\Facades\Log;
|
|
|
+use Illuminate\Support\Facades\Redis;
|
|
|
use Tymon\JWTAuth\Facades\JWTAuth;
|
|
|
use App\Models\PostDislike;
|
|
|
use App\Models\PostLike;
|
|
@@ -131,12 +132,17 @@ class FeedRepositories
|
|
|
}
|
|
|
if($value['type'] == 5){
|
|
|
$value['content'] = null;
|
|
|
- $relate_data = $this->getFollowMemberFans($value['relate_id']);
|
|
|
- if($relate_data){
|
|
|
- if(!empty($relate_data['username'])){
|
|
|
- $relate_data['username'] = subtext($relate_data['username'],10);
|
|
|
- }
|
|
|
- $value['relate_data'] = $relate_data;
|
|
|
+ $user = Redis::HGETALL('userInfo:'.$value['relate_id']);
|
|
|
+ if(!$user){
|
|
|
+ $user = $this->userInfo($value['relate_id']);
|
|
|
+ }
|
|
|
+ if($user){
|
|
|
+ $value['relate_data'] = [
|
|
|
+ 'uid' => $user['uid'],
|
|
|
+ 'username' => subtext($user['username'],10),
|
|
|
+ 'avatar' => $user['avatar'],
|
|
|
+ 'follow_status' => $this->getFollowStatus($userInfo['uid'],$value['relate_id']),
|
|
|
+ ];
|
|
|
}else{
|
|
|
unset($data[$key]);
|
|
|
}
|