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

Merge "Clean up ApiDiscussionToolsPageInfo hack"

Browse source
This commit is contained in:
jenkins-bot 2023-01-05 23:28:04 +00:00 committed by Gerrit Code Review
parent d326fa4671 ef7213a3d3
commit 6d52132754
1 changed files with 54 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
includes/ApiDiscussionToolsPageInfo.php
View file

@ -4,6 +4,7 @@ namespace MediaWiki\Extension\DiscussionTools;
use ApiBase;
use ApiMain;
use ApiUsageException;
use MediaWiki\Extension\DiscussionTools\Hooks\HookUtils;
use MediaWiki\Extension\DiscussionTools\ThreadItem\CommentItem;
use MediaWiki\Extension\DiscussionTools\ThreadItem\ContentHeadingItem;
@ -41,43 +42,7 @@ class ApiDiscussionToolsPageInfo extends ApiBase {
public function execute() {
$params = $this->extractRequestParams();
$this->requireAtLeastOneParameter( $params, 'page', 'oldid' );
if ( isset( $params['page'] ) ) {
$title = Title::newFromText( $params['page'] );
if ( !$title ) {
$this->dieWithError( [ 'apierror-invalidtitle', wfEscapeWikiText( $params['page'] ) ] );
}
if ( !HookUtils::isAvailableForTitle( $title ) ) {
$this->getResult()->addValue(
null,
$this->getModuleName(),
[ 'transcludedfrom' => [] ]
);
return;
}
}
if ( isset( $params['oldid'] ) ) {
$revision = $this->revisionLookup->getRevisionById( $params['oldid'] );
if ( !$revision ) {
$this->dieWithError( [ 'apierror-nosuchrevid', $params['oldid'] ] );
}
} else {
$title = Title::newFromText( $params['page'] );
if ( !$title ) {
$this->dieWithError( [ 'apierror-invalidtitle', wfEscapeWikiText( $params['page'] ) ] );
}
$revision = $this->revisionLookup->getRevisionByTitle( $title );
if ( !$revision ) {
$this->dieWithError(
[ 'apierror-missingrev-title', wfEscapeWikiText( $title->getPrefixedText() ) ],
'nosuchrevid'
);
}
}
$threadItemSet = HookUtils::parseRevisionParsoidHtml( $revision );
$threadItemSet = $this->getThreadItemSet( $params );
$result = [];
$prop = array_fill_keys( $params['prop'], true );
@ -93,6 +58,58 @@ class ApiDiscussionToolsPageInfo extends ApiBase {
$this->getResult()->addValue( null, $this->getModuleName(), $result );
}
/**
* Get the thread item set for the specified revision
*
* @param array $params
* @return ContentThreadItemSet
*/
private function getThreadItemSet( $params ) {
if ( isset( $params['page'] ) ) {
$title = Title::newFromText( $params['page'] );
if ( !$title ) {
throw ApiUsageException::newWithMessage(
$this,
[ 'apierror-invalidtitle', wfEscapeWikiText( $params['page'] ) ]
);
}
}
if ( isset( $params['oldid'] ) ) {
$revision = $this->revisionLookup->getRevisionById( $params['oldid'] );
if ( !$revision ) {
throw ApiUsageException::newWithMessage(
$this,
[ 'apierror-nosuchrevid', $params['oldid'] ]
);
}
} else {
$title = Title::newFromText( $params['page'] );
if ( !$title ) {
throw ApiUsageException::newWithMessage(
$this,
[ 'apierror-invalidtitle', wfEscapeWikiText( $params['page'] ) ]
);
}
$revision = $this->revisionLookup->getRevisionByTitle( $title );
if ( !$revision ) {
throw ApiUsageException::newWithMessage(
$this,
[ 'apierror-missingrev-title', wfEscapeWikiText( $title->getPrefixedText() ) ],
'nosuchrevid'
);
}
}
$title = Title::castFromPageIdentity( $revision->getPage() );
if ( !$title || !HookUtils::isAvailableForTitle( $title ) ) {
// T325477: don't parse non-discussion pages
return new ContentThreadItemSet;
}
return HookUtils::parseRevisionParsoidHtml( $revision );
}
/**
* Get transcluded=from data for a ContentThreadItemSet
*