From 5ef168bfe8a59440e251606be103bab7b43106f1 Mon Sep 17 00:00:00 2001
From: nobody <nobody@zotlabs.com>
Date: Mon, 23 Nov 2020 21:28:33 -0800
Subject: [PATCH] mod_sites - show non-zot projects

---
 Zotlabs/Lib/Activity.php         |   7 +++++--
 Zotlabs/Module/Sites.php         |  11 +++++++----
 Zotlabs/Widget/Site_projects.php |  14 ++++++++++++--
 images/activitypub-300.png       | Bin 0 -> 14633 bytes
 include/items.php                |  31 ++++++++++++++++++-------------
 view/tpl/site_projects.tpl       |   2 +-
 6 files changed, 43 insertions(+), 22 deletions(-)
 create mode 100644 images/activitypub-300.png

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 925fc8547..5a4a72d17 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -1914,7 +1914,8 @@ class Activity {
 			if ($ni && is_array($ni)) {
 				$software = ((array_path_exists('software/name',$ni)) ? $ni['software']['name'] : '');
 				$version = ((array_path_exists('software/version',$ni)) ? $ni['software']['version'] : '');
-
+				$register = $ni['openRegistrations'];
+				
 				$site = q("select * from site where site_url = '%s'",
 					dbesc($site_url)
 				);
@@ -1940,7 +1941,9 @@ class Activity {
 						'site_dead'   => 0,
 						'site_type'   => SITE_TYPE_NOTZOT,
 						'site_project' => $software,
-						'site_version' => $version
+						'site_version' => $version,
+						'site_access' => (($register) ? ACCESS_FREE : ACCESS_PRIVATE),
+						'site_register' => (($register) ? REGISTER_OPEN : REGISTER_CLOSED)
 						]
 					);
 				}
