Use the cached activity function

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

diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index e82a01fbce1a732190769cb20a150023cc89519e..e494119cb8d9731b26114a931643d6b09af22629 100644 (file)
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -45,7 +45,7 @@ class Mail
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function insert($msg, $notification = true)
+       public static function insert(array $msg, bool $notification = true)
        {
                if (!isset($msg['reply'])) {
                        $msg['reply'] = DBA::exists('mail', ['parent-uri' => $msg['parent-uri']]);
@@ -125,7 +125,7 @@ class Mail
         * @return int
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function send($recipient = 0, $body = '', $subject = '', $replyto = '')
+       public static function send(int $recipient = 0, string $body = '', string $subject = '', string $replyto = ''): int
        {
                $a = DI::app();
 
@@ -154,7 +154,7 @@ class Mail
                Photo::setPermissionFromBody($body, local_user(), $me['id'],  '<' . $contact['id'] . '>', '', '', '');
 
                $guid = System::createUUID();
-               $uri = Item::newURI(local_user(), $guid);
+               $uri = Item::newURI($guid);
 
                $convid = 0;
                $reply = false;
@@ -186,7 +186,7 @@ class Mail
                }
 
                if (!$convid) {
-                       Logger::notice('send message: conversation not found.');
+                       Logger::warning('conversation not found.');
                        return -4;
                }
 
@@ -255,7 +255,7 @@ class Mail
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function sendWall(array $recipient = [], $body = '', $subject = '', $replyto = '')
+       public static function sendWall(array $recipient = [], string $body = '', string $subject = '', string $replyto = ''): int
        {
                if (!$recipient) {
                        return -1;
@@ -266,7 +266,7 @@ class Mail
                }
 
                $guid = System::createUUID();
-               $uri = Item::newURI(local_user(), $guid);
+               $uri = Item::newURI($guid);
 
                $me = Contact::getByURL($replyto);
                if (!$me['name']) {
@@ -290,7 +290,7 @@ class Mail
                }
 
                if (!$convid) {
-                       Logger::notice('send message: conversation not found.');
+                       Logger::warning('conversation not found.');
                        return -4;
                }