heluecht/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request '"getAttachedData" has been removed' (#1359) from heluecht/friendica-addons:no-attached-data into develop

Browse source 
Reviewed-on: friendica/friendica-addons#1359
This commit is contained in:
Hypolite Petovan 2023-03-06 16:06:13 +01:00
parent b46e8ec4b2 f5d1316212
commit 2805395f77
2 changed files with 103 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

141
tumblr/tumblr.php
View file

@ -9,13 +9,12 @@
require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'tumblroauth.php'; require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'tumblroauth.php';
use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Database\DBA;
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;
@ -34,7 +33,9 @@ function tumblr_install()
* existence of this method is checked to figure out if the addon offers a * existence of this method is checked to figure out if the addon offers a
* module. * module.
*/ */
function tumblr_module() {} function tumblr_module()
{
}
function tumblr_content() function tumblr_content()
{ {
@ -45,11 +46,11 @@ function tumblr_content()
if (isset(DI::args()->getArgv()[1])) { if (isset(DI::args()->getArgv()[1])) {
switch (DI::args()->getArgv()[1]) { switch (DI::args()->getArgv()[1]) {
case "connect": case 'connect':
$o = tumblr_connect(); $o = tumblr_connect();
break; break;
case "callback": case 'callback':
$o = tumblr_callback(); $o = tumblr_callback();
break; break;
@ -66,7 +67,7 @@ function tumblr_content()
function tumblr_addon_admin(string &$o) function tumblr_addon_admin(string &$o)
{ {
$t = Renderer::getMarkupTemplate( "admin.tpl", "addon/tumblr/" ); $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/tumblr/');
$o = Renderer::replaceMacros($t, [ $o = Renderer::replaceMacros($t, [
'$submit' => DI::l10n()->t('Save Settings'), '$submit' => DI::l10n()->t('Save Settings'),
@ -87,9 +88,6 @@ function tumblr_connect()
// Start a session. This is necessary to hold on to a few keys the callback script will also need // Start a session. This is necessary to hold on to a few keys the callback script will also need
session_start(); session_start();
// Include the TumblrOAuth library
//require_once('addon/tumblr/tumblroauth/tumblroauth.php');
// Define the needed keys // Define the needed keys
$consumer_key = DI::config()->get('tumblr', 'consumer_key'); $consumer_key = DI::config()->get('tumblr', 'consumer_key');
$consumer_secret = DI::config()->get('tumblr', 'consumer_secret'); $consumer_secret = DI::config()->get('tumblr', 'consumer_secret');
@ -141,7 +139,6 @@ function tumblr_callback()
{ {
// Start a session, load the library // Start a session, load the library
session_start(); session_start();
//require_once('addon/tumblr/tumblroauth/tumblroauth.php');
// Define the needed keys // Define the needed keys
$consumer_key = DI::config()->get('tumblr', 'consumer_key'); $consumer_key = DI::config()->get('tumblr', 'consumer_key');
@ -174,7 +171,7 @@ function tumblr_callback()
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'oauth_token', $access_token['oauth_token']); DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'oauth_token', $access_token['oauth_token']);
DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'oauth_token_secret', $access_token['oauth_token_secret']); DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'oauth_token_secret', $access_token['oauth_token_secret']);
$o = DI::l10n()->t("You are now authenticated to tumblr."); $o = DI::l10n()->t('You are now authenticated to tumblr.');
$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;
@ -219,7 +216,7 @@ function tumblr_settings(array &$data)
$userinfo = $tum_oauth->get('user/info'); $userinfo = $tum_oauth->get('user/info');
$blogs = array_map(function ($blog) { $blogs = array_map(function ($blog) {
return substr(str_replace(["http://", "https://"], ["", ""], $blog->url), 0, -1); return substr(str_replace(['http://', 'https://'], ['', ''], $blog->url), 0, -1);
}, $userinfo->response->user->blogs); }, $userinfo->response->user->blogs);
$page_select = ['tumblr-page', DI::l10n()->t('Post to page:'), $page, '', $blogs]; $page_select = ['tumblr-page', DI::l10n()->t('Post to page:'), $page, '', $blogs];
@ -265,8 +262,10 @@ function tumblr_hook_fork(array &$b)
$post = $b['data']; $post = $b['data'];
if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) || if (
!strstr($post['postopts'] ?? '', 'tumblr') || ($post['parent'] != $post['id'])) { $post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
!strstr($post['postopts'] ?? '', 'tumblr') || ($post['parent'] != $post['id'])
) {
$b['execute'] = false; $b['execute'] = false;
return; return;
} }
@ -307,10 +306,8 @@ function tumblr_post_local(array &$b)
$b['postopts'] .= 'tumblr'; $b['postopts'] .= 'tumblr';
} }
function tumblr_send(array &$b)
{
function tumblr_send(array &$b) {
if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) { if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
return; return;
@ -320,22 +317,15 @@ function tumblr_send(array &$b) {
return; return;
} }
if ($b['parent'] != $b['id']) { if ($b['gravity'] != Item::GRAVITY_PARENT) {
return;
}
// Dont't post if the post doesn't belong to us.
// This is a check for forum postings
$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
if ($b['contact-id'] != $self['id']) {
return; return;
} }
$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b)); $b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
$oauth_token = DI::pConfig()->get($b['uid'], "tumblr", "oauth_token"); $oauth_token = DI::pConfig()->get($b['uid'], 'tumblr', 'oauth_token');
$oauth_token_secret = DI::pConfig()->get($b['uid'], "tumblr", "oauth_token_secret"); $oauth_token_secret = DI::pConfig()->get($b['uid'], 'tumblr', 'oauth_token_secret');
$page = DI::pConfig()->get($b['uid'], "tumblr", "page"); $page = DI::pConfig()->get($b['uid'], 'tumblr', 'page');
$tmbl_blog = 'blog/' . $page . '/post'; $tmbl_blog = 'blog/' . $page . '/post';
if ($oauth_token && $oauth_token_secret && $tmbl_blog) { if ($oauth_token && $oauth_token_secret && $tmbl_blog) {
@ -353,7 +343,12 @@ function tumblr_send(array &$b) {
$title = trim($b['title']); $title = trim($b['title']);
$siteinfo = BBCode::getAttachedData($b["body"]); $media = Post\Media::getByURIId($b['uri-id'], [Post\Media::HTML, Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::IMAGE]);
$photo = array_search(Post\Media::IMAGE, array_column($media, 'type'));
$link = array_search(Post\Media::HTML, array_column($media, 'type'));
$audio = array_search(Post\Media::AUDIO, array_column($media, 'type'));
$video = array_search(Post\Media::VIDEO, array_column($media, 'type'));
$params = [ $params = [
'state' => 'published', 'state' => 'published',
@ -362,65 +357,50 @@ function tumblr_send(array &$b) {
'format' => 'html', 'format' => 'html',
]; ];
if (!isset($siteinfo["type"])) { $body = BBCode::removeShareInformation($b['body']);
$siteinfo["type"] = "";
if ($photo != false) {
$params['type'] = 'photo';
if (!empty($body)) {
$params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
} elseif (!empty($params['caption'])) {
$params['caption'] = $media[$photo]['description'];
} }
$params['source'] = $media[$photo]['url'];
if (($title == "") && isset($siteinfo["title"])) { } elseif ($link != false) {
$title = $siteinfo["title"]; $params['type'] = 'link';
} $params['title'] = $media[$link]['name'];
$params['url'] = $media[$link]['url'];
if (isset($siteinfo["text"])) {
$body = $siteinfo["text"];
} else {
$body = BBCode::removeShareInformation($b["body"]);
}
switch ($siteinfo["type"]) {
case "photo":
$params['type'] = "photo";
$params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);;
if (isset($siteinfo["url"])) {
$params['link'] = $siteinfo["url"];
}
$params['source'] = $siteinfo["image"];
break;
case "link":
$params['type'] = "link";
$params['title'] = $title;
$params['url'] = $siteinfo["url"];
$params['description'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS); $params['description'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
break;
case "audio": if (!empty($media[$link]['preview'])) {
$params['type'] = "audio"; $params['thumbnail'] = $media[$link]['preview'];
$params['external_url'] = $siteinfo["url"]; }
if (!empty($media[$link]['description'])) {
$params['excerpt'] = $media[$link]['description'];
}
if (!empty($media[$link]['author-name'])) {
$params['author'] = $media[$link]['author-name'];
} elseif (!empty($media[$link]['publisher-name'])) {
$params['author'] = $media[$link]['publisher-name'];
}
} elseif ($audio != false) {
$params['type'] = 'audio';
$params['external_url'] = $media[$audio]['url'];
$params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS); $params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
break; } elseif ($video != false) {
$params['type'] = 'video';
case "video": $params['embed'] = $media[$video]['url'];
$params['type'] = "video";
$params['embed'] = $siteinfo["url"];
$params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS); $params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
break; } else {
$params['type'] = 'text';
default:
$params['type'] = "text";
$params['title'] = $title; $params['title'] = $title;
$params['body'] = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS); $params['body'] = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS);
break;
} }
if (isset($params['caption']) && (trim($title) != "")) { if (isset($params['caption']) && (trim($title) != '')) {
$params['caption'] = '<h1>'.$title."</h1>". $params['caption'] = '<h1>' . $title . '</h1>' .
"<p>".$params['caption']."</p>"; '<p>' . $params['caption'] . '</p>';
}
if (empty($params['caption']) && !empty($siteinfo["description"])) {
$params['caption'] = BBCode::convertForUriId($b['uri-id'], "[quote]" . $siteinfo["description"] . "[/quote]", BBCode::CONNECTORS);
} }
$consumer_key = DI::config()->get('tumblr', 'consumer_key'); $consumer_key = DI::config()->get('tumblr', 'consumer_key');
@ -432,7 +412,6 @@ function tumblr_send(array &$b) {
$x = $tum_oauth->post($tmbl_blog, $params); $x = $tum_oauth->post($tmbl_blog, $params);
$ret_code = $tum_oauth->http_code; $ret_code = $tum_oauth->http_code;
//print_r($params);
if ($ret_code == 201) { if ($ret_code == 201) {
Logger::notice('tumblr_send: success'); Logger::notice('tumblr_send: success');
} elseif ($ret_code == 403) { } elseif ($ret_code == 403) {

29
wppost/wppost.php
View file

@ -6,7 +6,6 @@
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike> * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*/ */
use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML; use Friendica\Content\Text\HTML;
use Friendica\Core\Hook; use Friendica\Core\Hook;
@ -14,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;
use Friendica\Util\XML; use Friendica\Util\XML;
@ -106,14 +106,17 @@ function wppost_hook_fork(array &$b)
$post = $b['data']; $post = $b['data'];
if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) || if (
!strstr($post['postopts'] ?? '', 'wppost') || ($post['parent'] != $post['id'])) { $post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
!strstr($post['postopts'] ?? '', 'wppost') || ($post['parent'] != $post['id'])
) {
$b['execute'] = false; $b['execute'] = false;
return; return;
} }
} }
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 // This can probably be changed to allow editing by pointing to a different API endpoint
@ -161,7 +164,7 @@ function wppost_send(array &$b)
return; return;
} }
if($b['parent'] != $b['id']) { if ($b['gravity'] != Item::GRAVITY_PARENT) {
return; return;
} }
@ -187,15 +190,7 @@ function wppost_send(array &$b)
if (intval(DI::pConfig()->get($b['uid'], 'wppost', 'shortcheck'))) { if (intval(DI::pConfig()->get($b['uid'], 'wppost', 'shortcheck'))) {
// Checking, if its a post that is worth a blog post // Checking, if its a post that is worth a blog post
$postentry = false; $postentry = (bool)Post\Media::getByURIId($b['uri-id'], [Post\Media::HTML, Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::IMAGE]);
$siteinfo = BBCode::getAttachedData($b["body"]);
// Is it a link to an aricle, a video or a photo?
if (isset($siteinfo["type"])) {
if (in_array($siteinfo["type"], ["link", "audio", "video", "photo"])) {
$postentry = true;
}
}
// Does it have a title? // Does it have a title?
if ($wptitle != "") { if ($wptitle != "") {
@ -215,9 +210,9 @@ function wppost_send(array &$b)
// If the title is empty then try to guess // If the title is empty then try to guess
if ($wptitle == '') { if ($wptitle == '') {
// Fetch information about the post // Fetch information about the post
$siteinfo = BBCode::getAttachedData($b["body"]); $media = Post\Media::getByURIId($b['uri-id'], [Post\Media::HTML]);
if (isset($siteinfo["title"])) { if (!empty($media) && !empty($media[0]['name']) && ($media[0]['name'] != $media[0]['url'])) {
$wptitle = $siteinfo["title"]; $wptitle = $media[0]['name'];
} }
// If no bookmark is found then take the first line // If no bookmark is found then take the first line