-
-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
120 additions
and
105 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,110 +1,50 @@ | ||
| <?php | ||
| namespace Coyote\Services\Session; | ||
|
|
||
| use Coyote\Session; | ||
| use Illuminate\Database; | ||
| use Illuminate\Database\Query\Builder; | ||
| use Illuminate\Database\Query\Expression; | ||
| use Coyote\Domain\Online\FakeSessionRepository; | ||
| use Coyote\Domain\Online\ViewersStore; | ||
| use Illuminate\Http\Request; | ||
| use Illuminate\Support; | ||
| use Illuminate\View\View; | ||
|
|
||
| class Renderer | ||
| { | ||
| const USER = 'Użytkownik'; | ||
|
|
||
| public function __construct( | ||
| private Database\Connection $db, | ||
| private Registered $registered, | ||
| private Request $request) | ||
| private FakeSessionRepository $session, | ||
| private ViewersStore $store, | ||
| private Request $request, | ||
| ) | ||
| { | ||
| } | ||
|
|
||
| public function render(string $title, ?string $requestUri): View | ||
| public function render(string $requestUri, bool $local): View | ||
| { | ||
| $collection = $this->data($requestUri); | ||
|
|
||
| $total = $collection->sum('count'); | ||
| $guests = $collection->where('user_id', null)->sum('count'); | ||
| $registered = $total - $guests; | ||
| $robots = $collection->filter(fn($item) => $item->robot)->sum('count'); | ||
|
|
||
| $guests -= $robots; | ||
| $total -= $robots; | ||
|
|
||
| $collection = $this->map($collection); | ||
|
|
||
| if ($this->request->user()) { | ||
| if (!$collection->contains('user_id', $this->request->user()->id)) { | ||
| $collection->push(new Session(['user_id' => $this->request->user()->id, 'path' => $requestUri])); | ||
| $total++; | ||
| $registered++; | ||
| } | ||
| } else if ($collection->count() === 0) { | ||
| // we keep session in redis but also - list of online users - in postgres. | ||
| // we refresh table every 1 minute, so info about user's current page might be sometimes outdated. | ||
| $total++; | ||
| $guests++; | ||
| } | ||
|
|
||
| $collection = $this->unique($collection); | ||
| $collection = $this->registered->setup($collection); | ||
|
|
||
| $groups = [self::USER => []]; | ||
| foreach ($collection->groupBy('group') as $name => $users) { | ||
| if ($name === '') { | ||
| $name = self::USER; | ||
| } else if (!isset($groups[$name])) { | ||
| $groups[$name] = []; | ||
| } | ||
| foreach ($users as $user) { | ||
| if ($user['user_id'] !== null) { | ||
| $groups[$name][] = $this->makeProfileLink($user['user_id'], $user['name']); | ||
| } | ||
| } | ||
| $sessions = $this->session->sessionsIn($requestUri); | ||
| if ($this->isUserLogged()) { | ||
| $sessions = $sessions->coalesceUser($this->loggedUserId()); | ||
| } else { | ||
| $sessions = $sessions->coalesceGuest(); | ||
| } | ||
| $viewers = $this->store->viewers($sessions); | ||
|
|
||
| unset($groups[self::USER]); | ||
| ksort($groups); | ||
|
|
||
| $viewersCount = $viewers->guestsCount + \count($viewers->users); | ||
| return view('components.viewers', [ | ||
| 'isLocalViewers' => $requestUri !== null, | ||
| 'title' => $title, | ||
| 'groups' => $requestUri === null ? $groups : [], | ||
| 'total' => $total, | ||
| 'guests' => $guests, | ||
| 'registered' => $registered, | ||
| 'local' => $local, | ||
| 'guestsCount' => $viewers->guestsCount, | ||
| 'usersCount' => \count($viewers->users), | ||
| 'title' => $local | ||
| ? 'Aktualnie na tej stronie' | ||
| : "$viewersCount użytkowników online", | ||
| 'users' => $viewers->users, | ||
| ]); | ||
| } | ||
|
|
||
| private function data(?string $requestUri): Support\Collection | ||
| { | ||
| return $this | ||
| ->db | ||
| ->table('sessions') | ||
| ->when($requestUri !== null, fn(Builder $builder) => $builder | ||
| ->where('path', 'LIKE', \mb_strToLower(\strTok($requestUri, '?')) . '%')) | ||
| ->groupBy(['user_id', 'robot']) | ||
| ->get(['user_id', 'robot', new Expression('COUNT(*)')]); | ||
| } | ||
|
|
||
| private function map(Support\Collection $collection): Support\Collection | ||
| { | ||
| return $collection->map(fn($item) => new Session((array)$item)); | ||
| } | ||
|
|
||
| private function makeProfileLink(int $userId, string $userName): string | ||
| private function isUserLogged(): bool | ||
| { | ||
| return link_to_route('profile', $userName, [$userId], ['data-user-id' => $userId]); | ||
| return !!$this->request->user(); | ||
| } | ||
|
|
||
| private function unique(Support\Collection $sessions): Support\Collection | ||
| private function loggedUserId() | ||
| { | ||
| $guests = $sessions->filter(fn(Session $item) => $item->userId === null); | ||
| $sessions | ||
| ->filter(fn(Session $item) => $item->userId !== null) | ||
| ->unique('user_id') | ||
| ->each(fn(Session $item) => $guests->push($item)); | ||
| return $guests; | ||
| return $this->request->user()->id; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| @mixin dark { | ||
| body.theme-dark & { | ||
| @content; | ||
| } | ||
| } | ||
|
|
||
| @mixin light { | ||
| body.theme-light & { | ||
| @content; | ||
| } | ||
| } | ||
|
|
||
| .viewers-online { | ||
| .viewer-pill { | ||
| padding: 4px; | ||
| overflow: hidden; | ||
| border-radius: 21px; | ||
| align-items: center; | ||
|
|
||
| @include dark { | ||
| background: #2e2e2e; | ||
| border: 1px solid #383838; | ||
| } | ||
|
|
||
| @include light { | ||
| background: white; | ||
| border: 1px solid #dedede; | ||
| } | ||
|
|
||
| .viewer-pill-title { | ||
| padding-left: 6px; | ||
| padding-right: 14px; | ||
| font-size: 0.8em; | ||
| line-height: 1.3em; | ||
| } | ||
| } | ||
|
|
||
| .viewers-users-group { | ||
| margin-left: -6px; | ||
| } | ||
|
|
||
| .viewers-users { | ||
| max-width: 90%; | ||
|
|
||
| .viewers-user { | ||
| border-radius: 32px; | ||
| overflow: hidden; | ||
| margin-right: -12px; | ||
| @include dark { | ||
| border: 1px solid #444; | ||
| } | ||
| @include light { | ||
| border: 1px solid #dedede; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters