2022-01-31 15:01:32 +00:00
|
|
|
<?php
|
|
|
|
|
|
|
|
namespace MediaWiki\Extension\DiscussionTools;
|
|
|
|
|
2022-02-02 00:13:32 +00:00
|
|
|
use ApiMain;
|
|
|
|
use ApiResult;
|
|
|
|
use DerivativeContext;
|
|
|
|
use DerivativeRequest;
|
|
|
|
use IContextSource;
|
Change CommentParser into a service
Goal:
-----
To have a method like CommentParser::parse(), which just takes a node
to parse and a title and returns plain data, so that we don't need to
keep track of the config to construct a CommentParser object (the
required config like content language is provided by services) and
we don't need to keep that object around after parsing.
Changes:
--------
CommentParser.php:
* …is now a service. Constructor only takes services as arguments.
The node and title are passed to a new parse() method.
* parse() should return plain data, but I split this part to a separate
patch for ease of review: I49bfe019aa460651447fd383f73eafa9d7180a92.
* CommentParser still cheats and accesses global state in a few places,
e.g. calling Title::makeTitleSafe or CommentUtils::getTitleFromUrl,
so we can't turn its tests into true unit tests. This work is left
for future commits.
LanguageData.php:
* …is now a service, instead of a static class.
Parser.js:
* …is not a real service, but it's changed to behave in a similar way.
Constructor takes only the required config as argument,
and node and title are instead passed to a new parse() method.
CommentParserTest.php:
parser.test.js:
* Can be simplified, now that we don't need a useless node and title
to test internal methods that don't use them.
testUtils.js:
* Can be simplified, now that we don't need to override internal
ResourceLoader stuff just to change the parser config.
Change-Id: Iadb7757debe000025e52770ca51ebcf24ca8ee66
2022-02-19 02:43:21 +00:00
|
|
|
use MediaWiki\MediaWikiServices;
|
2022-01-31 15:01:32 +00:00
|
|
|
use MediaWiki\Revision\RevisionRecord;
|
|
|
|
use Title;
|
|
|
|
use Wikimedia\Parsoid\Utils\DOMCompat;
|
|
|
|
use Wikimedia\Parsoid\Utils\DOMUtils;
|
|
|
|
|
2022-02-02 00:13:32 +00:00
|
|
|
/**
|
|
|
|
* Random methods we want to share between API modules.
|
|
|
|
*/
|
2022-01-31 15:01:32 +00:00
|
|
|
trait ApiDiscussionToolsTrait {
|
|
|
|
/**
|
|
|
|
* @param RevisionRecord $revision
|
2022-02-19 06:31:34 +00:00
|
|
|
* @return ThreadItemSet
|
2022-01-31 15:01:32 +00:00
|
|
|
*/
|
2022-02-19 06:31:34 +00:00
|
|
|
protected function parseRevision( RevisionRecord $revision ): ThreadItemSet {
|
2022-01-31 15:01:32 +00:00
|
|
|
$response = $this->requestRestbasePageHtml( $revision );
|
|
|
|
|
|
|
|
$doc = DOMUtils::parseHTML( $response['body'] );
|
|
|
|
$container = DOMCompat::getBody( $doc );
|
|
|
|
|
|
|
|
CommentUtils::unwrapParsoidSections( $container );
|
|
|
|
|
|
|
|
$title = Title::newFromLinkTarget(
|
|
|
|
$revision->getPageAsLinkTarget()
|
|
|
|
);
|
|
|
|
|
Change CommentParser into a service
Goal:
-----
To have a method like CommentParser::parse(), which just takes a node
to parse and a title and returns plain data, so that we don't need to
keep track of the config to construct a CommentParser object (the
required config like content language is provided by services) and
we don't need to keep that object around after parsing.
Changes:
--------
CommentParser.php:
* …is now a service. Constructor only takes services as arguments.
The node and title are passed to a new parse() method.
* parse() should return plain data, but I split this part to a separate
patch for ease of review: I49bfe019aa460651447fd383f73eafa9d7180a92.
* CommentParser still cheats and accesses global state in a few places,
e.g. calling Title::makeTitleSafe or CommentUtils::getTitleFromUrl,
so we can't turn its tests into true unit tests. This work is left
for future commits.
LanguageData.php:
* …is now a service, instead of a static class.
Parser.js:
* …is not a real service, but it's changed to behave in a similar way.
Constructor takes only the required config as argument,
and node and title are instead passed to a new parse() method.
CommentParserTest.php:
parser.test.js:
* Can be simplified, now that we don't need a useless node and title
to test internal methods that don't use them.
testUtils.js:
* Can be simplified, now that we don't need to override internal
ResourceLoader stuff just to change the parser config.
Change-Id: Iadb7757debe000025e52770ca51ebcf24ca8ee66
2022-02-19 02:43:21 +00:00
|
|
|
$parser = MediaWikiServices::getInstance()->getService( 'DiscussionTools.CommentParser' );
|
|
|
|
return $parser->parse( $container, $title );
|
2022-01-31 15:01:32 +00:00
|
|
|
}
|
|
|
|
|
2022-02-02 00:13:32 +00:00
|
|
|
/**
|
|
|
|
* Given parameters describing a reply or new topic, transform them into wikitext using Parsoid,
|
|
|
|
* then preview the wikitext using the legacy parser.
|
|
|
|
*
|
|
|
|
* @param array $params Associative array with the following keys:
|
|
|
|
* - `type` (string) 'topic' or 'reply'
|
|
|
|
* - `title` (Title) Context title for wikitext transformations
|
|
|
|
* - `wikitext` (string) Content of the message
|
|
|
|
* - `sectiontitle` (string) Content of the title, when `type` is 'topic'
|
|
|
|
* - `signature` (string|null) Wikitext signature to add to the message
|
|
|
|
* @return ApiResult action=parse API result
|
|
|
|
*/
|
|
|
|
protected function previewMessage( array $params ): ApiResult {
|
|
|
|
$wikitext = $params['wikitext'];
|
|
|
|
$title = $params['title'];
|
|
|
|
$signature = $params['signature'] ?? null;
|
|
|
|
|
|
|
|
switch ( $params['type'] ) {
|
|
|
|
case 'topic':
|
|
|
|
$wikitext = CommentUtils::htmlTrim( $wikitext );
|
|
|
|
if ( $signature !== null ) {
|
|
|
|
$wikitext .= $signature;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( $params['sectiontitle'] ) {
|
|
|
|
$wikitext = "== " . $params['sectiontitle'] . " ==\n" . $wikitext;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 'reply':
|
|
|
|
$doc = DOMUtils::parseHTML( '' );
|
|
|
|
|
|
|
|
$container = CommentModifier::prepareWikitextReply( $doc, $wikitext );
|
|
|
|
|
|
|
|
if ( $signature !== null ) {
|
|
|
|
CommentModifier::appendSignature( $container, $signature );
|
|
|
|
}
|
|
|
|
$list = CommentModifier::transferReply( $container );
|
|
|
|
$html = DOMCompat::getOuterHTML( $list );
|
|
|
|
|
|
|
|
$wikitext = $this->transformHTML( $title, $html )[ 'body' ];
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
$apiParams = [
|
|
|
|
'action' => 'parse',
|
|
|
|
'title' => $title->getPrefixedText(),
|
|
|
|
'text' => $wikitext,
|
|
|
|
'pst' => '1',
|
|
|
|
'preview' => '1',
|
|
|
|
'disableeditsection' => '1',
|
|
|
|
'prop' => 'text|modules|jsconfigvars',
|
|
|
|
];
|
|
|
|
|
|
|
|
$context = new DerivativeContext( $this->getContext() );
|
|
|
|
$context->setRequest(
|
|
|
|
new DerivativeRequest(
|
|
|
|
$context->getRequest(),
|
|
|
|
$apiParams,
|
|
|
|
/* was posted? */ true
|
|
|
|
)
|
|
|
|
);
|
|
|
|
$api = new ApiMain(
|
|
|
|
$context,
|
|
|
|
/* enable write? */ false
|
|
|
|
);
|
|
|
|
|
|
|
|
$api->execute();
|
|
|
|
return $api->getResult();
|
|
|
|
}
|
|
|
|
|
2022-01-31 15:01:32 +00:00
|
|
|
/**
|
|
|
|
* @param RevisionRecord $revision
|
|
|
|
* @return array
|
|
|
|
*/
|
|
|
|
abstract protected function requestRestbasePageHtml( RevisionRecord $revision ): array;
|
2022-02-02 00:13:32 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @param Title $title
|
|
|
|
* @param string $html
|
|
|
|
* @param int|null $oldid
|
|
|
|
* @param string|null $etag
|
|
|
|
* @return array
|
|
|
|
*/
|
|
|
|
abstract protected function transformHTML(
|
|
|
|
Title $title, string $html, int $oldid = null, string $etag = null
|
|
|
|
): array;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @return IContextSource
|
|
|
|
*/
|
|
|
|
abstract public function getContext();
|
|
|
|
|
2022-01-31 15:01:32 +00:00
|
|
|
}
|