function twitter_install() {
// we need some hooks, for the configuration and for sending tweets
- register_hook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings');
+ register_hook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings');
register_hook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
register_hook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local');
register_hook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook');
register_hook('cron', 'addon/twitter/twitter.php', 'twitter_cron');
register_hook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
register_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
+ register_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
+ register_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
logger("installed twitter");
}
function twitter_uninstall() {
- unregister_hook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings');
+ unregister_hook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings');
unregister_hook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
unregister_hook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local');
unregister_hook('notifier_normal', 'addon/twitter/twitter.php', 'twitter_post_hook');
unregister_hook('cron', 'addon/twitter/twitter.php', 'twitter_cron');
unregister_hook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
unregister_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
+ unregister_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
+ unregister_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
// old setting - remove only
unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
- unregister_hook('plugin_settings', 'addon/twitter/twitter.php', 'twitter_settings');
+ unregister_hook('plugin_settings', 'addon/twitter/twitter.php', 'twitter_settings');
unregister_hook('plugin_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
}
*/
del_pconfig(local_user(), 'twitter', 'consumerkey');
del_pconfig(local_user(), 'twitter', 'consumersecret');
- del_pconfig(local_user(), 'twitter', 'oauthtoken');
- del_pconfig(local_user(), 'twitter', 'oauthsecret');
- del_pconfig(local_user(), 'twitter', 'post');
- del_pconfig(local_user(), 'twitter', 'post_by_default');
- del_pconfig(local_user(), 'twitter', 'post_taglinks');
+ del_pconfig(local_user(), 'twitter', 'oauthtoken');
+ del_pconfig(local_user(), 'twitter', 'oauthsecret');
+ del_pconfig(local_user(), 'twitter', 'post');
+ del_pconfig(local_user(), 'twitter', 'post_by_default');
del_pconfig(local_user(), 'twitter', 'lastid');
del_pconfig(local_user(), 'twitter', 'mirror_posts');
- del_pconfig(local_user(), 'twitter', 'intelligent_shortening');
del_pconfig(local_user(), 'twitter', 'import');
del_pconfig(local_user(), 'twitter', 'create_user');
del_pconfig(local_user(), 'twitter', 'own_id');
$connection = new TwitterOAuth($ckey, $csecret, $_POST['twitter-token'], $_POST['twitter-token2']);
$token = $connection->getAccessToken( $_POST['twitter-pin'] );
// ok, now that we have the Access Token, save them in the user config
- set_pconfig(local_user(),'twitter', 'oauthtoken', $token['oauth_token']);
+ set_pconfig(local_user(),'twitter', 'oauthtoken', $token['oauth_token']);
set_pconfig(local_user(),'twitter', 'oauthsecret', $token['oauth_token_secret']);
- set_pconfig(local_user(),'twitter', 'post', 1);
- set_pconfig(local_user(),'twitter', 'post_taglinks', 1);
- // reload the Addon Settings page, if we don't do it see Bug #42
- goaway($a->get_baseurl().'/settings/connectors');
+ set_pconfig(local_user(),'twitter', 'post', 1);
+ // reload the Addon Settings page, if we don't do it see Bug #42
+ goaway($a->get_baseurl().'/settings/connectors');
} else {
// if no PIN is supplied in the POST variables, the user has changed the setting
// to post a tweet for every new __public__ posting to the wall
set_pconfig(local_user(),'twitter','post',intval($_POST['twitter-enable']));
- set_pconfig(local_user(),'twitter','post_by_default',intval($_POST['twitter-default']));
- set_pconfig(local_user(),'twitter','post_taglinks',intval($_POST['twitter-sendtaglinks']));
+ set_pconfig(local_user(),'twitter','post_by_default',intval($_POST['twitter-default']));
set_pconfig(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
- set_pconfig(local_user(), 'twitter', 'intelligent_shortening', intval($_POST['twitter-shortening']));
set_pconfig(local_user(), 'twitter', 'import', intval($_POST['twitter-import']));
set_pconfig(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user']));
- info( t('Twitter settings updated.') . EOL);
+
+ if (!intval($_POST['twitter-mirror']))
+ del_pconfig(local_user(),'twitter','lastid');
+
+ info(t('Twitter settings updated.') . EOL);
}}
}
function twitter_settings(&$a,&$s) {
- if(! local_user())
- return;
- $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/twitter/twitter.css' . '" media="all" />' . "\r\n";
+ if(! local_user())
+ return;
+ $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/twitter/twitter.css' . '" media="all" />' . "\r\n";
/***
* 1) Check that we have global consumer key & secret
* 2) If no OAuthtoken & stuff is present, generate button to get some
$csecret = get_config('twitter', 'consumersecret' );
$otoken = get_pconfig(local_user(), 'twitter', 'oauthtoken' );
$osecret = get_pconfig(local_user(), 'twitter', 'oauthsecret' );
- $enabled = get_pconfig(local_user(), 'twitter', 'post');
+ $enabled = get_pconfig(local_user(), 'twitter', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $defenabled = get_pconfig(local_user(),'twitter','post_by_default');
+ $defenabled = get_pconfig(local_user(),'twitter','post_by_default');
$defchecked = (($defenabled) ? ' checked="checked" ' : '');
- $linksenabled = get_pconfig(local_user(),'twitter','post_taglinks');
- $linkschecked = (($linksenabled) ? ' checked="checked" ' : '');
- $mirrorenabled = get_pconfig(local_user(),'twitter','mirror_posts');
- $mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
- $shorteningenabled = get_pconfig(local_user(),'twitter','intelligent_shortening');
- $shorteningchecked = (($shorteningenabled) ? ' checked="checked" ' : '');
- $importenabled = get_pconfig(local_user(),'twitter','import');
- $importchecked = (($importenabled) ? ' checked="checked" ' : '');
- $create_userenabled = get_pconfig(local_user(),'twitter','create_user');
- $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
-
- $globalshortening = get_config('twitter','intelligent_shortening');
+ $mirrorenabled = get_pconfig(local_user(),'twitter','mirror_posts');
+ $mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
+ $importenabled = get_pconfig(local_user(),'twitter','import');
+ $importchecked = (($importenabled) ? ' checked="checked" ' : '');
+ $create_userenabled = get_pconfig(local_user(),'twitter','create_user');
+ $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
+
+ $css = (($enabled) ? '' : '-disabled');
$s .= '<span id="settings_twitter_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
- $s .= '<img class="connector" src="images/twitter.png" /><h3 class="connector">'. t('Twitter Import/Export/Mirror').'</h3>';
+ $s .= '<img class="connector'.$css.'" src="images/twitter.png" /><h3 class="connector">'. t('Twitter Import/Export/Mirror').'</h3>';
$s .= '</span>';
$s .= '<div id="settings_twitter_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
- $s .= '<img class="connector" src="images/twitter.png" /><h3 class="connector">'. t('Twitter Import/Export/Mirror').'</h3>';
+ $s .= '<img class="connector'.$css.'" src="images/twitter.png" /><h3 class="connector">'. t('Twitter Import/Export/Mirror').'</h3>';
$s .= '</span>';
if ( (!$ckey) && (!$csecret) ) {
* which the user can request a PIN to connect the account to a
* account at Twitter.
*/
- require_once('library/twitteroauth.php');
+ require_once('library/twitteroauth.php');
$connection = new TwitterOAuth($ckey, $csecret);
$request_token = $connection->getRequestToken();
$token = $request_token['oauth_token'];
$s .= '<input id="twitter-pin" type="text" name="twitter-pin" />';
$s .= '<input id="twitter-token" type="hidden" name="twitter-token" value="'.$token.'" />';
$s .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="'.$request_token['oauth_token_secret'].'" />';
- $s .= '</div><div class="clear"></div>';
- $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+ $s .= '</div><div class="clear"></div>';
+ $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
} else {
/***
* we have an OAuth key / secret pair for the user
* so let's give a chance to disable the postings to Twitter
*/
- require_once('library/twitteroauth.php');
+ require_once('library/twitteroauth.php');
$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
$details = $connection->get('account/verify_credentials');
$s .= '<div id="twitter-info" ><img id="twitter-avatar" src="'.$details->profile_image_url.'" /><p id="twitter-info-block">'. t('Currently connected to: ') .'<a href="https://twitter.com/'.$details->screen_name.'" target="_twitter">'.$details->screen_name.'</a><br /><em>'.$details->description.'</em></p></div>';
$s .= '<p>'. t('If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') .'</p>';
- if ($a->user['hidewall']) {
- $s .= '<p>'. t('<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') .'</p>';
- }
+ if ($a->user['hidewall']) {
+ $s .= '<p>'. t('<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') .'</p>';
+ }
$s .= '<div id="twitter-enable-wrapper">';
$s .= '<label id="twitter-enable-label" for="twitter-checkbox">'. t('Allow posting to Twitter'). '</label>';
$s .= '<input id="twitter-checkbox" type="checkbox" name="twitter-enable" value="1" ' . $checked . '/>';
- $s .= '<div class="clear"></div>';
- $s .= '<label id="twitter-default-label" for="twitter-default">'. t('Send public postings to Twitter by default') .'</label>';
- $s .= '<input id="twitter-default" type="checkbox" name="twitter-default" value="1" ' . $defchecked . '/>';
$s .= '<div class="clear"></div>';
-
- $s .= '<label id="twitter-mirror-label" for="twitter-mirror">'.t('Mirror all posts from twitter that are no replies').'</label>';
- $s .= '<input id="twitter-mirror" type="checkbox" name="twitter-mirror" value="1" '. $mirrorchecked . '/>';
+ $s .= '<label id="twitter-default-label" for="twitter-default">'. t('Send public postings to Twitter by default') .'</label>';
+ $s .= '<input id="twitter-default" type="checkbox" name="twitter-default" value="1" ' . $defchecked . '/>';
$s .= '<div class="clear"></div>';
- if (!$globalshortening) {
- $s .= '<label id="twitter-shortening-label" for="twitter-shortening">'.t('Shortening method that optimizes the tweet').'</label>';
- $s .= '<input id="twitter-shortening" type="checkbox" name="twitter-shortening" value="1" '. $shorteningchecked . '/>';
- $s .= '<div class="clear"></div>';
-
- $s .= '<label id="twitter-sendtaglinks-label" for="twitter-sendtaglinks">'.t('Send linked #-tags and @-names to Twitter').'</label>';
- $s .= '<input id="twitter-sendtaglinks" type="checkbox" name="twitter-sendtaglinks" value="1" '. $linkschecked . '/>';
- $s .= '<div class="clear"></div>';
- }
+ $s .= '<label id="twitter-mirror-label" for="twitter-mirror">'.t('Mirror all posts from twitter that are no replies').'</label>';
+ $s .= '<input id="twitter-mirror" type="checkbox" name="twitter-mirror" value="1" '. $mirrorchecked . '/>';
+ $s .= '<div class="clear"></div>';
$s .= '</div>';
- $s .= '<label id="twitter-import-label" for="twitter-import">'.t('Import the remote timeline').'</label>';
- $s .= '<input id="twitter-import" type="checkbox" name="twitter-import" value="1" '. $importchecked . '/>';
+ $s .= '<label id="twitter-import-label" for="twitter-import">'.t('Import the remote timeline').'</label>';
+ $s .= '<input id="twitter-import" type="checkbox" name="twitter-import" value="1" '. $importchecked . '/>';
$s .= '<div class="clear"></div>';
- $s .= '<label id="twitter-create_user-label" for="twitter-create_user">'.t('Automatically create contacts').'</label>';
- $s .= '<input id="twitter-create_user" type="checkbox" name="twitter-create_user" value="1" '. $create_userchecked . '/>';
+ $s .= '<label id="twitter-create_user-label" for="twitter-create_user">'.t('Automatically create contacts').'</label>';
+ $s .= '<input id="twitter-create_user" type="checkbox" name="twitter-create_user" value="1" '. $create_userchecked . '/>';
$s .= '<div class="clear"></div>';
$s .= '<div id="twitter-disconnect-wrapper">';
- $s .= '<label id="twitter-disconnect-label" for="twitter-disconnect">'. t('Clear OAuth configuration') .'</label>';
- $s .= '<input id="twitter-disconnect" type="checkbox" name="twitter-disconnect" value="1" />';
+ $s .= '<label id="twitter-disconnect-label" for="twitter-disconnect">'. t('Clear OAuth configuration') .'</label>';
+ $s .= '<input id="twitter-disconnect" type="checkbox" name="twitter-disconnect" value="1" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
}
}
- $s .= '</div><div class="clear"></div>';
+ $s .= '</div><div class="clear"></div>';
}
if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'twitter','post_by_default')))
$twitter_enable = 1;
- if(! $twitter_enable)
- return;
-
- if(strlen($b['postopts']))
- $b['postopts'] .= ',';
- $b['postopts'] .= 'twitter';
- }
-}
-
-if (! function_exists('short_link')) {
-function short_link ($url) {
- require_once('library/slinky.php');
- $slinky = new Slinky( $url );
- $yourls_url = get_config('yourls','url1');
- if ($yourls_url) {
- $yourls_username = get_config('yourls','username1');
- $yourls_password = get_config('yourls', 'password1');
- $yourls_ssl = get_config('yourls', 'ssl1');
- $yourls = new Slinky_YourLS();
- $yourls->set( 'username', $yourls_username );
- $yourls->set( 'password', $yourls_password );
- $yourls->set( 'ssl', $yourls_ssl );
- $yourls->set( 'yourls-url', $yourls_url );
- $slinky->set_cascade( array( $yourls, new Slinky_UR1ca(), new Slinky_Trim(), new Slinky_IsGd(), new Slinky_TinyURL() ) );
- }
- else {
- // setup a cascade of shortening services
- // try to get a short link from these services
- // in the order ur1.ca, trim, id.gd, tinyurl
- $slinky->set_cascade( array( new Slinky_UR1ca(), new Slinky_Trim(), new Slinky_IsGd(), new Slinky_TinyURL() ) );
- }
- return $slinky->short();
-} };
-
-function twitter_shortenmsg($b, $shortlink = false) {
- require_once("include/api.php");
- require_once("include/bbcode.php");
- require_once("include/html2plain.php");
-
- $max_char = 140;
-
- $b['body'] = bb_CleanPictureLinks($b['body']);
-
- // Looking for the first image
- $cleaned_body = api_clean_plain_items($b['body']);
- $image = '';
- if(preg_match("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/is",$cleaned_body,$matches))
- $image = $matches[3];
-
- if ($image == '')
- if(preg_match("/\[img\](.*?)\[\/img\]/is",$cleaned_body,$matches))
- $image = $matches[1];
-
- $multipleimages = (strpos($cleaned_body, "[img") != strrpos($cleaned_body, "[img"));
-
- // When saved into the database the content is sent through htmlspecialchars
- // That means that we have to decode all image-urls
- $image = htmlspecialchars_decode($image);
-
- $body = $b["body"];
- if ($b["title"] != "")
- $body = $b["title"]."\n\n".$body;
-
- if (strpos($body, "[bookmark") !== false) {
- // splitting the text in two parts:
- // before and after the bookmark
- $pos = strpos($body, "[bookmark");
- $body1 = substr($body, 0, $pos);
- $body2 = substr($body, $pos);
-
- // Removing all quotes after the bookmark
- // they are mostly only the content after the bookmark.
- $body2 = preg_replace("/\[quote\=([^\]]*)\](.*?)\[\/quote\]/ism",'',$body2);
- $body2 = preg_replace("/\[quote\](.*?)\[\/quote\]/ism",'',$body2);
- $body = $body1.$body2;
- }
-
- // Add some newlines so that the message could be cut better
- $body = str_replace(array("[quote", "[bookmark", "[/bookmark]", "[/quote]"),
- array("\n[quote", "\n[bookmark", "[/bookmark]\n", "[/quote]\n"), $body);
-
- // remove the recycle signs and the names since they aren't helpful on twitter
- // recycle 1
- $recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
- $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n", $body);
- // recycle 2 (Test)
- $recycle = html_entity_decode("◌ ", ENT_QUOTES, 'UTF-8');
- $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n", $body);
-
- // remove the share element
- //$body = preg_replace("/\[share(.*?)\](.*?)\[\/share\]/ism","\n\n$2\n\n",$body);
-
- // At first convert the text to html
- $html = bbcode(api_clean_plain_items($body), false, false, 2);
-
- // Then convert it to plain text
- $msg = trim(html2plain($html, 0, true));
- $msg = html_entity_decode($msg,ENT_QUOTES,'UTF-8');
-
- // Removing multiple newlines
- while (strpos($msg, "\n\n\n") !== false)
- $msg = str_replace("\n\n\n", "\n\n", $msg);
-
- // Removing multiple spaces
- while (strpos($msg, " ") !== false)
- $msg = str_replace(" ", " ", $msg);
-
- $origmsg = trim($msg);
-
- // Removing URLs
- $msg = preg_replace('/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/i', "", $msg);
-
- $msg = trim($msg);
-
- $link = '';
- // look for bookmark-bbcode and handle it with priority
- if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches))
- $link = $matches[1];
-
- $multiplelinks = (strpos($b['body'], "[bookmark") != strrpos($b['body'], "[bookmark"));
-
- // If there is no bookmark element then take the first link
- if ($link == '') {
- $links = collecturls($html);
-
- foreach($links AS $singlelink) {
- $img_str = fetch_url($singlelink);
-
- $tempfile = tempnam(get_config("system","temppath"), "cache");
- file_put_contents($tempfile, $img_str);
- $mime = image_type_to_mime_type(exif_imagetype($tempfile));
- unlink($tempfile);
-
- if (substr($mime, 0, 6) == "image/") {
- $image = $singlelink;
- unset($links[$singlelink]);
- }
- }
-
- if (sizeof($links) > 0) {
- reset($links);
- $link = current($links);
- }
- $multiplelinks = (sizeof($links) > 1);
- }
-
- $msglink = "";
- if ($multiplelinks)
- $msglink = $b["plink"];
- else if ($link != "")
- $msglink = $link;
- else if ($multipleimages)
- $msglink = $b["plink"];
- else if ($image != "")
- $msglink = $image;
-
- if (($msglink == "") and strlen($msg) > $max_char)
- $msglink = $b["plink"];
-
- // If the message is short enough then don't modify it.
- if ((strlen($origmsg) <= $max_char) AND ($msglink == ""))
- return(array("msg"=>$origmsg, "image"=>""));
-
- // If the message is short enough and contains a picture then post the picture as well
- if ((strlen($origmsg) <= ($max_char - 23)) AND strpos($origmsg, $msglink))
- return(array("msg"=>$origmsg, "image"=>$image));
-
- // If the message is short enough and the link exists in the original message don't modify it as well
- // -3 because of the bad shortener of twitter
- if ((strlen($origmsg) <= ($max_char - 3)) AND strpos($origmsg, $msglink))
- return(array("msg"=>$origmsg, "image"=>""));
-
- // Preserve the unshortened link
- $orig_link = $msglink;
-
- // Just replace the message link with a 22 character long string
- // Twitter calculates with this length
- if (trim($msglink) <> '')
- $msglink = "1234567890123456789012";
-
- if (strlen(trim($msg." ".$msglink)) > ($max_char)) {
- $msg = substr($msg, 0, ($max_char) - (strlen($msglink)));
- $lastchar = substr($msg, -1);
- $msg = substr($msg, 0, -1);
- $pos = strrpos($msg, "\n");
- if ($pos > 0)
- $msg = substr($msg, 0, $pos);
- else if ($lastchar != "\n")
- $msg = substr($msg, 0, -3)."...";
-
- // if the post contains a picture and a link then the system tries to cut the post earlier.
- // So the link and the picture can be posted.
- if (($image != "") AND ($orig_link != $image)) {
- $msg2 = substr($msg, 0, ($max_char - 20) - (strlen($msglink)));
- $lastchar = substr($msg2, -1);
- $msg2 = substr($msg2, 0, -1);
- $pos = strrpos($msg2, "\n");
- if ($pos > 0)
- $msg = substr($msg2, 0, $pos);
- else if ($lastchar == "\n")
- $msg = trim($msg2);
- }
-
- }
- // Removing multiple spaces - again
- while (strpos($msg, " ") !== false)
- $msg = str_replace(" ", " ", $msg);
-
- $msg = trim($msg);
-
- // Removing multiple newlines
- //while (strpos($msg, "\n\n") !== false)
- // $msg = str_replace("\n\n", "\n", $msg);
-
- // Looking if the link points to an image
- $img_str = fetch_url($orig_link);
-
- $tempfile = tempnam(get_config("system","temppath"), "cache");
- file_put_contents($tempfile, $img_str);
- $mime = image_type_to_mime_type(exif_imagetype($tempfile));
- unlink($tempfile);
-
- if (($image == $orig_link) OR (substr($mime, 0, 6) == "image/"))
- return(array("msg"=>$msg, "image"=>$orig_link));
- else if (($image != $orig_link) AND ($image != "") AND (strlen($msg." ".$msglink) <= ($max_char - 23))) {
- if ($shortlink)
- $orig_link = short_link($orig_link);
-
- return(array("msg"=>$msg." ".$orig_link, "image"=>$image));
- } else {
- if ($shortlink)
- $orig_link = short_link($orig_link);
+ if(! $twitter_enable)
+ return;
- return(array("msg"=>$msg." ".$orig_link, "image"=>""));
+ if(strlen($b['postopts']))
+ $b['postopts'] .= ',';
+ $b['postopts'] .= 'twitter';
}
}
* Post to Twitter
*/
+ require_once("include/network.php");
+
if (!get_pconfig($b["uid"],'twitter','import')) {
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
return;
if($b['parent'] != $b['id']) {
logger("twitter_post_hook: parameter ".print_r($b, true), LOGGER_DATA);
- // Looking if its a reply to a twitter post
+ // Looking if its a reply to a twitter post
if ((substr($b["parent-uri"], 0, 9) != "twitter::") AND (substr($b["extid"], 0, 9) != "twitter::") AND (substr($b["thr-parent"], 0, 9) != "twitter::")) {
- logger("twitter_post_hook: no twitter post ".$b["parent"]);
- return;
+ logger("twitter_post_hook: no twitter post ".$b["parent"]);
+ return;
}
- $r = q("SELECT * FROM item WHERE item.uri = '%s' AND item.uid = %d LIMIT 1",
- dbesc($b["thr-parent"]),
- intval($b["uid"]));
+ $r = q("SELECT * FROM item WHERE item.uri = '%s' AND item.uid = %d LIMIT 1",
+ dbesc($b["thr-parent"]),
+ intval($b["uid"]));
+
+ if(!count($r)) {
+ logger("twitter_post_hook: no parent found ".$b["thr-parent"]);
+ return;
+ } else {
+ $iscomment = true;
+ $orig_post = $r[0];
+ }
- if(!count($r)) {
- logger("twitter_post_hook: no parent found ".$b["thr-parent"]);
- return;
- } else {
- $iscomment = true;
- $orig_post = $r[0];
- }
- $nickname = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
- $nickname = "@[url=".$orig_post["author-link"]."]".$nickname."[/url]";
+ $nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
+ $nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
+ $nicknameplain = "@".$nicknameplain;
- logger("twitter_post_hook: comparing ".$nickname." with ".$b["body"], LOGGER_DEBUG);
- if (strpos($b["body"], $nickname) === false)
+ logger("twitter_post_hook: comparing ".$nickname." and ".$nicknameplain." with ".$b["body"], LOGGER_DEBUG);
+ if ((strpos($b["body"], $nickname) === false) AND (strpos($b["body"], $nicknameplain) === false))
$b["body"] = $nickname." ".$b["body"];
logger("twitter_post_hook: parent found ".print_r($orig_post, true), LOGGER_DATA);
else
twitter_action($a, $b["uid"], substr($b["thr-parent"], 9), "like");
return;
- }
+ }
if($b['deleted'] || ($b['created'] !== $b['edited']))
- return;
+ return;
// if post comes from twitter don't send it back
+ if($b['extid'] == NETWORK_TWITTER)
+ return;
+
if($b['app'] == "Twitter")
return;
$csecret = get_config('twitter', 'consumersecret');
$otoken = get_pconfig($b['uid'], 'twitter', 'oauthtoken');
$osecret = get_pconfig($b['uid'], 'twitter', 'oauthsecret');
- $intelligent_shortening = get_pconfig($b['uid'], 'twitter', 'intelligent_shortening');
-
- // Global setting overrides this
- if (get_config('twitter','intelligent_shortening'))
- $intelligent_shortening = get_config('twitter','intelligent_shortening');
if($ckey && $csecret && $otoken && $osecret) {
logger('twitter: we have customer key and oauth stuff, going to send.', LOGGER_DEBUG);
require_once('include/bbcode.php');
$tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
- // in theory max char is 140 but T. uses t.co to make links
- // longer so we give them 10 characters extra
- if (!$intelligent_shortening) {
- $max_char = 130; // max. length for a tweet
- // we will only work with up to two times the length of the dent
- // we can later send to Twitter. This way we can "gain" some
- // information during shortening of potential links but do not
- // shorten all the links in a 200000 character long essay.
- if (! $b['title']=='') {
- $tmp = $b['title'] . ' : '. $b['body'];
- // $tmp = substr($tmp, 0, 4*$max_char);
- } else {
- $tmp = $b['body']; // substr($b['body'], 0, 3*$max_char);
- }
- // if [url=bla][img]blub.png[/img][/url] get blub.png
- $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\]\[img\](\\w+.*?)\\[\\/img\]\\[\\/url\]/i', '$2', $tmp);
- // preserve links to images, videos and audios
- $tmp = preg_replace( '/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism', '$3', $tmp);
- $tmp = preg_replace( '/\[\\/?img(\\s+.*?\]|\])/i', '', $tmp);
- $tmp = preg_replace( '/\[\\/?video(\\s+.*?\]|\])/i', '', $tmp);
- $tmp = preg_replace( '/\[\\/?youtube(\\s+.*?\]|\])/i', '', $tmp);
- $tmp = preg_replace( '/\[\\/?vimeo(\\s+.*?\]|\])/i', '', $tmp);
- $tmp = preg_replace( '/\[\\/?audio(\\s+.*?\]|\])/i', '', $tmp);
- $linksenabled = get_pconfig($b['uid'],'twitter','post_taglinks');
- // if a #tag is linked, don't send the [url] over to SN
- // that is, don't send if the option is not set in the
- // connector settings
- if ($linksenabled=='0') {
- // #-tags
- $tmp = preg_replace( '/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $tmp);
- // @-mentions
- $tmp = preg_replace( '/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $tmp);
- // recycle 1
- $recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
- $tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', $recycle.'$2', $tmp);
- // recycle 2 (Test)
- $recycle = html_entity_decode("◌ ", ENT_QUOTES, 'UTF-8');
- $tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', $recycle.'$2', $tmp);
- }
- $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/url\]/i', '$2 $1', $tmp);
- $tmp = preg_replace( '/\[bookmark\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/bookmark\]/i', '$2 $1', $tmp);
- // find all http or https links in the body of the entry and
- // apply the shortener if the link is longer then 20 characters
- if (( strlen($tmp)>$max_char ) && ( $max_char > 0 )) {
- preg_match_all ( '/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/i', $tmp, $allurls );
- foreach ($allurls as $url) {
- foreach ($url as $u) {
- if (strlen($u)>20) {
- $sl = short_link($u);
- $tmp = str_replace( $u, $sl, $tmp );
- }
- }
- }
- }
- // ok, all the links we want to send out are save, now strip
- // away the remaining bbcode
- //$msg = strip_tags(bbcode($tmp, false, false));
- $msg = bbcode($tmp, false, false, true);
- $msg = str_replace(array('<br>','<br />'),"\n",$msg);
- $msg = strip_tags($msg);
-
- // quotes not working - let's try this
- $msg = html_entity_decode($msg);
- if (( strlen($msg) > $max_char) && $max_char > 0) {
- $shortlink = short_link( $b['plink'] );
- // the new message will be shortened such that "... $shortlink"
- // will fit into the character limit
- $msg = nl2br(substr($msg, 0, $max_char-strlen($shortlink)-4));
- $msg = str_replace(array('<br>','<br />'),' ',$msg);
- $e = explode(' ', $msg);
- // remove the last word from the cut down message to
- // avoid sending cut words to the MicroBlog
- array_pop($e);
- $msg = implode(' ', $e);
- $msg .= '... ' . $shortlink;
- }
+ $max_char = 140;
+ require_once("include/plaintext.php");
+ $msgarr = plaintext($a, $b, $max_char, true, 8);
+ $msg = $msgarr["text"];
- $msg = trim($msg);
- $image = "";
- } else {
- $msgarr = twitter_shortenmsg($b);
- $msg = $msgarr["msg"];
- $image = $msgarr["image"];
- }
+ if (($msg == "") AND isset($msgarr["title"]))
+ $msg = shortenmsg($msgarr["title"], $max_char - 50);
+
+ $image = "";
+
+ if (isset($msgarr["url"]))
+ $msg .= "\n".$msgarr["url"];
+ elseif (isset($msgarr["image"]) AND ($msgarr["type"] != "video"))
+ $image = $msgarr["image"];
// and now tweet it :-)
if(strlen($msg) and ($image != "")) {
$img_str = fetch_url($image);
- $tempfile = tempnam(get_config("system","temppath"), "cache");
+ $tempfile = tempnam(get_temppath(), "cache");
file_put_contents($tempfile, $img_str);
// Twitter had changed something so that the old library doesn't work anymore
// so we are using a new library for twitter
// To-Do:
// Switching completely to this library with all functions
- require_once("addon/twitter/codebird.php");
+ require_once("addon/twitter/codebird.php");
$cb = \Codebird\Codebird::getInstance();
$cb->setConsumerKey($ckey, $csecret);
function twitter_plugin_admin_post(&$a){
$consumerkey = ((x($_POST,'consumerkey')) ? notags(trim($_POST['consumerkey'])) : '');
$consumersecret = ((x($_POST,'consumersecret')) ? notags(trim($_POST['consumersecret'])): '');
- $applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'])):'');
+ $applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'])):'');
set_config('twitter','consumerkey',$consumerkey);
set_config('twitter','consumersecret',$consumersecret);
set_config('twitter','application_name',$applicationname);
'$submit' => t('Save Settings'),
// name, label, value, help, [extra values]
'$consumerkey' => array('consumerkey', t('Consumer key'), get_config('twitter', 'consumerkey' ), ''),
- '$consumersecret' => array('consumersecret', t('Consumer secret'), get_config('twitter', 'consumersecret' ), ''),
- '$applicationname' => array('applicationname', t('Name of the Twitter Application'), get_config('twitter','application_name'),t('set this to avoid mirroring postings from ~friendica back to ~friendica'))
+ '$consumersecret' => array('consumersecret', t('Consumer secret'), get_config('twitter', 'consumersecret' ), ''),
+ '$applicationname' => array('applicationname', t('Name of the Twitter Application'), get_config('twitter','application_name'),t('set this to avoid mirroring postings from ~friendica back to ~friendica'))
));
}
/*
// To-Do
- // check for new contacts once a day
- $last_contact_check = get_pconfig($rr['uid'],'pumpio','contact_check');
- if($last_contact_check)
- $next_contact_check = $last_contact_check + 86400;
- else
- $next_contact_check = 0;
-
- if($next_contact_check <= time()) {
- pumpio_getallusers($a, $rr["uid"]);
- set_pconfig($rr['uid'],'pumpio','contact_check',time());
- }
+ // check for new contacts once a day
+ $last_contact_check = get_pconfig($rr['uid'],'pumpio','contact_check');
+ if($last_contact_check)
+ $next_contact_check = $last_contact_check + 86400;
+ else
+ $next_contact_check = 0;
+
+ if($next_contact_check <= time()) {
+ pumpio_getallusers($a, $rr["uid"]);
+ set_pconfig($rr['uid'],'pumpio','contact_check',time());
+ }
*/
- }
- }
+ }
+ }
logger('twitter: cron_end');
set_config('twitter','last_poll', time());
}
+function twitter_expire($a,$b) {
+
+ $days = get_config('twitter', 'expire');
+
+ if ($days == 0)
+ return;
+
+ $r = q("DELETE FROM `item` WHERE `deleted` AND `network` = '%s'", dbesc(NETWORK_TWITTER));
+
+ require_once("include/items.php");
+
+ logger('twitter_expire: expire_start');
+
+ $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
+ if(count($r)) {
+ foreach($r as $rr) {
+ logger('twitter_expire: user '.$rr['uid']);
+ item_expire($rr['uid'], $days, NETWORK_TWITTER, true);
+ }
+ }
+
+ logger('twitter_expire: expire_end');
+}
+
+function twitter_prepare_body(&$a,&$b) {
+ if ($b["item"]["network"] != NETWORK_TWITTER)
+ return;
+
+ if ($b["preview"]) {
+ $max_char = 140;
+ require_once("include/plaintext.php");
+ $item = $b["item"];
+ $item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
+
+ $r = q("SELECT `author-link` FROM item WHERE item.uri = '%s' AND item.uid = %d LIMIT 1",
+ dbesc($item["thr-parent"]),
+ intval(local_user()));
+
+ if(count($r)) {
+ $orig_post = $r[0];
+
+ $nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
+ $nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
+ $nicknameplain = "@".$nicknameplain;
+
+ if ((strpos($item["body"], $nickname) === false) AND (strpos($item["body"], $nicknameplain) === false))
+ $item["body"] = $nickname." ".$item["body"];
+ }
+
+
+ $msgarr = plaintext($a, $item, $max_char, true, 8);
+ $msg = $msgarr["text"];
+
+ if (isset($msgarr["url"]))
+ $msg .= " ".$msgarr["url"];
+
+ if (isset($msgarr["image"]))
+ $msg .= " ".$msgarr["image"];
+
+ $b['html'] = nl2br(htmlspecialchars($msg));
+ }
+}
+
function twitter_fetchtimeline($a, $uid) {
$ckey = get_config('twitter', 'consumerkey');
$csecret = get_config('twitter', 'consumersecret');
$posts = array_reverse($items);
- if (count($posts)) {
+ if (count($posts)) {
foreach ($posts as $post) {
if ($post->id_str > $lastid)
$lastid = $post->id_str;
$_REQUEST["type"] = "wall";
$_REQUEST["api_source"] = true;
$_REQUEST["profile_uid"] = $uid;
- $_REQUEST["source"] = "Twitter";
+ //$_REQUEST["source"] = "Twitter";
+ $_REQUEST["source"] = $post->source;
+ $_REQUEST["extid"] = NETWORK_TWITTER;
//$_REQUEST["date"] = $post->created_at;
$_REQUEST['body'] = $post->retweeted_status->text;
+ $picture = "";
+
// media
if (is_array($post->retweeted_status->entities->media)) {
foreach($post->retweeted_status->entities->media AS $media) {
switch($media->type) {
case 'photo':
- $_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']);
- $has_picture = true;
+ //$_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']);
+ //$has_picture = true;
+ $_REQUEST['body'] = str_replace($media->url, "", $_REQUEST['body']);
+ $picture = $media->media_url_https;
break;
}
}
}
- $converted = twitter_expand_entities($a, $_REQUEST['body'], $post->retweeted_status, true, $has_picture);
+ $converted = twitter_expand_entities($a, $_REQUEST['body'], $post->retweeted_status, true, $picture);
$_REQUEST['body'] = $converted["body"];
$_REQUEST['body'] = "[share author='".$post->retweeted_status->user->name.
} else {
$_REQUEST["body"] = $post->text;
+ $picture = "";
+
if (is_array($post->entities->media)) {
foreach($post->entities->media AS $media) {
switch($media->type) {
case 'photo':
- $_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']);
- $has_picture = true;
+ //$_REQUEST['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $_REQUEST['body']);
+ //$has_picture = true;
+ $_REQUEST['body'] = str_replace($media->url, "", $_REQUEST['body']);
+ $picture = $media->media_url_https;
break;
}
}
}
- $converted = twitter_expand_entities($a, $_REQUEST["body"], $post, true, $has_picture);
+ $converted = twitter_expand_entities($a, $_REQUEST["body"], $post, true, $picture);
$_REQUEST['body'] = $converted["body"];
}
// require_once('mod/item.php');
item_post($a);
- }
- }
+ }
+ }
}
set_pconfig($uid, 'twitter', 'lastid', $lastid);
}
}
function twitter_fetch_contact($uid, $contact, $create_user) {
+ require_once("include/Photo.php");
+
+ if ($contact->id_str == "")
+ return(-1);
+
+ $avatar = str_replace("_normal.", ".", $contact->profile_image_url_https);
+
+ $info = get_photo_info($avatar);
+ if (!$info)
+ $avatar = $contact->profile_image_url_https;
// Check if the unique contact is existing
// To-Do: only update once a while
- $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
+ $r = q("SELECT id FROM unique_contacts WHERE url='%s' LIMIT 1",
dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
if (count($r) == 0)
dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
dbesc($contact->name),
dbesc($contact->screen_name),
- dbesc($contact->profile_image_url_https));
+ dbesc($avatar));
else
q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'",
dbesc($contact->name),
dbesc($contact->screen_name),
- dbesc($contact->profile_image_url_https),
+ dbesc($avatar),
dbesc(normalise_link("https://twitter.com/".$contact->screen_name)));
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
dbesc("twitter::".$contact->id_str),
dbesc($contact->name),
dbesc($contact->screen_name),
- dbesc($contact->profile_image_url_https),
+ dbesc($avatar),
dbesc(NETWORK_TWITTER),
intval(CONTACT_IS_FRIEND),
intval(1),
require_once("Photo.php");
- $photos = import_profile_photo($contact->profile_image_url_https,$uid,$contact_id);
+ $photos = import_profile_photo($avatar,$uid,$contact_id);
q("UPDATE `contact` SET `photo` = '%s',
`thumb` = '%s',
require_once("Photo.php");
- $photos = import_profile_photo($contact->profile_image_url_https, $uid, $r[0]['id']);
+ $photos = import_profile_photo($avatar, $uid, $r[0]['id']);
q("UPDATE `contact` SET `photo` = '%s',
`thumb` = '%s',
return $contact_id;
}
-function twitter_expand_entities($a, $body, $item, $no_tags = false, $dontincludemedia) {
+function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
require_once("include/oembed.php");
require_once("include/network.php");
$type = $oembed_data->type;
if ($oembed_data->type == "video") {
- $body = str_replace($url->url,
- "[video]".$expanded_url."[/video]", $body);
- $dontincludemedia = true;
- } elseif (($oembed_data->type == "photo") AND isset($oembed_data->url) AND !$dontincludemedia) {
+ //$body = str_replace($url->url,
+ // "[video]".$expanded_url."[/video]", $body);
+ //$dontincludemedia = true;
+ $type = $oembed_data->type;
+ $footerurl = $expanded_url;
+ $footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
+
+ $body = str_replace($url->url, $footerlink, $body);
+ //} elseif (($oembed_data->type == "photo") AND isset($oembed_data->url) AND !$dontincludemedia) {
+ } elseif (($oembed_data->type == "photo") AND isset($oembed_data->url)) {
$body = str_replace($url->url,
"[url=".$expanded_url."][img]".$oembed_data->url."[/img][/url]",
$body);
- $dontincludemedia = true;
+ //$dontincludemedia = true;
} elseif ($oembed_data->type != "link")
$body = str_replace($url->url,
"[url=".$expanded_url."]".$expanded_url."[/url]",
else {
$img_str = fetch_url($expanded_url, true, $redirects, 4);
- $tempfile = tempnam(get_config("system","temppath"), "cache");
+ $tempfile = tempnam(get_temppath(), "cache");
file_put_contents($tempfile, $img_str);
$mime = image_type_to_mime_type(exif_imagetype($tempfile));
unlink($tempfile);
if (substr($mime, 0, 6) == "image/") {
$type = "photo";
$body = str_replace($url->url, "[img]".$expanded_url."[/img]", $body);
- $dontincludemedia = true;
+ //$dontincludemedia = true;
} else {
$type = $oembed_data->type;
$footerurl = $expanded_url;
}
if ($footerurl != "")
- $footer = add_page_info($footerurl);
+ $footer = add_page_info($footerurl, false, $picture);
if (($footerlink != "") AND (trim($footer) != "")) {
$removedlink = trim(str_replace($footerlink, "", $body));
- if (strstr($body, $removedlink))
+ if (($removedlink == "") OR strstr($body, $removedlink))
$body = $removedlink;
$body .= $footer;
}
+ if (($footer == "") AND ($picture != ""))
+ $body .= "\n\n[img]".$picture."[/img]\n";
+
if ($no_tags)
return(array("body" => $body, "tags" => ""));
}
// it seems as if the entities aren't always covering all mentions. So the rest will be checked here
- $tags = get_tags($body);
+ $tags = get_tags($body);
- if(count($tags)) {
+ if(count($tags)) {
foreach($tags as $tag) {
if (strstr(trim($tag), " "))
continue;
- if(strpos($tag,'#') === 0) {
- if(strpos($tag,'[url='))
- continue;
+ if(strpos($tag,'#') === 0) {
+ if(strpos($tag,'[url='))
+ continue;
// don't link tags that are already embedded in links
$tags_arr["#".$basetag] = $url;
continue;
} elseif(strpos($tag,'@') === 0) {
- if(strpos($tag,'[url='))
- continue;
+ if(strpos($tag,'[url='))
+ continue;
$basetag = substr($tag,1);
$url = '@[url=https://twitter.com/'.rawurlencode($basetag).']'.$basetag.'[/url]';
if (count($r)) {
$postarray['thr-parent'] = $r[0]["uri"];
$postarray['parent-uri'] = $r[0]["parent-uri"];
+ $postarray['parent'] = $r[0]["parent"];
+ $postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
} else {
$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
dbesc($parent),
if (count($r)) {
$postarray['thr-parent'] = $r[0]['uri'];
$postarray['parent-uri'] = $r[0]['parent-uri'];
+ $postarray['parent'] = $r[0]['parent'];
+ $postarray['object-type'] = ACTIVITY_OBJ_COMMENT;
} else {
$postarray['thr-parent'] = $postarray['uri'];
$postarray['parent-uri'] = $postarray['uri'];
+ $postarray['object-type'] = ACTIVITY_OBJ_NOTE;
}
}
} else
return(array());
}
- } else
+ // Don't create accounts of people who just comment something
+ $create_user = false;
+ } else {
$postarray['parent-uri'] = $postarray['uri'];
+ $postarray['object-type'] = ACTIVITY_OBJ_NOTE;
+ }
if ($contactid == 0) {
$contactid = twitter_fetch_contact($uid, $post->user, $create_user);
$postarray['body'] = $post->text;
+ $picture = "";
+
// media
if (is_array($post->entities->media)) {
foreach($post->entities->media AS $media) {
switch($media->type) {
case 'photo':
- $postarray['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $postarray['body']);
- $has_picture = true;
+ //$postarray['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $postarray['body']);
+ //$has_picture = true;
+ $postarray['body'] = str_replace($media->url, "", $postarray['body']);
+ $postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
+ $picture = $media->media_url_https;
break;
default:
$postarray['body'] .= print_r($media, true);
}
}
- $converted = twitter_expand_entities($a, $postarray['body'], $post, false, $has_picture);
+ $converted = twitter_expand_entities($a, $postarray['body'], $post, false, $picture);
$postarray['body'] = $converted["body"];
$postarray['tag'] = $converted["tags"];
$postarray['body'] = $post->retweeted_status->text;
+ $picture = "";
+
// media
if (is_array($post->retweeted_status->entities->media)) {
foreach($post->retweeted_status->entities->media AS $media) {
switch($media->type) {
case 'photo':
- $postarray['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $postarray['body']);
- $has_picture = true;
+ //$postarray['body'] = str_replace($media->url, "\n\n[img]".$media->media_url_https."[/img]\n", $postarray['body']);
+ //$has_picture = true;
+ $postarray['body'] = str_replace($media->url, "", $postarray['body']);
+ $postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
+ $picture = $media->media_url_https;
break;
default:
$postarray['body'] .= print_r($media, true);
}
}
- $converted = twitter_expand_entities($a, $postarray['body'], $post->retweeted_status, false, $has_picture);
+ $converted = twitter_expand_entities($a, $postarray['body'], $post->retweeted_status, false, $picture);
$postarray['body'] = $converted["body"];
$postarray['tag'] = $converted["tags"];
function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) {
+ // this whole function doesn't seem to work. Needs complete check
+
$user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
intval($uid)
);
'to_email' => $user[0]['email'],
'uid' => $user[0]['uid'],
'item' => $postarray,
- 'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item,
+ 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
'source_name' => $postarray['author-name'],
'source_link' => $postarray['author-link'],
'source_photo' => $postarray['author-avatar'],
return;
}
- $posts = array_reverse($items);
+ $posts = array_reverse($items);
logger("twitter_fetchhometimeline: Fetching timeline for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
return;
}
- $posts = array_reverse($items);
+ $posts = array_reverse($items);
logger("twitter_fetchhometimeline: Fetching mentions for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
$item = item_store($postarray);
+ if (!isset($postarray["parent"]) OR ($postarray["parent"] == 0))
+ $postarray["parent"] = $item;
+
logger('twitter_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item);
if ($item == 0) {
dbesc($postarray['uri']),
intval($uid)
);
- if (count($r))
+ if (count($r)) {
$item = $r[0]['id'];
- }
+ $parent_id = $r[0]['parent'];
+ }
+ } else
+ $parent_id = $postarray['parent'];
if ($item != 0) {
require_once('include/enotify.php');
notification(array(
'type' => NOTIFY_TAGSELF,
- 'notify_flags' => $u[0]['notify-flags'],
- 'language' => $u[0]['language'],
- 'to_name' => $u[0]['username'],
- 'to_email' => $u[0]['email'],
- 'uid' => $u[0]['uid'],
- 'item' => $postarray,
- 'link' => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item,
- 'source_name' => $postarray['author-name'],
- 'source_link' => $postarray['author-link'],
+ 'notify_flags' => $u[0]['notify-flags'],
+ 'language' => $u[0]['language'],
+ 'to_name' => $u[0]['username'],
+ 'to_email' => $u[0]['email'],
+ 'uid' => $u[0]['uid'],
+ 'item' => $postarray,
+ 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
+ 'source_name' => $postarray['author-name'],
+ 'source_link' => $postarray['author-link'],
'source_photo' => $postarray['author-avatar'],
- 'verb' => ACTIVITY_TAG,
- 'otype' => 'item'
- ));
+ 'verb' => ACTIVITY_TAG,
+ 'otype' => 'item',
+ 'parent' => $parent_id
+ ));
}
}
}
$contact_id = twitter_fetch_contact($uid, $user, true);
} else {
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
- intval($uid), dbesc("twitter::".$own_id));
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
+ intval($uid), dbesc("twitter::".$own_id));
if(count($r))
$contact_id = $r[0]["id"];
else
return(!isset($result->errors));
}
-
?>