jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403902 )
Change subject: Remove extension beta mode parts
......................................................................
Remove extension beta mode parts
We are not in beta mode for a very long time now ^_^
Bug: T184554
Change-Id: I879042fac53f60dcf01f1d512a544fb12f35670c
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M includes/Hooks.php
M includes/Hooks/PreferencesHookHandler.php
M tests/phpunit/includes/HooksTest.php
6 files changed, 15 insertions(+), 99 deletions(-)
Approvals:
jenkins-bot: Verified
Awight: Looks good to me, approved
diff --git a/extension.json b/extension.json
index b0a7a6b..f5fc903 100644
--- a/extension.json
+++ b/extension.json
@@ -62,9 +62,6 @@
"EnhancedChangesListModifyLineData": [
"ORES\\Hooks\\ChangesListHooksHandler::onEnhancedChangesListModifyLineData"
],
- "GetBetaFeaturePreferences": [
- "ORES\\Hooks::onGetBetaFeaturePreferences"
- ],
"GetPreferences": [
"ORES\\Hooks\\PreferencesHookHandler::onGetPreferences"
],
@@ -123,9 +120,6 @@
"ORESFetchScoreJob": "ORES\\FetchScoreJob"
},
"config": {
- "OresExtensionStatus": {
- "value": "on"
- },
"OresUiEnabled": {
"value": true
},
diff --git a/i18n/en.json b/i18n/en.json
index 1e136c3..ae9dbae 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2,8 +2,6 @@
"@metadata": {
"authors": []
},
- "ores-beta-feature-description": "ORES is an AI-based tool that
highlights probably damaging edits in recent changes and watchlist.",
- "ores-beta-feature-message": "ORES",
"ores-desc": "Expose automated revision scores in the interface",
"ores-damaging-filter": "$1 probably good edits",
"ores-damaging-letter": "r",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index c33972d..7b62a79 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -9,8 +9,6 @@
"Wladek92"
]
},
- "ores-beta-feature-description": "Description of ORES in beta features
page.",
- "ores-beta-feature-message": "Title of ORES section in beta features
page.",
"ores-desc":
"{{desc|name=ORES|url=https://www.mediawiki.org/wiki/Extension:ORES}}";,
"ores-damaging-filter": "Label to toggle filtering on ORES data.
Parameters:\n* $1 - Action to be performed by toggling. Can be either 'show' or
'hide'.",
"ores-damaging-letter": "Single letter for tagging possibly damaging
recent changes.",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index d86189a..ffe69db 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -16,9 +16,7 @@
namespace ORES;
-use BetaFeatures;
use DatabaseUpdater;
-use ExtensionRegistry;
use Exception;
use JobQueueGroup;
use IContextSource;
@@ -201,36 +199,13 @@
}
/**
- * Make a beta feature
- *
- * @param User $user
- * @param string[] &$prefs
- */
- public static function onGetBetaFeaturePreferences( User $user, array
&$prefs ) {
- global $wgOresExtensionStatus, $wgExtensionAssetsPath;
-
- if ( $wgOresExtensionStatus === 'beta' ) {
- $prefs['ores-enabled'] = [
- 'label-message' => 'ores-beta-feature-message',
- 'desc-message' =>
'ores-beta-feature-description',
- 'screenshot' => [
- 'ltr' =>
"$wgExtensionAssetsPath/ORES/images/ORES-beta-features-ltr.svg",
- 'rtl' =>
"$wgExtensionAssetsPath/ORES/images/ORES-beta-features-rtl.svg",
- ],
- 'info-link' =>
'https://www.mediawiki.org/wiki/ORES_review_tool',
- 'discussion-link' =>
'https://www.mediawiki.org/wiki/Talk:ORES_review_tool',
- ];
- }
- }
-
- /**
* Check whether ores is enabled
*
* @param User $user
* @return bool
*/
public static function oresUiEnabled( User $user ) {
- global $wgOresExtensionStatus, $wgOresUiEnabled;
+ global $wgOresUiEnabled;
// Is the UI enabled or not? If not, we've been deployed in
// infrastructure-only mode, so hide all the UI elements.
@@ -238,20 +213,7 @@
return false;
}
- // enabled by default for everybody
- if ( $wgOresExtensionStatus === 'on' ) {
- return true;
- }
-
- // exists as a beta feature, enabled by $user
- if ( $wgOresExtensionStatus === 'beta' ) {
- return $user &&
- $user->isLoggedIn() &&
- ExtensionRegistry::getInstance()->isLoaded(
'BetaFeatures' ) &&
- BetaFeatures::isFeatureEnabled( $user,
'ores-enabled' );
- }
-
- return false;
+ return true;
}
/**
diff --git a/includes/Hooks/PreferencesHookHandler.php
b/includes/Hooks/PreferencesHookHandler.php
index 64a2f50..2f3de26 100644
--- a/includes/Hooks/PreferencesHookHandler.php
+++ b/includes/Hooks/PreferencesHookHandler.php
@@ -29,7 +29,7 @@
* @param string[] &$preferences
*/
public static function onGetPreferences( User $user, array
&$preferences ) {
- global $wgOresFiltersThresholds, $wgOresExtensionStatus;
+ global $wgOresFiltersThresholds;
if ( !Hooks::oresUiEnabled( $user ) || !Hooks::isModelEnabled(
'damaging' ) ) {
return;
@@ -67,21 +67,19 @@
'help-message' => 'ores-help-damaging-pref',
];
- if ( $wgOresExtensionStatus !== 'beta' ) {
- // highlight damaging edits based on configured
sensitivity
- $preferences['oresHighlight'] = [
- 'type' => 'toggle',
- 'section' => 'watchlist/ores-wl',
- 'label-message' => 'ores-pref-highlight',
- ];
+ // highlight damaging edits based on configured sensitivity
+ $preferences['oresHighlight'] = [
+ 'type' => 'toggle',
+ 'section' => 'watchlist/ores-wl',
+ 'label-message' => 'ores-pref-highlight',
+ ];
- // Control whether the "r" appears on RC
- $preferences['ores-damaging-flag-rc'] = [
- 'type' => 'toggle',
- 'section' => 'rc/ores-rc',
- 'label-message' => 'ores-pref-damaging-flag',
- ];
- }
+ // Control whether the "r" appears on RC
+ $preferences['ores-damaging-flag-rc'] = [
+ 'type' => 'toggle',
+ 'section' => 'rc/ores-rc',
+ 'label-message' => 'ores-pref-damaging-flag',
+ ];
// Make hidenondamaging default
$preferences['oresWatchlistHideNonDamaging'] = [
diff --git a/tests/phpunit/includes/HooksTest.php
b/tests/phpunit/includes/HooksTest.php
index e961065..290ff11 100644
--- a/tests/phpunit/includes/HooksTest.php
+++ b/tests/phpunit/includes/HooksTest.php
@@ -212,40 +212,6 @@
}
/**
- * @covers ORES\Hooks::onGetBetaFeaturePreferences
- */
- public function testOnGetBetaFeaturePreferences_on() {
- $this->setMwGlobals( 'wgOresExtensionStatus', 'on' );
- $prefs = [];
- Hooks::onGetBetaFeaturePreferences( $this->user, $prefs );
-
- $this->assertSame( 0, count( $prefs ) );
- }
-
- /**
- * @covers ORES\Hooks::onGetBetaFeaturePreferences
- */
- public function testOnGetBetaFeaturePreferences_off() {
- $this->setMwGlobals( 'wgOresExtensionStatus', 'off' );
- $prefs = [];
- Hooks::onGetBetaFeaturePreferences( $this->user, $prefs );
-
- $this->assertSame( 0, count( $prefs ) );
- }
-
- /**
- * @covers ORES\Hooks::onGetBetaFeaturePreferences
- */
- public function testOnGetBetaFeaturePreferences_beta() {
- $this->setMwGlobals( 'wgOresExtensionStatus', 'beta' );
- $prefs = [];
- Hooks::onGetBetaFeaturePreferences( $this->user, $prefs );
-
- $this->assertSame( 1, count( $prefs ) );
- $this->assertArrayHasKey( 'ores-enabled', $prefs );
- }
-
- /**
* @param User $user
*
* @return IContextSource
--
To view, visit https://gerrit.wikimedia.org/r/403902
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I879042fac53f60dcf01f1d512a544fb12f35670c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
