clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4275 from annando/like-dislike 

Liking of your own stuff wasn't possible/enable dislike for Diaspora
This commit is contained in:
Hypolite Petovan 2018-01-18 16:30:18 -05:00 committed by GitHub
parent 271f0629f0 7b3e334f06
commit 380ae224a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Object/Post.php
View File

@ -82,8 +82,9 @@ class Post extends BaseObject
continue; continue;
} }
// You can always comment on Diaspora items // You can always comment on Diaspora and OStatus items
if (($item['network'] == NETWORK_DIASPORA) && (local_user() == $item['uid'])) { // The empty network can happen with your local (self) contact
if (in_array($item['network'], ['', NETWORK_OSTATUS, NETWORK_DIASPORA]) && (local_user() == $item['uid'])) {
$item['writable'] = true; $item['writable'] = true;
} }
@ -174,7 +175,7 @@ class Post extends BaseObject
'delete' => t('Delete'), 'delete' => t('Delete'),
]; ];
$filer = (($conv->getProfileOwner() == local_user()) ? t("save to folder") : false); $filer = (($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) ? t("save to folder") : false);
$diff_author = !link_compare($item['url'], $item['author-link']); $diff_author = !link_compare($item['url'], $item['author-link']);
$profile_name = htmlentities(((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); $profile_name = htmlentities(((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
@ -251,7 +252,7 @@ class Post extends BaseObject
$tagger = ''; $tagger = '';
if ($this->isToplevel()) { if ($this->isToplevel()) {
if ($conv->getProfileOwner() == local_user()) { if ($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) {
$isstarred = (($item['starred']) ? "starred" : "unstarred"); $isstarred = (($item['starred']) ? "starred" : "unstarred");
$star = [ $star = [
@ -262,6 +263,7 @@ class Post extends BaseObject
'classundo' => $item['starred'] ? "" : "hidden", 'classundo' => $item['starred'] ? "" : "hidden",
'starred' => t('starred'), 'starred' => t('starred'),
]; ];
$thread = dba::selectFirst('thread', ['ignored'], ['uid' => $item['uid'], 'iid' => $item['id']]); $thread = dba::selectFirst('thread', ['ignored'], ['uid' => $item['uid'], 'iid' => $item['id']]);
if (DBM::is_result($thread)) { if (DBM::is_result($thread)) {
$ignore = [ $ignore = [
@ -321,8 +323,7 @@ class Post extends BaseObject
$owner_name_e = $this->getOwnerName(); $owner_name_e = $this->getOwnerName();
// Disable features that aren't available in several networks // Disable features that aren't available in several networks
/// @todo Add NETWORK_DIASPORA when it will pass this information if (!in_array($item["item_network"], [NETWORK_DFRN, NETWORK_DIASPORA]) && isset($buttons["dislike"])) {
if (!in_array($item["item_network"], [NETWORK_DFRN]) && isset($buttons["dislike"])) {
unset($buttons["dislike"]); unset($buttons["dislike"]);
$isevent = false; $isevent = false;
$tagger = ''; $tagger = '';