aboutsummaryrefslogtreecommitdiffhomepage
path: root/main/app/sprinkles/admin/src/Controller/WormholeController.php
diff options
context:
space:
mode:
authorMarvin Borner2018-05-15 15:55:48 +0200
committerMarvin Borner2018-05-15 15:55:48 +0200
commit9913442a4aa0569060c9f2fa2f4e4470f9831335 (patch)
treeb2912f95778b0bae7e51737540d45a185c5491f0 /main/app/sprinkles/admin/src/Controller/WormholeController.php
parent6471687514d96a7b10034dbd50ffd43538b0ddb7 (diff)
Several fixes and improvements, mostly for chat encryption integration
Diffstat (limited to 'main/app/sprinkles/admin/src/Controller/WormholeController.php')
-rw-r--r--main/app/sprinkles/admin/src/Controller/WormholeController.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/main/app/sprinkles/admin/src/Controller/WormholeController.php b/main/app/sprinkles/admin/src/Controller/WormholeController.php
index 0040062..889c438 100644
--- a/main/app/sprinkles/admin/src/Controller/WormholeController.php
+++ b/main/app/sprinkles/admin/src/Controller/WormholeController.php
@@ -74,16 +74,15 @@ class WormholeController extends SimpleController
->where('user_id', $user->id)
->join("users", "users.id", "=", "user_follow.followed_by_id")
->select("user_follow.followed_by_id as id", "users.user_name as username")
- ->get(); // TODO: MULTI FOLLOWER ARRAY!
+ ->get();
$UsersFollows = DB::table('user_follow')
->where('followed_by_id', $user->id)
->join("users", "users.id", "=", "user_follow.user_id")
->select("user_follow.user_id as id", "users.user_name as username")
- ->get(); // TODO: MULTI FOLLOWER ARRAY!
+ ->get();
$result = $user->toArray();
- //print_r($user);
$result["avatar"] = $user->avatar;
$result["followers"] = $UsersFollower;
$result["follows"] = $UsersFollows;