Merge branch 'develop' into show_image_upload_limit

[friendica.git] / src / Navigation / Notifications / Entity / Notify.php

diff --git a/src/Navigation/Notifications/Entity/Notify.php b/src/Navigation/Notifications/Entity/Notify.php
index 88cd8ab36e865164a2930ff86d69250378ea6cf5..1070440073c0c0319dc88b1ea95cb695a3afd1f9 100644 (file)
--- a/src/Navigation/Notifications/Entity/Notify.php
+++ b/src/Navigation/Notifications/Entity/Notify.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Navigation\Notifications\Entity;
 
@@ -27,6 +46,8 @@ use Psr\Http\Message\UriInterface;
  * @property-read $uriId
  * @property-read $parentUriId
  * @property-read $id
+ *
+ * @deprecated since 2022.05 Use \Friendica\Navigation\Notifications\Entity\Notification instead
  */
 class Notify extends BaseEntity
 {
@@ -60,14 +81,14 @@ class Notify extends BaseEntity
        protected $name_cache;
        /** @var string */
        protected $msg_cache;
-       /** @var int */
+       /** @var int|null */
        protected $uriId;
-       /** @var int */
+       /** @var int|null */
        protected $parentUriId;
        /** @var int */
        protected $id;
 
-       public function __construct(int $type, string $name, UriInterface $url, UriInterface $photo, DateTime $date, int $uid, UriInterface $link, bool $seen, string $verb, string $otype, string $name_cache, string $msg = null, string $msg_cache = null, int $itemId = null, int $uriId = null, int $parent = null, int $parentUriId = null, int $id = null)
+       public function __construct(int $type, string $name, UriInterface $url, UriInterface $photo, DateTime $date, int $uid, UriInterface $link, bool $seen, string $verb, string $otype, string $name_cache, string $msg = null, string $msg_cache = null, int $itemId = null, int $uriId = null, int $parent = null, ?int $parentUriId = null, ?int $id = null)
        {
                $this->type        = $type;
                $this->name        = $name;
@@ -113,16 +134,6 @@ class Notify extends BaseEntity
         */
        public static function formatMessage(string $name, string $message): string
        {
-               if ($name != '') {
-                       $pos = strpos($message, $name);
-               } else {
-                       $pos = false;
-               }
-
-               if ($pos !== false) {
-                       $message = substr_replace($message, '{0}', $pos, strlen($name));
-               }
-
-               return $message;
+               return str_replace('{0}', '<span class="contactname">' . strip_tags(BBCode::convert($name)) . '</span>', $message);
        }
 }