Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/controllers/api/hackatime/v1/hackatime_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,8 @@ def queue_project_mapping(project_name)
def queue_heartbeat_public_activity(user_id, project_name)
# only queue the job once per minute
Rails.cache.fetch("heartbeat_public_activity_#{user_id}_#{project_name}", expires_in: 30.seconds) do
CreateHeartbeatActivityJob.perform_later(user_id, project_name)
# temporarily disable
# CreateHeartbeatActivityJob.perform_later(user_id, project_name)
end
rescue => e
# never raise an error here because it will break the heartbeat flow
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def switch_time_zone(&block)

def set_public_activity
return unless Flipper.enabled?(:public_activity_log, current_user)
@activities = PublicActivity::Activity.all
@activities = PublicActivity::Activity.limit(25).order(created_at: :desc).includes(:owner, :trackable)
end

def honeybadger_context
Expand Down
8 changes: 4 additions & 4 deletions app/jobs/create_heartbeat_activity_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def perform(user_id, project_name)

# Look for future coding activity only (not past events that are already showing)
recent_activity = PublicActivity::Activity.with_future
.where(owner_id: user_id, trackable_type: "Heartbeat", key: "coding_session")
.where(owner_id: user_id, trackable_type: "User", key: "user.coding_session")
.where("created_at > ?", Time.current)
.first

Expand All @@ -31,7 +31,7 @@ def perform(user_id, project_name)
PublicActivity::Activity.create!(
trackable: user,
owner: user,
key: "started_working",
key: "user.started_working",
parameters: { project: project_name }
)

Expand All @@ -40,7 +40,7 @@ def perform(user_id, project_name)
activity = PublicActivity::Activity.create!(
trackable: user,
owner: user,
key: "coding_session",
key: "user.coding_session",
parameters: {
project: project_name,
started_at: started_at,
Expand All @@ -55,7 +55,7 @@ def perform(user_id, project_name)
PublicActivity::Activity.create!(
trackable: user,
owner: user,
key: "first_heartbeat",
key: "user.first_heartbeat",
parameters: { project: project_name }
)
end
Expand Down