X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Fdelivery.php;h=dc02faaba8e03d1957797861a6cd4a0ee9defa59;hb=be40fb8186bc18e3562d780a7153f76ee7d5e90f;hp=a913e131701866d86e4d1a8d42ca159a3dbb0a16;hpb=a37f31b82fa72a5da70fc459a457fd1d88c9b035;p=friendica.git

diff --git a/include/delivery.php b/include/delivery.php
index a913e13170..dc02faaba8 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -2,6 +2,7 @@
 require_once("boot.php");
 require_once('include/queue_fn.php');
 require_once('include/html2plain.php');
+require_once("include/ostatus.php");
 
 function delivery_run(&$argv, &$argc){
 	global $a, $db;
@@ -340,9 +341,9 @@ function delivery_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');
@@ -391,7 +392,8 @@ function delivery_run(&$argv, &$argc){
 							continue;
 
 						if(($top_level) && ($public_message) && ($item['author-link'] === $item['owner-link']) && (! $expire))
-							$slaps[] = atom_entry($item,'html',null,$owner,true);
+							$slaps[] = ostatus_salmon($item,$owner);
+							//$slaps[] = atom_entry($item,'html',null,$owner,true);
 					}
 
 					logger('notifier: slapdelivery: ' . $contact['name']);
@@ -520,11 +522,16 @@ function delivery_run(&$argv, &$argc){
 				if((! $contact['pubkey']) && (! $public_message))
 					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'])) {
+
+				if(($target_item['deleted']) && ($target_item['uri'] === $target_item['parent-uri'])) {
 					// top-level retraction
 					logger('delivery: diaspora retract: ' . $loc);