pass to all templates by default

[friendica.git] / include / notifier.php

diff --git a/include/notifier.php b/include/notifier.php
index d4d254f1c9a82a628aad02b43bef658a189b4c17..9dac5f114b177d617956a9772d733194d13bd0f1 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -734,9 +734,9 @@ function notifier_run(&$argv, &$argc){
                                                        $ssl_policy = get_config('system','ssl_policy');
                                                        fix_contact_ssl_policy($x[0],$ssl_policy);
 
-                                                       // If we are setup as a soapbox we aren't accepting input from this person
+                                                       // If we are setup as a soapbox we aren't accepting top level posts from this person
 
-                                                       if($x[0]['page-flags'] == PAGE_SOAPBOX)
+                                                       if (($x[0]['page-flags'] == PAGE_SOAPBOX) AND $top_level)
                                                                break;
 
                                                        require_once('library/simplepie/simplepie.inc');
@@ -908,11 +908,16 @@ function notifier_run(&$argv, &$argc){
                                        if(! $contact['pubkey'])
                                                break;
 
-                                       if($target_item['verb'] === ACTIVITY_DISLIKE) {
-                                               // unsupported
-                                               break;
+                                       $unsupported_activities = array(ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE);
+
+                                       //don't transmit activities which are not supported by diaspora
+                                       foreach($unsupported_activities as $act) {
+                                               if(activity_match($target_item['verb'],$act)) {
+                                                       break 2;
+                                               }
                                        }
-                                       elseif(($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
+
+                                       if(($target_item['deleted']) && (($target_item['uri'] === $target_item['parent-uri']) || $followup)) {
                                                // send both top-level retractions and relayable retractions for owner to relay
                                                diaspora_send_retraction($target_item,$owner,$contact);
                                                break;