From 4647a8c8baa772120f2f662fd4697117f0c41fbd Mon Sep 17 00:00:00 2001
From: Baoshuo <i@baoshuo.ren>
Date: Thu, 19 Jan 2023 16:06:42 +0800
Subject: [PATCH] refactor(problem): remove UOJProblem::type()

---
 web/app/controllers/problem.php                  | 4 ++--
 web/app/controllers/problem_data_manage.php      | 2 +-
 web/app/controllers/problem_managers_manage.php  | 2 +-
 web/app/controllers/problem_statement_manage.php | 6 +++---
 web/app/models/UOJProblem.php                    | 8 ++------
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/web/app/controllers/problem.php b/web/app/controllers/problem.php
index ffcd596..c5762c2 100644
--- a/web/app/controllers/problem.php
+++ b/web/app/controllers/problem.php
@@ -241,10 +241,10 @@ if (UOJContest::cur()) {
 				</h1>
 
 				<?php
-				if (UOJProblem::cur()->type() == 'local') {
+				if (UOJProblem::info('type') == 'local') {
 					$time_limit = $conf instanceof UOJProblemConf ? $conf->getVal('time_limit', 1) : null;
 					$memory_limit = $conf instanceof UOJProblemConf ? $conf->getVal('memory_limit', 256) : null;
-				} else if (UOJProblem::cur()->type() == 'remote') {
+				} else if (UOJProblem::info('type') == 'remote') {
 					$time_limit = UOJProblem::cur()->getExtraConfig('time_limit');
 					$memory_limit = UOJProblem::cur()->getExtraConfig('memory_limit');
 				}
diff --git a/web/app/controllers/problem_data_manage.php b/web/app/controllers/problem_data_manage.php
index ab65cee..91112c7 100644
--- a/web/app/controllers/problem_data_manage.php
+++ b/web/app/controllers/problem_data_manage.php
@@ -10,7 +10,7 @@ requirePHPLib('data');
 
 UOJProblem::init(UOJRequest::get('id')) || UOJResponse::page404();
 UOJProblem::cur()->userCanManage(Auth::user()) || UOJResponse::page403();
-UOJProblem::cur()->type() === 'local' || UOJResponse::page404();
+UOJProblem::info('type') === 'local' || UOJResponse::page404();
 $problem = UOJProblem::info();
 $problem_extra_config = UOJProblem::cur()->getExtraConfig();
 
diff --git a/web/app/controllers/problem_managers_manage.php b/web/app/controllers/problem_managers_manage.php
index b381daa..9e8ca75 100644
--- a/web/app/controllers/problem_managers_manage.php
+++ b/web/app/controllers/problem_managers_manage.php
@@ -82,7 +82,7 @@ if (isSuperUser(Auth::user())) {
 					管理者
 				</a>
 			</li>
-			<?php if (UOJProblem::cur()->type() == 'local') : ?>
+			<?php if (UOJProblem::info('type') === 'local') : ?>
 				<li class="nav-item">
 					<a class="nav-link" href="/problem/<?= UOJProblem::info('id') ?>/manage/data" role="tab">
 						数据
diff --git a/web/app/controllers/problem_statement_manage.php b/web/app/controllers/problem_statement_manage.php
index 1b1ec05..59f4f9e 100644
--- a/web/app/controllers/problem_statement_manage.php
+++ b/web/app/controllers/problem_statement_manage.php
@@ -84,7 +84,7 @@ $difficulty_form->handle = function () {
 };
 $difficulty_form->runAtServer();
 
-if (UOJProblem::cur()->type() == 'remote') {
+if (UOJProblem::info('type') == 'remote') {
 	$remote_online_judge = UOJProblem::cur()->getExtraConfig('remote_online_judge');
 	$remote_problem_id = UOJProblem::cur()->getExtraConfig('remote_problem_id');
 	$remote_provider = UOJRemoteProblem::$providers[$remote_online_judge];
@@ -269,7 +269,7 @@ $solution_view_type_form->runAtServer();
 					管理者
 				</a>
 			</li>
-			<?php if (UOJProblem::cur()->type() == 'local') : ?>
+			<?php if (UOJProblem::info('type') == 'local') : ?>
 				<li class="nav-item">
 					<a class="nav-link" href="/problem/<?= UOJProblem::info('id') ?>/manage/data" role="tab">
 						数据
@@ -431,7 +431,7 @@ $solution_view_type_form->runAtServer();
 			</div>
 		</div>
 
-		<?php if (UOJProblem::cur()->type() == 'remote') : ?>
+		<?php if (UOJProblem::info('type') == 'remote') : ?>
 			<div class="card mt-3">
 				<div class="card-header fw-bold">
 					重新爬取题目信息
diff --git a/web/app/models/UOJProblem.php b/web/app/models/UOJProblem.php
index 9f85dd2..8e4bbce 100644
--- a/web/app/models/UOJProblem.php
+++ b/web/app/models/UOJProblem.php
@@ -344,10 +344,6 @@ class UOJProblem {
 		$this->info = $info;
 	}
 
-	public function type() {
-		return $this->info['type'];
-	}
-
 	public function getTitle(array $cfg = []) {
 		$cfg += [
 			'with' => 'id',
@@ -387,7 +383,7 @@ class UOJProblem {
 	}
 
 	public function getProviderLink() {
-		if ($this->type() == 'local') {
+		if ($this->info['type'] == 'local') {
 			return HTML::tag('a', ['href' => HTML::url('/')], UOJConfig::$data['profile']['oj-name-short']);
 		}
 
@@ -464,7 +460,7 @@ class UOJProblem {
 		return $key === null ? $extra_config : $extra_config[$key];
 	}
 	public function getCustomTestRequirement() {
-		if ($this->type() == 'remote') {
+		if ($this->info['type'] == 'remote') {
 			return [];
 		}