From 80f956a6223ad0a32c6b0e9b05a6075a71206aa5 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 4 Sep 2014 19:45:26 -0700
Subject: fix the client side of poco

---
 include/socgraph.php | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'include')

diff --git a/include/socgraph.php b/include/socgraph.php
index e12da5862..dc401ff34 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -123,7 +123,8 @@ function poco_load($xchan = '',$url = null) {
 					$profile_url = $url['value'];
 					continue;
 				}
-				if($url['type'] == 'zot') {
+				if($url['type'] == 'zot' || $url['type'] == 'diaspora' || $url['type'] == 'friendica') {
+					$network = $url['type'];
 					$address = str_replace('acct:' , '', $url['value']);
 					continue;
 				}
@@ -151,17 +152,25 @@ function poco_load($xchan = '',$url = null) {
 
 		if(($x !== false) && (! count($x))) {
 			if($address) {
-				$z = zot_finger($address,null);
-				if($z['success']) {
-					$j = json_decode($z['body'],true);
-					if($j)
-						import_xchan($j);
+				if($network === 'zot') {
+					$z = zot_finger($address,null);
+					if($z['success']) {
+						$j = json_decode($z['body'],true);
+						if($j)
+							import_xchan($j);
+					}
+					$x = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1",
+						dbesc($hash)
+					);
+					if(! $x) {
+						continue;
+					}
 				}
-				$x = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1",
-					dbesc($hash)
-				);
-				if(! $x) {
-					continue;
+				else {
+					$x = import_author_diaspora($address);
+					if(! $x) {
+						continue;
+					}
 				}
 			}
 			else {
-- 
cgit v1.2.3