friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

Twitter: the connector now works as a posting only connector #1410

Merged
MrPetovan merged 7 commits from heluecht/friendica-addons:twitter into develop 2023-08-10 23:51:37 +02:00
Conversation 0 Commits 7 Files changed 209 +16 -14
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 15ea39d830 - Show all commits

30
twitter/twitter.php
View file

@ -56,13 +56,13 @@ const TWITTER_MAX_IMAGE_SIZE = 500000;
function twitter_install() function twitter_install()
{ {
Hook::register('load_config' , __FILE__, 'twitter_load_config'); Hook::register('load_config', __FILE__, 'twitter_load_config');
Hook::register('connector_settings' , __FILE__, 'twitter_settings'); Hook::register('connector_settings', __FILE__, 'twitter_settings');
Hook::register('connector_settings_post', __FILE__, 'twitter_settings_post'); Hook::register('connector_settings_post', __FILE__, 'twitter_settings_post');
Hook::register('hook_fork' , __FILE__, 'twitter_hook_fork'); Hook::register('hook_fork', __FILE__, 'twitter_hook_fork');
Hook::register('post_local' , __FILE__, 'twitter_post_local'); Hook::register('post_local', __FILE__, 'twitter_post_local');
Hook::register('notifier_normal' , __FILE__, 'twitter_post_hook'); Hook::register('notifier_normal', __FILE__, 'twitter_post_hook');
Hook::register('jot_networks' , __FILE__, 'twitter_jot_nets'); Hook::register('jot_networks', __FILE__, 'twitter_jot_nets');
} }
function twitter_load_config(ConfigFileManager $loader) function twitter_load_config(ConfigFileManager $loader)
@ -124,7 +124,7 @@ function twitter_settings(array &$data)
'$api_secret' => ['twitter-api-secret', DI::l10n()->t('API Secret'), $api_secret], '$api_secret' => ['twitter-api-secret', DI::l10n()->t('API Secret'), $api_secret],
'$access_token' => ['twitter-access-token', DI::l10n()->t('Access Token'), $access_token], '$access_token' => ['twitter-access-token', DI::l10n()->t('Access Token'), $access_token],
'$access_secret' => ['twitter-access-secret', DI::l10n()->t('Access Secret'), $access_secret], '$access_secret' => ['twitter-access-secret', DI::l10n()->t('Access Secret'), $access_secret],
'$help' => DI::l10n()->t('Each user needs to register their own app to be able to post to Twitter. Please visit https://developer.twitter.com/en/portal/projects-and-apps to register a project. Inside the project you then have to register an app. You will find the needed data for the connector on the page "Keys and token" in the app settings.'), '$help' => DI::l10n()->t('Each user needs to register their own app to be able to post to Twitter. Please visit https://developer.twitter.com/en/portal/projects-and-apps to register a project. Inside the project you then have to register an app. You will find the needed data for the connector on the page "Keys and token" in the app settings.'),
]); ]);
$data = [ $data = [
@ -146,8 +146,10 @@ function twitter_hook_fork(array &$b)
$post = $b['data']; $post = $b['data'];
if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) || if (
!strstr($post['postopts'], 'twitter') || ($post['gravity'] != Item::GRAVITY_PARENT)) { $post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
!strstr($post['postopts'], 'twitter') || ($post['gravity'] != Item::GRAVITY_PARENT)
) {
$b['execute'] = false; $b['execute'] = false;
return; return;
} }
@ -223,9 +225,9 @@ function twitter_post_hook(array &$b)
} catch (\Throwable $th) { } catch (\Throwable $th) {
Logger::warning('Error while uploading image', ['image' => $image, 'code' => $th->getCode(), 'message' => $th->getMessage()]); Logger::warning('Error while uploading image', ['image' => $image, 'code' => $th->getCode(), 'message' => $th->getMessage()]);
// Currently don't defer to avoid a loop. // Currently don't defer to avoid a loop.
//Worker::defer(); //Worker::defer();
return; return;
} }
} }
} }
@ -305,7 +307,7 @@ function twitter_upload_image(int $uid, array $image)
function twitter_post(int $uid, string $url, string $type, array $data): stdClass function twitter_post(int $uid, string $url, string $type, array $data): stdClass
{ {
$stack = HandlerStack::create(); $stack = HandlerStack::create();
$middleware = new Oauth1([ $middleware = new Oauth1([
'consumer_key' => DI::pConfig()->get($uid, 'twitter', 'api_key'), 'consumer_key' => DI::pConfig()->get($uid, 'twitter', 'api_key'),
'consumer_secret' => DI::pConfig()->get($uid, 'twitter', 'api_secret'), 'consumer_secret' => DI::pConfig()->get($uid, 'twitter', 'api_secret'),
@ -314,7 +316,7 @@ function twitter_post(int $uid, string $url, string $type, array $data): stdClas
]); ]);
$stack->push($middleware); $stack->push($middleware);
$client = new Client([ $client = new Client([
'handler' => $stack 'handler' => $stack
]); ]);