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
28 changes: 28 additions & 0 deletions app/controllers/sessions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,34 @@ def find_or_create_user_from_api(auth)
access_token: token,
slack_id: identity["slack_id"]
)

# Fetch Slack display name if missing
if user.slack_id.present? && user.display_name_from_slack.blank?
fetch_and_update_display_name(user)
end

user
end

# Fetches the Slack display name for a single user and updates the record.
#
# @param user [User] The user to update.
def fetch_and_update_display_name(user)
slack_token = Rails.application.credentials.dig(:slack, :bot_token)
return unless slack_token.present?

response = Faraday.get("https://slack.com/api/users.info") do |req|
req.headers["Authorization"] = "Bearer #{slack_token}"
req.params["user"] = user.slack_id
end

data = JSON.parse(response.body)
return unless data["ok"]

profile = data.dig("user", "profile") || {}
display_name = profile["display_name"].presence || profile["real_name"].presence
user.update_column(:display_name_from_slack, display_name) if display_name.present?
rescue StandardError => e
Rails.logger.error "[SessionsController] Failed to fetch Slack display name: #{e.message}"
end
end
3 changes: 3 additions & 0 deletions app/jobs/airtable_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ def perform
# Check for newly viral projects and notify users
ViralNotificationJob.perform_later

# Fetch Slack display names for users missing them
FetchSlackDisplayNamesJob.perform_later

Rails.logger.info "[AirtableJob] Sync complete. Created: #{created}, Updated: #{updated}, Failed: #{failed}"
end

Expand Down
74 changes: 74 additions & 0 deletions app/jobs/fetch_slack_display_names_job.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# Fetches Slack display names for users who have a slack_id but no display_name_from_slack.
# Uses the Slack users.info API to get the display name.
class FetchSlackDisplayNamesJob < ApplicationJob
queue_as :default

# Prevents duplicate jobs from running concurrently.
def self.perform_later(*args)
return if SolidQueue::Job.table_exists? && SolidQueue::Job.where(class_name: name, finished_at: nil).exists?
super
rescue ActiveRecord::StatementInvalid
super
end

# Fetches display names for all users with slack_id but missing display_name_from_slack.
def perform
slack_token = Rails.application.credentials.dig(:slack, :bot_token)
unless slack_token.present?
Rails.logger.warn "[FetchSlackDisplayNamesJob] SLACK_BOT_TOKEN not configured, skipping"
return
end

users_to_update = User
.where.not(slack_id: [ nil, "" ])
.where(display_name_from_slack: [ nil, "" ])

Rails.logger.info "[FetchSlackDisplayNamesJob] Found #{users_to_update.count} users needing display names"

updated = 0
failed = 0

users_to_update.find_each do |user|
display_name = fetch_display_name(user.slack_id, slack_token)

if display_name.present?
user.update_column(:display_name_from_slack, display_name)
updated += 1
Rails.logger.info "[FetchSlackDisplayNamesJob] Updated #{user.email} -> #{display_name}"
else
failed += 1
end

sleep 0.1
rescue StandardError => e
failed += 1
Rails.logger.error "[FetchSlackDisplayNamesJob] Failed for #{user.slack_id}: #{e.message}"
end

Rails.logger.info "[FetchSlackDisplayNamesJob] Complete. Updated: #{updated}, Failed: #{failed}"
end

private

# Fetches display name from Slack API for a given user ID.
#
# @param slack_id [String] The Slack user ID.
# @param slack_token [String] The Slack bot token.
# @return [String, nil] The display name or nil if not found.
def fetch_display_name(slack_id, slack_token)
response = Faraday.get("https://slack.com/api/users.info") do |req|
req.headers["Authorization"] = "Bearer #{slack_token}"
req.params["user"] = slack_id
end

data = JSON.parse(response.body)

unless data["ok"]
Rails.logger.warn "[FetchSlackDisplayNamesJob] Slack API error for #{slack_id}: #{data['error']}"
return nil
end

profile = data.dig("user", "profile") || {}
profile["display_name"].presence || profile["real_name"].presence
end
end
2 changes: 1 addition & 1 deletion app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def admin?
#
# @return [String] The display name.
def display_name
display_name_from_slack.presence || email&.split("@")&.first || "Anonymous"
display_name_from_slack.presence || email&.split("@")&.first || "Idk"
end

private
Expand Down