Fixing small bug with FollowRemoteAccountService usage

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 605f615fdff61a6cee7a3e3a9eef074b768d2c56..8962603cf71cd326dc331a3fca998652c4327203 100644 (file)
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -98,7 +98,7 @@ class ProcessFeedService < BaseService
     account  = Account.find_by(username: username, domain: domain)
 
     if account.nil?
-      account = follow_remote_account_service.("acct:#{username}@#{domain}", false)
+      account = follow_remote_account_service.("#{username}@#{domain}", false)
       return nil if account.nil?
     end
 

diff --git a/app/services/process_interaction_service.rb b/app/services/process_interaction_service.rb
index 877647bbe93d429f652c1003611aefaa24206ce0..43c8ca4fde85d033f431ca13d6bce8a7375bfb95 100644 (file)
--- a/app/services/process_interaction_service.rb
+++ b/app/services/process_interaction_service.rb
@@ -14,15 +14,13 @@ class ProcessInteractionService < BaseService
     account  = Account.find_by(username: username, domain: domain)
 
     if account.nil?
-      account = follow_remote_account_service.("acct:#{username}@#{domain}", false)
+      account = follow_remote_account_service.("#{username}@#{domain}", false)
       return if account.nil?
     end
 
     if salmon.verify(envelope, account.keypair)
       update_remote_profile_service.(xml.at_xpath('/xmlns:entry/xmlns:author'), account)
 
-      binding.pry
-
       case verb(xml)
       when :follow
         follow!(account, target_account)

diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index e1fc2f0386986da093fc1e17a73ac966ed05ea8a..760fdcf15dd8d3220494355f2668e97e9d49b030 100644 (file)
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -11,7 +11,7 @@ class ProcessMentionsService < BaseService
       mentioned_account = Account.find_by(username: username, domain: domain)
 
       if mentioned_account.nil?
-        mentioned_account = follow_remote_account_service.("acct:#{match.first}")
+        mentioned_account = follow_remote_account_service.("#{match.first}")
       end
 
       mentioned_account.mentions.first_or_create(status: status)