Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mail: Replace deprecated User::getOption

Browse source 
Bug: T296083
Change-Id: Id6497992210b32cac0ddb5149869402e60a53fa2
This commit is contained in:
Umherirrender 2022-04-29 20:56:13 +02:00
parent c54056fc1a
commit 1fcd09581d
2 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
includes/mail/EmailNotification.php
View file

@ -273,12 +273,13 @@ class EmailNotification {
}
if ( $config->get( MainConfigNames::EnotifWatchlist ) ) {
$userOptionsLookup = $mwServices->getUserOptionsLookup();
// Send updates to watchers other than the current editor
// and don't send to watchers who are blocked and cannot login
$userArray = UserArray::newFromIDs( $watchers );
foreach ( $userArray as $watchingUser ) {
if ( $watchingUser->getOption( 'enotifwatchlistpages' )
&& ( !$minorEdit || $watchingUser->getOption( 'enotifminoredits' ) )
if ( $userOptionsLookup->getOption( $watchingUser, 'enotifwatchlistpages' )
&& ( !$minorEdit || $userOptionsLookup->getOption( $watchingUser, 'enotifminoredits' ) )
&& $watchingUser->isEmailConfirmed()
&& $watchingUser->getId() != $userTalkId
&& !in_array( $watchingUser->getName(),
@ -315,13 +316,15 @@ class EmailNotification {
* @return bool
*/
private function canSendUserTalkEmail( UserIdentity $editor, $title, $minorEdit ) {
$config = MediaWikiServices::getInstance()->getMainConfig();
$services = MediaWikiServices::getInstance();
$config = $services->getMainConfig();
$isUserTalkPage = ( $title->getNamespace() === NS_USER_TALK );
if ( !$config->get( MainConfigNames::EnotifUserTalk ) || !$isUserTalkPage ) {
return false;
}
$userOptionsLookup = $services->getUserOptionsLookup();
$targetUser = User::newFromName( $title->getText() );
if ( !$targetUser || $targetUser->isAnon() ) {
@ -333,8 +336,8 @@ class EmailNotification {
// @TODO Partial blocks should not prevent the user from logging in.
// see: https://phabricator.wikimedia.org/T208895
wfDebug( __METHOD__ . ": talk page owner is blocked and cannot login, no notification sent" );
} elseif ( $targetUser->getOption( 'enotifusertalkpages' )
&& ( !$minorEdit || $targetUser->getOption( 'enotifminoredits' ) )
} elseif ( $userOptionsLookup->getOption( $targetUser, 'enotifusertalkpages' )
&& ( !$minorEdit || $userOptionsLookup->getOption( $targetUser, 'enotifminoredits' ) )
) {
if ( !$targetUser->isEmailConfirmed() ) {
wfDebug( __METHOD__ . ": talk page owner doesn't have validated email" );
@ -355,7 +358,9 @@ class EmailNotification {
* @param MessageCache $messageCache
*/
private function composeCommonMailtext( MessageCache $messageCache ) {
$config = MediaWikiServices::getInstance()->getMainConfig();
$services = MediaWikiServices::getInstance();
$config = $services->getMainConfig();
$userOptionsLookup = $services->getUserOptionsLookup();
$this->composed_common = true;
@ -453,7 +458,7 @@ class EmailNotification {
);
if ( $config->get( MainConfigNames::EnotifRevealEditorAddress )
&& ( $this->editor->getEmail() != '' )
&& $this->editor->getOption( 'enotifrevealaddr' )
&& $userOptionsLookup->getOption( $this->editor, 'enotifrevealaddr' )
) {
$editorAddress = MailAddress::newFromUser( $this->editor );
if ( $config->get( MainConfigNames::EnotifFromEditor ) ) {

14
includes/specials/SpecialEmailUser.php
View file

@ -229,13 +229,23 @@ class SpecialEmailUser extends UnlistedSpecialPage {
return 'nowikiemail';
}
if ( !$target->getOption( 'email-allow-new-users' ) && $sender->isNewbie() ) {
$userOptionsLookup = MediaWikiServices::getInstance()
->getUserOptionsLookup();
if ( !$userOptionsLookup->getOption(
$target,
'email-allow-new-users'
) && $sender->isNewbie()
) {
wfDebug( "User does not allow user emails from new users." );
return 'nowikiemail';
}
$muteList = $target->getOption( 'email-blacklist', '' );
$muteList = $userOptionsLookup->getOption(
$target,
'email-blacklist',
''
);
if ( $muteList ) {
$muteList = MultiUsernameFilter::splitIds( $muteList );
$senderId = MediaWikiServices::getInstance()