From 699876405c6d100f620027651e56ede98dd5c9e2 Mon Sep 17 00:00:00 2001
From: Felix Albrigtsen <felixalbrigtsen@gmail.com>
Date: Mon, 16 Jan 2023 16:20:54 +0100
Subject: [PATCH] Inverted week offset on recurring events

---
 src/pvv/side/social/brettspillactivity.php | 4 +++-
 src/pvv/side/social/driftkveldactivity.php | 4 ++--
 src/pvv/side/social/hackekveldactivity.php | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pvv/side/social/brettspillactivity.php b/src/pvv/side/social/brettspillactivity.php
index 8217ab8..55c7fb5 100644
--- a/src/pvv/side/social/brettspillactivity.php
+++ b/src/pvv/side/social/brettspillactivity.php
@@ -13,7 +13,7 @@ class BrettspillActivity implements Activity {
 		$date = $date->setTime(16, 15, 0);
 		if ($date->format('N') != 7)
 			return $this->nextDate($date->add(new DateInterval('P1D')));
-		if ($date->format('W') % 2 - 1)
+		if ($date->format('W') % 2)
 			return $this->nextDate($date->add(new DateInterval('P7D')));
 		return $date;
 	}
@@ -24,6 +24,8 @@ class BrettspillActivity implements Activity {
 		$date = $date->setTime(16, 15, 0);
 		if ($date->format('N') != 7)
 			return $this->prevDate($date->sub(new DateInterval('P1D')));
+		if ($date->format('W') % 2)
+			return $this->prevDate($date->sub(new DateInterval('P7D')));
 
 		return $date;
 	}
diff --git a/src/pvv/side/social/driftkveldactivity.php b/src/pvv/side/social/driftkveldactivity.php
index dd1a367..9627723 100644
--- a/src/pvv/side/social/driftkveldactivity.php
+++ b/src/pvv/side/social/driftkveldactivity.php
@@ -13,7 +13,7 @@ class DriftkveldActivity implements Activity {
 		$date = $date->setTime(18, 15, 0);
 		if ($date->format('N') != 6)
 			return $this->nextDate($date->add(new DateInterval('P1D')));
-		if ($date->format('W') % 2 - 1)
+		if ($date->format('W') % 2)
 			return $this->nextDate($date->add(new DateInterval('P7D')));
 		return $date;
 	}
@@ -24,7 +24,7 @@ class DriftkveldActivity implements Activity {
 		$date = $date->setTime(18, 15, 0);
 		if ($date->format('N') != 6)
 			return $this->prevDate($date->sub(new DateInterval('P1D')));
-		if ($date->format('W') % 2 - 1)
+		if ($date->format('W') % 2)
 			return $this->prevDate($date->sub(new DateInterval('P7D')));
 		return $date;
 	}
diff --git a/src/pvv/side/social/hackekveldactivity.php b/src/pvv/side/social/hackekveldactivity.php
index 7b27319..c317d99 100644
--- a/src/pvv/side/social/hackekveldactivity.php
+++ b/src/pvv/side/social/hackekveldactivity.php
@@ -13,7 +13,7 @@ class HackekveldActivity implements Activity {
 		$date = $date->setTime(16, 15, 0);
 		if ($date->format('N') != 6)
 			return $this->nextDate($date->add(new DateInterval('P1D')));
-		if ($date->format('W') % 2)
+		if ($date->format('W') % 2 - 1)
 			return $this->nextDate($date->add(new DateInterval('P7D')));
 		return $date;
 	}
@@ -24,7 +24,7 @@ class HackekveldActivity implements Activity {
 		$date = $date->setTime(18, 15, 0);
 		if ($date->format('N') != 6)
 			return $this->prevDate($date->sub(new DateInterval('P1D')));
-		if ($date->format('W') % 2)
+		if ($date->format('W') % 2 - 1)
 			return $this->prevDate($date->sub(new DateInterval('P7D')));
 		return $date;
 	}