Merge branch 'master' into refactor/fit-text

* master:
  走者カメラをデフォルトでONにする (#678)
  寄付有無を設定可能にした (#679)
  feat(tracker): make websocket optional (#676)

configschema.json

@@ -18,7 +18,7 @@
 		"tracker": {
 			"type": "object",
 			"additionalProperties": false,
-			"required": ["domain", "event", "websocket", "secure"],
+			"required": ["domain", "event", "secure"],
 			"properties": {
 				"domain": {"type": "string"},
 				"event": {"type": "number"},
@@ -103,6 +103,7 @@
 			"items": {
 				"type": "string"
 			}
-		}
+		},
+		"donationEnabled": {"type": "boolean", "default": true}
 	}
 }

package.json

@@ -180,7 +180,7 @@
 				"name": "credit-control",
 				"title": "エンドロール操作",
 				"file": "credit-control.html",
-				"width": 1,
+				"width": 2,
 				"headerColor": "#00BEBE",
 				"workspace": "2-misc"
 			},

src/browser/graphics/views/omnibar.tsx

@@ -711,19 +711,23 @@ const Omnibar = () => {
 				</div>
 			</Row>
 
-			<img
-				src={lineImage}
-				style={{gridColumn: "3 / 4", gridRow: "1 / 2"}}
-			></img>
-
-			<div style={{width: "15px"}}></div>
-
-			<DonationTotal></DonationTotal>
-
-			<img
-				src={sponsorAssets?.[0]?.url}
-				style={{gridColumn: "5 / 6", gridRow: "1 / 2"}}
-			></img>
+			{nodecg.bundleConfig.donationEnabled && (
+				<>
+					<img
+						src={lineImage}
+						style={{gridColumn: "3 / 4", gridRow: "1 / 2"}}
+					></img>
+
+					<div style={{width: "15px"}}></div>
+
+					<DonationTotal></DonationTotal>
+
+					<img
+						src={sponsorAssets?.[0]?.url}
+						style={{gridColumn: "5 / 6", gridRow: "1 / 2"}}
+					></img>
+				</>
+			)}
 		</div>
 	);
 };

src/extension/tracker.ts

@@ -125,7 +125,7 @@ export const tracker = (nodecg: NodeCG) => {
 								twitch: runner?.fields.twitch,
 								nico: runner?.fields.nico,
 								twitter: runner?.fields.twitter,
-								camera: false,
+								camera: true,
 							};
 						}),
 						commentators: commentators
@@ -254,6 +254,13 @@ export const tracker = (nodecg: NodeCG) => {
 	}, 10 * 1000);
 
 	const connectWebSocket = () => {
+		if (!trackerConfig.websocket) {
+			log.warn(
+				"`websocket` config is empty. NodeCG will not connect to donation tracker's WebSocket.",
+			);
+			return;
+		}
+
 		const schema = trackerConfig.secure ? "wss" : "ws";
 		const url = new URL(
 			trackerConfig.websocket,