From 44c5958203dd8d0f96f880a8014a3233719077a6 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 25 Feb 2016 00:22:46 +0100 Subject: [PATCH] Fixed small bugs and code style offences --- app/helpers/atom_helper.rb | 8 ++++---- app/services/follow_remote_account_service.rb | 2 +- app/services/process_feed_service.rb | 6 +++--- app/services/process_interaction_service.rb | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/helpers/atom_helper.rb b/app/helpers/atom_helper.rb index f091d1afee..f8675db3bc 100644 --- a/app/helpers/atom_helper.rb +++ b/app/helpers/atom_helper.rb @@ -7,7 +7,7 @@ module AtomHelper if is_root root_tag(xml, :entry, &block) else - xml.entry &block + xml.entry(&block) end end @@ -44,11 +44,11 @@ module AtomHelper end def author(xml, &block) - xml.author &block + xml.author(&block) end def target(xml, &block) - xml['activity'].object &block + xml['activity'].object(&block) end def object_type(xml, type) @@ -177,6 +177,6 @@ module AtomHelper private def root_tag(xml, tag, &block) - xml.send(tag, {xmlns: 'http://www.w3.org/2005/Atom', 'xmlns:thr': 'http://purl.org/syndication/thread/1.0', 'xmlns:activity': 'http://activitystrea.ms/spec/1.0/', 'xmlns:poco': 'http://portablecontacts.net/spec/1.0'}, &block) + xml.send(tag, { :xmlns => 'http://www.w3.org/2005/Atom', 'xmlns:thr' => 'http://purl.org/syndication/thread/1.0', 'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/', 'xmlns:poco' => 'http://portablecontacts.net/spec/1.0' }, &block) end end diff --git a/app/services/follow_remote_account_service.rb b/app/services/follow_remote_account_service.rb index de2ca6e754..8e01991347 100644 --- a/app/services/follow_remote_account_service.rb +++ b/app/services/follow_remote_account_service.rb @@ -45,7 +45,7 @@ class FollowRemoteAccountService < BaseService end return account - rescue Goldfinger::Error, HTTP::Error => e + rescue Goldfinger::Error, HTTP::Error nil end diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb index 210de8cdb6..6ce74e32d7 100644 --- a/app/services/process_feed_service.rb +++ b/app/services/process_feed_service.rb @@ -28,7 +28,7 @@ class ProcessFeedService < BaseService private - def add_post!(entry, status) + def add_post!(_entry, status) status.save! end @@ -47,7 +47,7 @@ class ProcessFeedService < BaseService status.save! end - def find_original_status(xml, id) + def find_original_status(_xml, id) return nil if id.nil? if local_id?(id) @@ -96,7 +96,7 @@ class ProcessFeedService < BaseService end def activity_id(xml) - entry.at_xpath('./xmlns:id').content + xml.at_xpath('./xmlns:id').content end def target_content(xml) diff --git a/app/services/process_interaction_service.rb b/app/services/process_interaction_service.rb index 3a8332118e..7bd813c0e1 100644 --- a/app/services/process_interaction_service.rb +++ b/app/services/process_interaction_service.rb @@ -68,7 +68,7 @@ class ProcessInteractionService < BaseService end def status(xml) - Status.find(unique_tag_to_local_id(activity_id, 'Status')) + Status.find(unique_tag_to_local_id(activity_id(xml), 'Status')) end def activity_id(xml)