IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1847 from nickborromeo/refactor-user-updater

Browse Source 
Change user update to use #fetch for defaults
This commit is contained in:
Régis Hanol 2014-01-21 00:57:46 -08:00
commit 5a3c77abd9
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
app/services/user_updater.rb
View File

@ -1,27 +1,33 @@
class UserUpdater class UserUpdater
CATEGORY_IDS = {
watched_category_ids: :watching,
tracked_category_ids: :tracking,
muted_category_ids: :muted
}
USER_ATTR = [
:email_digests,
:email_always,
:email_direct,
:email_private_messages,
:external_links_in_new_tab,
:enable_quoting,
:dynamic_favicon,
:watch_new_topics
]
def initialize(actor, user) def initialize(actor, user)
@user = user @user = user
@guardian = Guardian.new(actor) @guardian = Guardian.new(actor)
end end
def update(attributes = {}) def update(attributes = {})
user.website = format_url(attributes[:website]) || user.website user.website = format_url(attributes.fetch(:website) { user.website })
user.bio_raw = attributes[:bio_raw] || user.bio_raw user.bio_raw = attributes.fetch(:bio_raw) { user.bio_raw }
user.name = attributes[:name] || user.name user.name = attributes.fetch(:name) { user.name }
user.digest_after_days = attributes[:digest_after_days] || user.digest_after_days user.digest_after_days = attributes.fetch(:digest_after_days) { user.digest_after_days }
if ids = attributes[:watched_category_ids]
CategoryUser.batch_set(user, :watching, ids)
end
if ids = attributes[:tracked_category_ids]
CategoryUser.batch_set(user, :tracking, ids)
end
if ids = attributes[:muted_category_ids]
CategoryUser.batch_set(user, :muted, ids)
end
if attributes[:auto_track_topics_after_msecs] if attributes[:auto_track_topics_after_msecs]
user.auto_track_topics_after_msecs = attributes[:auto_track_topics_after_msecs].to_i user.auto_track_topics_after_msecs = attributes[:auto_track_topics_after_msecs].to_i
@ -32,19 +38,16 @@ class UserUpdater
end end
if guardian.can_grant_title?(user) if guardian.can_grant_title?(user)
user.title = attributes[:title] || user.title user.title = attributes.fetch(:title) { user.title }
end end
[ CATEGORY_IDS.each do |attribute, level|
:email_digests, if ids = attributes[attribute]
:email_always, CategoryUser.batch_set(user, level, ids)
:email_direct, end
:email_private_messages, end
:external_links_in_new_tab,
:enable_quoting, USER_ATTR.each do |attribute|
:dynamic_favicon,
:watch_new_topics
].each do |attribute|
if attributes[attribute].present? if attributes[attribute].present?
user.send("#{attribute.to_s}=", attributes[attribute] == 'true') user.send("#{attribute.to_s}=", attributes[attribute] == 'true')
end end