Fix DomainSnapshot publishing (moving page) and verification of them

inblockio · Sep 4, 2024 · c1bd602 · c1bd602
1 parent 663ebc3
commit c1bd602
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/includes/API/WriteStoreWitnessTxHandler.php b/includes/API/WriteStoreWitnessTxHandler.php
@@ -102,9 +102,7 @@ public function run() {
 		if ( !$domainSnapshotPage ) {
 			throw new HttpException( "No Domain Snapshot page found", 404 );
 		}
-		$this->verificationEngine->getLookup()->updateEntity( $domainSnapshotPage, [
-			'witness_event_id' => $witness_event_id,
-		] );
+		$this->verificationEngine->buildAndUpdateVerificationData( $domainSnapshotPage, $domainSnapshotPage->getRevision() );
 
 		// Add receipt to the domain snapshot
 		$this->witnessingEngine->addReceiptToDomainSnapshot( $this->user, $witnessEvent );

diff --git a/includes/Verification/VerificationLookup.php b/includes/Verification/VerificationLookup.php
@@ -395,9 +395,9 @@ private function getCanonicalTitle( Title $title ): string {
 		}
 		$canonicalNamespace = $this->namespaceInfo->getCanonicalName( $title->getNamespace() );
 		if ( !$canonicalNamespace ) {
-			return $title->getPrefixedText();
+			return str_replace( '_', ' ', $title->getPrefixedText() );
 		}
-		return "$canonicalNamespace:{$title->getText()}";
+		return str_replace( '_', ' ', "$canonicalNamespace:{$title->getText()}" );
 	}
 
 	/**

diff --git a/includes/Verification/WitnessingEngine.php b/includes/Verification/WitnessingEngine.php
@@ -80,6 +80,8 @@ public function addReceiptToDomainSnapshot( User $user, WitnessEventEntity $enti
 			throw new \MWException( 'Could not store receipt to Domain Snapshot' );
 		}
 
+		$resRev = $this->revisionStore->getRevisionByTitle( $tentativeTitle );
+
 		// Rename from tentative title to final title.
 		$domainSnapshotVH = $entity->get( 'domain_snapshot_genesis_hash' );
 		$finalTitle = $this->titleFactory->makeTitle( 6942, "DomainSnapshot:$domainSnapshotVH" );
@@ -88,8 +90,9 @@ public function addReceiptToDomainSnapshot( User $user, WitnessEventEntity $enti
 		$createRedirect = false;
 		$movePage->move( $user, $reason, $createRedirect );
 		$this->getLookup()->updateWitnessEventEntity( $entity, [
-			'domain_snapshot_title' => $finalTitle->getPrefixedText(),
+			'domain_snapshot_title' => str_replace( '_', ' ', $finalTitle->getPrefixedText() ),
 		] );
+		return $resRev;
 	}
 
 	/**