Merge remote-tracking branch 'origin/develop' into develop

app/Repositories/FeedRepositories.php

@@ -124,9 +124,12 @@ class FeedRepositories
                 }
                 if($value['type'] == 5){
                     $value['content'] = null;
-                    $value['relate_data'] = $this->getFollowMemberFans($value['relate_id']);
+                    $relate_data = $this->getFollowMemberFans($value['relate_id']);
+                    if(!empty($relate_data['username'])){
+                        $relate_data['username'] = subtext($relate_data['username'],10);
+                    }
+                    $value['relate_data'] = $relate_data;
                 }
-                //$data[] = $value;
             }
         }
         return $data;
@@ -156,7 +159,7 @@ class FeedRepositories
             'type' => $post['type'],
             'created_at' => Carbon::parse($post['created_at'])->diffForHumans(),
             'uid' => $post['uid'],
-            'username' => $post['username'],
+            'username' => subtext($post['username'],10),
             'avatar' => $post['avatar'],
             'topic' => $topic,
             'title' => $post['title'],