Use getByNickname as suggested in code review.

[friendica.git] / src / Model / Item.php

diff --git a/src/Model/Item.php b/src/Model/Item.php
index e93708bfd29d469416c749ad9238f63ef2d3fe35..e8044ecd7a93b7b469952118194167b62f675851 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -932,7 +932,25 @@ class Item
                if ($notify) {
                        $item['edit'] = false;
                        $item['parent'] = $parent_id;
+
+                       // Trigger automatic reactions for addons
+                       $item['api_source'] = true;
+
+                       // We have to tell the hooks who we are - this really should be improved
+                       if (!local_user()) {
+                               $_SESSION['authenticated'] = true;
+                               $_SESSION['uid'] = $uid;
+                               $dummy_session = true;
+                       } else {
+                               $dummy_session = false;
+                       }
+
                        Hook::callAll('post_local', $item);
+
+                       if ($dummy_session) {
+                               unset($_SESSION['authenticated']);
+                               unset($_SESSION['uid']);
+                       }
                } else {
                        Hook::callAll('post_remote', $item);
                }
@@ -1971,13 +1989,6 @@ class Item
                        $result = true;
                }
 
-               // Trigger automatic reactions for addons
-               $datarray['api_source'] = true;
-
-               // We have to tell the hooks who we are - this really should be improved
-               $_SESSION['authenticated'] = true;
-               $_SESSION['uid'] = $contact['uid'];
-
                return (bool)$result;
        }
 
@@ -2696,7 +2707,7 @@ class Item
                        $shared_links = [];
                }
 
-               $attachments = Post\Media::splitAttachments($item['uri-id'], $item['guid'], $shared_links);
+               $attachments = Post\Media::splitAttachments($item['uri-id'], $item['guid'] ?? '', $shared_links);
                $s = self::addVisualAttachments($attachments, $item, $s, false);
                $s = self::addLinkAttachment($attachments, $body, $s, false, $shared_links);
                $s = self::addNonVisualAttachments($attachments, $item, $s, false);
@@ -2871,7 +2882,11 @@ class Item
                                                $found = true;
                                        }
                                }
-                               if (!$found) {
+                               // @todo Judge between the links to use the one with most information
+                               if (!$found && (empty($attachment) || !empty($link['author-name']) ||
+                                       (empty($attachment['name']) && !empty($link['name'])) ||
+                                       (empty($attachment['description']) && !empty($link['description'])) ||
+                                       (empty($attachment['preview']) && !empty($link['preview'])))) {
                                        $attachment = $link;
                                }
                        }
@@ -2910,11 +2925,11 @@ class Item
                                $data['description'] = '';
                        }
 
-                       if (!empty($data['author_name']) && !empty($data['provider_name'])) {
+                       if (($data['author_name'] ?? '') == ($data['provider_name'] ?? '')) {
                                $data['author_name'] = '';
                        }
 
-                       if (!empty($data['author_url']) && !empty($data['provider_url'])) {
+                       if (($data['author_url'] ?? '') == ($data['provider_url'] ?? '')) {
                                $data['author_url'] = '';
                        }
                } elseif (preg_match("/.*(\[attachment.*?\].*?\[\/attachment\]).*/ism", $body, $match)) {
@@ -2923,7 +2938,7 @@ class Item
                DI::profiler()->saveTimestamp($stamp1, 'rendering');
 
                if (isset($data['url']) && !in_array($data['url'], $ignore_links)) {
-                       if (!empty($data['description']) || !empty($data['image'] || !empty($data['preview']))) {
+                       if (!empty($data['description']) || !empty($data['image']) || !empty($data['preview'])) {
                                $parts = parse_url($data['url']);
                                if (!empty($parts['scheme']) && !empty($parts['host'])) {
                                        if (empty($data['provider_name'])) {
@@ -3012,18 +3027,19 @@ class Item
                                'href' => "display/" . $item['guid'],
                                'orig' => "display/" . $item['guid'],
                                'title' => DI::l10n()->t('View on separate page'),
-                               'orig_title' => DI::l10n()->t('view on separate page'),
+                               'orig_title' => DI::l10n()->t('View on separate page'),
                        ];
 
                        if (!empty($item['plink'])) {
-                               $ret["href"] = DI::baseUrl()->remove($item['plink']);
-                               $ret["title"] = DI::l10n()->t('link to source');
+                               $ret['href'] = DI::baseUrl()->remove($item['plink']);
+                               $ret['title'] = DI::l10n()->t('Link to source');
                        }
                } elseif (!empty($item['plink']) && ($item['private'] != self::PRIVATE)) {
                        $ret = [
                                'href' => $item['plink'],
                                'orig' => $item['plink'],
-                               'title' => DI::l10n()->t('link to source'),
+                               'title' => DI::l10n()->t('Link to source'),
+                               'orig_title' => DI::l10n()->t('Link to source'),
                        ];
                } else {
                        $ret = [];
@@ -3261,4 +3277,41 @@ class Item
 
                return true;
        }
+
+       /**
+        * Improve the data in shared posts
+        *
+        * @param array $item
+        * @return string body
+        */
+       public static function improveSharedDataInBody(array $item)
+       {
+               $shared = BBCode::fetchShareAttributes($item['body']);
+               if (empty($shared['link'])) {
+                       return $item['body'];   
+               }
+               
+               $id = self::fetchByLink($shared['link']);
+               Logger::info('Fetched shared post', ['uri-id' => $item['uri-id'], 'id' => $id, 'author' => $shared['profile'], 'url' => $shared['link'], 'guid' => $shared['guid'], 'callstack' => System::callstack()]);
+               if (!$id) {
+                       return $item['body'];   
+               }
+
+               $shared_item = Post::selectFirst(['author-name', 'author-link', 'author-avatar', 'plink', 'created', 'guid', 'title', 'body'], ['id' => $id]);
+               if (!DBA::isResult($shared_item)) {
+                       return $item['body'];   
+               }
+
+               $shared_content = BBCode::getShareOpeningTag($shared_item['author-name'], $shared_item['author-link'], $shared_item['author-avatar'], $shared_item['plink'], $shared_item['created'], $shared_item['guid']);
+
+               if (!empty($shared_item['title'])) {
+                       $shared_content .= '[h3]'.$shared_item['title'].'[/h3]'."\n";
+               }
+
+               $shared_content .= $shared_item['body'];
+
+               $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $shared_content . '[/share]', $item['body']);
+               Logger::info('New shared data', ['uri-id' => $item['uri-id'], 'id' => $id, 'shared_item' => $shared_item]);
+               return $item['body'];
+       }
 }