optimise UserConfig::get_for_user

shish · Feb 10, 2025 · a274ee7 · a274ee7
1 parent 2c3c112
commit a274ee7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/ext/avatar_post/main.php b/ext/avatar_post/main.php
@@ -85,7 +85,7 @@ public function avatar_html(User $user): HTMLElement|null
     public function get_avatar_html(User $user): HTMLElement|null
     {
         global $database, $config;
-        $user_config = new DatabaseConfig($database, "user_config", "user_id", (string)$user->id);
+        $user_config = UserConfig::get_for_user($user);
         $id = $user_config->get_int(AvatarPostConfig::AVATAR_ID, 0);
         if ($id === 0) {
             return null;

diff --git a/ext/biography/main.php b/ext/biography/main.php
@@ -13,7 +13,7 @@ public function onUserPageBuilding(UserPageBuildingEvent $event): void
     {
         global $page, $user;
         $duser = $event->display_user;
-        $duser_config = UserConfig::get_for_user($event->display_user->id);
+        $duser_config = UserConfig::get_for_user($event->display_user);
         $bio = $duser_config->get_string("biography", "");
 
         if ($user->id == $duser->id) {

diff --git a/ext/user/main.php b/ext/user/main.php
@@ -386,7 +386,7 @@ private function display_stats(UserPageBuildingEvent $event): void
 
         if (!$user->is_anonymous()) {
             if ($user->id == $event->display_user->id || $user->can("edit_user_info")) {
-                $user_config = UserConfig::get_for_user($event->display_user->id);
+                $user_config = UserConfig::get_for_user($event->display_user);
 
                 $uobe = send_event(new UserOperationsBuildingEvent($event->display_user, $user_config));
                 $page->add_block(new Block("Operations", $this->theme->build_operations($event->display_user, $uobe), "main", 60));

diff --git a/ext/user_config/main.php b/ext/user_config/main.php
@@ -58,14 +58,13 @@ public function onUserLogin(UserLoginEvent $event): void
     {
         global $user_config;
 
-        $user_config = self::get_for_user($event->user->id);
+        $user_config = self::get_for_user($event->user);
     }
 
-    public static function get_for_user(int $id): Config
+    public static function get_for_user(User $user): Config
     {
         global $database;
-        $user = User::by_id($id);
-        $user_config = new DatabaseConfig($database, "user_config", "user_id", "$id");
+        $user_config = new DatabaseConfig($database, "user_config", "user_id", "{$user->id}");
         send_event(new InitUserConfigEvent($user, $user_config));
         return $user_config;
     }
@@ -143,7 +142,7 @@ public function onPageRequest(PageRequestEvent $event): void
                 throw new PermissionDenied("You do not have permission to change other user's settings");
             }
 
-            $target_config = UserConfig::get_for_user($duser->id);
+            $target_config = UserConfig::get_for_user($duser);
             send_event(new ConfigSaveEvent($target_config, ConfigSaveEvent::postToSettings($event->POST)));
             $page->flash("Config saved");
             $page->set_mode(PageMode::REDIRECT);