<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Protocol\Activity;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Proxy;
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
private $thread = null;
private $redirect_url = null;
private $owner_url = '';
- private $owner_photo = '';
private $owner_name = '';
private $wall_to_wall = false;
private $threaded = false;
$dropping = true;
}
- $origin = $item['origin'];
+ $origin = $item['origin'] || $item['parent-origin'];
- if (!$origin) {
- /// @todo This shouldn't be done as query here, but better during the data creation.
- // it is now done here, since during the RC phase we shouldn't make to intense changes.
- $parent = PostModel::selectFirst(['origin'], ['id' => $item['parent']]);
- if (DBA::isResult($parent)) {
- $origin = $parent['origin'];
- }
- } elseif ($item['pinned']) {
- $pinned = DI::l10n()->t('pinned item');
+ if ($item['pinned']) {
+ $pinned = DI::l10n()->t('Pinned item');
}
- if ($origin && ($item['gravity'] != GRAVITY_PARENT) && ($item['network'] == Protocol::ACTIVITYPUB)) {
- // ActivityPub doesn't allow removal of remote comments
- $delete = DI::l10n()->t('Delete locally');
- } else {
- // Showing the one or the other text, depending upon if we can only hide it or really delete it.
- $delete = $origin ? DI::l10n()->t('Delete globally') : DI::l10n()->t('Remove locally');
- }
+ // Showing the one or the other text, depending upon if we can only hide it or really delete it.
+ $delete = $origin ? DI::l10n()->t('Delete globally') : DI::l10n()->t('Remove locally');
$drop = false;
+ $block = false;
if (local_user()) {
$drop = [
'dropping' => $dropping,
'pagedrop' => $item['pagedrop'],
- 'select' => DI::l10n()->t('Select'),
- 'delete' => $delete,
+ 'select' => DI::l10n()->t('Select'),
+ 'delete' => $delete,
+ ];
+ }
+
+ if (!$item['self']) {
+ $block = [
+ 'blocking' => true,
+ 'block' => DI::l10n()->t('Block %s', $item['author-name']),
+ 'author_id' => $item['author-id'],
];
}
- $filer = (($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) ? DI::l10n()->t("save to folder") : false);
+ $filer = (($conv->getProfileOwner() == local_user() && ($item['uid'] != 0)) ? DI::l10n()->t('Save to folder') : false);
$profile_name = $item['author-name'];
if (!empty($item['author-link']) && empty($item['author-name'])) {
$profile_name = $item['author-link'];
}
- $author = ['uid' => 0, 'id' => $item['author-id'],
- 'network' => $item['author-network'], 'url' => $item['author-link']];
-
if (Session::isAuthenticated()) {
+ $author = ['uid' => 0, 'id' => $item['author-id'],
+ 'network' => $item['author-network'], 'url' => $item['author-link']];
$profile_link = Contact::magicLinkByContact($author);
} else {
$profile_link = $item['author-link'];
$responses = [];
foreach ($response_verbs as $value => $verb) {
$responses[$verb] = [
- 'self' => $conv_responses[$verb][$item['uri']]['self'] ?? 0,
- 'output' => !empty($conv_responses[$verb][$item['uri']]) ? format_activity($conv_responses[$verb][$item['uri']]['links'], $verb, $item['uri']) : '',
+ 'self' => $conv_responses[$verb][$item['uri-id']]['self'] ?? 0,
+ 'output' => !empty($conv_responses[$verb][$item['uri-id']]) ? format_activity($conv_responses[$verb][$item['uri-id']]['links'], $verb, $item['uri-id']) : '',
];
}
if ($this->isToplevel()) {
if(local_user()) {
- $thread = Item::selectFirstThreadForUser(local_user(), ['ignored'], ['iid' => $item['id']]);
- if (DBA::isResult($thread)) {
+ $ignored = PostModel\ThreadUser::getIgnored($item['uri-id'], local_user());
+ if ($item['mention'] || $ignored) {
$ignore = [
- 'do' => DI::l10n()->t("ignore thread"),
- 'undo' => DI::l10n()->t("unignore thread"),
- 'toggle' => DI::l10n()->t("toggle ignore status"),
- 'classdo' => $thread['ignored'] ? "hidden" : "",
- 'classundo' => $thread['ignored'] ? "" : "hidden",
- 'ignored' => DI::l10n()->t('ignored'),
+ 'do' => DI::l10n()->t('Ignore thread'),
+ 'undo' => DI::l10n()->t('Unignore thread'),
+ 'toggle' => DI::l10n()->t('Toggle ignore status'),
+ 'classdo' => $ignored ? "hidden" : "",
+ 'classundo' => $ignored ? "" : "hidden",
+ 'ignored' => DI::l10n()->t('Ignored'),
];
}
$ispinned = ($item['pinned'] ? 'pinned' : 'unpinned');
$pin = [
- 'do' => DI::l10n()->t('pin'),
- 'undo' => DI::l10n()->t('unpin'),
- 'toggle' => DI::l10n()->t('toggle pin status'),
+ 'do' => DI::l10n()->t('Pin'),
+ 'undo' => DI::l10n()->t('Unpin'),
+ 'toggle' => DI::l10n()->t('Toggle pin status'),
'classdo' => $item['pinned'] ? 'hidden' : '',
'classundo' => $item['pinned'] ? '' : 'hidden',
- 'pinned' => DI::l10n()->t('pinned'),
+ 'pinned' => DI::l10n()->t('Pinned'),
];
}
$isstarred = (($item['starred']) ? "starred" : "unstarred");
$star = [
- 'do' => DI::l10n()->t("add star"),
- 'undo' => DI::l10n()->t("remove star"),
- 'toggle' => DI::l10n()->t("toggle star status"),
+ 'do' => DI::l10n()->t('Add star'),
+ 'undo' => DI::l10n()->t('Remove star'),
+ 'toggle' => DI::l10n()->t('Toggle star status'),
'classdo' => $item['starred'] ? "hidden" : "",
'classundo' => $item['starred'] ? "" : "hidden",
- 'starred' => DI::l10n()->t('starred'),
+ 'starred' => DI::l10n()->t('Starred'),
];
$tagger = [
- 'add' => DI::l10n()->t("add tag"),
+ 'add' => DI::l10n()->t('Add tag'),
'class' => "",
];
}
}
if ($conv->isWritable()) {
- $buttons['like'] = [DI::l10n()->t("I like this \x28toggle\x29") , DI::l10n()->t("like")];
- $buttons['dislike'] = [DI::l10n()->t("I don't like this \x28toggle\x29"), DI::l10n()->t("dislike")];
+ $buttons['like'] = [DI::l10n()->t("I like this \x28toggle\x29") , DI::l10n()->t('Like')];
+ $buttons['dislike'] = [DI::l10n()->t("I don't like this \x28toggle\x29"), DI::l10n()->t('Dislike')];
if ($shareable) {
$buttons['share'] = [DI::l10n()->t('Quote share this'), DI::l10n()->t('Quote Share')];
}
}
// Fetching of Diaspora posts doesn't always work. There are issues with reshares and possibly comments
- if (($item['network'] != Protocol::DIASPORA) && empty($comment) && !empty(Session::get('remote_comment'))) {
- $remote_comment = [DI::l10n()->t('Comment this item on your system'), DI::l10n()->t('remote comment'),
+ if (!local_user() && ($item['network'] != Protocol::DIASPORA) && !empty(Session::get('remote_comment'))) {
+ $remote_comment = [DI::l10n()->t('Comment this item on your system'), DI::l10n()->t('Remote comment'),
str_replace('{uri}', urlencode($item['uri']), Session::get('remote_comment'))];
+
+ // Ensure to either display the remote comment or the local activities
+ $buttons = [];
+ $comment_html = '';
} else {
$remote_comment = '';
}
$tmp_item = [
'template' => $this->getTemplate(),
'type' => implode("", array_slice(explode("/", $item['verb']), -1)),
+ 'comment_firstcollapsed' => false,
+ 'comment_lastcollapsed' => false,
'suppress_tags' => DI::config()->get('system', 'suppress_tags'),
'tags' => $tags['tags'],
'hashtags' => $tags['hashtags'],
'profile_url' => $profile_link,
'name' => $profile_name,
'item_photo_menu_html' => item_photo_menu($item),
- 'thumb' => DI::baseUrl()->remove($item['author-avatar']),
+ 'thumb' => DI::baseUrl()->remove(Contact::getAvatarUrlForUrl($item['author-link'], $item['uid'], Proxy::SIZE_THUMB)),
'osparkle' => $osparkle,
'sparkle' => $sparkle,
'title' => $title,
'shiny' => $shiny,
'owner_self' => $item['author-link'] == Session::get('my_url'),
'owner_url' => $this->getOwnerUrl(),
- 'owner_photo' => DI::baseUrl()->remove($item['owner-avatar']),
+ 'owner_photo' => DI::baseUrl()->remove(Contact::getAvatarUrlForUrl($item['owner-link'], $item['uid'], Proxy::SIZE_THUMB)),
'owner_name' => $this->getOwnerName(),
'plink' => Item::getPlink($item),
'edpost' => $edpost,
'filer' => $filer,
'language' => $languages,
'drop' => $drop,
+ 'block' => $block,
'vote' => $buttons,
'like_html' => $responses['like']['output'],
'dislike_html' => $responses['dislike']['output'],
}
}
- if ($this->isToplevel()) {
- $result['total_comments_num'] = "$total_children";
- $result['total_comments_text'] = DI::l10n()->tt('comment', 'comments', $total_children);
- }
+ $result['total_comments_num'] = $this->isToplevel() ? $total_children : 0;
$result['private'] = $item['private'];
$result['toplevel'] = ($this->isToplevel() ? 'toplevel_item' : '');
return '';
}
- $item = PostModel::selectFirst(['author-addr', 'uri-id'], ['id' => $this->getId()]);
+ $item = PostModel::selectFirst(['author-addr', 'uri-id', 'network', 'gravity'], ['id' => $this->getId()]);
if (!DBA::isResult($item) || empty($item['author-addr'])) {
// Should not happen
return '';
}
- if ($item['author-addr'] != $owner['addr']) {
+ if (($item['author-addr'] != $owner['addr']) && (($item['gravity'] != GRAVITY_PARENT) || !in_array($item['network'], [Protocol::DIASPORA]))) {
$text = '@' . $item['author-addr'] . ' ';
} else {
$text = '';
$terms = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
foreach ($terms as $term) {
+ if (!$term['url']) {
+ DI::logger()->warning('Mention term with no URL', ['term' => $term]);
+ continue;
+ }
+
$profile = Contact::getByURL($term['url'], false, ['addr', 'contact-type']);
- if (!empty($profile['addr']) && ((($profile['contact-type'] ?? '') ?: Contact::TYPE_UNKNOWN) != Contact::TYPE_COMMUNITY) &&
+ if (!empty($profile['addr']) && (($profile['contact-type'] ?? Contact::TYPE_UNKNOWN) != Contact::TYPE_COMMUNITY) &&
($profile['addr'] != $owner['addr']) && !strstr($text, $profile['addr'])) {
$text .= '@' . $profile['addr'] . ' ';
}
'$qcomment' => $qcomment,
'$default' => $default_text,
'$profile_uid' => $uid,
- '$mylink' => DI::baseUrl()->remove($a->contact['url']),
+ '$mylink' => DI::baseUrl()->remove($a->contact['url'] ?? ''),
'$mytitle' => DI::l10n()->t('This is you'),
- '$myphoto' => DI::baseUrl()->remove($a->contact['thumb']),
+ '$myphoto' => DI::baseUrl()->remove($a->contact['thumb'] ?? ''),
'$comment' => DI::l10n()->t('Comment'),
'$submit' => DI::l10n()->t('Submit'),
'$loading' => DI::l10n()->t('Loading...'),
// This will have been stored in $a->page_contact by our calling page.
// Put this person as the wall owner of the wall-to-wall notice.
- $this->owner_url = Contact::magicLink($a->page_contact['url']);
- $this->owner_photo = $a->page_contact['thumb'];
+ $this->owner_url = Contact::magicLinkByContact($a->page_contact);
$this->owner_name = $a->page_contact['name'];
$this->wall_to_wall = true;
} elseif ($this->getDataValue('owner-link')) {
// But it could be somebody else with the same name. It just isn't highly likely.
- $this->owner_photo = $this->getDataValue('owner-avatar');
$this->owner_name = $this->getDataValue('owner-name');
$this->wall_to_wall = true;
if (!$this->wall_to_wall) {
$this->setTemplate('wall');
$this->owner_url = '';
- $this->owner_photo = '';
$this->owner_name = '';
}
}
projects / friendica.git / blobdiff