jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Kill trailing whitespace in ruby files

Browse Source
This commit is contained in:
小太
2013-03-19 23:10:10 +11:00
parent c107f96cec
commit cba839ba76
319 changed files with 2710 additions and 2710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
app/models/user.rb
View File

@@ -3,7 +3,7 @@ require 'digest/sha1'
class User < ActiveRecord::Base
class Error < Exception ; end
class PrivilegeError < Exception ; end
module Levels
BLOCKED = 10
MEMBER = 20
@@ -15,7 +15,7 @@ class User < ActiveRecord::Base
MODERATOR = 40
ADMIN = 50
end
attr_accessor :password, :old_password
attr_accessible :enable_privacy_mode, :enable_post_navigation, :new_post_navigation_layout, :password, :old_password, :password_confirmation, :password_hash, :email, :last_logged_in_at, :last_forum_read_at, :has_mail, :receive_email_notifications, :comment_threshold, :always_resize_images, :favorite_tags, :blacklisted_tags, :name, :ip_addr, :time_zone, :default_image_size, :enable_sequential_post_navigation, :as => [:moderator, :janitor, :contributor, :privileged, :member, :anonymous, :default, :builder, :admin]
attr_accessible :level, :as => :admin
@@ -44,7 +44,7 @@ class User < ActiveRecord::Base
has_many :dmails, :foreign_key => "owner_id", :order => "dmails.id desc"
belongs_to :inviter, :class_name => "User"
after_update :create_mod_action
module BanMethods
def validate_ip_addr_is_not_banned
if IpBan.is_banned?(CurrentUser.ip_addr)
@@ -52,13 +52,13 @@ class User < ActiveRecord::Base
return false
end
end
def unban!
update_column(:is_banned, false)
ban.destroy
end
end
module InvitationMethods
def invite!(level)
if level.to_i <= Levels::CONTRIBUTOR
@@ -68,40 +68,40 @@ class User < ActiveRecord::Base
end
end
end
module NameMethods
extend ActiveSupport::Concern
module ClassMethods
def name_to_id(name)
Cache.get("uni:#{Cache.sanitize(name)}", 4.hours) do
select_value_sql("SELECT id FROM users WHERE lower(name) = ?", name.mb_chars.downcase)
end
end
def id_to_name(user_id)
Cache.get("uin:#{user_id}", 4.hours) do
select_value_sql("SELECT name FROM users WHERE id = ?", user_id) || Danbooru.config.default_guest_name
end
end
def find_by_name(name)
where("lower(name) = ?", name.mb_chars.downcase.tr(" ", "_")).first
end
def id_to_pretty_name(user_id)
id_to_name(user_id).tr("_", " ")
end
end
def pretty_name
name.tr("_", " ")
end
def update_cache
Cache.put("uin:#{id}", name)
end
def update_remote_cache
if name_changed?
Danbooru.config.other_server_hosts.each do |server|
@@ -111,7 +111,7 @@ class User < ActiveRecord::Base
rescue Exception
# swallow, since it'll be expired eventually anyway
end
def validate_feedback_on_name_change
if feedback.negative.count > 0 && name_changed?
self.errors[:base] << "You can not change your name if you have any negative feedback"
@@ -119,12 +119,12 @@ class User < ActiveRecord::Base
end
end
end
module PasswordMethods
def bcrypt_password
BCrypt::Password.new(bcrypt_password_hash)
end
def bcrypt_cookie_password_hash
bcrypt_password_hash.slice(20, 100)
end
@@ -133,11 +133,11 @@ class User < ActiveRecord::Base
self.password_hash = ""
self.bcrypt_password_hash = User.bcrypt(password)
end
def encrypt_password_on_update
return if password.blank?
return if old_password.blank?
if bcrypt_password == User.sha1(old_password)
self.bcrypt_password_hash = User.bcrypt(password)
return true
@@ -159,18 +159,18 @@ class User < ActiveRecord::Base
pass << rand(100).to_s
update_column(:bcrypt_password_hash, User.bcrypt(pass))
pass
pass
end
def reset_password_and_deliver_notice
new_password = reset_password()
Maintenance::User::PasswordResetMailer.confirmation(self, new_password).deliver
end
end
module AuthenticationMethods
extend ActiveSupport::Concern
module ClassMethods
def authenticate(name, pass)
authenticate_hash(name, sha1(pass))
@@ -193,7 +193,7 @@ class User < ActiveRecord::Base
nil
end
end
def bcrypt(pass)
BCrypt::Password.create(sha1(pass))
end
@@ -203,19 +203,19 @@ class User < ActiveRecord::Base
end
end
end
module FavoriteMethods
def favorites
Favorite.where("user_id % 100 = #{id % 100} and user_id = #{id}").order("id desc")
end
def add_favorite!(post)
return if Favorite.for_user(id).exists?(:user_id => id, :post_id => post.id)
Favorite.create(:user_id => id, :post_id => post.id)
increment!(:favorite_count)
post.add_favorite!(self)
end
def remove_favorite!(post)
return unless Favorite.for_user(id).exists?(:user_id => id, :post_id => post.id)
Favorite.destroy_all(:user_id => id, :post_id => post.id)
@@ -223,10 +223,10 @@ class User < ActiveRecord::Base
post.remove_favorite!(self)
end
end
module LevelMethods
extend ActiveSupport::Concern
module ClassMethods
def level_hash
return {
@@ -241,68 +241,68 @@ class User < ActiveRecord::Base
}
end
end
def promote_to_admin_if_first_user
return if Rails.env.test?
if User.count == 0
self.level = Levels::ADMIN
else
self.level = Levels::MEMBER
end
end
def role
case level
when Levels::MEMBER
:member
when Levels::PRIVILEGED
:privileged
when Levels::BUILDER
:builder
when Levels::CONTRIBUTOR
:contributor
when Levels::MODERATOR
:moderator
when Levels::JANITOR
:janitor
when Levels::ADMIN
:admin
end
end
def level_string(value = nil)
case (value || level)
when Levels::BLOCKED
"Banned"
when Levels::MEMBER
"Member"
when Levels::BUILDER
"Builder"
when Levels::PRIVILEGED
"Gold"
when Levels::PLATINUM
"Platinum"
when Levels::CONTRIBUTOR
"Contributor"
when Levels::JANITOR
"Janitor"
when Levels::MODERATOR
"Moderator"
when Levels::ADMIN
"Admin"
end
@@ -315,55 +315,55 @@ class User < ActiveRecord::Base
def is_member?
true
end
def is_builder?
level >= Levels::BUILDER
end
def is_privileged?
level >= Levels::PRIVILEGED
end
def is_platinum?
level >= Levels::PLATINUM
end
def is_contributor?
level >= Levels::CONTRIBUTOR
end
def is_janitor?
level >= Levels::JANITOR
end
def is_moderator?
level >= Levels::MODERATOR
end
def is_mod?
level >= Levels::MODERATOR
end
def is_admin?
level >= Levels::ADMIN
end
def create_mod_action
if level_changed?
ModAction.create(:description => "#{name} level changed #{level_string(level_was)} -> #{level_string} by #{CurrentUser.name}")
end
end
end
module EmailMethods
def is_verified?
email_verification_key.blank?
end
def generate_email_verification_key
self.email_verification_key = Digest::SHA1.hexdigest("#{Time.now.to_f}--#{name}--#{rand(1_000_000)}--")
end
def verify!(key)
if email_verification_key == key
self.update_column(:email_verification_key, nil)
@@ -372,17 +372,17 @@ class User < ActiveRecord::Base
end
end
end
module BlacklistMethods
def blacklisted_tag_array
Tag.scan_query(blacklisted_tags)
end
def normalize_blacklisted_tags
self.blacklisted_tags = blacklisted_tags.downcase if blacklisted_tags.present?
end
end
module ForumMethods
def has_forum_been_updated?
return false unless is_privileged?
@@ -392,7 +392,7 @@ class User < ActiveRecord::Base
return newest_topic.updated_at > last_forum_read_at
end
end
module LimitMethods
def can_upload?
if is_contributor?
@@ -403,7 +403,7 @@ class User < ActiveRecord::Base
upload_limit > 0
end
end
def upload_limited_reason
if created_at > 1.week.ago
"You cannot upload during your first week of registration"
@@ -413,7 +413,7 @@ class User < ActiveRecord::Base
nil
end
end
def can_comment?
if is_privileged?
true
@@ -423,33 +423,33 @@ class User < ActiveRecord::Base
Comment.where("creator_id = ? and created_at > ?", id, 1.hour.ago).count < Danbooru.config.member_comment_limit
end
end
def can_comment_vote?
CommentVote.where("user_id = ? and created_at > ?", id, 1.hour.ago).count < 10
end
def can_remove_from_pools?
created_at <= 1.week.ago
end
def upload_limit
deleted_count = Post.for_user(id).deleted.count
pending_count = Post.for_user(id).pending.count
approved_count = Post.where("is_flagged = false and is_pending = false and is_deleted = false and uploader_id = ?", id).count
if base_upload_limit
limit = base_upload_limit - pending_count
else
limit = 10 + (approved_count / 10) - (deleted_count / 4) - pending_count
end
if limit < 0
limit = 0
end
limit
end
def tag_query_limit
if is_platinum?
Danbooru.config.base_tag_query_limit * 2
@@ -459,7 +459,7 @@ class User < ActiveRecord::Base
2
end
end
def favorite_limit
if is_platinum?
nil
@@ -470,19 +470,19 @@ class User < ActiveRecord::Base
end
end
end
module ApiMethods
def hidden_attributes
super + [:password_hash, :bcrypt_password_hash, :email, :email_verification_key, :time_zone, :created_at, :updated_at, :receive_email_notifications, :last_logged_in_at, :last_forum_read_at, :has_mail, :default_image_size, :comment_threshold, :always_resize_images, :favorite_tags, :blacklisted_tags, :base_upload_limit, :recent_tags, :enable_privacy_mode, :enable_post_navigation, :new_post_navigation_layout]
end
def serializable_hash(options = {})
options ||= {}
options[:except] ||= []
options[:except] += hidden_attributes
super(options)
end
def to_xml(options = {}, &block)
# to_xml ignores the serializable_hash method
options ||= {}
@@ -500,48 +500,48 @@ class User < ActiveRecord::Base
}.to_json
end
end
module SearchMethods
def named(name)
where("lower(name) = ?", name)
end
def name_matches(name)
where("lower(name) like ? escape E'\\\\'", name.to_escaped_for_sql_like)
end
def admins
where("is_admin = TRUE")
end
def with_email(email)
if email.blank?
if email.blank?
where("FALSE")
else
else
where("email = ?", email)
end
end
def find_for_password_reset(name, email)
if email.blank?
if email.blank?
where("FALSE")
else
where(["name = ? AND email = ?", name, email])
end
end
def search(params)
q = scoped
return q if params.blank?
if params[:name].present?
q = q.name_matches(params[:name].mb_chars.downcase)
end
if params[:name_matches].present?
q = q.name_matches(params[:name_matches].mb_chars.downcase)
end
if params[:min_level].present?
q = q.where("level >= ?", params[:min_level].to_i)
end
@@ -549,32 +549,32 @@ class User < ActiveRecord::Base
if params[:level].present?
q = q.where("level = ?", params[:level].to_i)
end
if params[:id].present?
q = q.where("id = ?", params[:id].to_i)
end
case params[:order]
when "name"
q = q.order("name")
when "post_upload_count"
q = q.order("post_upload_count desc")
when "note_count"
q = q.order("note_update_count desc")
when "post_update_count"
when "post_update_count"
q = q.order("post_update_count desc")
else
q = q.order("created_at desc")
end
q
end
end
include BanMethods
include NameMethods
include PasswordMethods
@@ -588,7 +588,7 @@ class User < ActiveRecord::Base
include InvitationMethods
include ApiMethods
extend SearchMethods
def initialize_default_image_size
self.default_image_size = "large"
end
@@ -596,7 +596,7 @@ class User < ActiveRecord::Base
def can_update?(object, foreign_key = :user_id)
is_moderator? || is_admin? || object.__send__(foreign_key) == id
end
def dmail_count
if has_mail?
"(#{dmails.unread.count})"