From 69c6a5f567072a2633eca3cb2e640c9e16b1f9cb Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 21 Jul 2021 03:43:30 +0000 Subject: [PATCH] Avoid "DB Error" messages --- src/Content/Text/BBCode.php | 2 +- src/Model/Post/Link.php | 3 ++- src/Model/Post/UserNotification.php | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 17e630a8fc..177d648081 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -451,7 +451,7 @@ class BBCode // Only send proxied pictures to API and for internal display if (!in_array($simplehtml, [self::INTERNAL, self::API])) { return $image; - } elseif ($uriid) { + } elseif ($uriid > 0) { return Post\Link::getByLink($uriid, $image, $size); } else { return ProxyUtils::proxifyUrl($image, $size); diff --git a/src/Model/Post/Link.php b/src/Model/Post/Link.php index 758f00f1c6..64840a9c95 100644 --- a/src/Model/Post/Link.php +++ b/src/Model/Post/Link.php @@ -23,6 +23,7 @@ namespace Friendica\Model\Post; use Friendica\Core\Logger; use Friendica\Core\System; +use Friendica\Database\Database; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Util\Proxy; @@ -52,7 +53,7 @@ class Link } else { $mime = self::fetchMimeType($url); - DBA::insert('post-link', ['uri-id' => $uri_id, 'url' => $url, 'mimetype' => $mime]); + DBA::insert('post-link', ['uri-id' => $uri_id, 'url' => $url, 'mimetype' => $mime], Database::INSERT_IGNORE); $id = DBA::lastInsertId(); Logger::info('Inserted', ['id' => $id, 'uri-id' => $uri_id, 'url' => $url]); } diff --git a/src/Model/Post/UserNotification.php b/src/Model/Post/UserNotification.php index c8e31cdc03..2c942d2cb9 100644 --- a/src/Model/Post/UserNotification.php +++ b/src/Model/Post/UserNotification.php @@ -297,7 +297,7 @@ class UserNotification $fields['target-uri-id'] = $item['uri-id']; } - return DBA::insert('notification', $fields); + return DBA::insert('notification', $fields, Database::INSERT_IGNORE); } /** @@ -318,7 +318,7 @@ class UserNotification 'created' => DateTimeFormat::utcNow(), ]; - return DBA::insert('notification', $fields); + return DBA::insert('notification', $fields, Database::INSERT_IGNORE); } /**