Browse Source

delivery issues

zotlabs 1 year ago
parent
commit
54bfc4a88d

+ 4 - 0
Zotlabs/Lib/ActivityStreams.php

@@ -235,6 +235,10 @@ class ActivityStreams {
 		$base = (($base) ? $base : $this->data);
 		$propname = (($prefix) ? $prefix . ':' : '') . $property;
 
+		if(! is_array($base)) {
+			btlogger('not an array: ' . print_r($base,true));
+		}
+
 		return ((array_key_exists($propname, $base)) ? $base[$propname] : null);
 	}
 

+ 1 - 1
Zotlabs/Lib/Queue.php

@@ -303,7 +303,7 @@ class Queue {
 			$host_crypto = null;
 
 			if($channel && $base) {
-				$h = q("select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' order by hubloc_id desc limit 1",
+				$h = q("select hubloc_sitekey, site_crypto from hubloc left join site on hubloc_url = site_url where site_url = '%s' and hubloc_network = 'zot6' order by hubloc_id desc limit 1",
 					dbesc($base)
 				);
 				if($h) {

+ 5 - 1
Zotlabs/Lib/ThreadItem.php

@@ -129,6 +129,10 @@ class ThreadItem {
 		else
 			$edpost = false;
 
+		if($item['verb'] === 'Announce') {
+			$edpost = false;
+		}
+
 
 		if($observer['xchan_hash'] == $this->get_data_value('author_xchan') 
 			|| $observer['xchan_hash'] == $this->get_data_value('owner_xchan') 
@@ -497,7 +501,7 @@ class ThreadItem {
 			}
 		}
 		
-		logger('authors: ' . print_r($result['authors'],true));
+		//logger('authors: ' . print_r($result['authors'],true));
 
 		$result['private'] = $item['item_private'];
 		$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');

+ 2 - 2
Zotlabs/Module/Directory.php

@@ -204,7 +204,7 @@ class Directory extends \Zotlabs\Web\Controller {
 			logger('mod_directory: query: ' . $query);
 	
 			$x = z_fetch_url($query);
-			logger('directory: return from upstream: ' . print_r($x,true), LOGGER_DATA);
+			// logger('directory: return from upstream: ' . print_r($x,true), LOGGER_DATA);
 	
 			if($x['success']) {
 				$t = 0;
@@ -379,7 +379,7 @@ class Directory extends \Zotlabs\Web\Controller {
 							\App::$data['directory_keywords'] = $j['keywords'];
 						}
 	
-						logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA);
+						// logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA);
 	
 	
 						if($_REQUEST['aj']) {