mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-03-27 12:01:49 +03:00
Code Issues Projects Releases Packages Wiki Activity

Ensured visitor is normalized before creating the visit

Browse source
This commit is contained in:
Alejandro Celaya 2021-05-16 10:08:05 +02:00
parent f0dc32b6e5
commit 15c028e151
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
module/Core/src/Visit/VisitsTracker.php
View file

@ -31,50 +31,51 @@ class VisitsTracker implements VisitsTrackerInterface
public function track(ShortUrl $shortUrl, Visitor $visitor): void public function track(ShortUrl $shortUrl, Visitor $visitor): void
{ {
$this->trackVisit( $this->trackVisit(
Visit::forValidShortUrl($shortUrl, $visitor, $this->options->anonymizeRemoteAddr()), fn (Visitor $v) => Visit::forValidShortUrl($shortUrl, $v, $this->options->anonymizeRemoteAddr()),
$visitor->normalizeForTrackingOptions($this->options), $visitor,
); );
} }
public function trackInvalidShortUrlVisit(Visitor $visitor): void public function trackInvalidShortUrlVisit(Visitor $visitor): void
{ {
$this->trackOrphanVisit( $this->trackOrphanVisit(
Visit::forInvalidShortUrl($visitor, $this->options->anonymizeRemoteAddr()), fn (Visitor $v) => Visit::forInvalidShortUrl($v, $this->options->anonymizeRemoteAddr()),
$visitor->normalizeForTrackingOptions($this->options), $visitor,
); );
} }
public function trackBaseUrlVisit(Visitor $visitor): void public function trackBaseUrlVisit(Visitor $visitor): void
{ {
$this->trackOrphanVisit( $this->trackOrphanVisit(
Visit::forBasePath($visitor, $this->options->anonymizeRemoteAddr()), fn (Visitor $v) => Visit::forBasePath($v, $this->options->anonymizeRemoteAddr()),
$visitor->normalizeForTrackingOptions($this->options), $visitor,
); );
} }
public function trackRegularNotFoundVisit(Visitor $visitor): void public function trackRegularNotFoundVisit(Visitor $visitor): void
{ {
$this->trackOrphanVisit( $this->trackOrphanVisit(
Visit::forRegularNotFound($visitor, $this->options->anonymizeRemoteAddr()), fn (Visitor $v) => Visit::forRegularNotFound($v, $this->options->anonymizeRemoteAddr()),
$visitor->normalizeForTrackingOptions($this->options), $visitor,
); );
} }
private function trackOrphanVisit(Visit $visit, Visitor $visitor): void private function trackOrphanVisit(callable $createVisit, Visitor $visitor): void
{ {
if (! $this->options->trackOrphanVisits()) { if (! $this->options->trackOrphanVisits()) {
return; return;
} }
$this->trackVisit($visit, $visitor); $this->trackVisit($createVisit, $visitor);
} }
private function trackVisit(Visit $visit, Visitor $visitor): void private function trackVisit(callable $createVisit, Visitor $visitor): void
{ {
if ($this->options->disableTracking()) { if ($this->options->disableTracking()) {
return; return;
} }
$visit = $createVisit($visitor->normalizeForTrackingOptions($this->options));
$this->em->transactional(function () use ($visit, $visitor): void { $this->em->transactional(function () use ($visit, $visitor): void {
$this->em->persist($visit); $this->em->persist($visit);
$this->em->flush(); $this->em->flush();