From b6d598a0018301c47ae42340962720a7b5247e4a Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 2 May 2019 12:58:24 +0200
Subject: provide xchan_url if there is no xchan_addr

---
 Zotlabs/Lib/ThreadItem.php | 2 +-
 view/js/main.js            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 7a3a7c0c5..0fdbc9123 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -373,7 +373,7 @@ class ThreadItem {
 			'id' => $this->get_id(),
 			'mid' => $item['mid'],
 			'parent' => $item['parent'],
-			'author_id' => $item['author']['xchan_addr'],
+			'author_id' => (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url']),
 			'isevent' => $isevent,
 			'attend' => $attend,
 			'consensus' => $consensus,
diff --git a/view/js/main.js b/view/js/main.js
index 325ad9a51..b99fc0586 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1155,7 +1155,7 @@ function doreply(parent, ident, owner, hint) {
 	var btn = i.html().replace(/<[^>]*>/g, '').trim();
 	i.html('<i class="fa fa-reply" ></i> ' + btn);
 	i.prop('title', hint);
-	form.find('textarea').val("@{" + owner + "}\n");
+	form.find('textarea').val("@{" + owner + "} ");
 	$('#comment-edit-text-' + parent.toString()).focus();
 }
 
-- 
cgit v1.2.3