Add types to user class

app/models/user.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
+# typed: false
 
 class User < ActiveRecord::Base
+  extend T::Sig
   devise :omniauthable, :rememberable, :trackable
 
   has_many :reservations
@@ -30,36 +32,44 @@ def self.find_for_steam_auth(auth, _signed_in_resource = nil)
     user
   end
 
+  sig { returns(String) }
   def steam_profile_url
     "http://steamcommunity.com/profiles/#{uid}"
   end
 
+  sig { returns(T::Boolean) }
   def donator?
     @donator ||= group_ids.include?(Group.donator_group.id)
   end
 
+  sig { returns(T::Boolean) }
   def admin?
     @admin ||= group_ids.include?(Group.admin_group.id)
   end
 
+  sig { returns(T::Boolean) }
   def league_admin?
     @league_admin ||= group_ids.include?(Group.league_admin_group.id)
   end
 
+  sig { returns(T::Boolean) }
   def streamer?
     @streamer ||= group_ids.include?(Group.streamer_group.id)
   end
 
+  sig { returns(T::Boolean) }
   def trusted_api?
     @trusted_api ||= group_ids.include?(Group.trusted_api_group.id)
   end
 
+  sig { returns(T.nilable(T::Boolean)) }
   def banned?
     return false if ReservationPlayer.whitelisted_uid?(uid)
 
-    ReservationPlayer.banned_uid?(uid) || ReservationPlayer.banned_ip?(current_sign_in_ip)
+    !!(ReservationPlayer.banned_uid?(uid) || ReservationPlayer.banned_ip?(current_sign_in_ip))
   end
 
+  sig { returns(ActiveSupport::Duration) }
   def maximum_reservation_length
     if admin? || donator?
       10.hours
@@ -68,6 +78,7 @@ def maximum_reservation_length
     end
   end
 
+  sig { returns(ActiveSupport::Duration) }
   def reservation_extension_time
     if donator?
       1.hour
@@ -76,27 +87,33 @@ def reservation_extension_time
     end
   end
 
+  sig { returns(T.nilable(Integer)) }
   def total_reservation_seconds
     reservations.to_a.sum(&:duration)
   end
 
+  sig { returns(T::Boolean) }
   def top10?
     Statistic.top_10_users.key?(self)
   end
 
+  sig { returns(T.nilable(ActiveSupport::TimeWithZone)) }
   def donator_until
     group_users.find_by_group_id(Group.donator_group)&.expires_at
   end
 
+  sig { returns(T::Boolean) }
   def private_server_option?
     @private_server_option ||=
       groups.include?(Group.private_user(self))
   end
 
+  sig { returns(T.nilable(Server)) }
   def private_server
     Group.private_user(self).servers.first
   end
 
+  sig { params(server_id: String).returns(T.nilable(T::Boolean)) }
   def private_server_id=(server_id)
     return unless server_id.to_i.positive?
 
@@ -105,39 +122,46 @@ def private_server_id=(server_id)
     group_server.save!
   end
 
+  sig { returns(T.nilable(T::Boolean)) }
   def current_sign_in_ip_changed_and_ipv4?
     current_sign_in_ip_ipv4? && current_sign_in_ip_changed?
   end
 
+  sig { returns(T.nilable(T::Boolean)) }
   def current_sign_in_ip_ipv4?
     self[:current_sign_in_ip] && IPAddr.new(self[:current_sign_in_ip]).ipv4?
   end
 
+  sig { returns(T.nilable(Geocoder::Result::Base)) }
   def geocoded
     return unless current_sign_in_ip_ipv4?
 
     @geocoded ||= Geocoder.search(current_sign_in_ip).try(:first)
   end
 
+  sig { returns(T::Boolean) }
   def from_na?
     na_timezone? || na_sign_in_ip?
   end
 
+  sig { returns(T.nilable(T::Boolean)) }
   def banned_country?
     current_sign_in_ip_ipv4? && ReservationPlayer.banned_country?(current_sign_in_ip)
   end
 
   private
 
+  sig { returns(T::Boolean) }
   def na_timezone?
     return false unless time_zone
 
     ['US & Canada', 'Canada', 'Chicago', 'New_York', 'Los_Angeles', 'Denver', 'Phoenix', 'Halifax', 'Goose_Bay', 'St_Johns', 'Anchorage'].any? do |zone|
-      time_zone.match(/#{zone}/)
+      time_zone&.match(/#{zone}/)
     end
   end
 
+  sig { returns(T::Boolean) }
   def na_sign_in_ip?
-    geocoded && (geocoded.data['continent']['code'] == 'NA')
+    geocoded&.data&.[]('continent')&.[]('code') == 'NA'
   end
 end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2024_07_03_131707) do
+ActiveRecord::Schema[7.2].define(version: 2024_08_13_083542) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -341,6 +341,7 @@
     t.float "longitude"
     t.integer "expired_reservations", default: 0
     t.string "demos_tf_api_key"
+    t.boolean "enforce_league_bans"
     t.index ["api_key"], name: "index_users_on_api_key", unique: true
     t.index ["latitude", "longitude"], name: "index_users_on_latitude_and_longitude"
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true

sorbet/config

@@ -1,3 +1,5 @@
 --dir
 .
+--ignore=tmp/
 --ignore=vendor/
+--suppress-payload-superclass-redefinition-for=Reline::ANSI

sorbet/rbi/annotations/.gitattributes

@@ -0,0 +1 @@
+**/*.rbi linguist-vendored=true