From 451468d1297ba41a6c9ea29709444ceb15185bfb Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sun, 22 Nov 2020 16:37:20 +0000
Subject: fix mod item issue with remote channels

---
 Zotlabs/Module/Item.php | 28 ++++++++++++----------------
 view/js/main.js         | 24 ++++++++++++------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index ce344ee82..c4fac1385 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -300,6 +300,7 @@ class Item extends Controller {
 	
 		$parent = ((x($_REQUEST,'parent')) ? intval($_REQUEST['parent']) : 0);
 		$parent_mid = ((x($_REQUEST,'parent_mid')) ? trim($_REQUEST['parent_mid']) : '');
+		$mode = (($_REQUEST['conv_mode'] === 'channel') ? 'channel' : 'network');
 	
 		$remote_xchan = ((x($_REQUEST,'remote_xchan')) ? trim($_REQUEST['remote_xchan']) : false);
 		$r = q("select * from xchan where xchan_hash = '%s' limit 1",
@@ -1374,24 +1375,19 @@ class Item extends Controller {
 			goaway(z_root() . "/" . $return_path);
 		}
 
+		if($mode === 'channel')
+			profile_load($owner_xchan['xchan_name']);
 
-		if(local_channel()) {
-			$item[] = $datarray;
-			$item[0]['owner'] = $owner_xchan;
-			$item[0]['author'] = $observer;
-			$item[0]['attach'] = json_encode($datarray['attach']);
+		$item[] = $datarray;
+		$item[0]['owner'] = $owner_xchan;
+		$item[0]['author'] = $observer;
+		$item[0]['attach'] = json_encode($datarray['attach']);
 
-			$json = [
-				'success' => 1,
-				'id' => $post_id,
-				'html' => conversation($item,'network',true,'r_preview'),
-			];
-		}
-		else {
-			$json = [
-				'success' => 1
-			];
-		}
+		$json = [
+			'success' => 1,
+			'id' => $post_id,
+			'html' => conversation($item,$mode,true,'r_preview'),
+		];
 
 		if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload']))
 			$json['reload'] = z_root() . '/' . $_REQUEST['jsreload'];
diff --git a/view/js/main.js b/view/js/main.js
index 4c8cd0adf..35b03e03b 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1371,25 +1371,25 @@ function post_comment(id) {
 	$('body').css('cursor', 'wait');
 	$("#comment-preview-inp-" + id).val("0");
 
+	if(typeof conv_mode == typeof undefined)
+		conv_mode = '';
+
+	var form_data =	$("#comment-edit-form-" + id).serialize();
+
 	$.post(
 		"item",
-		$("#comment-edit-form-" + id).serialize(),
+		form_data  + '&conv_mode=' + conv_mode,
 		function(data) {
 			if(data.success) {
+
 				localStorage.removeItem("comment_body-" + id);
 				$("#comment-edit-preview-" + id).hide();
 				$("#comment-edit-text-" + id).val('').blur().attr('placeholder', aStr.comment);
-
-				if(! localUser) {
-					updateInit();
-				}
-				else {
-					$('#wall-item-comment-wrapper-' + id).before(data.html);
-					$('#wall-item-ago-' + data.id + ' .autotime').timeago();
-					$('body').css('cursor', 'unset');
-					collapseHeight();
-					commentBusy = false;
-				}
+				$('#wall-item-comment-wrapper-' + id).before(data.html);
+				$('#wall-item-ago-' + data.id + ' .autotime').timeago();
+				$('body').css('cursor', 'unset');
+				collapseHeight();
+				commentBusy = false;
 
 				var tarea = document.getElementById("comment-edit-text-" + id);
 				if(tarea) {
-- 
cgit v1.2.3