aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-02-07 14:38:05 -0800
committerzotlabs <mike@macgirvin.com>2019-02-07 14:38:05 -0800
commit317c53acf6b74a4f92284074017985fb09662a46 (patch)
treef7a6f35604bed1dca48b5425e5fd7a34b9a2a2b8
parentf02af5fe6ea9e86a99e6e1ae5a7057350bb7224a (diff)
downloadvolse-hubzilla-317c53acf6b74a4f92284074017985fb09662a46.tar.gz
volse-hubzilla-317c53acf6b74a4f92284074017985fb09662a46.tar.bz2
volse-hubzilla-317c53acf6b74a4f92284074017985fb09662a46.zip
disable repeat unless mid is a resolvable uri since this will do radically different things on different network stacks (e.g. Diaspora) and it turns out there is no possible way to make Diaspora reshares compatible with ActivityPub or Zot6 repeat/announce/boost/whatever.
-rw-r--r--Zotlabs/Lib/ThreadItem.php6
-rw-r--r--Zotlabs/Module/Share.php5
2 files changed, 5 insertions, 6 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 6c4deea27..94d0e3cf8 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -294,7 +294,11 @@ class ThreadItem {
}
if ($shareable) {
- $share = array( t('Repeat This'), t('repeat'));
+ // This actually turns out not to be possible in some protocol stacks without opening up hundreds of new issues.
+ // Will allow it only for uri resolvable sources.
+ if(strpos($item['mid'],'http') === 0) {
+ $share = array( t('Repeat This'), t('repeat'));
+ }
$embed = array( t('Share This'), t('share'));
}
diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php
index cca72f12f..53a06b072 100644
--- a/Zotlabs/Module/Share.php
+++ b/Zotlabs/Module/Share.php
@@ -51,11 +51,6 @@ 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);