wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-11-30 19:16:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

HookUtils::parseRevisionParsoidHtml doesn't need HTML for editing

Browse source 
Bug: T323357
Change-Id: Ifbde590ccb6bf3203a2f664cb0d8a73b8d507b78
This commit is contained in:
Bartosz Dziewoński 2022-11-21 13:37:16 +01:00
parent 1eba2b1286
commit 9601fde487
1 changed files with 15 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
includes/Hooks/HookUtils.php
View file

@ -15,8 +15,6 @@ use IDBAccessObject;
use MediaWiki\Extension\DiscussionTools\CommentUtils; use MediaWiki\Extension\DiscussionTools\CommentUtils;
use MediaWiki\Extension\DiscussionTools\ContentThreadItemSet; use MediaWiki\Extension\DiscussionTools\ContentThreadItemSet;
use MediaWiki\Extension\Gadgets\GadgetRepo; use MediaWiki\Extension\Gadgets\GadgetRepo;
use MediaWiki\Extension\VisualEditor\ParsoidClient;
use MediaWiki\Extension\VisualEditor\VisualEditorParsoidClientFactory;
use MediaWiki\Linker\LinkTarget; use MediaWiki\Linker\LinkTarget;
use MediaWiki\MediaWikiServices; use MediaWiki\MediaWikiServices;
use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionRecord;
@ -95,61 +93,26 @@ class HookUtils {
public static function parseRevisionParsoidHtml( RevisionRecord $revRecord ): ContentThreadItemSet { public static function parseRevisionParsoidHtml( RevisionRecord $revRecord ): ContentThreadItemSet {
$services = MediaWikiServices::getInstance(); $services = MediaWikiServices::getInstance();
$mainConfig = $services->getMainConfig(); $mainConfig = $services->getMainConfig();
$parsoidOutputAccess = $services->getParsoidOutputAccess();
// Detect WMF private wikis, where ParsoidHelper will not work with $forwardCookies=false. $pageRecord = $services->getPageStore()->getPageById( $revRecord->getPageId() ) ?:
// Use ParsoidOutputAccess instead, which is discouraged for production use for reasons no one $services->getPageStore()->getPageById( $revRecord->getPageId(), IDBAccessObject::READ_LATEST );
// was able to adequately explain, but it is the only way. WMF private wikis get very few edits Assert::postcondition( $pageRecord !== null, 'Revision had no page' );
// anyway, so this shouldn't be a big deal. (T315689)
$tryRESTBase = isset( $mainConfig->get( 'VirtualRestConfig' )['modules']['restbase'] );
$html = null;
// It's 2022 and we still can't use Parsoid in production. Work around this. (If it's no longer $status = $parsoidOutputAccess->getParserOutput(
// 2022 and this comment is still here, time to quit technology and find a job as a farmer.) $pageRecord,
if ( $tryRESTBase ) { ParserOptions::newFromAnon(),
$parsoidClientFactory = $services->getService( VisualEditorParsoidClientFactory::SERVICE_NAME ); $revRecord
/** @var ParsoidClient $parsoidClient */ );
$parsoidClient = $parsoidClientFactory->createParsoidClient( false );
// Get HTML for the revision if ( !$status->isOK() ) {
$response = $parsoidClient->getPageHtml( $revRecord, null ); [ 'message' => $key, 'params' => $params ] = $status->getErrors()[0];
$message = wfMessage( $key, ...$params );
if ( !empty( $response['error'] ) ) { throw new MWException( $message->inLanguage( 'en' )->useDatabase( false )->text() );
$msg = $response['error'];
if ( $msg[0] === 'apierror-visualeditor-docserver-http' && $msg[1] === 404 ) {
// Probably just RESTBase having outdated info. Try again without it. (T315688)
} else {
// @phan-suppress-next-line PhanParamTooFewUnpack We already checked that it's !empty()
$message = wfMessage( ...$msg );
throw new MWException( $message->inLanguage( 'en' )->useDatabase( false )->text() );
}
} else {
$html = $response['body'];
}
} }
if ( $html === null ) { $parserOutput = $status->getValue();
// Private wiki, or RESTBase having outdated info $html = $parserOutput->getText();
$parsoidOutputAccess = $services->getParsoidOutputAccess();
$pageRecord = $services->getPageStore()->getPageById( $revRecord->getPageId() ) ?:
$services->getPageStore()->getPageById( $revRecord->getPageId(), IDBAccessObject::READ_LATEST );
Assert::postcondition( $pageRecord !== null, 'Revision had no page' );
$status = $parsoidOutputAccess->getParserOutput(
$pageRecord,
ParserOptions::newFromAnon(),
$revRecord
);
if ( !$status->isOK() ) {
[ 'message' => $key, 'params' => $params ] = $status->getErrors()[0];
$message = wfMessage( $key, ...$params );
throw new MWException( $message->inLanguage( 'en' )->useDatabase( false )->text() );
}
$parserOutput = $status->getValue();
$html = $parserOutput->getText();
}
// Run the discussion parser on it // Run the discussion parser on it
$doc = DOMUtils::parseHTML( $html ); $doc = DOMUtils::parseHTML( $html );