wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-13 17:27:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Create helper methods for the 'warn' action"

Browse source
This commit is contained in:
jenkins-bot 2020-10-30 18:43:39 +00:00 committed by Gerrit Code Review
parent 1e1103cbbd d73a94ad30
commit e097904e54
1 changed files with 38 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
includes/AbuseFilterRunner.php
View file

@ -545,17 +545,9 @@ class AbuseFilterRunner {
if ( isset( $actions['warn'] ) ) {
$parameters = $actions['warn'];
// Generate a unique key to determine whether the user has already been warned.
// We'll warn again if one of these changes: session, page, triggered filter or action
$warnKey = 'abusefilter-warned-' . md5( $this->title->getPrefixedText() ) .
'-' . $filter . '-' . $this->action;
// Make sure the session is started prior to using it
$session = SessionManager::getGlobalSession();
$session->persist();
if ( !isset( $session[$warnKey] ) || !$session[$warnKey] ) {
$session[$warnKey] = true;
if ( $this->shouldBeWarned( $filter ) ) {
$this->setWarn( $filter, true );
$msg = $parameters[0] ?? 'abusefilter-warning';
$messages[] = [ $msg, $filterPublicComments, $filter ];
@ -565,8 +557,7 @@ class AbuseFilterRunner {
// Don't do anything else.
continue;
} else {
// We already warned them
$session[$warnKey] = false;
$this->setWarn( $filter, false );
}
unset( $actions['warn'] );
@ -697,6 +688,41 @@ class AbuseFilterRunner {
$stash->incrWithInit( $key, $ratePeriod );
}
/**
* @param string|int $filter
* @return bool
*/
private function shouldBeWarned( $filter ) : bool {
// Make sure the session is started prior to using it
$session = SessionManager::getGlobalSession();
$session->persist();
$warnKey = $this->getWarnKey( $filter );
return ( !isset( $session[$warnKey] ) || !$session[$warnKey] );
}
/**
* @param string|int $filter
* @param bool $value
*/
private function setWarn( $filter, bool $value ) : void {
// Make sure the session is started prior to using it
$session = SessionManager::getGlobalSession();
$session->persist();
$warnKey = $this->getWarnKey( $filter );
$session[$warnKey] = $value;
}
/**
* Generate a unique key to determine whether the user has already been warned.
* We'll warn again if one of these changes: session, page, triggered filter, or action
* @param string|int $filter
* @return string
*/
private function getWarnKey( $filter ) : string {
return 'abusefilter-warned-' . md5( $this->title->getPrefixedText() ) .
'-' . $filter . '-' . $this->action;
}
/**
* @param string $throttleId
* @param string $type