From 1145a1a3d44768d0e54594a590fbaff625e1774d Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Fri, 26 Nov 2021 17:27:00 -0800
Subject: [PATCH 1/6] Use skin extension registration

---
 SkinModernSkylight.php | 16 ++--------------
 skin.json              | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/SkinModernSkylight.php b/SkinModernSkylight.php
index b04bc1d..e233251 100644
--- a/SkinModernSkylight.php
+++ b/SkinModernSkylight.php
@@ -12,10 +12,6 @@
 }
 
 class SkinModernSkylight extends SkinTemplate {
-
-	var $skinname = 'modernskylight', $stylename = 'ModernSkylight',
-		$template = 'ModernSkylightTemplate', $useHeadElement = true;
-
 	/**
 	 * Initializes output page and sets up skin-specific parameters
 	 * @param $out OutputPage object to initialize
@@ -32,25 +28,17 @@ public function initPage( OutputPage $out ) {
 		$out->addHeadItem( 'csshover',
 			'<!--[if lt IE 7]><style type="text/css">body{behavior:url("' .
 				htmlspecialchars( $wgLocalStylePath ) .
-				"/{$this->stylename}/csshover{$min}.htc\")}</style><![endif]-->");
+				"/ModernSkylight/csshover{$min}.htc\")}</style><![endif]-->");
 
 		// tab-size가 듣지 않는 IE를 위해 글꼴 강제 수정
 		$out->addHeadItem( 'fontoverride',
 			'<!--[if IE]><style type="text/css">pre{font-family:굴림,Gulrim !important;}</style><![endif]-->'
 		);
 
-		$out->addModuleScripts( 'skins.modern-skylight.js' );
 		if ($out->getTitle()->isMainPage()) {
-			$out->addModuleScripts( 'skins.modern-skylight.mainpage.js' );
+			$out->addModules( 'skins.modern-skylight.mainpage.js' );
 		}
-	}
-
-	function setupSkinUserCss( OutputPage $out ){
-		global $wgStylePath;
-
-		parent::setupSkinUserCss( $out );
 
-		$out->addModuleStyles( 'skins.modern-skylight.css' );
 		if ($out->getTitle()->isMainPage()) {
 			$out->addModuleStyles( 'skins.modern-skylight.mainpage.css' );
 		}
diff --git a/skin.json b/skin.json
index 4d18232..a8d2cbc 100644
--- a/skin.json
+++ b/skin.json
@@ -11,13 +11,28 @@
 	"license-name": "BSD-2",
 	"type": "skin",
 	"ValidSkinNames": {
-		"modernskylight": "ModernSkylight"
+		"modernskylight": {
+			"class": "SkinModernSkylight",
+			"args": [
+				{
+					"name": "modernskylight",
+					"template": "ModernSkylightTemplate",
+					"styles": [
+						"skins.modern-skylight.css"
+					],
+					"scripts": [
+						"skins.modern-skylight.js"
+					]
+				}
+			]
+		}
 	},
 	"MessagesDirs": {
 		"ModernSkylight": [
 			"i18n"
 		]
 	},
+	"manifest_version": 2,
 	"AutoloadClasses": {
 		"SkinModernSkylight": "SkinModernSkylight.php",
 		"ModernSkylightTemplate": "ModernSkylightTemplate.php",

From 2d992a76d21db0c9c91d3c9ac80cef5192c1e80a Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Fri, 26 Nov 2021 17:33:00 -0800
Subject: [PATCH 2/6] Use BeforePageDisplay hook for head modification

---
 SkinModernSkylight.php => ModernSkylightHooks.php | 11 ++++++-----
 skin.json                                         |  7 +++++--
 2 files changed, 11 insertions(+), 7 deletions(-)
 rename SkinModernSkylight.php => ModernSkylightHooks.php (85%)

diff --git a/SkinModernSkylight.php b/ModernSkylightHooks.php
similarity index 85%
rename from SkinModernSkylight.php
rename to ModernSkylightHooks.php
index e233251..465395a 100644
--- a/SkinModernSkylight.php
+++ b/ModernSkylightHooks.php
@@ -11,20 +11,21 @@
 	die( -1 );
 }
 
-class SkinModernSkylight extends SkinTemplate {
+class ModernSkylightHooks {
 	/**
 	 * Initializes output page and sets up skin-specific parameters
 	 * @param $out OutputPage object to initialize
 	 */
-	public function initPage( OutputPage $out ) {
+	public static function onBeforePageDisplay( OutputPage $out, &$skin ) {
 		global $wgLocalStylePath;
-
-		parent::initPage( $out );
+		if ( $skin->getSkinName() !== 'modernskylight' ) {
+			return;
+		}
 
 		// Append CSS which includes IE only behavior fixes for hover support -
 		// this is better than including this in a CSS file since it doesn't
 		// wait for the CSS file to load before fetching the HTC file.
-		$min = $this->getRequest()->getFuzzyBool( 'debug' ) ? '' : '.min';
+		$min = $out->getRequest()->getFuzzyBool( 'debug' ) ? '' : '.min';
 		$out->addHeadItem( 'csshover',
 			'<!--[if lt IE 7]><style type="text/css">body{behavior:url("' .
 				htmlspecialchars( $wgLocalStylePath ) .
diff --git a/skin.json b/skin.json
index a8d2cbc..9eb9025 100644
--- a/skin.json
+++ b/skin.json
@@ -12,7 +12,7 @@
 	"type": "skin",
 	"ValidSkinNames": {
 		"modernskylight": {
-			"class": "SkinModernSkylight",
+			"class": "SkinTemplate",
 			"args": [
 				{
 					"name": "modernskylight",
@@ -34,10 +34,13 @@
 	},
 	"manifest_version": 2,
 	"AutoloadClasses": {
-		"SkinModernSkylight": "SkinModernSkylight.php",
+		"ModernSkylightHooks": "ModernSkylightHooks.php",
 		"ModernSkylightTemplate": "ModernSkylightTemplate.php",
 		"ModernSkylightMenubar": "ModernSkylightMenubar.php"
 	},
+	"Hooks": {
+		"BeforePageDisplay": "ModernSkylightHooks::onBeforePageDisplay"
+	},
 	"ResourceModules": {
 		"skins.modern-skylight.js": {
 			"scripts": [

From e844cc0a29213853d6b805d8e3677f4f8b82b8bc Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Fri, 26 Nov 2021 17:35:50 -0800
Subject: [PATCH 3/6] getEffectiveGroups() is deprecated

Context:
https://phabricator.wikimedia.org/T275148
---
 ModernSkylightTemplate.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ModernSkylightTemplate.php b/ModernSkylightTemplate.php
index e777f5d..d7f7d9a 100644
--- a/ModernSkylightTemplate.php
+++ b/ModernSkylightTemplate.php
@@ -20,6 +20,8 @@
 	define('NS_PORTAL', -10000);
 }
 
+use MediaWiki\MediaWikiServices;
+
 class ModernSkylightTemplate extends BaseTemplate {
 
 	// Functions
@@ -103,7 +105,8 @@ public function execute() {
 			$this->data['title'] = substr($this->data['title'], strpos($this->data['title'], ':') + 1 );
 
 		# 현재 유저가 어드민 그룹에 속해있는지 검사
-		if ( in_array('sysop', $skin->getUser()->getEffectiveGroups() ) )
+		$userGroupManager = MediaWikiServices::getInstance()->getUserGroupManager();
+		if ( in_array('sysop', $userGroupManager->getUserEffectiveGroups( $skin->getUser() ) ) )
 			$this->data['isadmin'] = true;
 		else
 			$this->data['isadmin'] = false;

From 742d36d9916c63ecf4e80acb5fe711808383759b Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Fri, 26 Nov 2021 17:37:19 -0800
Subject: [PATCH 4/6] getToolbox is deprecated

Context:
https://phabricator.wikimedia.org/T279390

Fixes: #2
---
 ModernSkylightTemplate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ModernSkylightTemplate.php b/ModernSkylightTemplate.php
index d7f7d9a..f3df87c 100644
--- a/ModernSkylightTemplate.php
+++ b/ModernSkylightTemplate.php
@@ -98,7 +98,7 @@ public function execute() {
 		//$this->data['catlinks'] = str_replace("</li></ul>", "</li> / </ul>", $this->data['catlinks']);
 
 		# 메뉴를 위한 툴 리스트 받기
-		$toolList = $this->getToolbox();
+		$toolList = $this->data['sidebar']['TOOLBOX'];
 
 		# 대문 네임스페이스에서 제목에서 '대문:' 자 빼기
 		if ($c_namespace == NS_PORTAL && strpos($this->data['title'], ':') !== false)

From 0fe6f5feb361ad7ffec772fa95102719a3707e0e Mon Sep 17 00:00:00 2001
From: jdlrobson <jdlrobson@gmail.com>
Date: Fri, 26 Nov 2021 17:48:04 -0800
Subject: [PATCH 5/6] Hide categories if all hidden

---
 resources/modern-skylight.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/modern-skylight.css b/resources/modern-skylight.css
index 69b2f98..d5cab2b 100644
--- a/resources/modern-skylight.css
+++ b/resources/modern-skylight.css
@@ -932,6 +932,9 @@ ul.top-menu > li:hover > a {
     padding: 0 6px 0 5px;
     content: "»";
 }
+.catlinks-allhidden {
+    display: none;
+}
 
 /* Page title */
 h1#firstheading {

From 4f6a23b7b65f1f0062fee2f4b13ed1ed40a35921 Mon Sep 17 00:00:00 2001
From: Jon Robson <jdlrobson@gmail.com>
Date: Tue, 18 Jul 2023 11:45:55 -0700
Subject: [PATCH 6/6] Fix for 1.41

* Skins should no longer output HTML and head tag
(https://phabricator.wikimedia.org/T306942)
---
 ModernSkylightTemplate.php | 4 ----
 skin.json                  | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ModernSkylightTemplate.php b/ModernSkylightTemplate.php
index f3df87c..4caaae8 100644
--- a/ModernSkylightTemplate.php
+++ b/ModernSkylightTemplate.php
@@ -114,7 +114,6 @@ public function execute() {
 		# 메뉴바 데이터 가져오기
 		$this->data['menubar'] = ModernSkylightMenubar::getMenubar();
 ?>
-		<?php $this->html( 'headelement' ); ?>
 
 		<div id="header" role="header">
 			<div class="holder clear">
@@ -254,9 +253,6 @@ public function execute() {
 				<?=wfMessage( 'ModernSkylightFooter' )->parse()?>
 			</div>
 		</div>
-		<?php $this->printTrail(); ?>
-	</body>
-</html>
 <?php
 	}
 
diff --git a/skin.json b/skin.json
index 9eb9025..338e601 100644
--- a/skin.json
+++ b/skin.json
@@ -32,6 +32,9 @@
 			"i18n"
 		]
 	},
+	"requires": {
+		"MediaWiki": ">= 1.41.0"
+	},
 	"manifest_version": 2,
 	"AutoloadClasses": {
 		"ModernSkylightHooks": "ModernSkylightHooks.php",