wikimedia/mediawiki-extensions-RelatedArticles
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/RelatedArticles synced 2024-11-24 00:05:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hooks: inject DisambiguatorLookup as an optional service

Browse source 
Follow-up: Id2a10f2f1be0e38ddb8ebef5d5babb3daac3ce9a
Change-Id: Ib1a0297fd17e1cec0847d68a0c184e3c713f0111
This commit is contained in:
DannyS712 2024-02-05 18:19:28 +00:00
parent 703e142c59
commit bc9added4f
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
extension.json
View file

@ -31,7 +31,10 @@
},
"HookHandlers": {
"main": {
"class": "RelatedArticles\\Hooks"
"class": "RelatedArticles\\Hooks",
"optional_services": [
"DisambiguatorLookup"
]
}
},
"MessagesDirs": {

26
includes/Hooks.php
View file

@ -4,6 +4,7 @@ namespace RelatedArticles;
use IContextSource;
use MediaWiki\Config\Config;
use MediaWiki\Extension\Disambiguator\Lookup;
use MediaWiki\Hook\BeforePageDisplayHook;
use MediaWiki\Hook\MakeGlobalVariablesScriptHook;
use MediaWiki\Hook\OutputPageParserOutputHook;
@ -27,6 +28,13 @@ class Hooks implements
SkinAfterContentHook
{
/** Either a Lookup from the Disambiguator extension, or null if that is not installed */
private ?Lookup $disambiguatorLookup;
public function __construct( ?Lookup $disambiguatorLookup ) {
$this->disambiguatorLookup = $disambiguatorLookup;
}
/**
* Handler for the <code>MakeGlobalVariablesScript</code> hook.
*
@ -52,13 +60,9 @@ class Hooks implements
* @param Title $title
* @return bool
*/
private static function isDisambiguationPage( Title $title ) {
$services = MediaWikiServices::getInstance();
if ( !$services->hasService( 'DisambiguatorLookup' ) ) {
return false;
}
return $services->getService( 'DisambiguatorLookup' )
->isDisambiguationPage( $title );
private function isDisambiguationPage( Title $title ) {
return $this->disambiguatorLookup &&
$this->disambiguatorLookup->isDisambiguationPage( $title );
}
/**
@ -101,7 +105,7 @@ class Hooks implements
* @param Skin $skin
* @return bool
*/
private static function hasRelatedArticles( Skin $skin ): bool {
private function hasRelatedArticles( Skin $skin ): bool {
$title = $skin->getTitle();
$action = $skin->getRequest()->getRawVal( 'action', 'view' );
return $title->inNamespace( NS_MAIN ) &&
@ -110,7 +114,7 @@ class Hooks implements
!$title->isMainPage() &&
$title->exists() &&
!self::isDiffPage( $skin ) &&
!self::isDisambiguationPage( $title ) &&
!$this->isDisambiguationPage( $title ) &&
self::isReadMoreAllowedOnSkin( $skin );
}
@ -135,7 +139,7 @@ class Hooks implements
* @param Skin $skin Skin object that will be used to generate the page
*/
public function onBeforePageDisplay( $out, $skin ): void {
if ( self::hasRelatedArticles( $skin ) ) {
if ( $this->hasRelatedArticles( $skin ) ) {
$out->addModules( [ 'ext.relatedArticles.readMore.bootstrap' ] );
$out->addModuleStyles( [ 'ext.relatedArticles.styles' ] );
}
@ -230,7 +234,7 @@ class Hooks implements
* @param Skin $skin
*/
public function onSkinAfterContent( &$data, $skin ) {
if ( self::hasRelatedArticles( $skin ) ) {
if ( $this->hasRelatedArticles( $skin ) ) {
$data .= Html::element( 'div', [ 'class' => 'read-more-container' ] );
}
}