EntropyEngineer/friendica-addons
0
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge pull request 'atproto: Usage of new atproto functions to handle with records' (#1647) from heluecht/friendica-addons:atp into develop

Browse source 
Reviewed-on: friendica/friendica-addons#1647
Reviewed-by: Hypolite Petovan <hypolite@mrpetovan.com>
This commit is contained in:
Hypolite Petovan 2026-04-12 06:51:56 +02:00
commit ecbdbe3ea9
1 changed files with 17 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

82
bluesky/bluesky.php
View file

@ -146,13 +146,7 @@ function bluesky_follow(array &$hook_data)
'$type' => 'app.bsky.graph.follow'
];
$post = [
'collection' => 'app.bsky.graph.follow',
'repo' => DI::atProtocol()->getUserDid($hook_data['uid']),
'record' => $record
];
$activity = DI::atProtocol()->XRPCPost($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
$activity = DI::atProtocol()->createRecord($hook_data['uid'], 'app.bsky.graph.follow', $record);
if (!empty($activity->uri)) {
$hook_data['contact'] = $contact;
DI::logger()->debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
@ -177,7 +171,7 @@ function bluesky_unfollow(array &$hook_data)
return;
}
bluesky_delete_post($data->viewer->following, $hook_data['uid']);
DI::atProtocol()->deleteRecord($hook_data['uid'], $data->viewer->following);
$hook_data['result'] = true;
}
@ -201,13 +195,7 @@ function bluesky_block(array &$hook_data)
'$type' => 'app.bsky.graph.block'
];
$post = [
'collection' => 'app.bsky.graph.block',
'repo' => DI::atProtocol()->getUserDid($hook_data['uid']),
'record' => $record
];
$activity = DI::atProtocol()->XRPCPost($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
$activity = DI::atProtocol()->createRecord($hook_data['uid'], 'app.bsky.graph.block', $record);
if (!empty($activity->uri)) {
$ucid = Contact::getUserContactId($hook_data['contact']['id'], $hook_data['uid']);
if ($ucid) {
@ -235,7 +223,7 @@ function bluesky_unblock(array &$hook_data)
return;
}
bluesky_delete_post($data->viewer->blocking, $hook_data['uid']);
DI::atProtocol()->deleteRecord($hook_data['uid'], $data->viewer->blocking);
$hook_data['result'] = true;
}
@ -589,7 +577,7 @@ function bluesky_send(array &$b)
DI::logger()->debug('Not an AT Protocol post', ['uri' => $b['uri']]);
return;
}
bluesky_delete_post($b['uri'], $b['uid']);
DI::atProtocol()->deleteRecord($b['uid'], $uri->uri);
return;
}
@ -626,40 +614,21 @@ function bluesky_create_activity(array $item, ?stdClass $parent = null)
return;
}
$did = DI::atProtocol()->getUserDid($uid);
if (empty($did)) {
if ($item['verb'] == Activity::LIKE) {
$collection = 'app.bsky.feed.like';
} elseif ($item['verb'] == Activity::ANNOUNCE) {
$collection = 'app.bsky.feed.repost';
} else {
return;
}
$post = [];
$record = [
'subject' => $parent,
'createdAt' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
'$type' => $collection,
];
if ($item['verb'] == Activity::LIKE) {
$record = [
'subject' => $parent,
'createdAt' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
'$type' => 'app.bsky.feed.like'
];
$post = [
'collection' => 'app.bsky.feed.like',
'repo' => $did,
'record' => $record
];
} elseif ($item['verb'] == Activity::ANNOUNCE) {
$record = [
'subject' => $parent,
'createdAt' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
'$type' => 'app.bsky.feed.repost'
];
$post = [
'collection' => 'app.bsky.feed.repost',
'repo' => $did,
'record' => $record
];
}
$activity = DI::atProtocol()->XRPCPost($uid, 'com.atproto.repo.createRecord', $post);
$activity = DI::atProtocol()->createRecord($uid, $collection, $record);
if (empty($activity->uri)) {
return;
}
@ -741,13 +710,7 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
}
}
$post = [
'collection' => 'app.bsky.feed.post',
'repo' => DI::atProtocol()->getUserDid($uid),
'record' => $record
];
$parent = DI::atProtocol()->XRPCPost($uid, 'com.atproto.repo.createRecord', $post);
$parent = DI::atProtocol()->createRecord($uid, 'app.bsky.feed.post', $record);
if (empty($parent->uri)) {
if ($part == 0) {
Worker::defer();
@ -978,17 +941,6 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
return $data->blob;
}
function bluesky_delete_post(string $uri, int $uid)
{
$parts = DI::atpProcessor()->getUriParts($uri);
if (empty($parts)) {
DI::logger()->debug('No uri delected', ['uri' => $uri]);
return;
}
DI::atProtocol()->XRPCPost($uid, 'com.atproto.repo.deleteRecord', $parts);
DI::logger()->debug('Deleted', ['parts' => $parts]);
}
function bluesky_fetch_timeline(int $uid)
{
DI::atProtocol()->setApiForUser($uid);