diff --git a/Zotlabs/Module/Sites.php b/Zotlabs/Module/Sites.php
index 8f8e8280c..7d38e3b10 100644
--- a/Zotlabs/Module/Sites.php
+++ b/Zotlabs/Module/Sites.php
@@ -13,9 +13,7 @@ class Sites extends \Zotlabs\Web\Controller {
 
 		$j = [];
 
-		$r = q("select * from site where site_type = %d and site_flags != 256 and site_dead = 0 $sql_extra order by site_update desc",
-			intval(SITE_TYPE_ZOT)
-		);
+		$r = q("select * from site where site_flags != 256 and site_dead = 0 $sql_extra order by site_update desc");
 			
 		if ($r) {
 			foreach ($r as $rr) {				
@@ -48,7 +46,12 @@ class Sites extends \Zotlabs\Web\Controller {
 					$logo = 'images/' . strtolower($rr['site_project']) . '.png';
 				}
 				if (! $logo) {
-					$logo = 'images/default_profile_photos/red_koala_trans/300.png';
+					if (intval($rr['site_type']) != 0) {
+						$logo = 'images/activitypub-300.png';
+					}
+					else {
+						$logo = 'images/default_profile_photos/red_koala_trans/300.png';
+					}
 				}
 
 				if ($rr['site_sellpage']) {
diff --git a/Zotlabs/Widget/Site_projects.php b/Zotlabs/Widget/Site_projects.php
index 3dd0f392b..0d790642f 100644
--- a/Zotlabs/Widget/Site_projects.php
+++ b/Zotlabs/Widget/Site_projects.php
@@ -9,15 +9,18 @@ class Site_projects {
 
 
 
-		$r = q("select site_project, count(site_project) as total from site where site_project != '' and site_flags != 256 and site_dead = 0 and site_type = 0 group by site_project order by site_project desc");
+		$r = q("select site_project, site_type, count(site_project) as total from site where site_project != '' and site_flags != 256 and site_dead = 0 group by site_project order by site_project desc");
 
 		$results = [];
-		
+
+		usort($r, [ 'self', 'site_sort' ]);
+
 		if ($r) {
 		
 			foreach ($r as $rv) {
 				$result = [];
 				$result['name'] = $rv['site_project'];
+				$result['type'] = $rv['site_type'];
 				$result['cname'] = ucfirst($result['name']);
 				if ($rv['site_project'] === $_REQUEST['project']) {
 					$result['selected'] = true;
@@ -38,4 +41,11 @@ class Site_projects {
 			return $o;
 		}		
 	}
+
+	static function site_sort($a,$b) {
+		if ($a['site_type'] === $b['site_type']) {
+			return strncmp($a,$b);
+		}
+		return (($a['site_type'] < $b['site_type']) ? -1 : 1);
+	}
 }
diff --git a/images/activitypub-300.png b/images/activitypub-300.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a1cf6dca4ce2bfe5c62619edd8b52203e989734
GIT binary patch
literal 14633
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
P*Z?TXew3+}0*Cw`7pIOt

literal 0
HcmV?d00001

diff --git a/include/items.php b/include/items.php
index 1564efdeb..ce0e2f9a1 100644
--- a/include/items.php
+++ b/include/items.php
@@ -268,8 +268,8 @@ function can_comment_on_post($observer_xchan, $item) {
 
 	$x = [
 		'observer_hash' => $observer_xchan,
-		'item' => $item,
-		'allowed' => 'unset'
+		'item'          => $item,
+		'allowed'       => 'unset'
 	];
 
 	/**
@@ -282,15 +282,15 @@ function can_comment_on_post($observer_xchan, $item) {
 
 	call_hooks('can_comment_on_post', $x);
 
-	if($x['allowed'] !== 'unset') {
+	if ($x['allowed'] !== 'unset') {
 		return $x['allowed'];
 	}
 
-	if(! $observer_xchan) {
+	if (! $observer_xchan) {
 		return false;
 	}
 
-	if($item['comment_policy'] === 'none') {
+	if ($item['comment_policy'] === 'none') {
 		return false;
 	}
 
@@ -298,17 +298,17 @@ function can_comment_on_post($observer_xchan, $item) {
 		return false;
 	}
 
-	if(comments_are_now_closed($item)) {
+	if (comments_are_now_closed($item)) {
 		return false;
 	}
 
-	if($observer_xchan === $item['author_xchan'] || $observer_xchan === $item['owner_xchan']) {
+	if ($observer_xchan === $item['author_xchan'] || $observer_xchan === $item['owner_xchan']) {
 		return true;
 	}
 
-	switch($item['comment_policy']) {
+	switch ($item['comment_policy']) {
 		case 'self':
-			if($observer_xchan === $item['author_xchan'] || $observer_xchan === $item['owner_xchan']) {
+			if ($observer_xchan === $item['author_xchan'] || $observer_xchan === $item['owner_xchan']) {
 				return true;
 			}
 			break;
@@ -324,21 +324,26 @@ function can_comment_on_post($observer_xchan, $item) {
 
 			// local posts only - check if the post owner granted me 
 			// comment permission
-			if(local_channel() && array_key_exists('owner',$item) && their_perms_contains(local_channel(),$item['owner']['abook_xchan'],'post_comments')) {
+			if (local_channel() && array_key_exists('owner',$item) && their_perms_contains(local_channel(),$item['owner']['abook_xchan'],'post_comments')) {
 					return true;
 			}
 
-			if(intval($item['item_wall']) && perm_is_allowed($item['uid'],$observer_xchan,'post_comments')) {
+			if (intval($item['item_wall']) && perm_is_allowed($item['uid'],$observer_xchan,'post_comments')) {
 				return true;
 			}
 			break;
 		default:
 			break;
 	}
-	if(strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'red')) {
+	if (strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'red')) {
 		return true;
 	}
-	if(strstr($item['comment_policy'],'site:') && strstr($item['comment_policy'],App::get_hostname())) {
+	
+	if (strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'activitypub')) {
+		return true;
+	}
+
+	if (strstr($item['comment_policy'],'site:') && strstr($item['comment_policy'],App::get_hostname())) {
 		return true;
 	}
 
diff --git a/view/tpl/site_projects.tpl b/view/tpl/site_projects.tpl
index 611d157c1..ac7cdb5b0 100644
--- a/view/tpl/site_projects.tpl
+++ b/view/tpl/site_projects.tpl
@@ -5,7 +5,7 @@
 	<ul class="nav nav-pills flex-column">
 		<li class="nav-item"><a href="{{$base}}" class="nav-link{{if $sel_all}} active{{/if}}">{{$all}}</a></li>
 		{{foreach $terms as $term}}
-		<li class="nav-item"><a  href="{{$base}}?project={{$term.name|urlencode}}" class="nav-link{{if $term.selected}} active{{/if}}">{{$term.cname}}</a></li>
+		<li class="nav-item"><a  href="{{$base}}?project={{$term.name|urlencode}}" class="nav-link{{if $term.selected}} active{{/if}}">{{if $term.type == 0}}<strong>{{$term.cname}}</strong>{{else}}{{$term.cname}}{{/if}}</a></li>
 		{{/foreach}}
 	</ul>
 </div>