Upgrade extension Thanks to MW 1.43 | Pull all Fandom patches into Thanks 1.43

.github/workflows/php-pr-checks.yml

@@ -0,0 +1,78 @@
+name: PHPUnit / PHPCS / Phan
+on:
+  pull_request:
+    branches: '**'
+
+  push:
+    branches: [ REL1_43 ]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        php_version: ['8.0']
+        mw: ['REL1_43']
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php_version }}
+          # We don't run any coverage, so we should set this parameter to none
+          # as this will disable xdebug which slows all processes significantly
+          coverage: none
+          extensions: ast
+      - uses: actions/checkout@v3
+
+      - name: Checkout Mediawiki
+        uses: actions/checkout@v3
+        with:
+          repository: wikimedia/mediawiki
+          path: mediawiki
+          ref: ${{ matrix.mw }}
+
+      - name: Checkout Echo (dependency) extension
+        uses: actions/checkout@v3
+        with:
+          repository: wikimedia/mediawiki-extensions-Echo
+          path: mediawiki/extensions/Echo
+
+      - name: Checkout Flow (implicit dependency) extension
+        uses: actions/checkout@v3
+        with:
+          repository: wikimedia/mediawiki-extensions-Flow
+          path: mediawiki/extensions/Flow
+
+      - name: Checkout MobileFrontend (implicit dependency) extension
+        uses: actions/checkout@v3
+        with:
+          repository: wikimedia/mediawiki-extensions-MobileFrontend
+          path: mediawiki/extensions/MobileFrontend
+
+      - name: Checkout CheckUser (implicit dependency) extension
+        uses: actions/checkout@v3
+        with:
+          repository: wikimedia/mediawiki-extensions-CheckUser
+          path: mediawiki/extensions/CheckUser
+
+      - name: Checkout Thanks extension
+        uses: actions/checkout@v2
+        with:
+          path: mediawiki/extensions/Thanks
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-v3-${{ hashFiles('**/composer.lock') }}
+
+      - name: Install composer dependencies
+        if: steps.composer-cache.outputs.cache-hit != 'true'
+        working-directory: ./mediawiki/extensions/Thanks
+        run: composer install --prefer-dist --no-progress
+
+      - name: Run PHPCS
+        working-directory: ./mediawiki/extensions/Thanks
+        run: composer phpcs

extension.json

@@ -11,10 +11,7 @@
 	"license-name": "MIT",
 	"type": "other",
 	"requires": {
-		"MediaWiki": ">= 1.43",
-		"extensions": {
-			"Echo": "*"
-		}
+		"MediaWiki": ">= 1.43"
 	},
 	"DefaultUserOptions": {
 		"echo-subscriptions-web-edit-thank": true,
@@ -81,6 +78,10 @@
 			"dependencies": [
 				"mediawiki.cookie",
 				"mediawiki.api"
+			],
+			"targets": [
+				"desktop",
+				"mobile"
 			]
 		},
 		"ext.thanks.corethank": {
@@ -106,6 +107,10 @@
 				"mediawiki.api",
 				"jquery.confirmable",
 				"ext.thanks"
+			],
+			"targets": [
+				"desktop",
+				"mobile"
 			]
 		},
 		"ext.thanks.flowthank": {
@@ -155,7 +160,11 @@
 		"LogEventsListLineEnding": "main",
 		"PageHistoryBeforeList": "main",
 		"PageHistoryPager::doBatchLookups": "main",
-		"ChangesListInitRows": "main"
+		"ChangesListInitRows": "main",
+		"EnhancedChangesListModifyLineData": "main",
+		"EnhancedChangesListModifyBlockLineData": "MediaWiki\\Extension\\Thanks\\Hooks::onEnhancedChangesListModifyBlockLineData",
+		"OldChangesListRecentChangesLine":  "main",
+		"ContributionsLineEnding":  "main"
 	},
 	"HookHandlers": {
 		"main": {
@@ -203,6 +212,9 @@
 				"rights/rights",
 				"lock"
 			]
+		},
+		"ThanksMaxLoadThankedPeriodDays": {
+			"value": 365
 		}
 	},
 	"manifest_version": 2

includes/Api/ApiCoreThank.php

@@ -7,17 +7,19 @@
 use MediaWiki\Api\ApiBase;
 use MediaWiki\Api\ApiMain;
 use MediaWiki\Extension\Notifications\DiscussionParser;
-use MediaWiki\Extension\Notifications\Model\Event;
 use MediaWiki\Extension\Thanks\Storage\Exceptions\InvalidLogType;
 use MediaWiki\Extension\Thanks\Storage\Exceptions\LogDeleted;
 use MediaWiki\Extension\Thanks\Storage\LogStore;
+use MediaWiki\Extension\Thanks\ThanksCache;
+use MediaWiki\MediaWikiServices;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Revision\RevisionRecord;
 use MediaWiki\Revision\RevisionStore;
 use MediaWiki\Title\Title;
 use MediaWiki\User\User;
 use MediaWiki\User\UserFactory;
 use MediaWiki\User\UserIdentity;
+use RequestContext;
 use Wikimedia\ParamValidator\ParamValidator;
 use Wikimedia\ParamValidator\TypeDef\IntegerDef;
 
@@ -115,7 +117,7 @@ public function execute() {
 				$user,
 				$type,
 				$id,
-				$excerpt,
+				'', // We don't need the excerpt for our notification, and it would come from Echo
 				$recipient,
 				$this->getSourceFromParams( $params ),
 				$title,
@@ -132,11 +134,16 @@ public function execute() {
 	 * @return bool
 	 */
 	protected function userAlreadySentThanks( User $user, $type, $id ) {
-		if ( $type === 'rev' ) {
-			// For b/c with old-style keys
-			$type = '';
-		}
-		return (bool)$user->getRequest()->getSessionData( "thanks-thanked-$type$id" );
+		/**
+		 * Fandom change - start - UGC-4533 - Cache thanks data in session in a better way
+		 * @author Mkostrzewski
+		 */
+		return ( new ThanksCache(
+			MediaWikiServices::getInstance()->getDBLoadBalancer(),
+			MediaWikiServices::getInstance()->getMainConfig()
+		) )
+			->haveThanked( RequestContext::getMain(), $user->getActorId(), $id, $type );
+		// Fandom change - end
 	}
 
 	private function getRevisionFromId( $revId ) {
@@ -241,8 +248,8 @@ protected function sendThanks(
 			return;
 		}
 
-		// Create the notification via Echo extension
-		Event::create( [
+		// Create notification via hook
+		$this->getHookContainer()->run( 'ThankCreated', [
 			'type' => 'edit-thank',
 			'title' => $title,
 			'extra' => [
@@ -256,7 +263,15 @@ protected function sendThanks(
 		] );
 
 		// And mark the thank in session for a cheaper check to prevent duplicates (Phab:T48690).
-		$user->getRequest()->setSessionData( "thanks-thanked-$type$id", true );
+		/**
+		 * Fandom change - start - UGC-4533 - Cache thanks data in session in a better way
+		 * @author Mkostrzewski
+		 */
+		( new ThanksCache(
+			MediaWikiServices::getInstance()->getDBLoadBalancer(),
+			MediaWikiServices::getInstance()->getMainConfig()
+		) )->appendUserThanks( $this->getContext(), $user->getActorId(), $uniqueId );
+		// Fandom change - end
 		// Set success message
 		$this->markResultSuccess( $recipient->getName() );
 		$this->logThanks( $user, $recipient, $uniqueId );