forked from treehouse/mastodon
Fix unfollows
parent
9cb690c706
commit
086d487145
|
@ -2,7 +2,7 @@ class Favourite < ActiveRecord::Base
|
|||
belongs_to :account, inverse_of: :favourites
|
||||
belongs_to :status, inverse_of: :favourites
|
||||
|
||||
has_one :stream_entry, as: :activity, dependent: :destroy
|
||||
has_one :stream_entry, as: :activity
|
||||
|
||||
def verb
|
||||
:favorite
|
||||
|
|
|
@ -2,7 +2,7 @@ class Follow < ActiveRecord::Base
|
|||
belongs_to :account
|
||||
belongs_to :target_account, class_name: 'Account'
|
||||
|
||||
has_one :stream_entry, as: :activity, dependent: :destroy
|
||||
has_one :stream_entry, as: :activity
|
||||
|
||||
validates :account, :target_account, presence: true
|
||||
validates :account_id, uniqueness: { scope: :target_account_id }
|
||||
|
|
|
@ -21,6 +21,8 @@ class ProcessInteractionService < BaseService
|
|||
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)
|
||||
|
@ -48,7 +50,7 @@ class ProcessInteractionService < BaseService
|
|||
end
|
||||
|
||||
def verb(xml)
|
||||
xml.at_xpath('//activity:verb').content.gsub('http://activitystrea.ms/schema/1.0/', '').to_sym
|
||||
xml.at_xpath('//activity:verb').content.gsub('http://activitystrea.ms/schema/1.0/', '').gsub('http://ostatus.org/schema/1.0/', '').to_sym
|
||||
rescue
|
||||
:post
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue