mirror of
https://github.com/discourse/discourse.git
synced 2025-06-01 06:09:15 +08:00
DEV: Apply syntax_tree formatting to app/*
This commit is contained in:
@ -16,11 +16,13 @@ class UserProfileView < ActiveRecord::Base
|
||||
redis_key << ":ip-#{ip}"
|
||||
end
|
||||
|
||||
if skip_redis || Discourse.redis.setnx(redis_key, '1')
|
||||
skip_redis || Discourse.redis.expire(redis_key, SiteSetting.user_profile_view_duration_hours.hours)
|
||||
if skip_redis || Discourse.redis.setnx(redis_key, "1")
|
||||
skip_redis ||
|
||||
Discourse.redis.expire(redis_key, SiteSetting.user_profile_view_duration_hours.hours)
|
||||
|
||||
self.transaction do
|
||||
sql = "INSERT INTO user_profile_views (user_profile_id, ip_address, viewed_at, user_id)
|
||||
sql =
|
||||
"INSERT INTO user_profile_views (user_profile_id, ip_address, viewed_at, user_id)
|
||||
SELECT :user_profile_id, :ip_address, :viewed_at, :user_id
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM user_profile_views
|
||||
@ -30,16 +32,24 @@ class UserProfileView < ActiveRecord::Base
|
||||
builder = DB.build(sql)
|
||||
|
||||
if !user_id
|
||||
builder.where("viewed_at = :viewed_at AND ip_address = :ip_address AND user_profile_id = :user_profile_id AND user_id IS NULL")
|
||||
builder.where(
|
||||
"viewed_at = :viewed_at AND ip_address = :ip_address AND user_profile_id = :user_profile_id AND user_id IS NULL",
|
||||
)
|
||||
else
|
||||
builder.where("viewed_at = :viewed_at AND user_id = :user_id AND user_profile_id = :user_profile_id")
|
||||
builder.where(
|
||||
"viewed_at = :viewed_at AND user_id = :user_id AND user_profile_id = :user_profile_id",
|
||||
)
|
||||
end
|
||||
|
||||
result = builder.exec(user_profile_id: user_profile_id, ip_address: ip, viewed_at: at, user_id: user_id)
|
||||
result =
|
||||
builder.exec(
|
||||
user_profile_id: user_profile_id,
|
||||
ip_address: ip,
|
||||
viewed_at: at,
|
||||
user_id: user_id,
|
||||
)
|
||||
|
||||
if result > 0
|
||||
UserProfile.find(user_profile_id).increment!(:views)
|
||||
end
|
||||
UserProfile.find(user_profile_id).increment!(:views) if result > 0
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -47,8 +57,10 @@ class UserProfileView < ActiveRecord::Base
|
||||
def self.profile_views_by_day(start_date, end_date, group_id = nil)
|
||||
profile_views = self.where("viewed_at >= ? AND viewed_at < ?", start_date, end_date + 1.day)
|
||||
if group_id
|
||||
profile_views = profile_views.joins("INNER JOIN users ON users.id = user_profile_views.user_id")
|
||||
profile_views = profile_views.joins("INNER JOIN group_users ON group_users.user_id = users.id")
|
||||
profile_views =
|
||||
profile_views.joins("INNER JOIN users ON users.id = user_profile_views.user_id")
|
||||
profile_views =
|
||||
profile_views.joins("INNER JOIN group_users ON group_users.user_id = users.id")
|
||||
profile_views = profile_views.where("group_users.group_id = ?", group_id)
|
||||
end
|
||||
profile_views.group("date(viewed_at)").order("date(viewed_at)").count
|
||||
|
Reference in New Issue
Block a user