wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-30 18:45:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace RecentChange::getPerformer with RecentChange::getPerformerIdentity

Browse source 
Refactor $actor as UserIdentity
Refactor Event::getAgent() to return UserIdentity

Bug: T276412
Change-Id: Ieb0dbacd2dcab7700b83fb090587b4957c8128c9
This commit is contained in:
Vadim Kovalenko 2021-03-09 13:29:11 -05:00 committed by Roman Stolar
parent f6d71ce1a9
commit 3e65888791
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/EchoHooks.php
View file

@ -1673,6 +1673,7 @@ class EchoHooks implements RecentChange_saveHook {
} else { } else {
$type = 'watchlist-change'; $type = 'watchlist-change';
} }
$user = User::newFromIdentity( $change->getPerformerIdentity() );
EchoEvent::create( [ EchoEvent::create( [
'type' => $type, 'type' => $type,
'title' => $change->getTitle(), 'title' => $change->getTitle(),
@ -1682,7 +1683,7 @@ class EchoHooks implements RecentChange_saveHook {
'status' => $change->mExtra["pageStatus"], 'status' => $change->mExtra["pageStatus"],
'timestamp' => $change->getAttribute( "rc_timestamp" ) 'timestamp' => $change->getAttribute( "rc_timestamp" )
], ],
'agent' => $change->getPerformer() 'agent' => $user
] ); ] );
} }

3
includes/model/Event.php
View file

@ -462,7 +462,8 @@ class EchoEvent extends EchoAbstractEntity implements Bundleable {
} else { } else {
// Use User::isHidden() // Use User::isHidden()
$permManager = MediaWikiServices::getInstance()->getPermissionManager(); $permManager = MediaWikiServices::getInstance()->getPermissionManager();
return $permManager->userHasAnyRight( $user, 'viewsuppressed', 'hideuser' ) || !$agent->isHidden(); return $permManager->userHasAnyRight( $user, 'viewsuppressed', 'hideuser' )
|| !$agent->isHidden();
} }
} elseif ( $revision ) { } elseif ( $revision ) {
// A revision is set, use rev_deleted // A revision is set, use rev_deleted

3
maintenance/generateSampleNotifications.php
View file

@ -246,7 +246,7 @@ class GenerateSampleNotifications extends Maintenance {
$this->output( "{$agent->getName()} is mentioning {$user->getName()} on {$title->getTalkPage()->getPrefixedText()}\n" ); $this->output( "{$agent->getName()} is mentioning {$user->getName()} on {$title->getTalkPage()->getPrefixedText()}\n" );
$this->addToPageContent( $title->getTalkPage(), $agent, $mention ); $this->addToPageContent( $title->getTalkPage(), $agent, $mention );
// agent tak // agent talk
$this->output( "{$agent->getName()} is mentioning {$user->getName()} on {$agent->getTalkPage()->getPrefixedText()}\n" ); $this->output( "{$agent->getName()} is mentioning {$user->getName()} on {$agent->getTalkPage()->getPrefixedText()}\n" );
$this->addToPageContent( $agent->getTalkPage(), $agent, $mention ); $this->addToPageContent( $agent->getTalkPage(), $agent, $mention );
@ -299,6 +299,7 @@ class GenerateSampleNotifications extends Maintenance {
); );
$status = $page->doEditContent( $content, 'undo', 0, false, $agent, null, [], $undoRev->getId() ); $status = $page->doEditContent( $content, 'undo', 0, false, $agent, null, [], $undoRev->getId() );
if ( !$status->isGood() ) { if ( !$status->isGood() ) {
$this->error( "Failed to undo {$moai->getPrefixedText()}: {$status->getMessage()->text()}" ); $this->error( "Failed to undo {$moai->getPrefixedText()}: {$status->getMessage()->text()}" );
} }