From f02af5fe6ea9e86a99e6e1ae5a7057350bb7224a Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 7 Feb 2019 14:25:25 -0800 Subject: automatically redirect repeat to share for posts with unresolvable message-ids (diaspora, hz < 4.0, etc.). --- Zotlabs/Module/Share.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'Zotlabs/Module') diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php index dcb2343ce..cca72f12f 100644 --- a/Zotlabs/Module/Share.php +++ b/Zotlabs/Module/Share.php @@ -27,13 +27,15 @@ class Share extends \Zotlabs\Web\Controller { $channel = App::get_channel(); - $r = q("SELECT * from item left join xchan on author_xchan = xchan_hash WHERE id = %d LIMIT 1", intval($post_id) ); if(! $r) killme(); + + + if(($r[0]['item_private']) && ($r[0]['xchan_network'] !== 'rss')) killme(); @@ -49,8 +51,12 @@ class Share extends \Zotlabs\Web\Controller { if($r[0]['mimetype'] !== 'text/bbcode') killme(); - - + + if(strpos($r[0]['mid'],'http') === false) { + notice( t('Source message cannot be repeated. Sharing instead.') . EOL); + goaway(z_root() . '/embed/' . argv(1)); + } + xchan_query($r); $arr = []; -- cgit v1.2.3