ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2024-12-28 13:31:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix steamid validation

Browse source
This commit is contained in:
Ari Timonen 2020-03-18 23:36:21 +02:00
parent c9b7036047
commit 5a2324166e
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/models/user.rb
View file

@ -28,6 +28,16 @@
require 'digest/md5' require 'digest/md5'
class SteamIdValidator < ActiveModel::Validator
def validate(record)
record.errors.add :steamid unless \
record.steamid.nil? ||
(m = record.steamid.match(/\A([01]):([01]):(\d{1,10})\Z/)) &&
(id = m[3].to_i) &&
id >= 1 && id <= 2147483647
end
end
class User < ActiveRecord::Base class User < ActiveRecord::Base
include Extra include Extra
@ -115,7 +125,8 @@ class User < ActiveRecord::Base
validates_length_of :email, :maximum => 50 validates_length_of :email, :maximum => 50
validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
validates_length_of :steamid, :maximum => 30 validates_length_of :steamid, :maximum => 30
validates_format_of :steamid, :with => /\ASTEAM_[0-5]:[01]:\d+\Z/ validates_with SteamIdValidator
# validates_format_of :steamid, :with => /\A(STEAM_)?[0-5]:[01]:\d+\Z/
validates_length_of :time_zone, :maximum => 100, :allow_blank => true, :allow_nil => true validates_length_of :time_zone, :maximum => 100, :allow_blank => true, :allow_nil => true
validates_inclusion_of [:public_email], :in => [true, false], :allow_nil => true validates_inclusion_of [:public_email], :in => [true, false], :allow_nil => true
validate :validate_team validate :validate_team
@ -271,14 +282,6 @@ class User < ActiveRecord::Base
issues.unread_by(self) issues.unread_by(self)
end end
def validate_steamid
errors.add :steamid unless
steamid.nil? ||
(m = steamid.match(/\A([01]):([01]):(\d{1,10})\Z/)) &&
(id = m[3].to_i) &&
id >= 1 && id <= 2147483647
end
def correct_steamid_universe def correct_steamid_universe
if steamid.present? if steamid.present?
steamid[0] = "0" steamid[0] = "0"