mod_sites - show non-zot projects

Zotlabs/Lib/Activity.php

@@ -1914,6 +1914,7 @@ 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)
 						]
 					);
 				}

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,8 +46,13 @@ class Sites extends \Zotlabs\Web\Controller {
 					$logo = 'images/' . strtolower($rr['site_project']) . '.png';
 				}
 				if (! $logo) {
+					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']) {
 					$register_link = $rr['site_sellpage'];

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);
+	}
 }

include/items.php

@@ -338,6 +338,11 @@ function can_comment_on_post($observer_xchan, $item) {
 	if (strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'red')) {
 		return true;
 	}
+	
+	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;
 	}

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>