chore: lean on Ruby 4 for fallback chains and the bot token

The app runs on Ruby 4.0.6 in development and in production, so a few places
can now say what they mean.

Fallback chains and multi-part conditions used trailing `||` / `&&`, which
pushed every alternative one indent deeper than the one before it. Ruby 4
continues a line when the operator opens the next one, so the alternatives in
LocaleDetector, the wallchart banner check, the Telegram display name and the
duplicate-match lookup now line up in one column.

Telegram::Poller holds the bot token in an instance variable, so any log line
or error message that inspected the poller printed the token with it. It now
lists only @offset in instance_variables_to_inspect.

A leading "@" in a Telegram handle is trimmed by String#lstrip with a selector
instead of an anchored regexp.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

Author: denis1011101

app/helpers/application_helper.rb

@@ -41,9 +41,9 @@ def wallchart_banner_active?
   # that kicks off within the promo season. The start-date bound keeps the promo
   # copy off unrelated matches featured after the tournament.
   def wallchart_final?(featured_match)
-    featured_match.active? &&
-      featured_match.status != "finished" &&
-      featured_match.starts_at.to_date <= WALLCHART_BANNER_UNTIL
+    featured_match.active?
+      && featured_match.status != "finished"
+      && featured_match.starts_at.to_date <= WALLCHART_BANNER_UNTIL
   end
 
   # Accessible label for the banner countdown region, matching what's shown:

app/models/court.rb

@@ -179,7 +179,7 @@ def build_contact_link(value)
         if normalized_value.match?(/\Ahttps?:\/\//)
           normalized_value
         else
-          username = normalized_value.sub(/\A@/, "")
+          username = normalized_value.lstrip("@")
           username.present? ? "https://t.me/#{username}" : nil
         end
       when "whatsapp"

app/services/locale_detector.rb

@@ -14,11 +14,11 @@ def initialize(request, cookies)
   end
 
   def call
-    subdomain_locale ||
-      cookie_locale ||
-      country_locale ||
-      accept_language_locale ||
-      default_locale
+    subdomain_locale
+      || cookie_locale
+      || country_locale
+      || accept_language_locale
+      || default_locale
   end
 
   private

app/services/player_statistics/upsert_match_for_game_service.rb

@@ -84,19 +84,19 @@ def find_or_init_manual_match(played_date)
 
           scope.to_a.find do |match|
             stats = match.stats.to_h
-            normalize_ids(stats["team_a_ids"]) == team_a_ids &&
-              normalize_ids(stats["team_b_ids"]) == team_b_ids &&
-              normalize_guest_names(stats["team_a_guest_names"]) == normalize_guest_names(@stats["team_a_guest_names"]) &&
-              normalize_guest_names(stats["team_b_guest_names"]) == normalize_guest_names(@stats["team_b_guest_names"])
+            normalize_ids(stats["team_a_ids"]) == team_a_ids
+              && normalize_ids(stats["team_b_ids"]) == team_b_ids
+              && normalize_guest_names(stats["team_a_guest_names"]) == normalize_guest_names(@stats["team_a_guest_names"])
+              && normalize_guest_names(stats["team_b_guest_names"]) == normalize_guest_names(@stats["team_b_guest_names"])
           end
         else
           opponent_id = @opponent&.id || normalize_ids(@stats["opponent_ids"]).first
           opponent_guest_names = normalize_guest_names(opponent_guest_names_for_stats(@stats))
 
           scope.to_a.find do |match|
             stats = match.stats.to_h
-            (opponent_id.present? && (match.opponent_id == opponent_id || normalize_ids(stats["opponent_ids"]).first == opponent_id)) ||
-              (opponent_guest_names.any? && normalize_guest_names(opponent_guest_names_for_stats(stats)) == opponent_guest_names)
+            (opponent_id.present? && (match.opponent_id == opponent_id || normalize_ids(stats["opponent_ids"]).first == opponent_id))
+              || (opponent_guest_names.any? && normalize_guest_names(opponent_guest_names_for_stats(stats)) == opponent_guest_names)
           end
         end
 

app/services/telegram/helpers/user_lookup.rb

@@ -26,9 +26,9 @@ def self.display_name(user, fallback: "User")
         elsif user.respond_to?(:username) && user.username.to_s.strip.present?
           "@#{user.username.to_s.strip.delete_prefix('@')}"
         else
-          user.name.to_s.strip.presence ||
-            (user.respond_to?(:email) && user.email.to_s.strip.presence) ||
-            fallback
+          user.name.to_s.strip.presence
+            || (user.respond_to?(:email) && user.email.to_s.strip.presence)
+            || fallback
         end
       end
     end

app/services/telegram/poller.rb

@@ -11,6 +11,10 @@ def initialize(token = ENV["TELEGRAM_BOT_TOKEN"], logger = Rails.logger)
       raise "TELEGRAM_BOT_TOKEN not set" if @token.empty?
     end
 
+    # Поллер попадает в логи и в сообщения об ошибках целиком, поэтому в inspect
+    # оставляем только позицию в очереди обновлений — токен бота светить нельзя.
+    private def instance_variables_to_inspect = [ :@offset ]
+
     # Single poll iteration: fetch updates and dispatch to UpdateService
     def run_once(poll_interval: 0.5)
       updates = fetch_updates(@offset)

test/services/telegram/poller_test.rb

@@ -0,0 +1,14 @@
+require "test_helper"
+
+class Telegram::PollerTest < ActiveSupport::TestCase
+  test "inspect keeps the bot token out of logs and error messages" do
+    poller = Telegram::Poller.new("123456:super-secret-token")
+
+    assert_not_includes poller.inspect, "super-secret-token"
+    assert_includes poller.inspect, "@offset"
+  end
+
+  test "refuses to start without a token" do
+    assert_raises(RuntimeError) { Telegram::Poller.new("") }
+  end
+end