V6

client/options/index.ts

@@ -29,6 +29,7 @@ interface Options extends ChangeEmitter {
 	radio: boolean
 	eden: boolean
 	shamiradio: boolean
+	shamiradio2: boolean
 	bgVideo: string
 	bgMute: boolean
 	horizontalPosting: boolean
@@ -173,7 +174,7 @@ export function initOptions() {
 				break
 			default:
 				const flags = parseInt(value, 10)
-				for (const [i, key] of ["radio", "eden", "shamiradio"].entries()) {
+				for (const [i, key] of ["radio", "eden", "shamiradio", "shamiradio2"].entries()) {
 					if (flags & 1 << i) {
 						localStorage.setItem(key, "true")
 					}

client/options/nowPlaying.ts

@@ -70,15 +70,22 @@ class Banner {
 	}
 
 	async fetch() {
-		const response = await fetch(this.api)
-		if (!response.ok) {
-			throw Error(await response.text())
-		}
-		const data = this.unmarshal(await response.json())
-		if (!RadioData.is(data)) {
-			throw Error("Unexpected response")
+		let response
+		const defaults = {listeners: 0, song: "ded", streamer: this.url.split('/')[2]}
+		try {
+			response = await fetch(this.api)
+		}catch(err) {
+			return defaults
 		}
-		return data
+		if (!response.ok) {
+			return defaults
+		}               
+
+        const data = this.unmarshal(await response.json())
+       	if (!RadioData.is(data)) {
+               return defaults
+        }
+        return data
 	}
 
 	async update() {

client/options/specs.ts

@@ -150,10 +150,30 @@ export const specs: { [id: string]: OptionSpec } = {
 			"https://shamiradio.imgoodatth.is/",
 			"https://shamiradio.imgoodatth.is/status-json.xsl",
 			({ icestats: { source } }) => {
-				const [fallback, main] = Array.isArray(source) ? source : [source]
-				const { listeners, server_name: streamer, title: song = "oh dear, tags aren't set" }
-					= main?.stream_start ? main : fallback
-				return { listeners, song, streamer }
+				if (source === undefined) {
+					return null
+				} else {				
+					const [fallback, main] = Array.isArray(source) ? source : [source]
+					const { listeners, server_name: streamer, title: song = "oh dear, tags aren't set" }
+						= main?.stream_start ? main : fallback
+					return { listeners, song, streamer }
+				}
+			},
+		),
+	},
+	shamiradio2: {
+		exec: toggleNowPlaying(
+			"https://shamiradio.stream/",
+			"https://shamiradio.stream/status-json.xsl",
+			({ icestats: { source } }) => {
+				if (source === undefined) {
+					return null
+				} else {				
+					const [fallback, main] = Array.isArray(source) ? source : [source]
+					const { listeners, server_name: streamer, title: song = "oh dear, tags aren't set" }
+						= main?.stream_start ? main : fallback
+					return { listeners, song, streamer }
+				}
 			},
 		),
 	},

docs/nginx.conf

@@ -70,6 +70,7 @@ server {
 		client_body_timeout 600s;
 		proxy_read_timeout 36000s;
 		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header X-Forwarded-Host $host;
 
 		# WebSockets support
 		proxy_http_version 1.1;

static/src/lang/en_GB/server.json

@@ -376,6 +376,10 @@
 			"Shamiradio",
 			"Shamiradio now playing banner"
 		],
+		"shamiradio2": [
+			"ShamIIradio",
+			"The cooler shamiradio"			
+		],
 		"spoilers": [
 			"Image Spoilers",
 			"Don't spoiler images"

templates/specs.go

@@ -381,6 +381,7 @@ var optionSpecs = [...][]inputSpec{
 		{ID: "radio"},
 		{ID: "eden"},
 		{ID: "shamiradio"},
+		{ID: "shamiradio2"},
 		{Type: _hr},
 		{
 			ID:      "bgVideo",