bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #7411 from annando/ap-quote

Browse source 
Preparation for quoted reshares on AP
This commit is contained in:
Philipp 2019-07-21 01:49:22 +02:00 committed by GitHub
commit c6131c057b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/api.php
View file

@ -5162,17 +5162,22 @@ function api_share_as_retweet(&$item)
$posted = $matches[1]; $posted = $matches[1];
} }
$pre_body = trim(preg_replace("/(.*?)\[share.*?\]\s?.*?\s?\[\/share\]\s?/ism", "$1", $body)); if (!preg_match("/(.*?)\[share.*?\]\s?(.*?)\s?\[\/share\]\s?(.*?)/ism", $body, $matches)) {
return false;
}
$pre_body = trim($matches[1]);
if ($pre_body != '') { if ($pre_body != '') {
$item['body'] = $pre_body; $item['body'] = $pre_body;
} }
$shared_body = trim(preg_replace("/(.*?)\[share.*?\]\s?(.*?)\s?\[\/share\]\s?/ism", "$2", $body)); $shared_body = trim($matches[2]);
if (($shared_body == "") || ($profile == "") || ($author == "") || ($avatar == "") || ($posted == "")) { if (($shared_body == "") || ($profile == "") || ($author == "") || ($avatar == "") || ($posted == "")) {
return false; return false;
} }
$reshared_item["share-pre-body"] = $pre_body;
$reshared_item["body"] = $shared_body; $reshared_item["body"] = $shared_body;
$reshared_item["author-id"] = Contact::getIdForURL($profile, 0, true); $reshared_item["author-id"] = Contact::getIdForURL($profile, 0, true);
$reshared_item["author-name"] = $author; $reshared_item["author-name"] = $author;

18
src/Protocol/ActivityPub/Transmitter.php
View file

@ -1287,6 +1287,7 @@ class Transmitter
*/ */
private static function createAnnounce($item, $data) private static function createAnnounce($item, $data)
{ {
$orig_body = $item['body'];
$announce = api_share_as_retweet($item); $announce = api_share_as_retweet($item);
if (empty($announce['plink'])) { if (empty($announce['plink'])) {
$data['type'] = 'Create'; $data['type'] = 'Create';
@ -1299,12 +1300,29 @@ class Transmitter
if (!empty($activity)) { if (!empty($activity)) {
$ldactivity = JsonLD::compact($activity); $ldactivity = JsonLD::compact($activity);
$id = JsonLD::fetchElement($ldactivity, '@id'); $id = JsonLD::fetchElement($ldactivity, '@id');
$type = str_replace('as:', '', JsonLD::fetchElement($ldactivity, '@type'));
if (!empty($id)) { if (!empty($id)) {
if (empty($announce['share-pre-body'])) {
// Pure announce, without a quote
$data['type'] = 'Announce';
$data['object'] = $id; $data['object'] = $id;
return $data; return $data;
} }
// Quote
$data['type'] = 'Create';
$item['body'] = trim($announce['share-pre-body']) . "\n" . $id;
$data['object'] = self::createNote($item);
/// @todo Finally descide how to implement this in AP. This is a possible way:
$data['object']['attachment'][] = ['type' => $type, 'id' => $id];
$data['object']['source']['content'] = $orig_body;
return $data;
}
} }
$item['body'] = $orig_body;
$data['type'] = 'Create'; $data['type'] = 'Create';
$data['object'] = self::createNote($item); $data['object'] = self::createNote($item);
return $data; return $data;