<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Database\Database;
use Friendica\DI;
use Friendica\Model\Item;
+use Friendica\Model\Post;
use Friendica\Model\Tag;
use Friendica\Util\DateTimeFormat;
public static function add(string $uri, array $item, int $notify = 0, bool $unprepared = false, string $delayed = '', array $taglist = [], array $attachments = [])
{
if (empty($item['uid']) || self::exists($uri, $item['uid'])) {
+ Logger::notice('No uid or already found');
return false;
}
Logger::notice('Adding post for delayed publishing', ['uid' => $item['uid'], 'delayed' => $delayed, 'uri' => $uri]);
- if (!Worker::add(['priority' => PRIORITY_HIGH, 'delayed' => $delayed], 'DelayedPublish', $item, $notify, $taglist, $attachments, $unprepared)) {
+ if (!Worker::add(['priority' => PRIORITY_HIGH, 'delayed' => $delayed], 'DelayedPublish', $item, $notify, $taglist, $attachments, $unprepared, $uri)) {
return false;
}
* @param array $taglist
* @param array $attachments
* @param bool $unprepared
+ * @param string $uri
* @return bool
*/
- public static function publish(array $item, int $notify = 0, array $taglist = [], array $attachments = [], bool $unprepared = false)
+ public static function publish(array $item, int $notify = 0, array $taglist = [], array $attachments = [], bool $unprepared = false, string $uri = '')
{
if ($unprepared) {
$_SESSION['authenticated'] = true;
require_once 'mod/item.php';
$id = item_post(DI::app());
- Logger::notice('Unprepared post stored', ['id' => $id, 'uid' => $item['uid'], 'extid' => $item['extid']]);
- return;
+ if (empty($uri) && !empty($item['extid'])) {
+ $uri = $item['extid'];
+ }
+
+ Logger::notice('Unprepared post stored', ['id' => $id, 'uid' => $item['uid'], 'uri' => $uri]);
+ if (self::exists($uri, $item['uid'])) {
+ self::delete($uri, $item['uid']);
+ }
+
+ return $id;
}
$id = Item::insert($item, $notify);
Logger::notice('Post stored', ['id' => $id, 'uid' => $item['uid'], 'cid' => $item['contact-id']]);
- if (!empty($item['uri']) && self::exists($item['uri'], $item['uid'])) {
- self::delete($item['uri'], $item['uid']);
+ if (empty($uri) && !empty($item['uri'])) {
+ $uri = $item['uri'];
+ }
+
+ if (!empty($uri) && self::exists($uri, $item['uid'])) {
+ self::delete($uri, $item['uid']);
}
if (!empty($id) && (!empty($taglist) || !empty($attachments))) {
- $feeditem = Item::selectFirst(['uri-id'], ['id' => $id]);
+ $feeditem = Post::selectFirst(['uri-id'], ['id' => $id]);
foreach ($taglist as $tag) {
Tag::store($feeditem['uri-id'], Tag::HASHTAG, $tag);