nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow Retraction to deal with Relayables

Browse source
This commit is contained in:
cmrd Senya 2015-12-02 04:15:54 +03:00 committed by Jonne Haß
parent fdb3ae5cb8
commit 4e41b8dc86
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/diaspora/federated/retraction.rb
View file

@ -46,6 +46,14 @@ class Retraction
logger.info "event=retraction status=complete type=#{type} guid=#{post_guid}" logger.info "event=retraction status=complete type=#{type} guid=#{post_guid}"
end end
def correct_authorship?
if target.respond_to?(:relayable?) && target.relayable?
[target.author, target.parent.author].include?(person)
else
target.author == person
end
end
def receive(user, person) def receive(user, person)
if self.type == 'Person' if self.type == 'Person'
unless self.person.guid.to_s == self.post_guid.to_s unless self.person.guid.to_s == self.post_guid.to_s
@ -55,7 +63,7 @@ class Retraction
return return
end end
user.disconnected_by(self.target) user.disconnected_by(self.target)
elsif self.target.nil? || self.target.author != self.person elsif target.nil? || !correct_authorship?
logger.warn "event=retraction status=abort reason='no post found authored by retractor' " \ logger.warn "event=retraction status=abort reason='no post found authored by retractor' " \
"sender=#{person.diaspora_handle} post_guid=#{post_guid}" "sender=#{person.diaspora_handle} post_guid=#{post_guid}"
else else