mirror of
https://github.com/SrIzan10/hc-harbor.git
synced 2026-05-01 10:45:21 +00:00
prioritize display name over username (#594)
This commit is contained in:
@@ -247,9 +247,9 @@ class User < ApplicationRecord
|
||||
|
||||
self.slack_avatar_url = profile["image_192"] || profile["image_72"]
|
||||
|
||||
self.slack_username = user_data["name"].presence
|
||||
self.slack_username ||= profile["display_name_normalized"].presence
|
||||
self.slack_username = profile["display_name_normalized"].presence
|
||||
self.slack_username ||= profile["real_name_normalized"].presence
|
||||
self.slack_username ||= user_data["name"].presence
|
||||
end
|
||||
|
||||
def update_slack_status
|
||||
@@ -381,9 +381,9 @@ class User < ApplicationRecord
|
||||
end
|
||||
|
||||
user.slack_uid = data.dig("authed_user", "id")
|
||||
user.slack_username = slack_user["name"].presence
|
||||
user.slack_username ||= profile["display_name_normalized"].presence
|
||||
user.slack_username = profile["display_name_normalized"].presence
|
||||
user.slack_username ||= profile["real_name_normalized"].presence
|
||||
user.slack_username ||= slack_user["name"].presence
|
||||
user.slack_avatar_url = profile["image_192"] || profile["image_72"]
|
||||
|
||||
user.parse_and_set_timezone(slack_user["tz"])
|
||||
|
||||
Reference in New Issue
Block a user