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 e0e4561ae50f0e0f7b53e2de2c124a929a5a382c..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);
@@ -2914,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)) {
@@ -3016,18 +3027,18 @@ 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['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 {