return true;
}
+ public function onGetNoticeSqlTimestamp($id, &$timestamp)
+ {
+ try {
+ $deleted = Deleted_notice::getByID($id);
+ $timestamp = $deleted->act_created;
+ } catch (NoResultException $e) {
+ return true;
+ }
+ // we're done for the event, so return false to stop it
+ return false;
+ }
+
+ public function onIsNoticeDeleted($id, &$deleted)
+ {
+ try {
+ $found = Deleted_notice::getByID($id);
+ $deleted = ($found instanceof Deleted_notice);
+ } catch (NoResultException $e) {
+ $deleted = false;
+ }
+ // return true (continue event) if $deleted is false, return false (stop event) if deleted notice was found
+ return !$deleted;
+ }
+
protected function getActionTitle(ManagedAction $action, $verb, Notice $target, Profile $scoped)
{
// FIXME: switch based on action type
switch (true) {
case ActivityUtils::compareVerbs($verb, array(ActivityVerb::DELETE)):
// do whatever preparation is necessary to delete a verb
- $target->delete();
+ $target->deleteAs($scoped);
break;
default:
throw new ServerException('ActivityVerb POST not handled by plugin that was supposed to do it.');
}
public function onDeleteNoticeAsProfile(Notice $stored, Profile $actor, &$result) {
- // By adding a new 'delete' verb we will eventually trigger $this->saveObjectFromActivity
+ // By adding a new object with the 'delete' verb we will trigger
+ // $this->saveObjectFromActivity that will do the actual ->delete()
if (false === Deleted_notice::addNew($stored, $actor)) {
// false is returned if we did not have an error, but did not create the object
// (i.e. the author is currently being deleted)
}
// We return false (to stop the event) if the deleted_notice entry was
- // added, which means we have run $this->saveObjectFromActivity which
- // in turn has called the delete function of the notice.
+ // added, which means we have already run $this->saveObjectFromActivity
+ // which in turn has called the delete function of the notice.
return false;
}
foreach($props as $prop) {
$stored->$prop = $target->$prop;
}
- //$stored->content = $stored->content ?: _('Notice deleted.');
- //$stored->rendered = $stored->rendered ?: $stored->rendered;
- common_debug('DELETENOTICE: Replacement notice has been prepared: '.var_export($stored, true));
// Let's see if this has been deleted already.
try {