don't send attendance activities to diaspora (unsupported)

diff --git a/include/delivery.php b/include/delivery.php
index a913e131701866d86e4d1a8d42ca159a3dbb0a16..3b554370f51bbcac4d2d36d3c04254c7d4b65979 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -520,11 +520,16 @@ function delivery_run(&$argv, &$argc){
                                if((! $contact['pubkey']) && (! $public_message))
                                        break;
 
-                               if($target_item['verb'] === ACTIVITY_DISLIKE) {
-                                       // unsupported
-                                       break;
+                               $unsupported_activities = array(ACTIVITY_LIKE, 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'])) {
+
+                               if(($target_item['deleted']) && ($target_item['uri'] === $target_item['parent-uri'])) {
                                        // top-level retraction
                                        logger('delivery: diaspora retract: ' . $loc);
 

diff --git a/include/notifier.php b/include/notifier.php
index d4d254f1c9a82a628aad02b43bef658a189b4c17..4d97649c9536f40f2ff7f05a8621195d29793680 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -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_LIKE, 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;