Preserves buddy list in User properties even if feature is disabled

Signed-off-by: Jon Stovell <jonstovell@gmail.com>

Author: Sesquipedalian

Sources/Actions/AutoSuggest.php

@@ -18,6 +18,7 @@
 use SMF\ActionInterface;
 use SMF\ActionRouter;
 use SMF\ActionTrait;
+use SMF\Config;
 use SMF\Db\DatabaseApi as Db;
 use SMF\IntegrationHook;
 use SMF\OutputTypeInterface;
@@ -136,6 +137,11 @@ public function member(): array
 			],
 		];
 
+		// Can't search for buddies if that feature is disabled.
+		if (empty(Config::$modSettings['enable_buddylist'])) {
+			unset($this->search_param['buddies']);
+		}
+
 		// Find the member.
 		$request = Db::$db->query(
 			'SELECT id_member, real_name

Sources/Actions/BoardIndex.php

@@ -80,7 +80,7 @@ public function execute(): void
 
 		// Set a few minor things.
 		Utils::$context['show_stats'] = User::$me->allowedTo('view_stats') && !empty(Config::$modSettings['trackStats']);
-		Utils::$context['show_buddies'] = !empty(User::$me->buddies);
+		Utils::$context['show_buddies'] = !empty(User::$me->buddies) && !empty(Config::$modSettings['enable_buddylist']);
 		Utils::$context['show_who'] = User::$me->allowedTo('who_view') && !empty(Config::$modSettings['who_enabled']);
 
 		// Retrieve the categories and boards.

Sources/Actions/BuddyListToggle.php

@@ -19,6 +19,7 @@
 use SMF\ActionRouter;
 use SMF\ActionTrait;
 use SMF\Cache\CacheApi;
+use SMF\Config;
 use SMF\Db\DatabaseApi as Db;
 use SMF\ErrorHandler;
 use SMF\Routable;
@@ -61,7 +62,7 @@ public function execute(): void
 		User::$me->isAllowedTo('profile_extra_own');
 		User::$me->kickIfGuest();
 
-		if (empty($this->userReceiver)) {
+		if (empty($this->userReceiver) || empty(Config::$modSettings['enable_buddylist'])) {
 			ErrorHandler::fatalLang('no_access', false);
 		}
 

Sources/Actions/Display.php

@@ -861,7 +861,7 @@ protected function getWhoViewing(): void
 					$link = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
 				}
 
-				$is_buddy = \in_array($row['id_member'], User::$me->buddies);
+				$is_buddy = !empty(Config::$modSettings['enable_buddylist']) && \in_array($row['id_member'], User::$me->buddies);
 
 				if ($is_buddy) {
 					$link = '<strong>' . $link . '</strong>';

Sources/Actions/MessageIndex.php

@@ -870,7 +870,7 @@ protected function getWhoViewing(): void
 					$link = '<a href="' . Config::$scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
 				}
 
-				$is_buddy = \in_array($row['id_member'], User::$me->buddies);
+				$is_buddy = !empty(Config::$modSettings['enable_buddylist']) && \in_array($row['id_member'], User::$me->buddies);
 
 				if ($is_buddy) {
 					$link = '<strong>' . $link . '</strong>';

Sources/Actions/RequestMembers.php

@@ -18,6 +18,7 @@
 use SMF\ActionInterface;
 use SMF\ActionRouter;
 use SMF\ActionTrait;
+use SMF\Config;
 use SMF\Db\DatabaseApi as Db;
 use SMF\Routable;
 use SMF\User;
@@ -65,6 +66,11 @@ public function execute(): void
 
 		header('content-type: text/plain; charset=UTF-8');
 
+		// Can't search for buddies if that feature is disabled.
+		if (empty(Config::$modSettings['enable_buddylist'])) {
+			unset($_REQUEST['buddies']);
+		}
+
 		$request = Db::$db->query(
 			'SELECT real_name
 			FROM {db_prefix}members

Sources/Logging.php

@@ -669,7 +669,7 @@ public static function getMembersOnlineStats(array $membersOnlineOptions): array
 			}
 
 			// Buddies get counted and highlighted.
-			$is_buddy = \in_array($row['id_member'], User::$me->buddies);
+			$is_buddy = !empty(Config::$modSettings['enable_buddylist']) && \in_array($row['id_member'], User::$me->buddies);
 
 			if ($is_buddy) {
 				$membersOnlineStats['num_buddies']++;

Sources/ServerSideIncludes.php

@@ -1694,7 +1694,7 @@ public static function whosOnline(string $output_method = 'echo'): ?array
 
 		$bracketList = [];
 
-		if (!empty(User::$me->buddies)) {
+		if (!empty(Config::$modSettings['enable_buddylist']) && !empty(User::$me->buddies)) {
 			$bracketList[] = Lang::getTxt('number_of_buddies', [$return['num_buddies']], file: 'General');
 		}
 

Sources/User.php

@@ -1039,8 +1039,8 @@ public function format(bool $display_custom_fields = false): array
 				'username_color' => '<span ' . (!empty($this->group_color) ? 'style="color:' . $this->group_color . ';"' : '') . '>' . $this->username . '</span>',
 				'name_color' => '<span ' . (!empty($this->group_color) ? 'style="color:' . $this->group_color . ';"' : '') . '>' . $this->name . '</span>',
 				'link_color' => '<a href="' . Config::$scripturl . '?action=profile;u=' . $this->id . '" title="' . Lang::getTxt('view_profile_of_username', ['name' => $this->name], file: 'General') . '" ' . (!empty($this->group_color) ? 'style="color:' . $this->group_color . ';"' : '') . '>' . $this->name . '</a>',
-				'is_buddy' => \in_array($this->id, self::$me->buddies),
-				'is_reverse_buddy' => \in_array(self::$me->id, $this->buddies),
+				'is_buddy' => !empty(Config::$modSettings['enable_buddylist']) && \in_array($this->id, self::$me->buddies),
+				'is_reverse_buddy' => !empty(Config::$modSettings['enable_buddylist']) && \in_array(self::$me->id, $this->buddies),
 				'buddies' => $this->buddies,
 				'title' => !empty(Config::$modSettings['titlesEnable']) ? $this->title : '',
 				'blurb' => $this->personal_text,
@@ -3620,7 +3620,7 @@ public static function find(string|array $names, bool $use_wildcards = false, bo
 				AND is_activated IN ({array_int:activated})
 			LIMIT {int:limit}',
 			array_merge($where_params, [
-				'buddy_list' => self::$me->buddies,
+				'buddy_list' => !empty(Config::$modSettings['enable_buddylist']) ? self::$me->buddies : [],
 				'limit' => $max,
 				'activated' => [self::ACTIVATED, self::ACTIVATED_BANNED],
 			]),
@@ -3946,7 +3946,7 @@ protected function setProperties(): void
 		$this->time_offset = (int) ($profile['time_offset'] ?? 0);
 
 		// Buddies and personal messages.
-		$this->buddies = !empty(Config::$modSettings['enable_buddylist']) && !empty($profile['buddy_list']) ? explode(',', $profile['buddy_list']) : [];
+		$this->buddies = !empty($profile['buddy_list']) ? explode(',', $profile['buddy_list']) : [];
 		$this->ignoreusers = !empty($profile['pm_ignore_list']) ? explode(',', $profile['pm_ignore_list']) : [];
 		$this->pm_receive_from = (int) ($profile['pm_receive_from'] ?? 0);
 		$this->pm_prefs = (int) ($profile['pm_prefs'] ?? 0);