Merge pull request 'Connectors: Fix handling of the 'private' field / reformatted code' (#1564) from heluecht/friendica-addons:private into 2024.09-rc
Reviewed-on: https://git.friendi.ca/friendica/friendica-addons/pulls/1564 Reviewed-by: Hypolite Petovan <hypolite@mrpetovan.com>pull/1565/head
commit
aeefb92926
|
@ -587,13 +587,13 @@ function bluesky_hook_fork(array &$b)
|
||||||
|
|
||||||
if (DI::pConfig()->get($post['uid'], 'bluesky', 'import')) {
|
if (DI::pConfig()->get($post['uid'], 'bluesky', 'import')) {
|
||||||
// Don't post if it isn't a reply to a bluesky post
|
// Don't post if it isn't a reply to a bluesky post
|
||||||
if (($post['parent'] != $post['id']) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::BLUESKY])) {
|
if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::BLUESKY])) {
|
||||||
Logger::notice('No bluesky parent found', ['item' => $post['id']]);
|
Logger::notice('No bluesky parent found', ['item' => $post['id']]);
|
||||||
$b['execute'] = false;
|
$b['execute'] = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} elseif (!strstr($post['postopts'] ?? '', 'bluesky') || ($post['parent'] != $post['id']) || $post['private']) {
|
} elseif (!strstr($post['postopts'] ?? '', 'bluesky') || ($post['gravity'] != Item::GRAVITY_PARENT) || ($post['private'] == Item::PRIVATE)) {
|
||||||
DI::logger()->info('Activities are never exported when we don\'t import the bluesky timeline', ['uid' => $post['uid']]);
|
DI::logger()->info('Post will not be exported', ['uid' => $post['uid'], 'postopts' => $post['postopts'], 'gravity' => $post['gravity'], 'private' => $post['private']]);
|
||||||
$b['execute'] = false;
|
$b['execute'] = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -601,15 +601,11 @@ function bluesky_hook_fork(array &$b)
|
||||||
|
|
||||||
function bluesky_post_local(array &$b)
|
function bluesky_post_local(array &$b)
|
||||||
{
|
{
|
||||||
if ($b['edit']) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($b['private'] || $b['parent']) {
|
if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -667,7 +663,7 @@ function bluesky_send(array &$b)
|
||||||
bluesky_create_activity($b, $parent);
|
bluesky_create_activity($b, $parent);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
} elseif ($b['private'] || !strstr($b['postopts'], 'bluesky')) {
|
} elseif (($b['private'] == Item::PRIVATE) || !strstr($b['postopts'], 'bluesky')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1481,6 +1477,18 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
|
||||||
|
|
||||||
case 'app.bsky.embed.record#view':
|
case 'app.bsky.embed.record#view':
|
||||||
$original_uri = $uri = bluesky_get_uri($embed->record);
|
$original_uri = $uri = bluesky_get_uri($embed->record);
|
||||||
|
$type = '$type';
|
||||||
|
if (!empty($embed->record->record->$type)) {
|
||||||
|
$embed_type = $embed->record->record->$type;
|
||||||
|
if ($embed_type == 'app.bsky.graph.starterpack') {
|
||||||
|
Logger::debug('Starterpacks are not fetched like posts', ['original-uri' => $original_uri]);
|
||||||
|
if (empty($item['body'])) {
|
||||||
|
// @todo process starterpack
|
||||||
|
$item['body'] = '[url=' . $embed->record->record->list . ']' . $embed->record->record->name . '[/url]';
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
|
$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
|
||||||
if ($uri) {
|
if ($uri) {
|
||||||
$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$item['uid'], 0]]);
|
$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$item['uid'], 0]]);
|
||||||
|
|
|
@ -17,6 +17,7 @@ use Friendica\Core\Renderer;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
use Friendica\Core\Worker;
|
use Friendica\Core\Worker;
|
||||||
use Friendica\DI;
|
use Friendica\DI;
|
||||||
|
use Friendica\Model\Item;
|
||||||
use Friendica\Model\Post;
|
use Friendica\Model\Post;
|
||||||
|
|
||||||
function diaspora_install()
|
function diaspora_install()
|
||||||
|
@ -120,15 +121,15 @@ function diaspora_settings(array &$data)
|
||||||
function diaspora_settings_post(array &$b)
|
function diaspora_settings_post(array &$b)
|
||||||
{
|
{
|
||||||
if (!empty($_POST['diaspora-submit'])) {
|
if (!empty($_POST['diaspora-submit'])) {
|
||||||
DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'post' , intval($_POST['enabled']));
|
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'diaspora', 'post', intval($_POST['enabled']));
|
||||||
if (intval($_POST['enabled'])) {
|
if (intval($_POST['enabled'])) {
|
||||||
if (isset($_POST['handle'])) {
|
if (isset($_POST['handle'])) {
|
||||||
DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'handle' , trim($_POST['handle']));
|
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'diaspora', 'handle', trim($_POST['handle']));
|
||||||
DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'password' , trim($_POST['password']));
|
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'diaspora', 'password', trim($_POST['password']));
|
||||||
}
|
}
|
||||||
if (!empty($_POST['aspect'])) {
|
if (!empty($_POST['aspect'])) {
|
||||||
DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'aspect' , trim($_POST['aspect']));
|
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'diaspora', 'aspect', trim($_POST['aspect']));
|
||||||
DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'post_by_default', intval($_POST['post_by_default']));
|
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'diaspora', 'post_by_default', intval($_POST['post_by_default']));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'diaspora', 'password');
|
DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'diaspora', 'password');
|
||||||
|
@ -144,8 +145,10 @@ function diaspora_hook_fork(array &$b)
|
||||||
|
|
||||||
$post = $b['data'];
|
$post = $b['data'];
|
||||||
|
|
||||||
if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
|
if (
|
||||||
!strstr($post['postopts'] ?? '', 'diaspora') || ($post['parent'] != $post['id'])) {
|
$post['deleted'] || ($post['private'] == Item::PRIVATE) || ($post['created'] !== $post['edited']) ||
|
||||||
|
!strstr($post['postopts'] ?? '', 'diaspora') || ($post['gravity'] != Item::GRAVITY_PARENT)
|
||||||
|
) {
|
||||||
$b['execute'] = false;
|
$b['execute'] = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -153,23 +156,19 @@ function diaspora_hook_fork(array &$b)
|
||||||
|
|
||||||
function diaspora_post_local(array &$b)
|
function diaspora_post_local(array &$b)
|
||||||
{
|
{
|
||||||
if ($b['edit']) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($b['private'] || $b['parent']) {
|
if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$diaspora_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'diaspora','post'));
|
$diaspora_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'diaspora', 'post'));
|
||||||
|
|
||||||
$diaspora_enable = (($diaspora_post && !empty($_REQUEST['diaspora_enable'])) ? intval($_REQUEST['diaspora_enable']) : 0);
|
$diaspora_enable = (($diaspora_post && !empty($_REQUEST['diaspora_enable'])) ? intval($_REQUEST['diaspora_enable']) : 0);
|
||||||
|
|
||||||
if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'diaspora','post_by_default'))) {
|
if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'diaspora', 'post_by_default'))) {
|
||||||
$diaspora_enable = 1;
|
$diaspora_enable = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -190,11 +189,11 @@ function diaspora_send(array &$b)
|
||||||
|
|
||||||
Logger::notice('diaspora_send: invoked');
|
Logger::notice('diaspora_send: invoked');
|
||||||
|
|
||||||
if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
|
if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strstr($b['postopts'],'diaspora')) {
|
if (!strstr($b['postopts'], 'diaspora')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -214,9 +213,9 @@ function diaspora_send(array &$b)
|
||||||
|
|
||||||
Logger::info('diaspora_send: prepare posting');
|
Logger::info('diaspora_send: prepare posting');
|
||||||
|
|
||||||
$handle = DI::pConfig()->get($b['uid'],'diaspora','handle');
|
$handle = DI::pConfig()->get($b['uid'], 'diaspora', 'handle');
|
||||||
$password = DI::pConfig()->get($b['uid'],'diaspora','password');
|
$password = DI::pConfig()->get($b['uid'], 'diaspora', 'password');
|
||||||
$aspect = DI::pConfig()->get($b['uid'],'diaspora','aspect');
|
$aspect = DI::pConfig()->get($b['uid'], 'diaspora', 'aspect');
|
||||||
|
|
||||||
if ($handle && $password) {
|
if ($handle && $password) {
|
||||||
Logger::info('diaspora_send: all values seem to be okay');
|
Logger::info('diaspora_send: all values seem to be okay');
|
||||||
|
@ -230,7 +229,7 @@ function diaspora_send(array &$b)
|
||||||
// Removal of tags and mentions
|
// Removal of tags and mentions
|
||||||
// #-tags
|
// #-tags
|
||||||
$body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body);
|
$body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body);
|
||||||
// @-mentions
|
// @-mentions
|
||||||
$body = preg_replace('/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $body);
|
$body = preg_replace('/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $body);
|
||||||
|
|
||||||
// remove multiple newlines
|
// remove multiple newlines
|
||||||
|
@ -244,7 +243,7 @@ function diaspora_send(array &$b)
|
||||||
|
|
||||||
// Adding the title
|
// Adding the title
|
||||||
if (strlen($title)) {
|
if (strlen($title)) {
|
||||||
$body = "## ".html_entity_decode($title)."\n\n".$body;
|
$body = "## " . html_entity_decode($title) . "\n\n" . $body;
|
||||||
}
|
}
|
||||||
|
|
||||||
require_once "addon/diaspora/diasphp.php";
|
require_once "addon/diaspora/diasphp.php";
|
||||||
|
@ -252,9 +251,9 @@ function diaspora_send(array &$b)
|
||||||
try {
|
try {
|
||||||
Logger::info('diaspora_send: prepare');
|
Logger::info('diaspora_send: prepare');
|
||||||
$conn = new Diaspora_Connection($handle, $password);
|
$conn = new Diaspora_Connection($handle, $password);
|
||||||
Logger::info('diaspora_send: try to log in '.$handle);
|
Logger::info('diaspora_send: try to log in ' . $handle);
|
||||||
$conn->logIn();
|
$conn->logIn();
|
||||||
Logger::info('diaspora_send: try to send '.$body);
|
Logger::info('diaspora_send: try to send ' . $body);
|
||||||
|
|
||||||
$conn->provider = $hostname;
|
$conn->provider = $hostname;
|
||||||
$conn->postStatusMessage($body, $aspect);
|
$conn->postStatusMessage($body, $aspect);
|
||||||
|
@ -263,7 +262,7 @@ function diaspora_send(array &$b)
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
Logger::notice("diaspora_send: Error submitting the post: " . $e->getMessage());
|
Logger::notice("diaspora_send: Error submitting the post: " . $e->getMessage());
|
||||||
|
|
||||||
Logger::info('diaspora_send: requeueing '.$b['uid']);
|
Logger::info('diaspora_send: requeueing ' . $b['uid']);
|
||||||
|
|
||||||
Worker::defer();
|
Worker::defer();
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,7 @@ use Friendica\Core\Hook;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\DI;
|
use Friendica\DI;
|
||||||
|
use Friendica\Model\Item;
|
||||||
use Friendica\Model\Post;
|
use Friendica\Model\Post;
|
||||||
use Friendica\Model\Tag;
|
use Friendica\Model\Tag;
|
||||||
use Friendica\Model\User;
|
use Friendica\Model\User;
|
||||||
|
@ -88,24 +89,20 @@ function dwpost_settings_post(array &$b)
|
||||||
|
|
||||||
function dwpost_post_local(array &$b)
|
function dwpost_post_local(array &$b)
|
||||||
{
|
{
|
||||||
// This can probably be changed to allow editing by pointing to a different API endpoint
|
|
||||||
if ($b['edit']) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((!DI::userSession()->getLocalUserId()) || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
if ((!DI::userSession()->getLocalUserId()) || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($b['private'] || $b['parent']) {
|
// This can probably be changed to allow editing by pointing to a different API endpoint
|
||||||
|
if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$dw_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'dwpost','post'));
|
$dw_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'dwpost', 'post'));
|
||||||
|
|
||||||
$dw_enable = (($dw_post && !empty($_REQUEST['dwpost_enable'])) ? intval($_REQUEST['dwpost_enable']) : 0);
|
$dw_enable = (($dw_post && !empty($_REQUEST['dwpost_enable'])) ? intval($_REQUEST['dwpost_enable']) : 0);
|
||||||
|
|
||||||
if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'dwpost','post_by_default'))) {
|
if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'dwpost', 'post_by_default'))) {
|
||||||
$dw_enable = 1;
|
$dw_enable = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -122,7 +119,7 @@ function dwpost_post_local(array &$b)
|
||||||
|
|
||||||
function dwpost_send(array &$b)
|
function dwpost_send(array &$b)
|
||||||
{
|
{
|
||||||
if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
|
if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -145,8 +142,8 @@ function dwpost_send(array &$b)
|
||||||
$user = User::getById($b['uid']);
|
$user = User::getById($b['uid']);
|
||||||
$tz = $user['timezone'] ?: 'UTC';
|
$tz = $user['timezone'] ?: 'UTC';
|
||||||
|
|
||||||
$dw_username = DI::pConfig()->get($b['uid'],'dwpost','dw_username');
|
$dw_username = DI::pConfig()->get($b['uid'], 'dwpost', 'dw_username');
|
||||||
$dw_password = DI::pConfig()->get($b['uid'],'dwpost','dw_password');
|
$dw_password = DI::pConfig()->get($b['uid'], 'dwpost', 'dw_password');
|
||||||
$dw_blog = 'http://www.dreamwidth.org/interface/xmlrpc';
|
$dw_blog = 'http://www.dreamwidth.org/interface/xmlrpc';
|
||||||
|
|
||||||
if ($dw_username && $dw_password && $dw_blog) {
|
if ($dw_username && $dw_password && $dw_blog) {
|
||||||
|
@ -156,11 +153,11 @@ function dwpost_send(array &$b)
|
||||||
$tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
|
$tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
|
||||||
|
|
||||||
$date = DateTimeFormat::convert($b['created'], $tz);
|
$date = DateTimeFormat::convert($b['created'], $tz);
|
||||||
$year = intval(substr($date,0,4));
|
$year = intval(substr($date, 0, 4));
|
||||||
$mon = intval(substr($date,5,2));
|
$mon = intval(substr($date, 5, 2));
|
||||||
$day = intval(substr($date,8,2));
|
$day = intval(substr($date, 8, 2));
|
||||||
$hour = intval(substr($date,11,2));
|
$hour = intval(substr($date, 11, 2));
|
||||||
$min = intval(substr($date,14,2));
|
$min = intval(substr($date, 14, 2));
|
||||||
|
|
||||||
$xml = <<< EOT
|
$xml = <<< EOT
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
|
@ -14,6 +14,7 @@ use Friendica\Core\Hook;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\DI;
|
use Friendica\DI;
|
||||||
|
use Friendica\Model\Item;
|
||||||
use Friendica\Model\Tag;
|
use Friendica\Model\Tag;
|
||||||
use Friendica\Model\User;
|
use Friendica\Model\User;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
|
@ -85,17 +86,12 @@ function ijpost_settings_post(array &$b)
|
||||||
|
|
||||||
function ijpost_post_local(array &$b)
|
function ijpost_post_local(array &$b)
|
||||||
{
|
{
|
||||||
// This can probably be changed to allow editing by pointing to a different API endpoint
|
|
||||||
|
|
||||||
if ($b['edit']) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($b['private'] || $b['parent']) {
|
// This can probably be changed to allow editing by pointing to a different API endpoint
|
||||||
|
if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -120,7 +116,7 @@ function ijpost_post_local(array &$b)
|
||||||
|
|
||||||
function ijpost_send(array &$b)
|
function ijpost_send(array &$b)
|
||||||
{
|
{
|
||||||
if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
|
if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -150,11 +146,11 @@ function ijpost_send(array &$b)
|
||||||
$tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
|
$tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
|
||||||
|
|
||||||
$date = DateTimeFormat::convert($b['created'], $tz);
|
$date = DateTimeFormat::convert($b['created'], $tz);
|
||||||
$year = intval(substr($date,0,4));
|
$year = intval(substr($date, 0, 4));
|
||||||
$mon = intval(substr($date,5,2));
|
$mon = intval(substr($date, 5, 2));
|
||||||
$day = intval(substr($date,8,2));
|
$day = intval(substr($date, 8, 2));
|
||||||
$hour = intval(substr($date,11,2));
|
$hour = intval(substr($date, 11, 2));
|
||||||
$min = intval(substr($date,14,2));
|
$min = intval(substr($date, 14, 2));
|
||||||
|
|
||||||
$xml = <<< EOT
|
$xml = <<< EOT
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
|
@ -13,6 +13,7 @@ use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
use Friendica\DI;
|
use Friendica\DI;
|
||||||
|
use Friendica\Model\Item;
|
||||||
use Friendica\Model\Post;
|
use Friendica\Model\Post;
|
||||||
|
|
||||||
function libertree_install()
|
function libertree_install()
|
||||||
|
@ -74,13 +75,11 @@ function libertree_settings(array &$data)
|
||||||
function libertree_settings_post(array &$b)
|
function libertree_settings_post(array &$b)
|
||||||
{
|
{
|
||||||
if (!empty($_POST['libertree-submit'])) {
|
if (!empty($_POST['libertree-submit'])) {
|
||||||
DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','post',intval($_POST['libertree']));
|
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'libertree', 'post', intval($_POST['libertree']));
|
||||||
DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
|
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'libertree', 'post_by_default', intval($_POST['libertree_bydefault']));
|
||||||
DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
|
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'libertree', 'libertree_api_token', trim($_POST['libertree_api_token']));
|
||||||
DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','libertree_url',trim($_POST['libertree_url']));
|
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'libertree', 'libertree_url', trim($_POST['libertree_url']));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function libertree_hook_fork(array &$b)
|
function libertree_hook_fork(array &$b)
|
||||||
|
@ -91,8 +90,10 @@ function libertree_hook_fork(array &$b)
|
||||||
|
|
||||||
$post = $b['data'];
|
$post = $b['data'];
|
||||||
|
|
||||||
if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
|
if (
|
||||||
!strstr($post['postopts'], 'libertree') || ($post['parent'] != $post['id'])) {
|
$post['deleted'] || ($post['private'] == Item::PRIVATE) || ($post['created'] !== $post['edited']) ||
|
||||||
|
!strstr($post['postopts'], 'libertree') || ($post['gravity'] != Item::GRAVITY_PARENT)
|
||||||
|
) {
|
||||||
$b['execute'] = false;
|
$b['execute'] = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -100,26 +101,20 @@ function libertree_hook_fork(array &$b)
|
||||||
|
|
||||||
function libertree_post_local(array &$b)
|
function libertree_post_local(array &$b)
|
||||||
{
|
{
|
||||||
|
|
||||||
// This can probably be changed to allow editing by pointing to a different API endpoint
|
|
||||||
|
|
||||||
if ($b['edit']) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($b['private'] || $b['parent']) {
|
// This can probably be changed to allow editing by pointing to a different API endpoint
|
||||||
|
if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$ltree_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'libertree','post'));
|
$ltree_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post'));
|
||||||
|
|
||||||
$ltree_enable = (($ltree_post && !empty($_REQUEST['libertree_enable'])) ? intval($_REQUEST['libertree_enable']) : 0);
|
$ltree_enable = (($ltree_post && !empty($_REQUEST['libertree_enable'])) ? intval($_REQUEST['libertree_enable']) : 0);
|
||||||
|
|
||||||
if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'libertree','post_by_default'))) {
|
if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post_by_default'))) {
|
||||||
$ltree_enable = 1;
|
$ltree_enable = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -138,11 +133,11 @@ function libertree_send(array &$b)
|
||||||
{
|
{
|
||||||
Logger::notice('libertree_send: invoked');
|
Logger::notice('libertree_send: invoked');
|
||||||
|
|
||||||
if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
|
if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! strstr($b['postopts'],'libertree')) {
|
if (! strstr($b['postopts'], 'libertree')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -159,15 +154,15 @@ function libertree_send(array &$b)
|
||||||
|
|
||||||
$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
|
$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
|
||||||
|
|
||||||
$ltree_api_token = DI::pConfig()->get($b['uid'],'libertree','libertree_api_token');
|
$ltree_api_token = DI::pConfig()->get($b['uid'], 'libertree', 'libertree_api_token');
|
||||||
$ltree_url = DI::pConfig()->get($b['uid'],'libertree','libertree_url');
|
$ltree_url = DI::pConfig()->get($b['uid'], 'libertree', 'libertree_url');
|
||||||
$ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
|
$ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
|
||||||
$ltree_source = DI::baseUrl()->getHost();
|
$ltree_source = DI::baseUrl()->getHost();
|
||||||
|
|
||||||
if ($b['app'] != "")
|
if ($b['app'] != "")
|
||||||
$ltree_source .= " (".$b['app'].")";
|
$ltree_source .= " (" . $b['app'] . ")";
|
||||||
|
|
||||||
if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
|
if ($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
|
||||||
$title = $b['title'];
|
$title = $b['title'];
|
||||||
$body = $b['body'];
|
$body = $b['body'];
|
||||||
// Insert a newline before and after a quote
|
// Insert a newline before and after a quote
|
||||||
|
@ -177,7 +172,7 @@ function libertree_send(array &$b)
|
||||||
// Removal of tags and mentions
|
// Removal of tags and mentions
|
||||||
// #-tags
|
// #-tags
|
||||||
$body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body);
|
$body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body);
|
||||||
// @-mentions
|
// @-mentions
|
||||||
$body = preg_replace('/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $body);
|
$body = preg_replace('/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $body);
|
||||||
|
|
||||||
// remove multiple newlines
|
// remove multiple newlines
|
||||||
|
@ -198,7 +193,7 @@ function libertree_send(array &$b)
|
||||||
$params = [
|
$params = [
|
||||||
'text' => $body,
|
'text' => $body,
|
||||||
'source' => $ltree_source
|
'source' => $ltree_source
|
||||||
// 'token' => $ltree_api_token
|
// 'token' => $ltree_api_token
|
||||||
];
|
];
|
||||||
|
|
||||||
$result = DI::httpClient()->post($ltree_blog, $params)->getBodyString();
|
$result = DI::httpClient()->post($ltree_blog, $params)->getBodyString();
|
||||||
|
|
|
@ -14,6 +14,7 @@ use Friendica\Core\Hook;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\DI;
|
use Friendica\DI;
|
||||||
|
use Friendica\Model\Item;
|
||||||
use Friendica\Model\Post;
|
use Friendica\Model\Post;
|
||||||
use Friendica\Model\Tag;
|
use Friendica\Model\Tag;
|
||||||
use Friendica\Model\User;
|
use Friendica\Model\User;
|
||||||
|
@ -35,7 +36,7 @@ function ljpost_jot_nets(array &$jotnets_fields)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (DI::pConfig()->get(DI::userSession()->getLocalUserId(),'ljpost','post')) {
|
if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post')) {
|
||||||
$jotnets_fields[] = [
|
$jotnets_fields[] = [
|
||||||
'type' => 'checkbox',
|
'type' => 'checkbox',
|
||||||
'field' => [
|
'field' => [
|
||||||
|
@ -57,7 +58,7 @@ function ljpost_settings(array &$data)
|
||||||
$ij_username = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'ij_username');
|
$ij_username = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'ij_username');
|
||||||
$def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default');
|
$def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default');
|
||||||
|
|
||||||
$t= Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ljpost/');
|
$t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ljpost/');
|
||||||
$html = Renderer::replaceMacros($t, [
|
$html = Renderer::replaceMacros($t, [
|
||||||
'$enabled' => ['ljpost', DI::l10n()->t('Enable LiveJournal Post Addon'), $enabled],
|
'$enabled' => ['ljpost', DI::l10n()->t('Enable LiveJournal Post Addon'), $enabled],
|
||||||
'$username' => ['ij_username', DI::l10n()->t('LiveJournal username'), $ij_username],
|
'$username' => ['ij_username', DI::l10n()->t('LiveJournal username'), $ij_username],
|
||||||
|
@ -86,20 +87,16 @@ function ljpost_settings_post(array &$b)
|
||||||
|
|
||||||
function ljpost_post_local(array &$b)
|
function ljpost_post_local(array &$b)
|
||||||
{
|
{
|
||||||
// This can probably be changed to allow editing by pointing to a different API endpoint
|
|
||||||
if ($b['edit']) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($b['private'] || $b['parent']) {
|
// This can probably be changed to allow editing by pointing to a different API endpoint
|
||||||
|
if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$lj_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'ljpost','post'));
|
$lj_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post'));
|
||||||
$lj_enable = (($lj_post && !empty($_REQUEST['ljpost_enable'])) ? intval($_REQUEST['ljpost_enable']) : 0);
|
$lj_enable = (($lj_post && !empty($_REQUEST['ljpost_enable'])) ? intval($_REQUEST['ljpost_enable']) : 0);
|
||||||
|
|
||||||
if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default'))) {
|
if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default'))) {
|
||||||
|
@ -118,11 +115,11 @@ function ljpost_post_local(array &$b)
|
||||||
|
|
||||||
function ljpost_send(array &$b)
|
function ljpost_send(array &$b)
|
||||||
{
|
{
|
||||||
if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
|
if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strstr($b['postopts'],'ljpost')) {
|
if (!strstr($b['postopts'], 'ljpost')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -139,13 +136,13 @@ function ljpost_send(array &$b)
|
||||||
$user = User::getById($b['uid']);
|
$user = User::getById($b['uid']);
|
||||||
$tz = $user['timezone'] ?: 'UTC';
|
$tz = $user['timezone'] ?: 'UTC';
|
||||||
|
|
||||||
$lj_username = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_username'));
|
$lj_username = XML::escape(DI::pConfig()->get($b['uid'], 'ljpost', 'lj_username'));
|
||||||
$lj_password = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_password'));
|
$lj_password = XML::escape(DI::pConfig()->get($b['uid'], 'ljpost', 'lj_password'));
|
||||||
$lj_journal = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_journal'));
|
$lj_journal = XML::escape(DI::pConfig()->get($b['uid'], 'ljpost', 'lj_journal'));
|
||||||
// if(! $lj_journal)
|
// if(! $lj_journal)
|
||||||
// $lj_journal = $lj_username;
|
// $lj_journal = $lj_username;
|
||||||
|
|
||||||
$lj_blog = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_blog'));
|
$lj_blog = XML::escape(DI::pConfig()->get($b['uid'], 'ljpost', 'lj_blog'));
|
||||||
if (!strlen($lj_blog)) {
|
if (!strlen($lj_blog)) {
|
||||||
$lj_blog = XML::escape('http://www.livejournal.com/interface/xmlrpc');
|
$lj_blog = XML::escape('http://www.livejournal.com/interface/xmlrpc');
|
||||||
}
|
}
|
||||||
|
@ -157,11 +154,11 @@ function ljpost_send(array &$b)
|
||||||
$tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
|
$tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
|
||||||
|
|
||||||
$date = DateTimeFormat::convert($b['created'], $tz);
|
$date = DateTimeFormat::convert($b['created'], $tz);
|
||||||
$year = intval(substr($date,0,4));
|
$year = intval(substr($date, 0, 4));
|
||||||
$mon = intval(substr($date,5,2));
|
$mon = intval(substr($date, 5, 2));
|
||||||
$day = intval(substr($date,8,2));
|
$day = intval(substr($date, 8, 2));
|
||||||
$hour = intval(substr($date,11,2));
|
$hour = intval(substr($date, 11, 2));
|
||||||
$min = intval(substr($date,14,2));
|
$min = intval(substr($date, 14, 2));
|
||||||
|
|
||||||
$xml = <<< EOT
|
$xml = <<< EOT
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
|
@ -18,6 +18,7 @@ use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\Core\System;
|
use Friendica\Core\System;
|
||||||
use Friendica\DI;
|
use Friendica\DI;
|
||||||
|
use Friendica\Model\Item;
|
||||||
use Friendica\Model\Photo;
|
use Friendica\Model\Photo;
|
||||||
use phpnut\phpnutException;
|
use phpnut\phpnutException;
|
||||||
|
|
||||||
|
@ -82,7 +83,7 @@ function pnut_connect()
|
||||||
$o = DI::l10n()->t('Error fetching token. Please try again.', ['code' => $e->getCode(), 'message' => $e->getMessage()]);
|
$o = DI::l10n()->t('Error fetching token. Please try again.', ['code' => $e->getCode(), 'message' => $e->getMessage()]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$o .= '<br /><a href="' . DI::baseUrl() . '/settings/connectors">' . DI::l10n()->t("return to the connector page").'</a>';
|
$o .= '<br /><a href="' . DI::baseUrl() . '/settings/connectors">' . DI::l10n()->t("return to the connector page") . '</a>';
|
||||||
|
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
@ -119,7 +120,7 @@ function pnut_settings(array &$data)
|
||||||
}
|
}
|
||||||
|
|
||||||
$redirectUri = DI::baseUrl() . '/pnut/connect';
|
$redirectUri = DI::baseUrl() . '/pnut/connect';
|
||||||
$scope = ['write_post','files'];
|
$scope = ['write_post', 'files'];
|
||||||
|
|
||||||
$enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post') ?? false;
|
$enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post') ?? false;
|
||||||
$def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default') ?? false;
|
$def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default') ?? false;
|
||||||
|
@ -221,7 +222,7 @@ function pnut_hook_fork(array &$b)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strstr($post['postopts'] ?? '', 'pnut') || ($post['parent'] != $post['id']) || $post['private']) {
|
if (!strstr($post['postopts'] ?? '', 'pnut') || ($post['gravity'] != Item::GRAVITY_PARENT) || ($post['private'] == Item::PRIVATE)) {
|
||||||
$b['execute'] = false;
|
$b['execute'] = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -229,15 +230,11 @@ function pnut_hook_fork(array &$b)
|
||||||
|
|
||||||
function pnut_post_local(array &$b)
|
function pnut_post_local(array &$b)
|
||||||
{
|
{
|
||||||
if ($b['edit']) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($b['private'] || $b['parent']) {
|
if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -265,7 +262,7 @@ function pnut_post_hook(array &$b)
|
||||||
/**
|
/**
|
||||||
* Post to pnut.io
|
* Post to pnut.io
|
||||||
*/
|
*/
|
||||||
if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
|
if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -345,14 +345,14 @@ function pumpio_hook_fork(array &$b)
|
||||||
|
|
||||||
if (DI::pConfig()->get($post['uid'], 'pumpio', 'import')) {
|
if (DI::pConfig()->get($post['uid'], 'pumpio', 'import')) {
|
||||||
// Don't fork if it isn't a reply to a pump.io post
|
// Don't fork if it isn't a reply to a pump.io post
|
||||||
if (($post['parent'] != $post['id']) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::PUMPIO])) {
|
if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::PUMPIO])) {
|
||||||
Logger::notice('No pump.io parent found for item ' . $post['id']);
|
Logger::notice('No pump.io parent found for item ' . $post['id']);
|
||||||
$b['execute'] = false;
|
$b['execute'] = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Comments are never exported when we don't import the pumpio timeline
|
// Comments are never exported when we don't import the pumpio timeline
|
||||||
if (!strstr($post['postopts'], 'pumpio') || ($post['parent'] != $post['id']) || $post['private']) {
|
if (!strstr($post['postopts'], 'pumpio') || ($post['gravity'] != Item::GRAVITY_PARENT)|| ($post['private'] == Item::PRIVATE)) {
|
||||||
$b['execute'] = false;
|
$b['execute'] = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -412,7 +412,7 @@ function pumpio_send(array &$b)
|
||||||
|
|
||||||
Logger::notice('pumpio_send: receiver ', $receiver);
|
Logger::notice('pumpio_send: receiver ', $receiver);
|
||||||
|
|
||||||
if (!count($receiver) && ($b['private'] || !strstr($b['postopts'], 'pumpio'))) {
|
if (!count($receiver) && ($b['private'] == Item::PRIVATE) || !strstr($b['postopts'], 'pumpio'))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1319,7 +1319,7 @@ function pumpio_getreceiver(array $b)
|
||||||
{
|
{
|
||||||
$receiver = [];
|
$receiver = [];
|
||||||
|
|
||||||
if (!$b['private']) {
|
if ($b['private'] != Item::PRIVATE)) {
|
||||||
if (!strstr($b['postopts'], 'pumpio')) {
|
if (!strstr($b['postopts'], 'pumpio')) {
|
||||||
return $receiver;
|
return $receiver;
|
||||||
}
|
}
|
||||||
|
|
|
@ -296,7 +296,7 @@ function statusnet_hook_fork(array &$b)
|
||||||
|
|
||||||
$post = $b['data'];
|
$post = $b['data'];
|
||||||
|
|
||||||
if ($post['deleted'] || ($post['created'] !== $post['edited']) || strpos($post['postopts'] ?? '', 'statusnet') === false || ($post['parent'] != $post['id']) || $post['private']) {
|
if ($post['deleted'] || ($post['created'] !== $post['edited']) || strpos($post['postopts'] ?? '', 'statusnet') === false || ($post['gravity'] != Item::GRAVITY_PARENT) || ($post['private'] == Item::PRIVATE)) {
|
||||||
$b['execute'] = false;
|
$b['execute'] = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -336,7 +336,7 @@ function statusnet_post_hook(array &$b)
|
||||||
/**
|
/**
|
||||||
* Post to GNU Social
|
* Post to GNU Social
|
||||||
*/
|
*/
|
||||||
if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
|
if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -439,11 +439,13 @@ function statusnet_addon_admin_post()
|
||||||
$secret = trim($_POST['secret'][$id]);
|
$secret = trim($_POST['secret'][$id]);
|
||||||
$key = trim($_POST['key'][$id]);
|
$key = trim($_POST['key'][$id]);
|
||||||
//$applicationname = (!empty($_POST['applicationname']) ? Strings::escapeTags(trim($_POST['applicationname'][$id])):'');
|
//$applicationname = (!empty($_POST['applicationname']) ? Strings::escapeTags(trim($_POST['applicationname'][$id])):'');
|
||||||
if ($sitename != '' &&
|
if (
|
||||||
|
$sitename != '' &&
|
||||||
$apiurl != '' &&
|
$apiurl != '' &&
|
||||||
$secret != '' &&
|
$secret != '' &&
|
||||||
$key != '' &&
|
$key != '' &&
|
||||||
empty($_POST['delete'][$id])) {
|
empty($_POST['delete'][$id])
|
||||||
|
) {
|
||||||
|
|
||||||
$sites[] = [
|
$sites[] = [
|
||||||
'sitename' => $sitename,
|
'sitename' => $sitename,
|
||||||
|
|
|
@ -477,13 +477,13 @@ function tumblr_hook_fork(array &$b)
|
||||||
|
|
||||||
if (DI::pConfig()->get($post['uid'], 'tumblr', 'import')) {
|
if (DI::pConfig()->get($post['uid'], 'tumblr', 'import')) {
|
||||||
// Don't post if it isn't a reply to a tumblr post
|
// Don't post if it isn't a reply to a tumblr post
|
||||||
if (($post['parent'] != $post['id']) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::TUMBLR])) {
|
if (($post['gravity'] != Item::GRAVITY_PARENT) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::TUMBLR])) {
|
||||||
Logger::notice('No tumblr parent found', ['item' => $post['id']]);
|
Logger::notice('No tumblr parent found', ['item' => $post['id']]);
|
||||||
$b['execute'] = false;
|
$b['execute'] = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} elseif (!strstr($post['postopts'] ?? '', 'tumblr') || ($post['parent'] != $post['id']) || $post['private']) {
|
} elseif (!strstr($post['postopts'] ?? '', 'tumblr') || ($post['gravity'] != Item::GRAVITY_PARENT) || ($post['private'] == Item::PRIVATE)) {
|
||||||
DI::logger()->info('Activities are never exported when we don\'t import the tumblr timeline', ['uid' => $post['uid']]);
|
DI::logger()->info('Post will not be exported', ['uid' => $post['uid'], 'postopts' => $post['postopts'], 'gravity' => $post['gravity'], 'private' => $post['private']]);
|
||||||
$b['execute'] = false;
|
$b['execute'] = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -491,15 +491,11 @@ function tumblr_hook_fork(array &$b)
|
||||||
|
|
||||||
function tumblr_post_local(array &$b)
|
function tumblr_post_local(array &$b)
|
||||||
{
|
{
|
||||||
if ($b['edit']) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($b['private'] || $b['parent']) {
|
if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -575,7 +571,7 @@ function tumblr_send(array &$b)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
} elseif ($b['private'] || !strstr($b['postopts'], 'tumblr')) {
|
} elseif (($b['private'] == Item::PRIVATE) || !strstr($b['postopts'], 'tumblr')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -170,7 +170,7 @@ function twitter_hook_fork(array &$b)
|
||||||
$post = $b['data'];
|
$post = $b['data'];
|
||||||
|
|
||||||
if (
|
if (
|
||||||
$post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
|
$post['deleted'] || ($post['private'] == Item::PRIVATE) || ($post['created'] !== $post['edited']) ||
|
||||||
!strstr($post['postopts'], 'twitter') || ($post['gravity'] != Item::GRAVITY_PARENT)
|
!strstr($post['postopts'], 'twitter') || ($post['gravity'] != Item::GRAVITY_PARENT)
|
||||||
) {
|
) {
|
||||||
$b['execute'] = false;
|
$b['execute'] = false;
|
||||||
|
@ -184,7 +184,7 @@ function twitter_post_local(array &$b)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($b['edit'] || $b['private'] || $b['parent']) {
|
if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -211,7 +211,7 @@ function twitter_post_hook(array &$b)
|
||||||
{
|
{
|
||||||
DI::logger()->debug('Invoke post hook', $b);
|
DI::logger()->debug('Invoke post hook', $b);
|
||||||
|
|
||||||
if (($b['gravity'] != Item::GRAVITY_PARENT) || !strstr($b['postopts'], 'twitter') || $b['private'] || $b['deleted'] || ($b['created'] !== $b['edited'])) {
|
if (($b['gravity'] != Item::GRAVITY_PARENT) || !strstr($b['postopts'], 'twitter') || ($b['private'] == Item::PRIVATE) || $b['deleted'] || ($b['created'] !== $b['edited'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -108,8 +108,8 @@ function wppost_hook_fork(array &$b)
|
||||||
$post = $b['data'];
|
$post = $b['data'];
|
||||||
|
|
||||||
if (
|
if (
|
||||||
$post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
|
$post['deleted'] || ($post['private'] == Item::PRIVATE) || ($post['created'] !== $post['edited']) ||
|
||||||
!strstr($post['postopts'] ?? '', 'wppost') || ($post['parent'] != $post['id'])
|
!strstr($post['postopts'] ?? '', 'wppost') || ($post['gravity'] != Item::GRAVITY_PARENT)
|
||||||
) {
|
) {
|
||||||
$b['execute'] = false;
|
$b['execute'] = false;
|
||||||
return;
|
return;
|
||||||
|
@ -118,18 +118,12 @@ function wppost_hook_fork(array &$b)
|
||||||
|
|
||||||
function wppost_post_local(array &$b)
|
function wppost_post_local(array &$b)
|
||||||
{
|
{
|
||||||
|
|
||||||
// This can probably be changed to allow editing by pointing to a different API endpoint
|
|
||||||
|
|
||||||
if ($b['edit']) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($b['private'] || $b['parent']) {
|
// This can probably be changed to allow editing by pointing to a different API endpoint
|
||||||
|
if ($b['edit'] || ($b['private'] == Item::PRIVATE) || ($b['gravity'] != Item::GRAVITY_PARENT)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -152,12 +146,9 @@ function wppost_post_local(array &$b)
|
||||||
$b['postopts'] .= 'wppost';
|
$b['postopts'] .= 'wppost';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function wppost_send(array &$b)
|
function wppost_send(array &$b)
|
||||||
{
|
{
|
||||||
if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
|
if ($b['deleted'] || ($b['private'] == Item::PRIVATE) || ($b['created'] !== $b['edited'])) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue