From c90ef9f1b05e4f9093e05c98c769c40a43a47bcc Mon Sep 17 00:00:00 2001
From: BrokenEagle <brokeneagle98@yahoo.com>
Date: Tue, 19 Jan 2021 00:43:44 +0000
Subject: [PATCH] Add the Twitter name to the list of other names for new
 artists

The artist name is supposed to be the display name according to the
base file, however the artist name was treated like the tag name
instead. This commit renames all instances of "artist_name" to
"tag_name" and then adds an "artist_name" function that uses the
Twitter display name if available.
---
 app/logical/sources/strategies/twitter.rb | 28 +++++++++++++++--------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/logical/sources/strategies/twitter.rb b/app/logical/sources/strategies/twitter.rb
index 503a96df0..593a049f6 100644
--- a/app/logical/sources/strategies/twitter.rb
+++ b/app/logical/sources/strategies/twitter.rb
@@ -50,7 +50,7 @@ module Sources::Strategies
       nil
     end
 
-    def self.artist_name_from_url(url)
+    def self.tag_name_from_url(url)
       if url =~ PROFILE && !$~[:username].in?(RESERVED_USERNAMES)
         $~[:username]
       else
@@ -100,13 +100,13 @@ module Sources::Strategies
     end
 
     def page_url
-      return nil if status_id.blank? || artist_name.blank?
-      "https://twitter.com/#{artist_name}/status/#{status_id}"
+      return nil if status_id.blank? || tag_name.blank?
+      "https://twitter.com/#{tag_name}/status/#{status_id}"
     end
 
     def profile_url
-      return nil if artist_name.blank?
-      "https://twitter.com/#{artist_name}"
+      return nil if tag_name.blank?
+      "https://twitter.com/#{tag_name}"
     end
 
     def intent_url
@@ -119,9 +119,9 @@ module Sources::Strategies
       [profile_url, intent_url].compact
     end
 
-    def artist_name
-      if artist_name_from_url.present?
-        artist_name_from_url
+    def tag_name
+      if tag_name_from_url.present?
+        tag_name_from_url
       elsif api_response.present?
         api_response.dig(:user, :screen_name)
       else
@@ -129,6 +129,14 @@ module Sources::Strategies
       end
     end
 
+    def artist_name
+      if api_response.present?
+        api_response.dig(:user, :name)
+      else
+        tag_name
+      end
+    end
+
     def artist_commentary_title
       ""
     end
@@ -208,8 +216,8 @@ module Sources::Strategies
       [url, referer_url].map {|x| self.class.status_id_from_url(x)}.compact.first
     end
 
-    def artist_name_from_url
-      [url, referer_url].map {|x| self.class.artist_name_from_url(x)}.compact.first
+    def tag_name_from_url
+      [url, referer_url].map {|x| self.class.tag_name_from_url(x)}.compact.first
     end
 
     memoize :api_response