mod actions: separate account upgrades from promotions (fix #3841)

This commit is contained in:
evazion
2018-08-25 15:25:26 -05:00
parent 79961c8ed9
commit 6ff70c5002
7 changed files with 31 additions and 20 deletions

View File

@@ -19,9 +19,10 @@ class ModAction < ApplicationRecord
user_ban: 4,
user_unban: 5,
user_name_change: 6,
user_level: 7,
user_level_change: 7,
user_approval_privilege: 8,
user_upload_privilege: 9,
user_account_upgrade: 19,
user_feedback_update: 21,
user_feedback_delete: 22,
post_delete: 42,

View File

@@ -110,7 +110,6 @@ class User < ApplicationRecord
has_many :favorite_groups, -> {order(name: :asc)}, foreign_key: :creator_id
has_many :favorites, ->(rec) {where("user_id % 100 = #{rec.id % 100} and user_id = #{rec.id}").order("id desc")}
belongs_to :inviter, class_name: "User", optional: true
after_update :create_mod_action
accepts_nested_attributes_for :dmail_filter
module BanMethods
@@ -355,10 +354,6 @@ class User < ApplicationRecord
level_string.downcase.to_sym
end
def level_string_before_last_save
level_string(level_before_last_save)
end
def level_string_was
level_string(level_was)
end
@@ -411,12 +406,6 @@ class User < ApplicationRecord
can_approve_posts?
end
def create_mod_action
if saved_change_to_level?
ModAction.log(%{"#{name}":/users/#{id} level changed #{level_string_before_last_save} -> #{level_string}},:user_level)
end
end
def set_per_page
if per_page.nil? || !is_gold?
self.per_page = Danbooru.config.posts_per_page