X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fconversation.php;h=43eeb9e41ce1cced73d39bdb72e3ee27e7945303;hb=461e01bd337aa8ae689d7a990f42b194c409bd14;hp=ed273a52ce22c70985df1b77c6bfeb1b2f372b1a;hpb=b7527a803a5eda9a383b6fc95c522d1ebf8580eb;p=friendica.git
diff --git a/include/conversation.php b/include/conversation.php
index ed273a52ce..43eeb9e41c 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1,6 +1,22 @@
.
+ *
*/
use Friendica\App;
@@ -128,222 +144,106 @@ function localize_item(&$item)
$item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']);
}
- /*
- heluecht 2018-06-19: from my point of view this whole code part is useless.
- It just renders the body message of technical posts (Like, dislike, ...).
- But: The body isn't visible at all. So we do this stuff just because we can.
- Even if these messages were visible, this would only mean that something went wrong.
- During the further steps of the database restructuring I would like to address this issue.
- */
-
- $activity = DI::activity();
-
- $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
- if ($activity->match($item['verb'], Activity::LIKE)
- || $activity->match($item['verb'], Activity::DISLIKE)
- || $activity->match($item['verb'], Activity::ATTEND)
- || $activity->match($item['verb'], Activity::ATTENDNO)
- || $activity->match($item['verb'], Activity::ATTENDMAYBE)) {
-
- $fields = ['author-link', 'author-name', 'verb', 'object-type', 'resource-id', 'body', 'plink'];
- $obj = Item::selectFirst($fields, ['uri' => $item['parent-uri']]);
- if (!DBA::isResult($obj)) {
- return;
- }
-
- $author = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
- $objauthor = '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
-
- switch ($obj['verb']) {
- case Activity::POST:
- switch ($obj['object-type']) {
- case Activity\ObjectType::EVENT:
- $post_type = DI::l10n()->t('event');
- break;
- default:
- $post_type = DI::l10n()->t('status');
- }
- break;
- default:
- if ($obj['resource-id']) {
- $post_type = DI::l10n()->t('photo');
- $m = [];
- preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
- $rr['plink'] = $m[1];
- } else {
- $post_type = DI::l10n()->t('status');
- }
- }
-
- $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
-
- $bodyverb = '';
- if ($activity->match($item['verb'], Activity::LIKE)) {
- $bodyverb = DI::l10n()->t('%1$s likes %2$s\'s %3$s');
- } elseif ($activity->match($item['verb'], Activity::DISLIKE)) {
- $bodyverb = DI::l10n()->t('%1$s doesn\'t like %2$s\'s %3$s');
- } elseif ($activity->match($item['verb'], Activity::ATTEND)) {
- $bodyverb = DI::l10n()->t('%1$s attends %2$s\'s %3$s');
- } elseif ($activity->match($item['verb'], Activity::ATTENDNO)) {
- $bodyverb = DI::l10n()->t('%1$s doesn\'t attend %2$s\'s %3$s');
- } elseif ($activity->match($item['verb'], Activity::ATTENDMAYBE)) {
- $bodyverb = DI::l10n()->t('%1$s attends maybe %2$s\'s %3$s');
- }
-
- $item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
- }
+ /// @todo The following functionality needs to be cleaned up.
+ if (!empty($item['verb'])) {
+ $activity = DI::activity();
- if ($activity->match($item['verb'], Activity::FRIEND)) {
-
- if ($item['object-type']=="" || $item['object-type']!== Activity\ObjectType::PERSON) return;
-
- $Aname = $item['author-name'];
- $Alink = $item['author-link'];
-
- $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
-
- $obj = XML::parseString($xmlhead.$item['object']);
- $links = XML::parseString($xmlhead."".XML::unescape($obj->link)."");
+ $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
- $Bname = $obj->title;
- $Blink = "";
- $Bphoto = "";
- foreach ($links->link as $l) {
- $atts = $l->attributes();
- switch ($atts['rel']) {
- case "alternate": $Blink = $atts['href']; break;
- case "photo": $Bphoto = $atts['href']; break;
+ if (stristr($item['verb'], Activity::POKE)) {
+ $verb = urldecode(substr($item['verb'], strpos($item['verb'],'#') + 1));
+ if (!$verb) {
+ return;
+ }
+ if ($item['object-type'] == "" || $item['object-type'] !== Activity\ObjectType::PERSON) {
+ return;
}
- }
-
- $A = '[url=' . Contact::magicLink($Alink) . ']' . $Aname . '[/url]';
- $B = '[url=' . Contact::magicLink($Blink) . ']' . $Bname . '[/url]';
- if ($Bphoto != "") {
- $Bphoto = '[url=' . Contact::magicLink($Blink) . '][img]' . $Bphoto . '[/img][/url]';
- }
-
- $item['body'] = DI::l10n()->t('%1$s is now friends with %2$s', $A, $B)."\n\n\n".$Bphoto;
-
- }
- if (stristr($item['verb'], Activity::POKE)) {
- $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
- if (!$verb) {
- return;
- }
- if ($item['object-type']=="" || $item['object-type']!== Activity\ObjectType::PERSON) {
- return;
- }
-
- $Aname = $item['author-name'];
- $Alink = $item['author-link'];
- $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
+ $Aname = $item['author-name'];
+ $Alink = $item['author-link'];
- $obj = XML::parseString($xmlhead.$item['object']);
+ $obj = XML::parseString($xmlhead . $item['object']);
- $Bname = $obj->title;
- $Blink = $obj->id;
- $Bphoto = "";
+ $Bname = $obj->title;
+ $Blink = $obj->id;
+ $Bphoto = "";
- foreach ($obj->link as $l) {
- $atts = $l->attributes();
- switch ($atts['rel']) {
- case "alternate": $Blink = $atts['href'];
- case "photo": $Bphoto = $atts['href'];
+ foreach ($obj->link as $l) {
+ $atts = $l->attributes();
+ switch ($atts['rel']) {
+ case "alternate": $Blink = $atts['href'];
+ case "photo": $Bphoto = $atts['href'];
+ }
}
- }
-
- $A = '[url=' . Contact::magicLink($Alink) . ']' . $Aname . '[/url]';
- $B = '[url=' . Contact::magicLink($Blink) . ']' . $Bname . '[/url]';
- if ($Bphoto != "") {
- $Bphoto = '[url=' . Contact::magicLink($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
- }
- /*
- * we can't have a translation string with three positions but no distinguishable text
- * So here is the translate string.
- */
- $txt = DI::l10n()->t('%1$s poked %2$s');
+ $A = '[url=' . Contact::magicLink($Alink) . ']' . $Aname . '[/url]';
+ $B = '[url=' . Contact::magicLink($Blink) . ']' . $Bname . '[/url]';
+ if ($Bphoto != "") {
+ $Bphoto = '[url=' . Contact::magicLink($Blink) . '][img=80x80]' . $Bphoto . '[/img][/url]';
+ }
- // now translate the verb
- $poked_t = trim(sprintf($txt, "", ""));
- $txt = str_replace($poked_t, DI::l10n()->t($verb), $txt);
+ /*
+ * we can't have a translation string with three positions but no distinguishable text
+ * So here is the translate string.
+ */
+ $txt = DI::l10n()->t('%1$s poked %2$s');
- // then do the sprintf on the translation string
+ // now translate the verb
+ $poked_t = trim(sprintf($txt, '', ''));
+ $txt = str_replace($poked_t, DI::l10n()->t($verb), $txt);
- $item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto;
+ // then do the sprintf on the translation string
- }
+ $item['body'] = sprintf($txt, $A, $B) . "\n\n\n" . $Bphoto;
- if ($activity->match($item['verb'], Activity::TAG)) {
- $fields = ['author-id', 'author-link', 'author-name', 'author-network',
- 'verb', 'object-type', 'resource-id', 'body', 'plink'];
- $obj = Item::selectFirst($fields, ['uri' => $item['parent-uri']]);
- if (!DBA::isResult($obj)) {
- return;
}
- $author_arr = ['uid' => 0, 'id' => $item['author-id'],
- 'network' => $item['author-network'], 'url' => $item['author-link']];
- $author = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $item['author-name'] . '[/url]';
-
- $author_arr = ['uid' => 0, 'id' => $obj['author-id'],
- 'network' => $obj['author-network'], 'url' => $obj['author-link']];
- $objauthor = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $obj['author-name'] . '[/url]';
-
- switch ($obj['verb']) {
- case Activity::POST:
- switch ($obj['object-type']) {
- case Activity\ObjectType::EVENT:
- $post_type = DI::l10n()->t('event');
- break;
- default:
- $post_type = DI::l10n()->t('status');
- }
- break;
- default:
- if ($obj['resource-id']) {
- $post_type = DI::l10n()->t('photo');
- $m=[]; preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
- $rr['plink'] = $m[1];
- } else {
- $post_type = DI::l10n()->t('status');
- }
- // Let's break everthing ... ;-)
- break;
- }
- $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
-
- $parsedobj = XML::parseString($xmlhead.$item['object']);
-
- $tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content);
- $item['body'] = DI::l10n()->t('%1$s tagged %2$s\'s %3$s with %4$s', $author, $objauthor, $plink, $tag);
- }
-
- if ($activity->match($item['verb'], Activity::FAVORITE)) {
- if ($item['object-type'] == "") {
- return;
- }
+ if ($activity->match($item['verb'], Activity::TAG)) {
+ $fields = ['author-id', 'author-link', 'author-name', 'author-network',
+ 'verb', 'object-type', 'resource-id', 'body', 'plink'];
+ $obj = Item::selectFirst($fields, ['uri' => $item['parent-uri']]);
+ if (!DBA::isResult($obj)) {
+ return;
+ }
- $Aname = $item['author-name'];
- $Alink = $item['author-link'];
+ $author_arr = ['uid' => 0, 'id' => $item['author-id'],
+ 'network' => $item['author-network'], 'url' => $item['author-link']];
+ $author = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $item['author-name'] . '[/url]';
+
+ $author_arr = ['uid' => 0, 'id' => $obj['author-id'],
+ 'network' => $obj['author-network'], 'url' => $obj['author-link']];
+ $objauthor = '[url=' . Contact::magicLinkByContact($author_arr) . ']' . $obj['author-name'] . '[/url]';
+
+ switch ($obj['verb']) {
+ case Activity::POST:
+ switch ($obj['object-type']) {
+ case Activity\ObjectType::EVENT:
+ $post_type = DI::l10n()->t('event');
+ break;
+ default:
+ $post_type = DI::l10n()->t('status');
+ }
+ break;
+ default:
+ if ($obj['resource-id']) {
+ $post_type = DI::l10n()->t('photo');
+ $m=[]; preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
+ $rr['plink'] = $m[1];
+ } else {
+ $post_type = DI::l10n()->t('status');
+ }
+ // Let's break everthing ... ;-)
+ break;
+ }
+ $plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
- $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
+ $parsedobj = XML::parseString($xmlhead . $item['object']);
- $obj = XML::parseString($xmlhead.$item['object']);
- if (strlen($obj->id)) {
- $fields = ['author-link', 'author-name', 'plink'];
- $target = Item::selectFirst($fields, ['uri' => $obj->id, 'uid' => $item['uid']]);
- if (DBA::isResult($target) && $target['plink']) {
- $Bname = $target['author-name'];
- $Blink = $target['author-link'];
- $A = '[url=' . Contact::magicLink($Alink) . ']' . $Aname . '[/url]';
- $B = '[url=' . Contact::magicLink($Blink) . ']' . $Bname . '[/url]';
- $P = '[url=' . $target['plink'] . ']' . DI::l10n()->t('post/item') . '[/url]';
- $item['body'] = DI::l10n()->t('%1$s marked %2$s\'s %3$s as favorite', $A, $B, $P)."\n";
- }
+ $tag = sprintf('#[url=%s]%s[/url]', $parsedobj->id, $parsedobj->content);
+ $item['body'] = DI::l10n()->t('%1$s tagged %2$s\'s %3$s with %4$s', $author, $objauthor, $plink, $tag);
}
}
+
$matches = null;
if (preg_match_all('/@\[url=(.*?)\]/is', $item['body'], $matches, PREG_SET_ORDER)) {
foreach ($matches as $mtch) {
@@ -444,7 +344,6 @@ function conv_get_blocklist()
* that are based on unique features of the calling module.
* @param App $a
* @param array $items
- * @param Pager $pager
* @param $mode
* @param $update
* @param bool $preview
@@ -454,7 +353,7 @@ function conv_get_blocklist()
* @throws ImagickException
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
-function conversation(App $a, array $items, Pager $pager, $mode, $update, $preview = false, $order = 'commented', $uid = 0)
+function conversation(App $a, array $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0)
{
$ssl_state = (local_user() ? true : false);
@@ -490,7 +389,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
. (!empty($_GET['cmax']) ? '&cmax=' . rawurlencode($_GET['cmax']) : '')
. (!empty($_GET['file']) ? '&file=' . rawurlencode($_GET['file']) : '')
- . "'; var profile_page = " . $pager->getPage() . "; \r\n";
+ . "'; \r\n";
}
} elseif ($mode === 'profile') {
$items = conversation_add_children($items, false, $order, $uid);
@@ -509,7 +408,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
$live_update_div = '
' . "\r\n"
. "\r\n";
+ . "; var netargs = '?f='; \r\n";
}
}
} elseif ($mode === 'notes') {
@@ -519,7 +418,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
if (!$update) {
$live_update_div = '' . "\r\n"
. "\r\n";
+ . "; var netargs = '/?f='; \r\n";
}
} elseif ($mode === 'display') {
$items = conversation_add_children($items, false, $order, $uid);
@@ -528,7 +427,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
if (!$update) {
$live_update_div = '' . "\r\n"
. "";
+ . "";
}
} elseif ($mode === 'community') {
$items = conversation_add_children($items, true, $order, $uid);
@@ -537,7 +436,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
if (!$update) {
$live_update_div = '' . "\r\n"
. "\r\n";
+ ."/?f='; \r\n";
}
} elseif ($mode === 'contacts') {
$items = conversation_add_children($items, false, $order, $uid);
@@ -546,7 +445,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
if (!$update) {
$live_update_div = '' . "\r\n"
. "\r\n";
+ ."/?f='; \r\n";
}
} elseif ($mode === 'search') {
$live_update_div = '' . "\r\n";
@@ -564,14 +463,18 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
$items = $cb['items'];
$conv_responses = [
- 'like' => ['title' => DI::l10n()->t('Likes','title')],
- 'dislike' => ['title' => DI::l10n()->t('Dislikes','title')],
- 'attendyes' => ['title' => DI::l10n()->t('Attending','title')],
- 'attendno' => ['title' => DI::l10n()->t('Not attending','title')],
- 'attendmaybe' => ['title' => DI::l10n()->t('Might attend','title')],
- 'announce' => ['title' => DI::l10n()->t('Reshares','title')]
+ 'like' => [],
+ 'dislike' => [],
+ 'attendyes' => [],
+ 'attendno' => [],
+ 'attendmaybe' => [],
+ 'announce' => [],
];
+ if (DI::pConfig()->get(local_user(), 'system', 'hide_dislike')) {
+ unset($conv_responses['dislike']);
+ }
+
// array with html for each thread (parent+comments)
$threads = [];
$threadsid = -1;
@@ -657,7 +560,15 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
$isstarred = "unstarred";
$lock = false;
- $likebuttons = false;
+ $likebuttons = [
+ 'like' => null,
+ 'dislike' => null,
+ 'share' => null,
+ ];
+
+ if (DI::pConfig()->get(local_user(), 'system', 'hide_dislike')) {
+ unset($likebuttons['dislike']);
+ }
$body = Item::prepareBody($item, true, $preview);
@@ -791,7 +702,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
/**
* Fetch all comments from a query. Additionally set the newest resharer as thread owner.
*
- * @param array $thread_items Database statement with thread posts
+ * @param mixed $thread_items Database statement with thread posts
* @param boolean $pinned Is the item pinned?
*
* @return array items with parents and comments
@@ -919,22 +830,22 @@ function item_photo_menu($item) {
}
if ($sparkle) {
- $status_link = $profile_link . '?tab=status';
+ $status_link = $profile_link . '/status';
$photos_link = str_replace('/profile/', '/photos/', $profile_link);
- $profile_link = $profile_link . '?=profile';
+ $profile_link = $profile_link . '/profile';
}
if (!empty($pcid)) {
$contact_url = 'contact/' . $pcid;
- $posts_link = 'contact/' . $pcid . '/posts';
- $block_link = 'contact/' . $pcid . '/block';
- $ignore_link = 'contact/' . $pcid . '/ignore';
+ $posts_link = $contact_url . '/posts';
+ $block_link = $contact_url . '/block';
+ $ignore_link = $contact_url . '/ignore';
}
if ($cid && !$item['self']) {
- $poke_link = 'poke?c=' . $cid;
$contact_url = 'contact/' . $cid;
- $posts_link = 'contact/' . $cid . '/posts';
+ $poke_link = $contact_url . '/poke';
+ $posts_link = $contact_url . '/posts';
if (in_array($network, [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA])) {
$pm_url = 'message/new/' . $cid;
@@ -1214,6 +1125,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
'$return_path' => $query_str,
'$action' => 'item',
'$share' => ($x['button'] ?? '') ?: DI::l10n()->t('Share'),
+ '$loading' => DI::l10n()->t('Loading...'),
'$upload' => DI::l10n()->t('Upload photo'),
'$shortupload' => DI::l10n()->t('upload photo'),
'$attach' => DI::l10n()->t('Attach file'),
@@ -1267,6 +1179,8 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false)
//jot nav tab (used in some themes)
'$message' => DI::l10n()->t('Message'),
'$browser' => DI::l10n()->t('Browser'),
+
+ '$compose_link_title' => DI::l10n()->t('Open Compose page'),
]);
@@ -1544,56 +1458,3 @@ function render_location_dummy(array $item) {
return $item['coord'];
}
}
-
-function get_responses(array $conv_responses, array $response_verbs, array $item, Post $ob = null) {
- $ret = [];
- foreach ($response_verbs as $v) {
- $ret[$v] = [];
- $ret[$v]['count'] = $conv_responses[$v][$item['uri']] ?? 0;
- $ret[$v]['list'] = $conv_responses[$v][$item['uri'] . '-l'] ?? [];
- $ret[$v]['self'] = $conv_responses[$v][$item['uri'] . '-self'] ?? '0';
- if (count($ret[$v]['list']) > MAX_LIKERS) {
- $ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS);
- array_push($ret[$v]['list_part'], '' . DI::l10n()->t('View all') . '');
- } else {
- $ret[$v]['list_part'] = '';
- }
- $ret[$v]['button'] = get_response_button_text($v, $ret[$v]['count']);
- $ret[$v]['title'] = $conv_responses[$v]['title'];
- }
-
- $count = 0;
- foreach ($ret as $key) {
- if ($key['count'] == true) {
- $count++;
- }
- }
- $ret['count'] = $count;
-
- return $ret;
-}
-
-function get_response_button_text($v, $count)
-{
- $return = '';
- switch ($v) {
- case 'like':
- $return = DI::l10n()->tt('Like', 'Likes', $count);
- break;
- case 'dislike':
- $return = DI::l10n()->tt('Dislike', 'Dislikes', $count);
- break;
- case 'attendyes':
- $return = DI::l10n()->tt('Attending', 'Attending', $count);
- break;
- case 'attendno':
- $return = DI::l10n()->tt('Not Attending', 'Not Attending', $count);
- break;
- case 'attendmaybe':
- $return = DI::l10n()->tt('Undecided', 'Undecided', $count);
- break;
- }
-
- return $return;
-}