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

Use namespaced notification classes from Echo

Browse source 
Change-Id: I80377881e6aabf3014394c024fca6af50166aa1a
This commit is contained in:
Ed Sanders 2024-05-28 15:46:27 +01:00
parent de26956c55
commit d1bffdee70
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/Hooks/EchoHooks.php
View file

@ -9,7 +9,6 @@
namespace MediaWiki\Extension\DiscussionTools\Hooks; namespace MediaWiki\Extension\DiscussionTools\Hooks;
use EchoUserLocator;
use MediaWiki\Extension\DiscussionTools\Notifications\AddedTopicPresentationModel; use MediaWiki\Extension\DiscussionTools\Notifications\AddedTopicPresentationModel;
use MediaWiki\Extension\DiscussionTools\Notifications\EnhancedEchoEditUserTalkPresentationModel; use MediaWiki\Extension\DiscussionTools\Notifications\EnhancedEchoEditUserTalkPresentationModel;
use MediaWiki\Extension\DiscussionTools\Notifications\EnhancedEchoMentionPresentationModel; use MediaWiki\Extension\DiscussionTools\Notifications\EnhancedEchoMentionPresentationModel;
@ -20,6 +19,7 @@ use MediaWiki\Extension\Notifications\Hooks\BeforeCreateEchoEventHook;
use MediaWiki\Extension\Notifications\Hooks\EchoGetBundleRulesHook; use MediaWiki\Extension\Notifications\Hooks\EchoGetBundleRulesHook;
use MediaWiki\Extension\Notifications\Hooks\EchoGetEventsForRevisionHook; use MediaWiki\Extension\Notifications\Hooks\EchoGetEventsForRevisionHook;
use MediaWiki\Extension\Notifications\Model\Event; use MediaWiki\Extension\Notifications\Model\Event;
use MediaWiki\Extension\Notifications\UserLocator;
use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionRecord;
use Wikimedia\Parsoid\Core\ResourceLimitExceededException; use Wikimedia\Parsoid\Core\ResourceLimitExceededException;
@ -53,10 +53,10 @@ class EchoHooks implements
// duplicate notifications for a single comment // duplicate notifications for a single comment
'user-filters' => [ 'user-filters' => [
[ [
[ EchoUserLocator::class, 'locateFromEventExtra' ], [ UserLocator::class, 'locateFromEventExtra' ],
[ 'mentioned-users' ] [ 'mentioned-users' ]
], ],
[ [ EchoUserLocator::class, 'locateTalkPageOwner' ] ], [ [ UserLocator::class, 'locateTalkPageOwner' ] ],
], ],
'presentation-model' => SubscribedNewCommentPresentationModel::class, 'presentation-model' => SubscribedNewCommentPresentationModel::class,
'bundle' => [ 'bundle' => [

4
includes/Notifications/DiscussionToolsEventTrait.php
View file

@ -9,8 +9,8 @@
namespace MediaWiki\Extension\DiscussionTools\Notifications; namespace MediaWiki\Extension\DiscussionTools\Notifications;
use EchoDiscussionParser;
use Language; use Language;
use MediaWiki\Extension\Notifications\DiscussionParser;
use MediaWiki\Extension\Notifications\Formatters\EchoPresentationModelSection; use MediaWiki\Extension\Notifications\Formatters\EchoPresentationModelSection;
use MediaWiki\Extension\Notifications\Model\Event; use MediaWiki\Extension\Notifications\Model\Event;
use MediaWiki\Revision\RevisionRecord; use MediaWiki\Revision\RevisionRecord;
@ -113,7 +113,7 @@ trait DiscussionToolsEventTrait {
if ( !$content ) { if ( !$content ) {
return ''; return '';
} }
return $this->language->truncateForVisual( $content, EchoDiscussionParser::DEFAULT_SNIPPET_LENGTH ); return $this->language->truncateForVisual( $content, DiscussionParser::DEFAULT_SNIPPET_LENGTH );
} }
/** /**

2
includes/Notifications/EnhancedEchoEditUserTalkPresentationModel.php
View file

@ -9,7 +9,7 @@
namespace MediaWiki\Extension\DiscussionTools\Notifications; namespace MediaWiki\Extension\DiscussionTools\Notifications;
use EchoEditUserTalkPresentationModel; use MediaWiki\Extension\Notifications\Formatters\EchoEditUserTalkPresentationModel;
use MediaWiki\Language\RawMessage; use MediaWiki\Language\RawMessage;
use Message; use Message;
use Wikimedia\Timestamp\TimestampException; use Wikimedia\Timestamp\TimestampException;

2
includes/Notifications/EnhancedEchoMentionPresentationModel.php
View file

@ -9,7 +9,7 @@
namespace MediaWiki\Extension\DiscussionTools\Notifications; namespace MediaWiki\Extension\DiscussionTools\Notifications;
use EchoMentionPresentationModel; use MediaWiki\Extension\Notifications\Formatters\EchoMentionPresentationModel;
use Wikimedia\Timestamp\TimestampException; use Wikimedia\Timestamp\TimestampException;
class EnhancedEchoMentionPresentationModel extends EchoMentionPresentationModel { class EnhancedEchoMentionPresentationModel extends EchoMentionPresentationModel {

4
includes/Notifications/PlaintextEchoPresentationModelSection.php
View file

@ -9,7 +9,7 @@
namespace MediaWiki\Extension\DiscussionTools\Notifications; namespace MediaWiki\Extension\DiscussionTools\Notifications;
use EchoDiscussionParser; use MediaWiki\Extension\Notifications\DiscussionParser;
use MediaWiki\Extension\Notifications\Formatters\EchoPresentationModelSection; use MediaWiki\Extension\Notifications\Formatters\EchoPresentationModelSection;
use RuntimeException; use RuntimeException;
@ -31,7 +31,7 @@ class PlaintextEchoPresentationModelSection extends EchoPresentationModelSection
return false; return false;
} }
$plaintext = trim( $plaintext ); $plaintext = trim( $plaintext );
return $this->language->truncateForVisual( $plaintext, EchoDiscussionParser::DEFAULT_SNIPPET_LENGTH ); return $this->language->truncateForVisual( $plaintext, DiscussionParser::DEFAULT_SNIPPET_LENGTH );
} }
/** /**