]> git.mxchange.org Git - friendica.git/blobdiff - include/conversation.php
Merge remote-tracking branch 'upstream/develop' into no-term2
[friendica.git] / include / conversation.php
index 02b1b7340a83e6eb8ba39b5b2080282b443b1938..a4fe9c00e397a7f6053990ed2997a589b5248330 100644 (file)
@@ -22,7 +22,6 @@
 use Friendica\App;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
-use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -34,7 +33,7 @@ use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
-use Friendica\Model\Term;
+use Friendica\Model\Tag;
 use Friendica\Object\Post;
 use Friendica\Object\Thread;
 use Friendica\Protocol\Activity;
@@ -144,222 +143,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]';
+       /// @todo The following functionality needs to be cleaned up. 
+       if (!empty($item['verb'])) {
+               $activity = DI::activity();
 
-               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);
-       }
-
-       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."<links>".XML::unescape($obj->link)."</links>");
+               $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) {
@@ -583,7 +466,8 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                'dislike'     => [],
                'attendyes'   => [],
                'attendno'    => [],
-               'attendmaybe' => []
+               'attendmaybe' => [],
+               'announce'    => [],    
        ];
 
        if (DI::pConfig()->get(local_user(), 'system', 'hide_dislike')) {
@@ -642,7 +526,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        $profile_name = $item['author-link'];
                                }
 
-                               $tags = Term::populateTagsFromItem($item);
+                               $tags = Tag::populateFromItem($item);
 
                                $author = ['uid' => 0, 'id' => $item['author-id'],
                                        'network' => $item['author-network'], 'url' => $item['author-link']];
@@ -952,15 +836,15 @@ function item_photo_menu($item) {
 
        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;
@@ -1294,6 +1178,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'),
        ]);