Merge branch 'dev' of /home/macgirvin/z into dev

Zotlabs/Module/Item.php

@@ -29,6 +29,7 @@ use Zotlabs\Lib\Libzot;
 use Zotlabs\Lib\ThreadListener;
 use Zotlabs\Lib\Config;
 use Zotlabs\Lib\IConfig;
+use Zotlabs\Lib\PConfig;
 use Zotlabs\Lib\Enotify;
 use Zotlabs\Lib\Apps;
 use Zotlabs\Access\PermissionLimits;
@@ -324,7 +325,7 @@ class Item extends Controller {
 		$item_blocked = false;
 
 		$post_tags = false;
-
+		$pub_copy = false;
 
 
 
@@ -507,6 +508,7 @@ class Item extends Controller {
 
 				if (local_channel()) {
 					$r = [ copy_of_pubitem(App::get_channel(), $r[0]['mid']) ];
+					$pub_copy = true;
 				}
 			}
 
@@ -1408,7 +1410,7 @@ class Item extends Controller {
 		// as a duplicate if you're editing it very soon after posting it initially and you edited
 		// some attribute besides the content, such as title or categories. 
 
-		if(feature_enabled($profile_uid,'suppress_duplicates') && (! $orig_post)) {
+		if(PConfig::Get($profile_uid,'system','suppress_duplicates',true) && (! $orig_post)) {
 	
 			$z = q("select created from item where uid = %d and created > %s - INTERVAL %s and body = '%s' limit 1",
 				intval($profile_uid),
@@ -1469,12 +1471,13 @@ class Item extends Controller {
 					Libsync::build_sync_packet($profile_uid,array('item' => array(encode_item($sync_item[0],true))));
 				}
 			}
-			if(! $nopush)
+			if (! $nopush) {
 				Run::Summon( [ 'Notifier', 'edit_post', $post_id ] );
+			}
 
-
-			if($api_source)
+			if ($api_source) {
 				return($x);
+			}
 
 
 			if (intval($datarray['item_unpublished'])) {
@@ -1482,7 +1485,6 @@ class Item extends Controller {
 			}
 
 
-
 			if((x($_REQUEST,'return')) && strlen($return_path)) {
 				logger('return: ' . $return_path);
 				goaway(z_root() . "/" . $return_path );
@@ -1494,9 +1496,15 @@ class Item extends Controller {
 	
 		$post = item_store($datarray,$execflag);
 
+		if ($pub_copy) {
+			info( t('Your comment has been posted.') . EOL);
+		}
+
 		$post_id = $post['item_id'];
 		$datarray = $post['item'];
 
+
+
 		if($post_id) {
 			logger('mod_item: saved item ' . $post_id);
 	

boot.php

@@ -17,7 +17,7 @@ use Zotlabs\Daemon\Run;
  * @brief This file defines some global constants and includes the central App class.
  */
 
-define ( 'STD_VERSION',             '21.05.27' );
+define ( 'STD_VERSION',             '21.05.28' );
 define ( 'ZOT_REVISION',            '10.0' );
 
 define ( 'DB_UPDATE_VERSION',       1248 );