codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 10:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #904 from janjiss/master

Browse source 
Removed code duplication on UserAction model
This commit is contained in:
Sam 2013-05-26 16:34:36 -07:00
commit 6046d33645
1 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
app/models/user_action.rb
View file

@ -114,21 +114,7 @@ LEFT JOIN categories c on c.id = t.category_id
builder.limit(limit.to_i) builder.limit(limit.to_i)
data = builder.exec.to_a data = builder.exec.to_a
end end
normalize_builder_data(data)
data.each do |row|
row["action_type"] = row["action_type"].to_i
row["created_at"] = DateTime.parse(row["created_at"])
# we should probably cache the excerpts in the db at some point
row["excerpt"] = PrettyText.excerpt(row["cooked"],300) if row["cooked"]
row["cooked"] = nil
row["avatar_template"] = User.avatar_template(row["email"])
row["acting_avatar_template"] = User.avatar_template(row["acting_email"])
row.delete("email")
row.delete("acting_email")
row["slug"] = Slug.for(row["title"])
end
data
end end
# slightly different to standard stream, it collapses replies # slightly different to standard stream, it collapses replies
@ -164,21 +150,7 @@ ORDER BY p.created_at desc
data = builder.exec(user_id: user_id, action_type: action_type).to_a data = builder.exec(user_id: user_id, action_type: action_type).to_a
data.each do |row| normalize_builder_data(data)
row["action_type"] = row["action_type"].to_i
row["created_at"] = DateTime.parse(row["created_at"])
# we should probably cache the excerpts in the db at some point
row["excerpt"] = PrettyText.excerpt(row["cooked"],300) if row["cooked"]
row["cooked"] = nil
row["avatar_template"] = User.avatar_template(row["email"])
row["acting_avatar_template"] = User.avatar_template(row["acting_email"])
row.delete("email")
row.delete("acting_email")
row["slug"] = Slug.for(row["title"])
end
data
end end
def self.log_action!(hash) def self.log_action!(hash)
@ -238,6 +210,21 @@ ORDER BY p.created_at desc
protected protected
def self.normalize_builder_data(data)
data.each do |row|
row["action_type"] = row["action_type"].to_i
row["created_at"] = DateTime.parse(row["created_at"])
# we should probably cache the excerpts in the db at some point
row["excerpt"] = PrettyText.excerpt(row["cooked"],300) if row["cooked"]
row["cooked"] = nil
row["avatar_template"] = User.avatar_template(row["email"])
row["acting_avatar_template"] = User.avatar_template(row["acting_email"])
row.delete("email")
row.delete("acting_email")
row["slug"] = Slug.for(row["title"])
end
end
def self.apply_common_filters(builder,user_id,guardian,ignore_private_messages=false) def self.apply_common_filters(builder,user_id,guardian,ignore_private_messages=false)