diff options
| author | friendica <info@friendica.com> | 2014-09-02 17:21:12 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-02 17:21:12 -0700 |
| commit | 2c94d59cba0b3231b0dd822fc1b95bed5521c48d (patch) | |
| tree | 5000d4070a1810c1c4b538bf0970d867f0bb6ddb /include/ItemObject.php | |
| parent | 17c1ddb77e153b72fd70d3b58befb9e791ca04c7 (diff) | |
| download | volse-hubzilla-2c94d59cba0b3231b0dd822fc1b95bed5521c48d.tar.gz volse-hubzilla-2c94d59cba0b3231b0dd822fc1b95bed5521c48d.tar.bz2 volse-hubzilla-2c94d59cba0b3231b0dd822fc1b95bed5521c48d.zip | |
use feed title for channel name before checking author, make feed items shareable (they're private to the channel so they won't be shown in searches), try and handle Diaspora mentions a bit more elegantly. (Bug: we don't convert mentions to Diaspora's format on outbound at all!)
Diffstat (limited to 'include/ItemObject.php')
| -rw-r--r-- | include/ItemObject.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index a5870ef91..b4a60762b 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -90,6 +90,10 @@ class Item extends BaseObject { : false); $shareable = ((($conv->get_profile_owner() == local_user()) && ($item['item_private'] != 1)) ? true : false); + // allow an exemption for sharing stuff from your private feeds + if($item['author']['xchan_network'] === 'rss') + $shareable = true; + $mode = $conv->get_mode(); if(local_user() && $observer['xchan_hash'] === $item['author_xchan']) @@ -207,10 +211,11 @@ class Item extends BaseObject { if($this->is_commentable()) { $like = array( t("I like this \x28toggle\x29"), t("like")); $dislike = array( t("I don't like this \x28toggle\x29"), t("dislike")); - if ($shareable) - $share = array( t('Share This'), t('share')); } + if ($shareable) + $share = array( t('Share This'), t('share')); + if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) $indent .= ' shiny'; |