Apply fandom changes

includes/PopupsContext.php

@@ -132,18 +132,6 @@ public function getConfigBitmaskFromUser( User $user ) {
 		return ( $this->conflictsWithNavPopupsGadget( $user ) ? self::NAV_POPUPS_ENABLED : 0 );
 	}
 
-	/**
-	 * @return bool
-	 */
-	public function areDependenciesMet() {
-		if ( $this->config->get( 'PopupsGateway' ) === 'mwApiPlain' ) {
-			return $this->extensionRegistry->isLoaded( 'TextExtracts' )
-			&& $this->extensionRegistry->isLoaded( 'PageImages' );
-		}
-
-		return true;
-	}
-
 	/**
 	 * Whether popups code should be shipped to $title
 	 *

includes/PopupsHooks.php

@@ -147,12 +147,6 @@ public function onBeforePageDisplay( $out, $skin ): void {
 			return;
 		}
 
-		if ( !$this->popupsContext->areDependenciesMet() ) {
-			$this->logger->error( 'Popups requires the PageImages extensions.
-				TextExtracts extension is required when using mwApiPlain gateway.' );
-			return;
-		}
-
 		$out->addModules( [ 'ext.popups' ] );
 	}
 

src/gateway/mediawiki.js

@@ -38,7 +38,7 @@ export default function createMediaWikiApiGateway( api, config ) {
 	function fetch( title ) {
 		return api.get( {
 			action: 'query',
-			prop: 'info|extracts|pageimages|revisions|info',
+			prop: 'info|articlesnippet|revisions|info|vignetteimages',
 			formatversion: 2,
 			redirects: true,
 			exintro: mw.config.get( 'wgPopupsTextExtractsIntroOnly', true ),
@@ -57,7 +57,8 @@ export default function createMediaWikiApiGateway( api, config ) {
 			titles: title,
 			smaxage: CACHE_LIFETIME,
 			maxage: CACHE_LIFETIME,
-			uselang: 'content'
+			uselang: 'content',
+			vigthumbsize: config.THUMBNAIL_SIZE
 		}, {
 			headers: {
 				'X-Analytics': 'preview=1',

src/isPagePreviewsEnabled.js

@@ -34,5 +34,5 @@ export default function isPagePreviewsEnabled( user, userSettings, config ) {
 	}
 
 	// Registered users never can enable popup types at run-time.
-	return mw.user.options.get( 'popups' ) === '1' ? true : null;
+	return Number( mw.user.options.get( 'popups' ) ) === 1 ? true : null;
 }