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

Merge pull request #683 from MrPetovan/bug/4584-fix-twitter-gif-still-image

Browse source 
Restore source storing for Twitter conversations
This commit is contained in:
Michael Vogel 2018-08-05 14:05:03 +02:00 committed by GitHub
parent e79d738437 6f0b79456e
commit ca325fbd63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 60 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
twitter/twitter.php
View file

@ -73,6 +73,7 @@ use Friendica\Core\PConfig;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Model\GContact; use Friendica\Model\GContact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Item; use Friendica\Model\Item;
@ -95,48 +96,48 @@ define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
function twitter_install() function twitter_install()
{ {
// we need some hooks, for the configuration and for sending tweets // we need some hooks, for the configuration and for sending tweets
Addon::registerHook('load_config', 'addon/twitter/twitter.php', 'twitter_load_config'); Addon::registerHook('load_config' , __FILE__, 'twitter_load_config');
Addon::registerHook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings'); Addon::registerHook('connector_settings' , __FILE__, 'twitter_settings');
Addon::registerHook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post'); Addon::registerHook('connector_settings_post', __FILE__, 'twitter_settings_post');
Addon::registerHook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local'); Addon::registerHook('post_local' , __FILE__, 'twitter_post_local');
Addon::registerHook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook'); Addon::registerHook('notifier_normal' , __FILE__, 'twitter_post_hook');
Addon::registerHook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets'); Addon::registerHook('jot_networks' , __FILE__, 'twitter_jot_nets');
Addon::registerHook('cron', 'addon/twitter/twitter.php', 'twitter_cron'); Addon::registerHook('cron' , __FILE__, 'twitter_cron');
Addon::registerHook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook'); Addon::registerHook('queue_predeliver' , __FILE__, 'twitter_queue_hook');
Addon::registerHook('follow', 'addon/twitter/twitter.php', 'twitter_follow'); Addon::registerHook('follow' , __FILE__, 'twitter_follow');
Addon::registerHook('expire', 'addon/twitter/twitter.php', 'twitter_expire'); Addon::registerHook('expire' , __FILE__, 'twitter_expire');
Addon::registerHook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body'); Addon::registerHook('prepare_body' , __FILE__, 'twitter_prepare_body');
Addon::registerHook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification'); Addon::registerHook('check_item_notification', __FILE__, 'twitter_check_item_notification');
logger("installed twitter"); logger("installed twitter");
} }
function twitter_uninstall() function twitter_uninstall()
{ {
Addon::unregisterHook('load_config', 'addon/twitter/twitter.php', 'twitter_load_config'); Addon::unregisterHook('load_config' , __FILE__, 'twitter_load_config');
Addon::unregisterHook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings'); Addon::unregisterHook('connector_settings' , __FILE__, 'twitter_settings');
Addon::unregisterHook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post'); Addon::unregisterHook('connector_settings_post', __FILE__, 'twitter_settings_post');
Addon::unregisterHook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local'); Addon::unregisterHook('post_local' , __FILE__, 'twitter_post_local');
Addon::unregisterHook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook'); Addon::unregisterHook('notifier_normal' , __FILE__, 'twitter_post_hook');
Addon::unregisterHook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets'); Addon::unregisterHook('jot_networks' , __FILE__, 'twitter_jot_nets');
Addon::unregisterHook('cron', 'addon/twitter/twitter.php', 'twitter_cron'); Addon::unregisterHook('cron' , __FILE__, 'twitter_cron');
Addon::unregisterHook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook'); Addon::unregisterHook('queue_predeliver' , __FILE__, 'twitter_queue_hook');
Addon::unregisterHook('follow', 'addon/twitter/twitter.php', 'twitter_follow'); Addon::unregisterHook('follow' , __FILE__, 'twitter_follow');
Addon::unregisterHook('expire', 'addon/twitter/twitter.php', 'twitter_expire'); Addon::unregisterHook('expire' , __FILE__, 'twitter_expire');
Addon::unregisterHook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body'); Addon::unregisterHook('prepare_body' , __FILE__, 'twitter_prepare_body');
Addon::unregisterHook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification'); Addon::unregisterHook('check_item_notification', __FILE__, 'twitter_check_item_notification');
// old setting - remove only // old setting - remove only
Addon::unregisterHook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook'); Addon::unregisterHook('post_local_end' , __FILE__, 'twitter_post_hook');
Addon::unregisterHook('addon_settings', 'addon/twitter/twitter.php', 'twitter_settings'); Addon::unregisterHook('addon_settings' , __FILE__, 'twitter_settings');
Addon::unregisterHook('addon_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post'); Addon::unregisterHook('addon_settings_post', __FILE__, 'twitter_settings_post');
} }
function twitter_load_config(App $a) function twitter_load_config(App $a)
{ {
$a->loadConfigFile(__DIR__. '/config/twitter.ini.php'); $a->loadConfigFile(__DIR__ . '/config/twitter.ini.php');
} }
function twitter_check_item_notification(App $a, &$notification_data) function twitter_check_item_notification(App $a, array &$notification_data)
{ {
$own_id = PConfig::get($notification_data["uid"], 'twitter', 'own_id'); $own_id = PConfig::get($notification_data["uid"], 'twitter', 'own_id');
@ -150,7 +151,7 @@ function twitter_check_item_notification(App $a, &$notification_data)
} }
} }
function twitter_follow(App $a, &$contact) function twitter_follow(App $a, array &$contact)
{ {
logger("twitter_follow: Check if contact is twitter contact. " . $contact["url"], LOGGER_DEBUG); logger("twitter_follow: Check if contact is twitter contact. " . $contact["url"], LOGGER_DEBUG);
@ -204,7 +205,7 @@ function twitter_jot_nets(App $a, &$b)
} }
} }
function twitter_settings_post(App $a, $post) function twitter_settings_post(App $a)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
@ -385,7 +386,7 @@ function twitter_settings(App $a, &$s)
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
} }
function twitter_post_local(App $a, &$b) function twitter_post_local(App $a, array &$b)
{ {
if ($b['edit']) { if ($b['edit']) {
return; return;
@ -445,7 +446,7 @@ function twitter_action(App $a, $uid, $pid, $action)
logger("twitter_action '" . $action . "' send, result: " . print_r($result, true), LOGGER_DEBUG); logger("twitter_action '" . $action . "' send, result: " . print_r($result, true), LOGGER_DEBUG);
} }
function twitter_post_hook(App $a, &$b) function twitter_post_hook(App $a, array &$b)
{ {
// Post to Twitter // Post to Twitter
if (!PConfig::get($b["uid"], 'twitter', 'import') if (!PConfig::get($b["uid"], 'twitter', 'import')
@ -657,7 +658,7 @@ function twitter_addon_admin(App $a, &$o)
]); ]);
} }
function twitter_cron(App $a, $b) function twitter_cron(App $a)
{ {
$last = Config::get('twitter', 'last_poll'); $last = Config::get('twitter', 'last_poll');
@ -725,7 +726,7 @@ function twitter_cron(App $a, $b)
Config::set('twitter', 'last_poll', time()); Config::set('twitter', 'last_poll', time());
} }
function twitter_expire(App $a, $b) function twitter_expire(App $a)
{ {
$days = Config::get('twitter', 'expire'); $days = Config::get('twitter', 'expire');
@ -760,7 +761,7 @@ function twitter_expire(App $a, $b)
logger('twitter_expire: expire_end'); logger('twitter_expire: expire_end');
} }
function twitter_prepare_body(App $a, &$b) function twitter_prepare_body(App $a, array &$b)
{ {
if ($b["item"]["network"] != NETWORK_TWITTER) { if ($b["item"]["network"] != NETWORK_TWITTER) {
return; return;
@ -809,12 +810,13 @@ function twitter_prepare_body(App $a, &$b)
*/ */
function twitter_do_mirrorpost(App $a, $uid, $post) function twitter_do_mirrorpost(App $a, $uid, $post)
{ {
$datarray["api_source"] = true; $datarray['api_source'] = true;
$datarray["profile_uid"] = $uid; $datarray['profile_uid'] = $uid;
$datarray["extid"] = NETWORK_TWITTER; $datarray['extid'] = NETWORK_TWITTER;
$datarray['message_id'] = Item::newURI($uid, NETWORK_TWITTER . ":" . $post->id); $datarray['message_id'] = Item::newURI($uid, NETWORK_TWITTER . ':' . $post->id);
// $datarray['object'] = json_encode($post); // Activate for debugging $datarray['protocol'] = Conversation::PARCEL_TWITTER;
$datarray["title"] = ""; $datarray['source'] = json_encode($post);
$datarray['title'] = '';
if (!empty($post->retweeted_status)) { if (!empty($post->retweeted_status)) {
// We don't support nested shares, so we mustn't show quotes as shares on retweets // We don't support nested shares, so we mustn't show quotes as shares on retweets
@ -824,7 +826,7 @@ function twitter_do_mirrorpost(App $a, $uid, $post)
$item['author-name'], $item['author-name'],
$item['author-link'], $item['author-link'],
$item['author-avatar'], $item['author-avatar'],
"", '',
$item['created'], $item['created'],
$item['plink'] $item['plink']
); );
@ -836,15 +838,15 @@ function twitter_do_mirrorpost(App $a, $uid, $post)
$datarray['body'] = $item['body']; $datarray['body'] = $item['body'];
} }
$datarray["source"] = $item['app']; $datarray['source'] = $item['app'];
$datarray["verb"] = $item['verb']; $datarray['verb'] = $item['verb'];
if (isset($item["location"])) { if (isset($item['location'])) {
$datarray["location"] = $item["location"]; $datarray['location'] = $item['location'];
} }
if (isset($item["coord"])) { if (isset($item['coord'])) {
$datarray["coord"] = $item["coord"]; $datarray['coord'] = $item['coord'];
} }
return $datarray; return $datarray;
@ -919,7 +921,7 @@ function twitter_fetchtimeline(App $a, $uid)
PConfig::set($uid, 'twitter', 'lastid', $lastid); PConfig::set($uid, 'twitter', 'lastid', $lastid);
} }
function twitter_queue_hook(App $a, &$b) function twitter_queue_hook(App $a)
{ {
$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'", $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
DBA::escape(NETWORK_TWITTER) DBA::escape(NETWORK_TWITTER)
@ -1272,7 +1274,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
* *
* @return $picture string Image URL or empty string * @return $picture string Image URL or empty string
*/ */
function twitter_media_entities($post, &$postarray) function twitter_media_entities($post, array &$postarray)
{ {
// There are no media entities? So we quit. // There are no media entities? So we quit.
if (empty($post->extended_entities->media)) { if (empty($post->extended_entities->media)) {
@ -1331,14 +1333,15 @@ function twitter_media_entities($post, &$postarray)
return ""; return "";
} }
function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_existing_contact, $noquote) function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $only_existing_contact, $noquote)
{ {
$postarray = []; $postarray = [];
$postarray['network'] = NETWORK_TWITTER; $postarray['network'] = NETWORK_TWITTER;
$postarray['uid'] = $uid; $postarray['uid'] = $uid;
$postarray['wall'] = 0; $postarray['wall'] = 0;
$postarray['uri'] = "twitter::" . $post->id_str; $postarray['uri'] = "twitter::" . $post->id_str;
// $postarray['object'] = json_encode($post); // Activate for debugging $postarray['protocol'] = Conversation::PARCEL_TWITTER;
$postarray['source'] = json_encode($post);
// Don't import our own comments // Don't import our own comments
if (DBA::exists('item', ['extid' => $postarray['uri'], 'uid' => $uid])) { if (DBA::exists('item', ['extid' => $postarray['uri'], 'uid' => $uid])) {
@ -1462,7 +1465,7 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
if (!empty($post->retweeted_status)) { if (!empty($post->retweeted_status)) {
$retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote); $retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote);
//$retweet['object'] = $postarray['object']; // Activate for debugging $retweet['source'] = $postarray['source'];
$retweet['private'] = $postarray['private']; $retweet['private'] = $postarray['private'];
$retweet['allow_cid'] = $postarray['allow_cid']; $retweet['allow_cid'] = $postarray['allow_cid'];
$retweet['contact-id'] = $postarray['contact-id']; $retweet['contact-id'] = $postarray['contact-id'];
@ -1493,7 +1496,7 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
return $postarray; return $postarray;
} }
function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection, $self, $own_id) function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection, array $self)
{ {
logger("twitter_fetchparentposts: Fetching for user " . $uid . " and post " . $post->id_str, LOGGER_DEBUG); logger("twitter_fetchparentposts: Fetching for user " . $uid . " and post " . $post->id_str, LOGGER_DEBUG);
@ -1652,7 +1655,7 @@ function twitter_fetchhometimeline(App $a, $uid)
} }
if ($post->in_reply_to_status_id_str != "") { if ($post->in_reply_to_status_id_str != "") {
twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id); twitter_fetchparentposts($a, $uid, $post, $connection, $self);
} }
$postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true, false); $postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true, false);
@ -1714,7 +1717,7 @@ function twitter_fetchhometimeline(App $a, $uid)
} }
if ($post->in_reply_to_status_id_str != "") { if ($post->in_reply_to_status_id_str != "") {
twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id); twitter_fetchparentposts($a, $uid, $post, $connection, $self);
} }
$postarray = twitter_createpost($a, $uid, $post, $self, false, false, false); $postarray = twitter_createpost($a, $uid, $post, $self, false, false, false);