fix: use acronym instead of mandator to generate relive + voctoweb url

voc · Jan 14, 2024 · 6f3fb8e · 6f3fb8e
1 parent f2864cf
commit 6f3fb8e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/model/Conference.php b/model/Conference.php
@@ -15,6 +15,10 @@ public function getSlug() {
 		return $this->slug;
 	}
 
+	public function getAcronym() {
+		return $this->get('CONFERENCE.ACRONYM', $this->slug);
+	}
+
 	public function getTitle() {
 		return $this->get('CONFERENCE.TITLE', 'C3VOC');
 	}

diff --git a/model/ConferenceJson.php b/model/ConferenceJson.php
@@ -46,8 +46,8 @@ function($r) { return $r->slug; },
 		else {
 			$groups['Live'] = array_keys((array) $this->rooms);
 		}
-		
-		$acronym = $mandator ?: $c->acronym;
+
+		$acronym = $c->acronym ?: $mandator;
 
 		$config = array_merge(
 			isset($c->streamingConfig) ? get_object_vars($c->streamingConfig) : [],
@@ -62,7 +62,7 @@ function($r) { return $r->slug; },
 					// future TODO: change structure
 					"relive_json"	=> "https://cdn.c3voc.de/relive/".$acronym."/index.json",
 					"releases"		=> "https://media.ccc.de/c/".$acronym,
-				], 
+				],
 				// 'schedule' => (array) $c->streamingConfig->schedule
 				'rooms' => $this->rooms,
 				'overview' => [
@@ -81,7 +81,7 @@ function($r) { return $r->slug; },
 			$config['conference']['releases'] = null;
 		}
 
-		parent::__construct($config, $acronym);
+		parent::__construct($config, $mandator);
 	}
 
 	public function has($keychain)