From 1712eceaf95e5e57d8f5866cb1f6100a0acd28b6 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sun, 26 Jan 2020 15:08:55 +0000
Subject: port Lib/Connect and Module/Follow from zap. Connect with new
 connections via zot6

---
 Zotlabs/Module/Follow.php | 102 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 80 insertions(+), 22 deletions(-)

(limited to 'Zotlabs/Module/Follow.php')

diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php
index cbf9d62c5..11febd8fc 100644
--- a/Zotlabs/Module/Follow.php
+++ b/Zotlabs/Module/Follow.php
@@ -1,31 +1,88 @@
 <?php
 namespace Zotlabs\Module;
 
+use App;
+use Zotlabs\Web\Controller;
+use Zotlabs\Lib\Libsync;
+use Zotlabs\Lib\ActivityStreams;
+use Zotlabs\Lib\Activity;
+use Zotlabs\Web\HTTPSig;
+use Zotlabs\Lib\LDSignatures;
+use Zotlabs\Lib\Connect;
+use Zotlabs\Daemon\Master;
 
-require_once('include/follow.php');
-
-
-class Follow extends \Zotlabs\Web\Controller {
+class Follow extends Controller {
 
 	function init() {
 	
-		if(! local_channel()) {
+		if (ActivityStreams::is_as_request() && argc() == 2) {
+
+			$abook_id = intval(argv(1));
+			if(! $abook_id)
+				return;
+
+			$r = q("select * from abook left join xchan on abook_xchan = xchan_hash where abook_id = %d",
+				intval($abook_id)
+			);
+			if (! $r) {
+				return;
+			}
+
+			$chan = channelx_by_n($r[0]['abook_channel']);
+
+			if (! $chan) {
+				http_status_exit(404, 'Not found');
+			}
+
+			$actor = Activity::encode_person($chan,true,true);
+			if (! $actor) {
+				http_status_exit(404, 'Not found');
+			}
+
+			$x = array_merge(['@context' => [
+				ACTIVITYSTREAMS_JSONLD_REV,
+				'https://w3id.org/security/v1',
+				z_root() . ZOT_APSCHEMA_REV
+			]],
+			[
+				'id'     => z_root() . '/follow/' . $r[0]['abook_id'],
+				'type'   => 'Follow',
+				'actor'  => $actor,
+				'object' => $r[0]['xchan_url']
+			]);
+
+			$headers = [];
+			$headers['Content-Type'] = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' ;
+			$x['signature'] = LDSignatures::sign($x,$chan);
+			$ret = json_encode($x, JSON_UNESCAPED_SLASHES);
+			$headers['Date'] = datetime_convert('UTC','UTC', 'now', 'D, d M Y H:i:s \\G\\M\\T');
+			$headers['Digest'] = HTTPSig::generate_digest_header($ret);
+			$headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']) . ' ' . $_SERVER['REQUEST_URI'];
+			$h = HTTPSig::create_sig($headers,$chan['channel_prvkey'],channel_url($chan));
+			HTTPSig::set_headers($h);
+			echo $ret;
+			killme();
+
+		}
+
+		if (! local_channel()) {
 			return;
 		}
-	
+
 		$uid = local_channel();
 		$url = notags(trim(punify($_REQUEST['url'])));
 		$return_url = $_SESSION['return_url'];
 		$confirm = intval($_REQUEST['confirm']);
 		$interactive = (($_REQUEST['interactive']) ? intval($_REQUEST['interactive']) : 1);	
-		$channel = \App::get_channel();
+		$channel = App::get_channel();
 
-		$result = new_contact($uid,$url,$channel,$interactive,$confirm);
+		$result = Connect::connect($channel,$url);
 		
-		if($result['success'] == false) {
-			if($result['message'])
+		if ($result['success'] == false) {
+			if ($result['message']) {
 				notice($result['message']);
-			if($interactive) {
+			}
+			if ($interactive) {
 				goaway($return_url);
 			}
 			else {
@@ -36,8 +93,8 @@ class Follow extends \Zotlabs\Web\Controller {
 		info( t('Connection added.') . EOL);
 	
 		$clone = array();
-		foreach($result['abook'] as $k => $v) {
-			if(strpos($k,'abook_') === 0) {
+		foreach ($result['abook'] as $k => $v) {
+			if (strpos($k,'abook_') === 0) {
 				$clone[$k] = $v;
 			}
 		}
@@ -46,20 +103,21 @@ class Follow extends \Zotlabs\Web\Controller {
 		unset($clone['abook_channel']);
 	
 		$abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']);
-		if($abconfig)
+		if ($abconfig) {
 			$clone['abconfig'] = $abconfig;
+		}
+		Libsync::build_sync_packet(0, [ 'abook' => [ $clone ] ], true);
 	
-		build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone)), true);
-	
-		$can_view_stream = intval(get_abconfig($channel['channel_id'],$clone['abook_xchan'],'their_perms','view_stream'));
+		$can_view_stream = their_perms_contains($channel['channel_id'],$clone['abook_xchan'],'view_stream');
 	
 		// If we can view their stream, pull in some posts
 	
-		if(($can_view_stream) || ($result['abook']['xchan_network'] === 'rss'))
-			\Zotlabs\Daemon\Master::Summon(array('Onepoll',$result['abook']['abook_id']));
+		if (($can_view_stream) || ($result['abook']['xchan_network'] === 'rss')) {
+			Master::Summon([ 'Onepoll', $result['abook']['abook_id'] ]);
+		}
 	
-		if($interactive) {
-			goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?f=&follow=1');
+		if ($interactive) {
+			goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?follow=1');
 		}
 		else {
 			json_return_and_die([ 'success' => true ]);
@@ -68,7 +126,7 @@ class Follow extends \Zotlabs\Web\Controller {
 	}
 	
 	function get() {
-		if(! local_channel()) {
+		if (! local_channel()) {
 			return login();
 		}
 	}
-- 
cgit v1.2.3