Merge branch 'main' into sophie/fix-tech-rev-refresh-status

apps/app-frontend/src/App.vue

@@ -1341,12 +1341,11 @@ async function processPendingSurveys() {
 	const creds = await getCreds().catch(handleError)
 	const userId = creds?.user_id
 
-	const instances = await list().catch(handleError)
-	const isActivePlayer =
-		instances.findIndex(
-			(instance) =>
-				isWithinLastTwoWeeks(instance.last_played) && !isWithinLastTwoWeeks(instance.created),
-		) >= 0
+	const instances = (await list().catch(handleError)) ?? []
+	const isActivePlayer = instances.some(
+		(instance) =>
+			isWithinLastTwoWeeks(instance.last_played) && !isWithinLastTwoWeeks(instance.created),
+	)
 
 	let surveys = []
 	try {

apps/app-frontend/src/helpers/types.d.ts

@@ -97,6 +97,7 @@ type ReleaseChannel = 'release' | 'beta' | 'alpha'
 export type InstanceLoader = 'vanilla' | 'forge' | 'fabric' | 'quilt' | 'neoforge'
 
 type ContentFile = {
+	enabled: boolean
 	metadata?: {
 		project_id: string
 		version_id: string

apps/app-playground/src/main.rs

@@ -47,7 +47,7 @@ async fn main() -> theseus::Result<()> {
     for world in worlds {
         println!(
             "World: {:?}/{:?} played at {:?}: {:#?}",
-            world.profile,
+            world.instance_id,
             world.world.name,
             world.world.last_played,
             world.world.details

apps/frontend/src/public/ads.txt

@@ -526,4 +526,11 @@ yahoo.com, 100033, DIRECT, e1a5b5b6e3255540
 
 #IndexExchange
 indexexchange.com, 184169, DIRECT, 50b1c356f2c5c8fc
-indexexchange.com, 198988, DIRECT, 50b1c356f2c5c8fc
+indexexchange.com, 198988, DIRECT, 50b1c356f2c5c8fc
+
+#AppNexus
+Xandr.com, 2398, DIRECT
+
+#Rubicon
+rubiconproject.com, 24584, DIRECT, 0bfd66d529a55807
+rubiconproject.com, 24586, DIRECT, 0bfd66d529a55807