diff options
Diffstat (limited to 'main/app/sprinkles/admin/src')
| -rw-r--r-- | main/app/sprinkles/admin/src/Controller/UserController.php | 2 | ||||
| -rw-r--r-- | main/app/sprinkles/admin/src/Controller/WormholeController.php | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/main/app/sprinkles/admin/src/Controller/UserController.php b/main/app/sprinkles/admin/src/Controller/UserController.php index 45bedf5..ede9523 100644 --- a/main/app/sprinkles/admin/src/Controller/UserController.php +++ b/main/app/sprinkles/admin/src/Controller/UserController.php @@ -1006,7 +1006,7 @@ class UserController extends SimpleController if ((Capsule::table('public_keys') ->where('user_id', "=", $requestedUser->id) - ->exists()) === TRUE) { + ->exists())) { $RawPublicKey = Capsule::table('public_keys') ->where('user_id', "=", $requestedUser->id) diff --git a/main/app/sprinkles/admin/src/Controller/WormholeController.php b/main/app/sprinkles/admin/src/Controller/WormholeController.php index 68bbca7..a2775f1 100644 --- a/main/app/sprinkles/admin/src/Controller/WormholeController.php +++ b/main/app/sprinkles/admin/src/Controller/WormholeController.php @@ -82,13 +82,17 @@ class WormholeController extends SimpleController ->select("user_follow.user_id as id", "users.user_name as username") ->get(); - $UsersFriends = DB::select("SELECT id FROM (SELECT user_id AS id FROM user_follow WHERE followed_by_id = $user->id UNION ALL SELECT followed_by_id FROM user_follow WHERE user_id = $user->id) t GROUP BY id HAVING COUNT(id) > 1"); + $UsersFriends = Capsule::select("SELECT id FROM (SELECT user_id AS id FROM user_follow WHERE followed_by_id = $user->id UNION ALL SELECT followed_by_id FROM user_follow WHERE user_id = $user->id) t GROUP BY id HAVING COUNT(id) > 1"); + /** @var UserFrosting\Sprinkle\Core\Util\ClassMapper $classMapper */ + $classMapper = $this->ci->classMapper; foreach ($UsersFriends as $Key => $UsersFriendId) { // NOT THAT EFFICIENT... - $UsersFriendInformation = DB::table('users') - ->where('id', "=", $UsersFriendId->id) - ->select("users.id", "users.user_name as username") + $UsersFriendInformation = $classMapper->createInstance('user')// select doesnt work with instance + ->where('id', $UsersFriendId->id) ->get(); - $UsersFriends[$Key] = $UsersFriendInformation[0]; + $UsersFriends[$Key]->id = $UsersFriendInformation[0]->id; + $UsersFriends[$Key]->username = $UsersFriendInformation[0]->user_name; + $UsersFriends[$Key]->avatar = $UsersFriendInformation[0]->avatar; + $UsersFriends[$Key]->full_name = $UsersFriendInformation[0]->full_name; } $result = $user->toArray(); |