From 353ee59c076a6a5375c404a0bf976623ed953078 Mon Sep 17 00:00:00 2001
From: Baoshuo <i@baoshuo.ren>
Date: Wed, 15 Feb 2023 17:17:14 +0800
Subject: [PATCH] fix: 2cd81ab055d428220f6adf5d0afc871597aee312

---
 web/app/models/UOJUser.php                      | 3 ++-
 web/app/upgrade/42_acm_team_account/upgrade.php | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/app/models/UOJUser.php b/web/app/models/UOJUser.php
index 782ec8a..b65bab9 100644
--- a/web/app/models/UOJUser.php
+++ b/web/app/models/UOJUser.php
@@ -375,6 +375,7 @@ class UOJUser {
 			$extra = [];
 		}
 		mergeConfig($extra, [
+			'school' => null,
 			'permissions' => UOJContext::getMeta('users_default_permissions'),
 			'social' => [
 				'codeforces' => null,
@@ -391,7 +392,7 @@ class UOJUser {
 			'username_color' => isSuperUser($user) ? '#9d3dcf' : '#0d6efd',
 		]);
 
-		if ($key == null) {
+		if ($key === null) {
 			return $extra;
 		}
 
diff --git a/web/app/upgrade/42_acm_team_account/upgrade.php b/web/app/upgrade/42_acm_team_account/upgrade.php
index 2a58a2f..3392ca5 100644
--- a/web/app/upgrade/42_acm_team_account/upgrade.php
+++ b/web/app/upgrade/42_acm_team_account/upgrade.php
@@ -14,14 +14,14 @@ return function ($type) {
 			DB::update([
 				"update user_info",
 				"set", [
-					"extra" => json_encode($extra, JSON_UNESCAPED_UNICODE)
+					"extra" => json_encode($extra, JSON_UNESCAPED_UNICODE),
 				],
 				"where", [
 					"username" => $user['username']
 				]
 			]);
 
-			echo "Updated user {$user['username']}. \n";
+			echo "Updated user {$user['username']} ({$extra['school']}).\n";
 		}
 	}
 };