diff --git a/README.md b/README.md index c09d06cbd..dada231d4 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,6 @@ ZAP === -Zap is a webserver app which implements a decentralised social network with more privacy and less drama. +A fediverse server. -===== - -The Zot Manifesto - -You have the right to a permanent internet identity which is not associated with what server you are currently using and cannot be taken away from you by anybody, ever. - -You have the right to refuse/reject or possibly moderate comments on your posts by anybody you don't know. - -You also have the right to not allow them to comment on your posts in the first place, until such time as they have earned your trust. - -You have the right to show your photos and videos to anybody you desire and also NOT show them to anybody you desire. - -If your software does not implement these rights, you have the right to fix it or replace it. - -===== - -The Earth Manifesto - -The earth is your mother. She gave you life. Respect her or she will take it away. - -Silence is complicity. Speak. - -Those who are leading us to destruction can be stopped. - -7.5 billion people cannot be stopped. - -===== - diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 567dcc58e..0566c0fdc 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -1892,9 +1892,6 @@ class Libzot { if (intval($arr['item_deleted'])) { - // remove_community_tag is a no-op if this isn't a community tag activity - self::remove_community_tag($sender,$arr,$channel['channel_id']); - // set these just in case we need to store a fresh copy of the deleted post. // This could happen if the delete got here before the original post did. diff --git a/boot.php b/boot.php index ea70d794b..f3506cb32 100755 --- a/boot.php +++ b/boot.php @@ -16,7 +16,7 @@ use Zotlabs\Daemon\Master; * @brief This file defines some global constants and includes the central App class. */ -define ( 'STD_VERSION', '20.03.10' ); +define ( 'STD_VERSION', '20.03.13' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1237 ); @@ -602,6 +602,8 @@ define ( 'ITEM_TYPE_REPORT', 10 ); define ( 'ITEM_IS_STICKY', 1000 ); +define ( 'BLOCKTYPE_CHANNEL', 0 ); +define ( 'BLOCKTYPE_SERVER', 1 ); define ( 'DBTYPE_MYSQL', 0 ); define ( 'DBTYPE_POSTGRES', 1 ); diff --git a/include/conversation.php b/include/conversation.php index 6032308ae..13aef5da7 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -86,7 +86,7 @@ function item_redir_and_replace_images($body, $images, $cid) { function localize_item(&$item){ - if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE) || $item['verb'] === 'Announce'){ + if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE) || $item['verb'] === 'Announce') { if (! $item['obj']) { return; diff --git a/include/text.php b/include/text.php index b40ac8aaf..c027c8188 100644 --- a/include/text.php +++ b/include/text.php @@ -2381,7 +2381,7 @@ function find_xchan_in_array($xchan,$arr) { function get_rel_link($j,$rel) { if(is_array($j) && ($j)) foreach($j as $l) - if(array_key_exists('rel',$l) && $l['rel'] === $rel && array_key_exists('href',$l)) + if(is_array($l) && array_key_exists('rel',$l) && $l['rel'] === $rel && array_key_exists('href',$l)) return $l['href']; return '';