Diaspora reshares via API are fixed now
This commit is contained in:
parent
dfa57d54e3
commit
bd2ee581d3
|
@ -27,7 +27,6 @@ use Friendica\App;
|
|||
use Friendica\Content\Text\BBCode;
|
||||
use Friendica\Content\Text\HTML;
|
||||
use Friendica\Core\Logger;
|
||||
use Friendica\Core\Protocol;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\DI;
|
||||
|
@ -50,8 +49,6 @@ use Friendica\Util\DateTimeFormat;
|
|||
use Friendica\Util\Images;
|
||||
use Friendica\Util\Strings;
|
||||
|
||||
require_once __DIR__ . '/../mod/item.php';
|
||||
|
||||
$API = [];
|
||||
|
||||
/**
|
||||
|
|
|
@ -27,11 +27,11 @@ use Friendica\Database\DBA;
|
|||
use Friendica\DI;
|
||||
use Friendica\Model\Item;
|
||||
use Friendica\Model\Post;
|
||||
use Friendica\Model\User;
|
||||
use Friendica\Module\BaseApi;
|
||||
use Friendica\Network\HTTPException\BadRequestException;
|
||||
use Friendica\Network\HTTPException\ForbiddenException;
|
||||
use Friendica\Network\HTTPException\InternalServerErrorException;
|
||||
use Friendica\Protocol\Diaspora;
|
||||
|
||||
/**
|
||||
* Repeats a status.
|
||||
|
@ -62,45 +62,7 @@ class Retweet extends BaseApi
|
|||
|
||||
$item_id = $id;
|
||||
} else {
|
||||
if (strpos($item['body'], "[/share]") !== false) {
|
||||
$pos = strpos($item['body'], "[share");
|
||||
$post = substr($item['body'], $pos);
|
||||
} else {
|
||||
$post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
|
||||
|
||||
if (!empty($item['title'])) {
|
||||
$post .= '[h3]' . $item['title'] . "[/h3]\n";
|
||||
}
|
||||
|
||||
$post .= $item['body'];
|
||||
$post .= "[/share]";
|
||||
}
|
||||
$item = [
|
||||
'uid' => $uid,
|
||||
'body' => $post,
|
||||
'app' => $request['source'] ?? '',
|
||||
];
|
||||
|
||||
$owner = User::getOwnerDataById($uid);
|
||||
|
||||
$item['allow_cid'] = $owner['allow_cid'];
|
||||
$item['allow_gid'] = $owner['allow_gid'];
|
||||
$item['deny_cid'] = $owner['deny_cid'];
|
||||
$item['deny_gid'] = $owner['deny_gid'];
|
||||
|
||||
if (!empty($item['allow_cid'] . $item['allow_gid'] . $item['deny_cid'] . $item['deny_gid'])) {
|
||||
$item['private'] = Item::PRIVATE;
|
||||
} elseif (DI::pConfig()->get($uid, 'system', 'unlisted')) {
|
||||
$item['private'] = Item::UNLISTED;
|
||||
} else {
|
||||
$item['private'] = Item::PUBLIC;
|
||||
}
|
||||
|
||||
if (empty($item['app']) && !empty(self::getCurrentApplication()['name'])) {
|
||||
$item['app'] = self::getCurrentApplication()['name'];
|
||||
}
|
||||
|
||||
$item_id = Item::insert($item, true);
|
||||
$item_id = Diaspora::performReshare($item['uri-id'], $uid);
|
||||
}
|
||||
} else {
|
||||
throw new ForbiddenException();
|
||||
|
|
|
@ -22,15 +22,15 @@
|
|||
namespace Friendica\Module\Item;
|
||||
|
||||
use Friendica\BaseModule;
|
||||
use Friendica\Content\Text\BBCode;
|
||||
use Friendica\Core\Logger;
|
||||
use Friendica\Core\Protocol;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\DI;
|
||||
use Friendica\Model\Item;
|
||||
use Friendica\Core\Session;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Model\Post;
|
||||
use Friendica\Network\HTTPException;
|
||||
use Friendica\Protocol\Diaspora;
|
||||
|
||||
/**
|
||||
* Performs an activity (like, dislike, announce, attendyes, attendno, attendmaybe)
|
||||
|
@ -50,13 +50,17 @@ class Activity extends BaseModule
|
|||
|
||||
$verb = $this->parameters['verb'];
|
||||
$itemId = $this->parameters['id'];
|
||||
|
||||
Logger::info('Blubb-1', ['id' => $itemId, 'verb' => $verb]);
|
||||
if (in_array($verb, ['announce', 'unannounce'])) {
|
||||
$item = Post::selectFirst(['network'], ['id' => $itemId]);
|
||||
$item = Post::selectFirst(['network', 'uri-id', 'uid'], ['id' => $itemId]);
|
||||
Logger::info('Blubb-2', ['id' => $itemId, 'item' => $item]);
|
||||
if ($item['network'] == Protocol::DIASPORA) {
|
||||
self::performDiasporaReshare($itemId);
|
||||
Logger::info('Blubb-3', ['id' => $itemId]);
|
||||
$id = Diaspora::performReshare($item['uri-id'], $item['uid']);
|
||||
Logger::info('Blubb-ende', ['id' => $id]);
|
||||
}
|
||||
}
|
||||
Logger::info('Blubb-activity', ['id' => $itemId]);
|
||||
|
||||
if (!Item::performActivity($itemId, $verb, local_user())) {
|
||||
throw new HTTPException\BadRequestException();
|
||||
|
@ -84,32 +88,4 @@ class Activity extends BaseModule
|
|||
|
||||
System::jsonExit($return);
|
||||
}
|
||||
|
||||
private static function performDiasporaReshare(int $itemId)
|
||||
{
|
||||
$fields = ['uri-id', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
|
||||
$item = Post::selectFirst($fields, ['id' => $itemId, 'private' => [Item::PUBLIC, Item::UNLISTED]]);
|
||||
if (!DBA::isResult($item)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (strpos($item['body'], '[/share]') !== false) {
|
||||
$pos = strpos($item['body'], '[share');
|
||||
$post = substr($item['body'], $pos);
|
||||
} else {
|
||||
$post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
|
||||
|
||||
if (!empty($item['title'])) {
|
||||
$post .= '[h3]' . $item['title'] . "[/h3]\n";
|
||||
}
|
||||
|
||||
$post .= $item['body'];
|
||||
$post .= '[/share]';
|
||||
}
|
||||
$_REQUEST['body'] = $post;
|
||||
$_REQUEST['profile_uid'] = local_user();
|
||||
|
||||
require_once 'mod/item.php';
|
||||
item_post(DI::app());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4053,4 +4053,55 @@ class Diaspora
|
|||
|
||||
return $message;
|
||||
}
|
||||
|
||||
public static function performReshare(int $UriId, int $uid)
|
||||
{
|
||||
$fields = ['uri-id', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
|
||||
$item = Post::selectFirst($fields, ['uri-id' => $UriId, 'uid' => [$uid, 0], 'private' => [Item::PUBLIC, Item::UNLISTED]]);
|
||||
if (!DBA::isResult($item)) {
|
||||
Logger::info('Blubb-4', ['uri-id' => $UriId, 'uid' => $uid]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (strpos($item['body'], '[/share]') !== false) {
|
||||
$pos = strpos($item['body'], '[share');
|
||||
$post = substr($item['body'], $pos);
|
||||
} else {
|
||||
$post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
|
||||
|
||||
if (!empty($item['title'])) {
|
||||
$post .= '[h3]' . $item['title'] . "[/h3]\n";
|
||||
}
|
||||
|
||||
$post .= $item['body'];
|
||||
$post .= '[/share]';
|
||||
}
|
||||
|
||||
$owner = User::getOwnerDataById($uid);
|
||||
$author = Contact::getPublicIdByUserId($uid);
|
||||
|
||||
$item = [
|
||||
'uid' => $uid,
|
||||
'verb' => Activity::POST,
|
||||
'contact-id' => $owner['id'],
|
||||
'author-id' => $author,
|
||||
'owner-id' => $author,
|
||||
'body' => $post,
|
||||
'allow_cid' => $owner['allow_cid'],
|
||||
'allow_gid' => $owner['allow_gid'],
|
||||
'deny_cid' => $owner['deny_cid'],
|
||||
'deny_gid' => $owner['deny_gid'],
|
||||
];
|
||||
|
||||
if (!empty($item['allow_cid'] . $item['allow_gid'] . $item['deny_cid'] . $item['deny_gid'])) {
|
||||
$item['private'] = Item::PRIVATE;
|
||||
} elseif (DI::pConfig()->get($uid, 'system', 'unlisted')) {
|
||||
$item['private'] = Item::UNLISTED;
|
||||
} else {
|
||||
$item['private'] = Item::PUBLIC;
|
||||
}
|
||||
Logger::info('Blubb-5', ['uri-id' => $UriId, 'uid' => $uid, 'item' => $item]);
|
||||
|
||||
return Item::insert($item, true);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue