keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7259 from MrPetovan/bug/7240-private-message-ap

Browse source 
Normalize the datetime format of received activity before DB insertion
This commit is contained in:
Michael Vogel 2019-06-13 05:21:53 +02:00 committed by GitHub
commit 33f5a98fd6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Protocol/ActivityPub/Processor.php
View file

@ -142,7 +142,7 @@ class Processor
} }
$item['changed'] = DateTimeFormat::utcNow(); $item['changed'] = DateTimeFormat::utcNow();
$item['edited'] = $activity['updated']; $item['edited'] = DateTimeFormat::utc($activity['updated']);
$item = self::processContent($activity, $item); $item = self::processContent($activity, $item);
if (empty($item)) { if (empty($item)) {
@ -382,8 +382,8 @@ class Processor
$item['uri'] = $activity['id']; $item['uri'] = $activity['id'];
$item['created'] = $activity['published']; $item['created'] = DateTimeFormat::utc($activity['published']);
$item['edited'] = $activity['updated']; $item['edited'] = DateTimeFormat::utc($activity['updated']);
$item['guid'] = $activity['diaspora:guid']; $item['guid'] = $activity['diaspora:guid'];
$item = self::processContent($activity, $item); $item = self::processContent($activity, $item);
@ -442,8 +442,8 @@ class Processor
* *
* @param array $activity Activity data * @param array $activity Activity data
* @param array $item item array * @param array $item item array
* @return int|bool New mail table row id or false on error
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/ */
private static function postMail($activity, $item) private static function postMail($activity, $item)
{ {
@ -497,7 +497,7 @@ class Processor
} }
$msg['body'] = $item['body']; $msg['body'] = $item['body'];
Mail::insert($msg); return Mail::insert($msg);
} }
/** /**