clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11863 from annando/database 

Avoid some database errors
This commit is contained in:
Tobias Diekershoff 2022-08-25 13:49:05 +02:00 committed by GitHub
parent 453667023e 15d975f143
commit fde853897f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Post/Media.php
View File

@ -85,6 +85,7 @@ class Media
} }
$media = self::unsetEmptyFields($media); $media = self::unsetEmptyFields($media);
$media = DI::dbaDefinition()->truncateFieldsForTable('post-media', $media);
// We are storing as fast as possible to avoid duplicated network requests // We are storing as fast as possible to avoid duplicated network requests
// when fetching additional information for pictures and other content. // when fetching additional information for pictures and other content.
@ -94,6 +95,7 @@ class Media
$media = self::fetchAdditionalData($media); $media = self::fetchAdditionalData($media);
$media = self::unsetEmptyFields($media); $media = self::unsetEmptyFields($media);
$media = DI::dbaDefinition()->truncateFieldsForTable('post-media', $media);
if (array_diff_assoc($media, $stored)) { if (array_diff_assoc($media, $stored)) {
$result = DBA::insert('post-media', $media, Database::INSERT_UPDATE); $result = DBA::insert('post-media', $media, Database::INSERT_UPDATE);

2
src/Navigation/Notifications/Repository/Notification.php
View File

@ -251,7 +251,7 @@ class Notification extends BaseRepository
$this->db->update(self::$table_name, $fields, ['id' => $Notification->id]); $this->db->update(self::$table_name, $fields, ['id' => $Notification->id]);
} else { } else {
$fields['created'] = DateTimeFormat::utcNow(); $fields['created'] = DateTimeFormat::utcNow();
$this->db->insert(self::$table_name, $fields); $this->db->insert(self::$table_name, $fields, Database::INSERT_IGNORE);
$Notification = $this->selectOneById($this->db->lastInsertId()); $Notification = $this->selectOneById($this->db->lastInsertId());
} }

3
src/Protocol/ActivityPub/Receiver.php
View File

@ -29,6 +29,7 @@ use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\Database;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\APContact; use Friendica\Model\APContact;
@ -1911,7 +1912,7 @@ class Receiver
private static function addArrivedId(string $id) private static function addArrivedId(string $id)
{ {
DBA::delete('arrived-activity', ["`received` < ?", DateTimeFormat::utc('now - 5 minutes')]); DBA::delete('arrived-activity', ["`received` < ?", DateTimeFormat::utc('now - 5 minutes')]);
DBA::insert('arrived-activity', ['object-id' => $id, 'received' => DateTimeFormat::utcNow()]); DBA::insert('arrived-activity', ['object-id' => $id, 'received' => DateTimeFormat::utcNow()], Database::INSERT_IGNORE);
} }
/** /**