Merge branch 'master' into french-translation

3 files changed, 4 insertions, 2 deletions

diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index c0f1d4c53..772adfb90 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -10,6 +10,8 @@ class NotifyService < BaseService
 
     create_notification
     send_email if email_enabled?
+  rescue ActiveRecord::RecordInvalid
+    return
   end
 
   private
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 8daafd444..1cd801b80 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -61,7 +61,7 @@ class ProcessFeedService < BaseService
 
       status.save!
 
-      NotifyService.new.call(status.reblog.account, status) if status.reblog?
+      NotifyService.new.call(status.reblog.account, status) if status.reblog? && status.reblog.account.local?
       Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution"
       DistributionWorker.perform_async(status.id)
       status
diff --git a/app/services/search_service.rb b/app/services/search_service.rb
index c4cffda13..598c7d02c 100644
--- a/app/services/search_service.rb
+++ b/app/services/search_service.rb
@@ -12,7 +12,7 @@ class SearchService < BaseService
                 Account.search_for("#{username} #{domain}")
               end
 
-    results = results.limit(limit).with_counters
+    results = results.limit(limit)
 
     if resolve && results.empty? && !domain.nil?
       results = [FollowRemoteAccountService.new.call("#{username}@#{domain}")]