diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-16 22:39:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-16 22:39:35 +0100 |
| commit | a85912b0d6d2ee68aa35794fbb51c5358768c092 (patch) | |
| tree | af0dde21359576102ab8dcf8a1dc3342f67bb71c /app/helpers | |
| parent | 07cb948f39464b11959fc506b673a90d9524e519 (diff) | |
| parent | 278bd61d6f507e56350e7f14caaeaa954700ecd8 (diff) | |
Merge pull request #1659 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/admin/dashboard_helper.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers/admin/dashboard_helper.rb b/app/helpers/admin/dashboard_helper.rb index 32aaf9f5e..c21d41341 100644 --- a/app/helpers/admin/dashboard_helper.rb +++ b/app/helpers/admin/dashboard_helper.rb @@ -2,17 +2,17 @@ module Admin::DashboardHelper def relevant_account_ip(account, ip_query) - default_ip = [account.user_current_sign_in_ip || account.user_sign_up_ip] + ips = account.user.present? ? account.user.ips.to_a : [] matched_ip = begin ip_query_addr = IPAddr.new(ip_query) - account.user.recent_ips.find { |(_, ip)| ip_query_addr.include?(ip) } || default_ip + ips.find { |ip| ip_query_addr.include?(ip.ip) } || ips.first rescue IPAddr::Error - default_ip - end.last + ips.first + end if matched_ip - link_to matched_ip, admin_accounts_path(ip: matched_ip) + link_to matched_ip.ip, admin_accounts_path(ip: matched_ip.ip) else '-' end |