Update src/Model/Photo.php

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

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 6d55fd56658b53d3c795243eeefb8ca368453204..6488e479e5bdae9a87a54d813d8def8c072bec41 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -241,7 +241,7 @@ class Item
                        if ($item['uid'] == $uid) {
                                self::markForDeletionById($item['id'], PRIORITY_HIGH);
                        } elseif ($item['uid'] != 0) {
-                               Logger::log('Wrong ownership. Not deleting item ' . $item['id']);
+                               Logger::notice('Wrong ownership. Not deleting item', ['id' => $item['id']]);
                        }
                }
                DBA::close($items);
@@ -2177,9 +2177,15 @@ class Item
 
        public static function firstPostDate($uid, $wall = false)
        {
-               $condition = ['gravity' => GRAVITY_PARENT, 'uid' => $uid, 'wall' => $wall, 'deleted' => false, 'visible' => true];
+               $user = User::getById($uid, ['register_date']);
+               if (empty($user)) {
+                       return false;
+               }
+
+               $condition = ["`uid` = ? AND `wall` = ? AND NOT `deleted` AND `visible` AND `received` >= ?",
+                       $uid, $wall, $user['register_date']];
                $params = ['order' => ['received' => false]];
-               $thread = Post::selectFirst(['received'], $condition, $params);
+               $thread = Post::selectFirstThread(['received'], $condition, $params);
                if (DBA::isResult($thread)) {
                        $postdate = substr(DateTimeFormat::local($thread['received']), 0, 10);
                        return $postdate;
@@ -2475,22 +2481,23 @@ class Item
        /**
         * get translated item type
         *
-        * @param $item
+        * @param array                $item
+        * @param \Friendica\Core\L10n $l10n
         * @return string
         */
-       public static function postType($item)
+       public static function postType(array $item, \Friendica\Core\L10n $l10n)
        {
                if (!empty($item['event-id'])) {
-                       return DI::l10n()->t('event');
+                       return $l10n->t('event');
                } elseif (!empty($item['resource-id'])) {
-                       return DI::l10n()->t('photo');
+                       return $l10n->t('photo');
                } elseif ($item['gravity'] == GRAVITY_ACTIVITY) {
-                       return DI::l10n()->t('activity');
+                       return $l10n->t('activity');
                } elseif ($item['gravity'] == GRAVITY_COMMENT) {
-                       return DI::l10n()->t('comment');
+                       return $l10n->t('comment');
                }
 
-               return DI::l10n()->t('post');
+               return $l10n->t('post');
        }
 
        /**