X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=app%2FModels%2FChannel.php;h=500f2e33e6f9fb3456694d7dc403159dd7205260;hb=abdc2ea1ade1fb12ceacc28660890750e69ae36f;hp=8debe4f9434ab554d70eb5e16086bf875ed1875e;hpb=167f986f468014e00d82fa2df8193f6be8dca19d;p=alttp.git

diff --git a/app/Models/Channel.php b/app/Models/Channel.php
index 8debe4f..500f2e3 100644
--- a/app/Models/Channel.php
+++ b/app/Models/Channel.php
@@ -32,7 +32,21 @@ class Channel extends Model {
 	}
 
 	public function getGuessingLeaderboard() {
-		return $this->winners()->selectRaw('(select t2.uname from guessing_winners t2 where t2.uid = guessing_winners.uid order by created_at desc limit 1) as name, sum(score) as score')->groupBy('uid')->orderBy('score', 'desc')->limit(10)->get();
+		$query = $this->winners()
+			->selectRaw('(select t2.uname from guessing_winners t2 where t2.uid = guessing_winners.uid order by created_at desc limit 1) as name, sum(score) as score')
+			->where('score', '!=', 0)
+			->groupBy('uid')
+			->orderBy('score', 'desc')
+			->limit(10);
+		$type = $this->getGuessingSetting('leaderboard_type', 'all');
+		if ($type == 'month') {
+			$query->where('created_at', '>=', now()->startOfMonth());
+		} else if ($type == 'year') {
+			$query->where('created_at', '>=', now()->startOfYear());
+		} else if (is_numeric($type)) {
+			$query->where('created_at', '>=', now()->sub($type, 'days'));
+		}
+		return $query->get();
 	}
 
 	public function hasActiveGuessing() {
@@ -119,23 +133,33 @@ class Channel extends Model {
 		$this->save();
 	}
 
+	public function transformGuess($original) {
+		$transformed = trim($original);
+		if ($this->guessing_type == 'gtbk') {
+			$transformed = str_replace(['roodyo1Gtbigkey'], ['2'], $transformed);
+			$transformed = str_ireplace(['vier 4Head'], ['4'], $transformed);
+		}
+		return $transformed;
+	}
+
 	public function registerGuess($uid, $uname, $guess) {
 		$model = new GuessingGuess();
 		$model->channel()->associate($this);
 		$model->uid = $uid;
 		$model->uname = $uname;
-		$model->guess = $guess;
+		$model->guess = $this->transformGuess($guess);
 		$model->save();
 	}
 
 	public function scoreGuessing($solution, $guess, $first) {
-		if ($guess == $solution) {
+		$transformed = $this->transformGuess($guess);
+		if ($transformed == $solution) {
 			if ($first) {
 				return $this->getGuessingSetting('points_exact_first', 1);
 			}
 			return $this->getGuessingSetting('points_exact_other', 1);
 		}
-		$distance = abs(intval($guess) - intval($solution));
+		$distance = abs(intval($transformed) - intval($solution));
 		if ($distance <= $this->getGuessingSetting('points_close_max', 3)) {
 			if ($first) {
 				return $this->getGuessingSetting('points_close_first', 1);
@@ -146,13 +170,33 @@ class Channel extends Model {
 	}
 
 	public function isValidGuess($solution) {
+		$transformed = $this->transformGuess($solution);
 		if ($this->guessing_type == 'gtbk') {
-			$int_solution = intval($solution);
-			return $int_solution > 0 && $int_solution < 23;
+			$int_solution = intval($transformed);
+			return is_numeric($transformed) && $int_solution > 0 && $int_solution < 23;
 		}
 		return false;
 	}
 
+	public function listGuessingWinners($winners) {
+		$names = [];
+		$distance = 0;
+		foreach ($winners as $winner) {
+			if ($winner->score > 0) {
+				$names[] = $winner->uname;
+				$distance = abs(intval($winner->guess) - intval($winner->solution));
+			}
+		}
+		$msg = '';
+		if (empty($names)) {
+			$msg = $this->getGuessingSetting('no_winners_message');
+		} else {
+			$msg = $this->getGuessingSetting($distance ? 'close_winners_message' : 'winners_message', $this->getGuessingSetting('winners_message'));
+			$msg = str_replace(['{distance}', '{names}'], [$distance, $this->listAnd($names)], $msg);
+		}
+		return $msg;
+	}
+
 	public function listAnd($entries) {
 		$lang = empty($this->languages) ? 'en' : $this->languages[0];
 		if ($lang == 'de') {