SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392453 )
Change subject: Convert UserBoard to use extension registration
......................................................................
Convert UserBoard to use extension registration
Bug: T152865
Change-Id: I8bdd6e5a329cffa78619b10d9a7660f127a595e0
---
M SocialProfile.php
A UserBoard/extension.json
M UserBoard/i18n/en.json
M UserBoard/i18n/qqq.json
4 files changed, 80 insertions(+), 56 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile
refs/changes/53/392453/1
diff --git a/SocialProfile.php b/SocialProfile.php
index 15f5a28..4399893 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -27,7 +27,6 @@
$wgMessagesDirs['SocialProfile'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['SocialProfileAlias'] = __DIR__ .
'/SocialProfile.alias.php';
-$wgMessagesDirs['SocialProfileUserBoard'] = __DIR__ . '/UserBoard/i18n';
$wgMessagesDirs['SocialProfileUserProfile'] = __DIR__ . '/UserProfile/i18n';
$wgMessagesDirs['SocialProfileUserRelationship'] = __DIR__ .
'/UserRelationship/i18n';
$wgMessagesDirs['SocialProfileUserStats'] = __DIR__ . '/UserStats/i18n';
@@ -37,11 +36,9 @@
// Classes to be autoloaded
$wgAutoloadClasses['GenerateTopUsersReport'] = __DIR__ .
'/UserStats/GenerateTopUsersReport.php';
-$wgAutoloadClasses['EchoUserBoardMessagePresentationModel'] = __DIR__ .
'/UserBoard/EchoUserBoardMessagePresentationModel.php';
$wgAutoloadClasses['EchoUserRelationshipPresentationModel'] = __DIR__ .
'/UserRelationship/EchoUserRelationshipPresentationModel.php';
$wgAutoloadClasses['EchoUserLevelAdvancePresentationModel'] = __DIR__ .
'/UserStats/EchoUserLevelAdvancePresentationModel.php';
$wgAutoloadClasses['SpecialAddRelationship'] = __DIR__ .
'/UserRelationship/SpecialAddRelationship.php';
-$wgAutoloadClasses['SpecialBoardBlast'] = __DIR__ .
'/UserBoard/SpecialSendBoardBlast.php';
$wgAutoloadClasses['SpecialEditProfile'] = __DIR__ .
'/UserProfile/SpecialEditProfile.php';
$wgAutoloadClasses['SpecialPopulateUserProfiles'] = __DIR__ .
'/UserProfile/SpecialPopulateExistingUsersProfiles.php';
$wgAutoloadClasses['SpecialRemoveRelationship'] = __DIR__ .
'/UserRelationship/SpecialRemoveRelationship.php';
@@ -51,11 +48,8 @@
$wgAutoloadClasses['UploadAvatar'] = __DIR__ .
'/UserProfile/SpecialUploadAvatar.php';
$wgAutoloadClasses['SpecialViewRelationshipRequests'] = __DIR__ .
'/UserRelationship/SpecialViewRelationshipRequests.php';
$wgAutoloadClasses['SpecialViewRelationships'] = __DIR__ .
'/UserRelationship/SpecialViewRelationships.php';
-$wgAutoloadClasses['SpecialViewUserBoard'] = __DIR__ .
'/UserBoard/SpecialUserBoard.php';
$wgAutoloadClasses['RemoveAvatar'] = __DIR__ .
'/UserProfile/SpecialRemoveAvatar.php';
$wgAutoloadClasses['UpdateEditCounts'] = __DIR__ .
'/UserStats/SpecialUpdateEditCounts.php';
-$wgAutoloadClasses['UserBoard'] = __DIR__ . '/UserBoard/UserBoardClass.php';
-$wgAutoloadClasses['UserBoardHooks'] = __DIR__ .
'/UserBoard/UserBoardHooks.php';
$wgAutoloadClasses['UserProfile'] = __DIR__ .
'/UserProfile/UserProfileClass.php';
$wgAutoloadClasses['UserProfileHooks'] = __DIR__ .
'/UserProfile/UserProfileHooks.php';
$wgAutoloadClasses['UserProfilePage'] = __DIR__ .
'/UserProfile/UserProfilePage.php';
@@ -77,24 +71,10 @@
$wgAutoloadClasses['ApiUserProfilePrivacy'] = __DIR__ .
'/UserProfile/ApiUserProfilePrivacy.php';
$wgAPIModules['smpuserprivacy'] = 'ApiUserProfilePrivacy';
-$wgAutoloadClasses['ApiDeleteUserBoardMessage'] = __DIR__ .
'/UserBoard/ApiDeleteUserBoardMessage.php';
-$wgAPIModules['socialprofile-delete-message'] = 'ApiDeleteUserBoardMessage';
-
-$wgAutoloadClasses['ApiSendUserBoardMessage'] = __DIR__ .
'/UserBoard/ApiSendUserBoardMessage.php';
-$wgAPIModules['socialprofile-send-message'] = 'ApiSendUserBoardMessage';
-
$wgAutoloadClasses['ApiRelationshipResponse'] = __DIR__ .
'/UserRelationship/ApiRelationshipResponse.php';
$wgAPIModules['socialprofile-request-response'] = 'ApiRelationshipResponse';
// Echo (Notifications) stuff
-// UserBoard
-$wgHooks['BeforeCreateEchoEvent'][] =
'UserBoardHooks::onBeforeCreateEchoEvent';
-$wgHooks['EchoGetDefaultNotifiedUsers'][] =
'UserBoardHooks::onEchoGetDefaultNotifiedUsers';
-$wgHooks['EchoGetBundleRules'][] = 'UserBoardHooks::onEchoGetBundleRules';
-
-$wgDefaultUserOptions['echo-subscriptions-web-social-msg'] = true;
-$wgDefaultUserOptions['echo-subscriptions-email-social-msg'] = false;
-
// UserRelationship
$wgHooks['BeforeCreateEchoEvent'][] =
'UserRelationshipHooks::onBeforeCreateEchoEvent';
$wgHooks['EchoGetDefaultNotifiedUsers'][] =
'UserRelationshipHooks::onEchoGetDefaultNotifiedUsers';
@@ -116,7 +96,6 @@
$wgSpecialPages['PopulateUserProfiles'] = 'SpecialPopulateUserProfiles';
$wgSpecialPages['RemoveAvatar'] = 'RemoveAvatar';
$wgSpecialPages['RemoveRelationship'] = 'SpecialRemoveRelationship';
-$wgSpecialPages['SendBoardBlast'] = 'SpecialBoardBlast';
$wgSpecialPages['TopFansByStatistic'] = 'TopFansByStat';
$wgSpecialPages['TopUsers'] = 'TopUsersPoints';
$wgSpecialPages['TopUsersRecent'] = 'TopFansRecent';
@@ -124,7 +103,6 @@
$wgSpecialPages['UpdateEditCounts'] = 'UpdateEditCounts';
$wgSpecialPages['UpdateProfile'] = 'SpecialUpdateProfile';
$wgSpecialPages['UploadAvatar'] = 'SpecialUploadAvatar';
-$wgSpecialPages['UserBoard'] = 'SpecialViewUserBoard';
$wgSpecialPages['ViewRelationshipRequests'] =
'SpecialViewRelationshipRequests';
$wgSpecialPages['ViewRelationships'] = 'SpecialViewRelationships';
@@ -162,7 +140,10 @@
require_once( "$IP/extensions/SocialProfile/UserProfile/UserProfile.php" ); //
Profile page configuration loader file
require_once( "$IP/extensions/SocialProfile/UserGifts/Gifts.php" ); //
UserGifts (user-to-user gifting functionality) loader file
require_once( "$IP/extensions/SocialProfile/SystemGifts/SystemGifts.php" ); //
SystemGifts (awards functionality) loader file
-wfLoadExtension( 'SocialProfile/UserActivity' ); // UserActivity - recent
social changes
+wfLoadExtensions( [
+ 'SocialProfile/UserActivity', // UserActivity - recent social changes
+ 'SocialProfile/UserBoard'
+] );
$wgHooks['BeforePageDisplay'][] = 'SocialProfileHooks::onBeforePageDisplay';
$wgHooks['CanonicalNamespaces'][] =
'SocialProfileHooks::onCanonicalNamespaces';
@@ -205,39 +186,6 @@
'position' => 'bottom',
'localBasePath' => __DIR__ . '/shared',
'remoteExtPath' => 'SocialProfile/shared',
-);
-
-// UserBoard
-$wgResourceModules['ext.socialprofile.userboard.js'] = array(
- 'scripts' => 'UserBoard.js',
- 'dependencies' => array( 'mediawiki.api' ),
- 'messages' => array( 'userboard_confirmdelete' ),
- 'localBasePath' => __DIR__ . '/UserBoard',
- 'remoteExtPath' => 'SocialProfile/UserBoard',
-);
-
-$wgResourceModules['ext.socialprofile.userboard.css'] = array(
- 'styles' => 'UserBoard.css',
- 'localBasePath' => __DIR__ . '/UserBoard',
- 'remoteExtPath' => 'SocialProfile/UserBoard',
- 'position' => 'top' // just in case
-);
-
-$wgResourceModules['ext.socialprofile.userboard.boardblast.css'] = array(
- 'styles' => 'BoardBlast.css',
- 'localBasePath' => __DIR__ . '/UserBoard',
- 'remoteExtPath' => 'SocialProfile/UserBoard',
- 'position' => 'top' // just in case
-);
-
-$wgResourceModules['ext.socialprofile.userboard.boardblast.js'] = array(
- 'scripts' => 'BoardBlast.js',
- 'messages' => array(
- 'boardblast-js-sending', 'boardblast-js-error-missing-message',
- 'boardblast-js-error-missing-user'
- ),
- 'localBasePath' => __DIR__ . '/UserBoard',
- 'remoteExtPath' => 'SocialProfile/UserBoard',
);
// UserRelationship
diff --git a/UserBoard/extension.json b/UserBoard/extension.json
new file mode 100644
index 0000000..fc922b9
--- /dev/null
+++ b/UserBoard/extension.json
@@ -0,0 +1,74 @@
+{
+ "name": "UserBoard",
+ "author": [
+ "Aaron Wright",
+ "David Pean",
+ "Jack Phoenix"
+ ],
+ "license-name": "GPL-2.0+",
+ "descriptionmsg": "userboard-desc",
+ "type": "other",
+ "MessagesDirs": {
+ "UserBoard": [
+ "i18n"
+ ]
+ },
+ "AutoloadClasses": {
+ "EchoUserBoardMessagePresentationModel":
"EchoUserBoardMessagePresentationModel.php",
+ "SpecialBoardBlast": "SpecialSendBoardBlast.php",
+ "SpecialViewUserBoard": "SpecialUserBoard.php",
+ "UserBoard": "UserBoardClass.php",
+ "UserBoardHooks": "UserBoardHooks.php",
+ "ApiDeleteUserBoardMessage": "ApiDeleteUserBoardMessage.php",
+ "ApiSendUserBoardMessage": "ApiSendUserBoardMessage.php"
+ },
+ "APIModules": {
+ "socialprofile-delete-message": "ApiDeleteUserBoardMessage",
+ "socialprofile-send-message": "ApiSendUserBoardMessage"
+ },
+ "Hooks": {
+ "BeforeCreateEchoEvent":
"UserBoardHooks::onBeforeCreateEchoEvent",
+ "EchoGetDefaultNotifiedUsers":
"UserBoardHooks::onEchoGetDefaultNotifiedUsers",
+ "EchoGetBundleRules": "UserBoardHooks::onEchoGetBundleRules"
+ },
+ "DefaultUserOptions": {
+ "echo-subscriptions-web-social-msg": true,
+ "echo-subscriptions-email-social-msg": false
+ },
+ "SpecialPages": {
+ "SendBoardBlast": "SpecialBoardBlast",
+ "UserBoard": "SpecialViewUserBoard"
+ },
+ "ResourceModules": {
+ "ext.socialprofile.userboard.js": {
+ "scripts": "UserBoard.js",
+ "dependencies": [
+ "mediawiki.api"
+ ],
+ "messages": [
+ "userboard_confirmdelete"
+ ]
+ },
+ "ext.socialprofile.userboard.css": {
+ "styles": "UserBoard.css",
+ "position": "top"
+ },
+ "ext.socialprofile.userboard.boardblast.css": {
+ "styles": "BoardBlast.css",
+ "position": "top"
+ },
+ "ext.socialprofile.userboard.boardblast.js": {
+ "scripts": "BoardBlast.js",
+ "messages": [
+ "boardblast-js-sending",
+ "boardblast-js-error-missing-message",
+ "boardblast-js-error-missing-user"
+ ]
+ }
+ },
+ "ResourceFileModulePaths": {
+ "localBasePath": "",
+ "remoteExtPath": "SocialProfile/UserBoard"
+ },
+ "manifest_version": 1
+}
\ No newline at end of file
diff --git a/UserBoard/i18n/en.json b/UserBoard/i18n/en.json
index 84c37ba..8cde24f 100644
--- a/UserBoard/i18n/en.json
+++ b/UserBoard/i18n/en.json
@@ -6,6 +6,7 @@
"Purodha"
]
},
+ "userboard-desc": "Allows for sending board-to-board messages",
"boardblastlogintitle": "You must be logged in to send board blasts",
"boardblastlogintext": "In order to send board blasts, you must be
[[Special:UserLogin|logged in]].",
"messagesenttitle": "Messages sent",
diff --git a/UserBoard/i18n/qqq.json b/UserBoard/i18n/qqq.json
index 8b6c2ee..200f75f 100644
--- a/UserBoard/i18n/qqq.json
+++ b/UserBoard/i18n/qqq.json
@@ -9,6 +9,7 @@
"Umherirrender"
]
},
+ "userboard-desc":
"{{desc|name=UserBoard|url=https://www.mediawiki.org/wiki/Extension:SocialProfile}}";,
"boardblastlogintitle": "As I understand it, it is a sort of board tool
to leave messages. Is
it?\nhttp://www.mediawiki.org/wiki/Extension:SocialProfile#Board_Blast";,
"userboard_private": "{{Identical|Private}}",
"userboard_public": "{{Identical|Public}}",
--
To view, visit https://gerrit.wikimedia.org/r/392453
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8bdd6e5a329cffa78619b10d9a7660f127a595e0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen <samanthanguyen1...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
