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

Merge "ApiDiscussionToolsCompare: Deduplicate 'from'/'to' param handling"

Browse source
This commit is contained in:
jenkins-bot 2024-04-30 20:02:59 +00:00 committed by Gerrit Code Review
parent 3c4b5364f2 f3e96a72fa
commit af74638d08
1 changed files with 28 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
includes/ApiDiscussionToolsCompare.php
View file

@ -32,6 +32,32 @@ class ApiDiscussionToolsCompare extends ApiBase {
$this->revisionLookup = $revisionLookup; $this->revisionLookup = $revisionLookup;
} }
/**
* @throws ApiUsageException
*/
private function getRevision( array $params, string $prefix ): RevisionRecord {
if ( isset( $params["{$prefix}rev"] ) ) {
$rev = $this->revisionLookup->getRevisionById( $params["{$prefix}rev"] );
if ( !$rev ) {
$this->dieWithError( [ 'apierror-nosuchrevid', $params["{$prefix}rev"] ] );
}
} else {
$title = Title::newFromText( $params["{$prefix}title"] );
if ( !$title ) {
$this->dieWithError( [ 'apierror-invalidtitle', wfEscapeWikiText( $params["{$prefix}title"] ) ] );
}
$rev = $this->revisionLookup->getRevisionByTitle( $title );
if ( !$rev ) {
$this->dieWithError(
[ 'apierror-missingrev-title', wfEscapeWikiText( $title->getPrefixedText() ) ],
'nosuchrevid'
);
}
}
return $rev;
}
/** /**
* @inheritDoc * @inheritDoc
* @throws ApiUsageException * @throws ApiUsageException
@ -42,25 +68,7 @@ class ApiDiscussionToolsCompare extends ApiBase {
$this->requireOnlyOneParameter( $params, 'fromtitle', 'fromrev' ); $this->requireOnlyOneParameter( $params, 'fromtitle', 'fromrev' );
$this->requireOnlyOneParameter( $params, 'totitle', 'torev' ); $this->requireOnlyOneParameter( $params, 'totitle', 'torev' );
if ( isset( $params['torev'] ) ) { $toRev = $this->getRevision( $params, 'to' );
$toRev = $this->revisionLookup->getRevisionById( $params['torev'] );
if ( !$toRev ) {
$this->dieWithError( [ 'apierror-nosuchrevid', $params['torev'] ] );
}
} else {
$toTitle = Title::newFromText( $params['totitle'] );
if ( !$toTitle ) {
$this->dieWithError( [ 'apierror-invalidtitle', wfEscapeWikiText( $params['totitle'] ) ] );
}
$toRev = $this->revisionLookup->getRevisionByTitle( $toTitle );
if ( !$toRev ) {
$this->dieWithError(
[ 'apierror-missingrev-title', wfEscapeWikiText( $toTitle->getPrefixedText() ) ],
'nosuchrevid'
);
}
}
// When polling for new comments this is an important optimisation, // When polling for new comments this is an important optimisation,
// as usually there is no new revision. // as usually there is no new revision.
@ -69,25 +77,7 @@ class ApiDiscussionToolsCompare extends ApiBase {
return; return;
} }
if ( isset( $params['fromrev'] ) ) { $fromRev = $this->getRevision( $params, 'from' );
$fromRev = $this->revisionLookup->getRevisionById( $params['fromrev'] );
if ( !$fromRev ) {
$this->dieWithError( [ 'apierror-nosuchrevid', $params['fromrev'] ] );
}
} else {
$fromTitle = Title::newFromText( $params['fromtitle'] );
if ( !$fromTitle ) {
$this->dieWithError( [ 'apierror-invalidtitle', wfEscapeWikiText( $params['fromtitle'] ) ] );
}
$fromRev = $this->revisionLookup->getRevisionByTitle( $fromTitle );
if ( !$fromRev ) {
$this->dieWithError(
[ 'apierror-missingrev-title', wfEscapeWikiText( $fromTitle->getPrefixedText() ) ],
'nosuchrevid'
);
}
}
if ( $fromRev->hasSameContent( $toRev ) ) { if ( $fromRev->hasSameContent( $toRev ) ) {
$this->addResult( $fromRev, $toRev ); $this->addResult( $fromRev, $toRev );