From 2ee50af605eeff6d0fac02ac616952d637efec0b Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 23 Mar 2014 22:40:50 +0100 Subject: [PATCH 1/6] fbsync/fbpost: postings to selected facebook addresses now work. (will work for new contacts and step by step for old contacts) --- fbpost/fbpost.php | 9 +- fbsync/fbsync.php | 256 +++++++++++++++++++++++----------------------- 2 files changed, 134 insertions(+), 131 deletions(-) diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php index db905a157..919e0f8f6 100644 --- a/fbpost/fbpost.php +++ b/fbpost/fbpost.php @@ -96,7 +96,7 @@ function fbpost_init(&$a) { if(strpos($x,'access_token=') !== false) { $token = str_replace('access_token=', '', $x); - if(strpos($token,'&') !== false) + if(strpos($token,'&') !== false) $token = substr($token,0,strpos($token,'&')); set_pconfig($uid,'facebook','access_token',$token); set_pconfig($uid,'facebook','post','1'); @@ -571,7 +571,8 @@ function fbpost_post_hook(&$a,&$b) { $allow_str = dbesc(implode(', ',$recipients)); if($allow_str) { - $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $allow_str ) AND `network` = 'face'"); + logger("fbpost_post_hook: private post to: ".$allow_str, LOGGER_DEBUG); + $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $allow_str ) AND `network` = 'face'"); if(count($r)) foreach($r as $rr) $allow_arr[] = $rr['notify']; @@ -579,7 +580,7 @@ function fbpost_post_hook(&$a,&$b) { $deny_str = dbesc(implode(', ',$deny)); if($deny_str) { - $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $deny_str ) AND `network` = 'face'"); + $r = q("SELECT `notify` FROM `contact` WHERE `id` IN ( $deny_str ) AND `network` = 'face'"); if(count($r)) foreach($r as $rr) $deny_arr[] = $rr['notify']; @@ -962,7 +963,7 @@ function fbpost_get_app_access_token() { logger('fb_get_app_access_token: returned access token: ' . $x, LOGGER_DATA); $token = str_replace('access_token=', '', $x); - if(strpos($token,'&') !== false) + if(strpos($token,'&') !== false) $token = substr($token,0,strpos($token,'&')); if ($token == "") { diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php index e69cd2c0c..dac6cd2ef 100644 --- a/fbsync/fbsync.php +++ b/fbsync/fbsync.php @@ -423,18 +423,18 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl // Check if the contact id was blocked if ($parent_contact > 0) { $r = q("SELECT `blocked`, `readonly`, `nick` FROM `contact` WHERE `uid` = %d AND `id` = %d LIMIT 1", - intval($uid), intval($parent_contact)); + intval($uid), intval($parent_contact)); // Should only happen if someone deleted the contact manually - if(!count($r)) { - logger("fbsync_createcomment: UID ".$uid." - Contact ".$parent_contact." doesn't seem to exist.", LOGGER_DEBUG); - return; + if(!count($r)) { + logger("fbsync_createcomment: UID ".$uid." - Contact ".$parent_contact." doesn't seem to exist.", LOGGER_DEBUG); + return; } // Is blocked? Then return - if ($r[0]["readonly"] OR $r[0]["blocked"]) { - logger("fbsync_createcomment: UID ".$uid." - Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG); - return; + if ($r[0]["readonly"] OR $r[0]["blocked"]) { + logger("fbsync_createcomment: UID ".$uid." - Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG); + return; } $parent_nick = $r[0]["nick"]; @@ -522,8 +522,8 @@ function fbsync_createcomment($a, $uid, $self_id, $self, $user, $contacts, $appl if(count($myconv)) { $importer_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname']; - $own_contact = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", - intval($uid), dbesc("facebook::".$self_id)); + $own_contact = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", + intval($uid), dbesc("facebook::".$self_id)); if (!count($own_contact)) return; @@ -570,8 +570,8 @@ function fbsync_createlike($a, $uid, $self_id, $self, $contacts, $like) { intval($uid) ); - if (count($r)) - $orig_post = $r[0]; + if (count($r)) + $orig_post = $r[0]; else return; @@ -597,15 +597,15 @@ function fbsync_createlike($a, $uid, $self_id, $self, $contacts, $like) { $contact_id = $self[0]["id"]; $likedata = array(); - $likedata['parent'] = $orig_post['id']; - $likedata['verb'] = ACTIVITY_LIKE; + $likedata['parent'] = $orig_post['id']; + $likedata['verb'] = ACTIVITY_LIKE; $likedate['network'] = dbesc(NETWORK_FACEBOOK); - $likedata['gravity'] = 3; - $likedata['uid'] = $uid; - $likedata['wall'] = 0; - $likedata['uri'] = item_new_uri($a->get_baseurl(), $uid); - $likedata['parent-uri'] = $orig_post["uri"]; - $likedata['app'] = "Facebook"; + $likedata['gravity'] = 3; + $likedata['uid'] = $uid; + $likedata['wall'] = 0; + $likedata['uri'] = item_new_uri($a->get_baseurl(), $uid); + $likedata['parent-uri'] = $orig_post["uri"]; + $likedata['app'] = "Facebook"; if ($like->user_id != $self_id) { $likedata['contact-id'] = $contact_id; @@ -625,12 +625,12 @@ function fbsync_createlike($a, $uid, $self_id, $self, $contacts, $like) { $post_type = t('status'); $plink = '[url=' . $orig_post['plink'] . ']' . $post_type . '[/url]'; - $likedata['object-type'] = ACTIVITY_OBJ_NOTE; + $likedata['object-type'] = ACTIVITY_OBJ_NOTE; - $likedata['body'] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); + $likedata['body'] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); - $likedata['object'] = '' . ACTIVITY_OBJ_NOTE . '1' . - '' . $orig_post['uri'] . '' . xmlify('') . '' . $orig_post['title'] . '' . $orig_post['body'] . ''; + $likedata['object'] = '' . ACTIVITY_OBJ_NOTE . '1' . + '' . $orig_post['uri'] . '' . xmlify('') . '' . $orig_post['title'] . '' . $orig_post['body'] . ''; $r = q("SELECT * FROM `item` WHERE `parent-uri` = '%s' AND `author-link` = '%s' AND `verb` = '%s' AND `uid` = %d LIMIT 1", @@ -640,7 +640,7 @@ function fbsync_createlike($a, $uid, $self_id, $self, $contacts, $like) { intval($uid) ); - if (count($r)) + if (count($r)) return; $item = item_store($likedata); @@ -657,131 +657,133 @@ function fbsync_fetch_contact($uid, $contact, $create_user) { if (count($r) == 0) q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')", dbesc(normalise_link($contact->url)), - dbesc($contact->name), - dbesc($contact->username), + dbesc($contact->name), + dbesc($contact->username), dbesc($contact->pic_square)); else q("UPDATE unique_contacts SET name = '%s', nick = '%s', avatar = '%s' WHERE url = '%s'", - dbesc($contact->name), - dbesc($contact->username), + dbesc($contact->name), + dbesc($contact->username), dbesc($contact->pic_square), dbesc(normalise_link($contact->url))); - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", - intval($uid), dbesc("facebook::".$contact->id)); + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", + intval($uid), dbesc("facebook::".$contact->id)); - if(!count($r) AND !$create_user) - return(0); + if(!count($r) AND !$create_user) + return(0); - if (count($r) AND ($r[0]["readonly"] OR $r[0]["blocked"])) { - logger("fbsync_fetch_contact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG); - return(-1); - } + if (count($r) AND ($r[0]["readonly"] OR $r[0]["blocked"])) { + logger("fbsync_fetch_contact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG); + return(-1); + } $avatarpicture = $contact->pic_square; - if(!count($r)) { - // create contact record - q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, - `name`, `nick`, `photo`, `network`, `rel`, `priority`, - `writable`, `blocked`, `readonly`, `pending`) - VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0)", - intval($uid), - dbesc(datetime_convert()), - dbesc($contact->url), - dbesc(normalise_link($contact->url)), - dbesc($contact->username."@facebook.com"), - dbesc("facebook::".$contact->id), - dbesc(''), - dbesc("facebook::".$contact->id), - dbesc($contact->name), - dbesc($contact->username), - dbesc($avatarpicture), - dbesc(NETWORK_FACEBOOK), - intval(CONTACT_IS_FRIEND), - intval(1), - intval(1) - ); + if(!count($r)) { + // create contact record + q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, + `name`, `nick`, `photo`, `network`, `rel`, `priority`, + `writable`, `blocked`, `readonly`, `pending`) + VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0)", + intval($uid), + dbesc(datetime_convert()), + dbesc($contact->url), + dbesc(normalise_link($contact->url)), + dbesc($contact->username."@facebook.com"), + dbesc("facebook::".$contact->id), + dbesc($contact->id), + dbesc("facebook::".$contact->id), + dbesc($contact->name), + dbesc($contact->username), + dbesc($avatarpicture), + dbesc(NETWORK_FACEBOOK), + intval(CONTACT_IS_FRIEND), + intval(1), + intval(1) + ); - $r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d LIMIT 1", - dbesc("facebook::".$contact->id), - intval($uid) - ); + $r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d LIMIT 1", + dbesc("facebook::".$contact->id), + intval($uid) + ); - if(! count($r)) - return(false); + if(! count($r)) + return(false); - $contact_id = $r[0]['id']; + $contact_id = $r[0]['id']; - $g = q("SELECT def_gid FROM user WHERE uid = %d LIMIT 1", - intval($uid) - ); + $g = q("SELECT def_gid FROM user WHERE uid = %d LIMIT 1", + intval($uid) + ); - if($g && intval($g[0]['def_gid'])) { - require_once('include/group.php'); - group_add_member($uid,'',$contact_id,$g[0]['def_gid']); - } + if($g && intval($g[0]['def_gid'])) { + require_once('include/group.php'); + group_add_member($uid,'',$contact_id,$g[0]['def_gid']); + } - require_once("Photo.php"); + require_once("Photo.php"); - $photos = import_profile_photo($avatarpicture,$uid,$contact_id); + $photos = import_profile_photo($avatarpicture,$uid,$contact_id); - q("UPDATE `contact` SET `photo` = '%s', - `thumb` = '%s', - `micro` = '%s', - `name-date` = '%s', - `uri-date` = '%s', - `avatar-date` = '%s' - WHERE `id` = %d", - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - intval($contact_id) - ); - } else { - // update profile photos once every 12 hours as we have no notification of when they change. - $update_photo = ($r[0]['avatar-date'] < datetime_convert('','','now -12 hours')); + q("UPDATE `contact` SET `photo` = '%s', + `thumb` = '%s', + `micro` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s' + WHERE `id` = %d", + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + intval($contact_id) + ); + } else { + // update profile photos once every 12 hours as we have no notification of when they change. + $update_photo = ($r[0]['avatar-date'] < datetime_convert('','','now -12 hours')); - // check that we have all the photos, this has been known to fail on occasion - if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) { + // check that we have all the photos, this has been known to fail on occasion + if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) { - logger("fbsync_fetch_contact: Updating contact ".$contact->username, LOGGER_DEBUG); + logger("fbsync_fetch_contact: Updating contact ".$contact->username, LOGGER_DEBUG); - require_once("Photo.php"); + require_once("Photo.php"); - $photos = import_profile_photo($avatarpicture, $uid, $r[0]['id']); + $photos = import_profile_photo($avatarpicture, $uid, $r[0]['id']); - q("UPDATE `contact` SET `photo` = '%s', - `thumb` = '%s', - `micro` = '%s', - `name-date` = '%s', - `uri-date` = '%s', - `avatar-date` = '%s', - `url` = '%s', - `nurl` = '%s', - `addr` = '%s', - `name` = '%s', - `nick` = '%s' - WHERE `id` = %d", - dbesc($photos[0]), - dbesc($photos[1]), - dbesc($photos[2]), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc($contact->url), - dbesc(normalise_link($contact->url)), - dbesc($contact->username."@facebook.com"), - dbesc($contact->name), - dbesc($contact->username), - intval($r[0]['id']) - ); - } - } - return($r[0]["id"]); + q("UPDATE `contact` SET `photo` = '%s', + `thumb` = '%s', + `micro` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s', + `url` = '%s', + `nurl` = '%s', + `addr` = '%s', + `name` = '%s', + `nick` = '%s', + `notify` = '%s' + WHERE `id` = %d", + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($contact->url), + dbesc(normalise_link($contact->url)), + dbesc($contact->username."@facebook.com"), + dbesc($contact->name), + dbesc($contact->username), + dbesc($contact->id), + intval($r[0]['id']) + ); + } + } + return($r[0]["id"]); } function fbsync_get_self($uid) { @@ -854,9 +856,9 @@ function fbsync_fetchuser($a, $uid, $id) { if (count($contact)) { if (($contact[0]["readonly"] OR $contact[0]["blocked"])) { - logger("fbsync_fetchuser: Contact '".$contact[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG); + logger("fbsync_fetchuser: Contact '".$contact[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG); $user["contact-id"] = -1; - } else + } else $user["contact-id"] = $contact[0]["id"]; $user["name"] = $contact[0]["name"]; From 9ffc6f389702360adf7bf7aecd6d3f7fdce0fa52 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 4 Apr 2014 11:07:19 +0200 Subject: [PATCH 2/6] fbpost: When posting comments, now links don't disappear anymore --- fbpost/fbpost.php | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php index 919e0f8f6..839c42b33 100644 --- a/fbpost/fbpost.php +++ b/fbpost/fbpost.php @@ -207,7 +207,7 @@ function fbpost_content(&$a) { $a->page['htmlhead'] .= '' . "\r\n"; - $o .= '

' . t('Facebook') . '

'; + $o .= '

' . t('Facebook Export/Mirror') . '

'; if(! $fb_installed) { $o .= '
'; @@ -293,7 +293,7 @@ function fbpost_content(&$a) { function fbpost_plugin_settings(&$a,&$b) { $b .= '
'; - $b .= '

' . t('Facebook') . '

'; + $b .= '

' . t('Facebook Export/Mirror') . '

'; $b .= '
'; } @@ -634,22 +634,32 @@ function fbpost_post_hook(&$a,&$b) { logger('fbpost_post_hook: original msg=' . $msg, LOGGER_DATA); - // To-Do: if it is a reply, then only do a simple bbcode2plain conversion - $msgarr = fbpost_createmsg($b); - $msg = $msgarr["msg"]; - $link = $msgarr["link"]; - $image = $msgarr["image"]; - $linkname = $msgarr["linkname"]; + if ($toplevel) { + $msgarr = fbpost_createmsg($b); + $msg = $msgarr["msg"]; + $link = $msgarr["link"]; + $image = $msgarr["image"]; + $linkname = $msgarr["linkname"]; - // Fallback - if message is empty - if(!strlen($msg)) - $msg = $linkname; + // Fallback - if message is empty + if(!strlen($msg)) + $msg = $linkname; - if(!strlen($msg)) - $msg = $link; + if(!strlen($msg)) + $msg = $link; - if(!strlen($msg)) - $msg = $image; + if(!strlen($msg)) + $msg = $image; + } else { + require_once("include/bbcode.php"); + require_once("include/html2plain.php"); + $msg = bb_CleanPictureLinks($msg); + $msg = bbcode($msg, false, false, 2, true); + $msg = trim(html2plain($msg, 0)); + $link = ""; + $image = ""; + $linkname = ""; + } // If there is nothing to post then exit if(!strlen($msg)) @@ -1106,7 +1116,7 @@ function fbpost_fetchwall($a, $uid) { } if ($content) - $_REQUEST["body"] .= "\n\n"; + $_REQUEST["body"] .= "\n"; if ($type) $_REQUEST["body"] .= "[class=type-".$type."]"; From 76fac5069ce0a74c1f204c516cfe58c147723bc7 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 4 Apr 2014 11:10:01 +0200 Subject: [PATCH 3/6] Statusnet bidirectional sync. It is now possible to import a remote statusnet timeline. It is adopted code from the twitter addon. --- statusnet/statusnet.css | 2 + statusnet/statusnet.php | 1465 +++++++++++++++++++++++++++++++-------- 2 files changed, 1187 insertions(+), 280 deletions(-) mode change 100755 => 100644 statusnet/statusnet.php diff --git a/statusnet/statusnet.css b/statusnet/statusnet.css index 81c38d98a..f50d9c05a 100755 --- a/statusnet/statusnet.css +++ b/statusnet/statusnet.css @@ -24,6 +24,8 @@ #statusnet-sendtaglinks-label, #statusnet-shortening-label, #statusnet-mirror-label, +#statusnet-import-label, +#statusnet-create_user-label, #statusnet-pin-label, #statusnet-enable-label { float: left; diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php old mode 100755 new mode 100644 index d4120aaf9..6b7d35ab1 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -32,7 +32,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ - + /*** * We have to alter the TwitterOAuth class a little bit to work with any StatusNet @@ -47,16 +47,16 @@ require_once('library/twitteroauth.php'); class StatusNetOAuth extends TwitterOAuth { function get_maxlength() { - $config = $this->get($this->host . 'statusnet/config.json'); - return $config->site->textlimit; + $config = $this->get($this->host . 'statusnet/config.json'); + return $config->site->textlimit; } function accessTokenURL() { return $this->host.'oauth/access_token'; } - function authenticateURL() { return $this->host.'oauth/authenticate'; } + function authenticateURL() { return $this->host.'oauth/authenticate'; } function authorizeURL() { return $this->host.'oauth/authorize'; } function requestTokenURL() { return $this->host.'oauth/request_token'; } function __construct($apipath, $consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) { - parent::__construct($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret); - $this->host = $apipath; + parent::__construct($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret); + $this->host = $apipath; } /** * Make an HTTP request @@ -71,11 +71,11 @@ class StatusNetOAuth extends TwitterOAuth { /* Curl settings */ $prx = get_config('system','proxy'); if(strlen($prx)) { - curl_setopt($ci, CURLOPT_HTTPPROXYTUNNEL, 1); - curl_setopt($ci, CURLOPT_PROXY, $prx); - $prxusr = get_config('system','proxyuser'); - if(strlen($prxusr)) - curl_setopt($ci, CURLOPT_PROXYUSERPWD, $prxusr); + curl_setopt($ci, CURLOPT_HTTPPROXYTUNNEL, 1); + curl_setopt($ci, CURLOPT_PROXY, $prx); + $prxusr = get_config('system','proxyuser'); + if(strlen($prxusr)) + curl_setopt($ci, CURLOPT_PROXYUSERPWD, $prxusr); } curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent); curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout); @@ -88,16 +88,16 @@ class StatusNetOAuth extends TwitterOAuth { switch ($method) { case 'POST': - curl_setopt($ci, CURLOPT_POST, TRUE); - if (!empty($postfields)) { - curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields); - } - break; + curl_setopt($ci, CURLOPT_POST, TRUE); + if (!empty($postfields)) { + curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields); + } + break; case 'DELETE': - curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE'); - if (!empty($postfields)) { - $url = "{$url}?{$postfields}"; - } + curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE'); + if (!empty($postfields)) { + $url = "{$url}?{$postfields}"; + } } curl_setopt($ci, CURLOPT_URL, $url); @@ -112,7 +112,7 @@ class StatusNetOAuth extends TwitterOAuth { function statusnet_install() { // we need some hooks, for the configuration and for sending tweets - register_hook('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); + register_hook('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); register_hook('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); register_hook('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); register_hook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local'); @@ -123,7 +123,7 @@ function statusnet_install() { function statusnet_uninstall() { - unregister_hook('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); + unregister_hook('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); unregister_hook('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); unregister_hook('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); unregister_hook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local'); @@ -132,7 +132,7 @@ function statusnet_uninstall() { // old setting - remove only unregister_hook('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); - unregister_hook('plugin_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); + unregister_hook('plugin_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); unregister_hook('plugin_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); } @@ -152,116 +152,122 @@ function statusnet_jot_nets(&$a,&$b) { function statusnet_settings_post ($a,$post) { if(! local_user()) - return; + return; // don't check statusnet settings if statusnet submit button is not clicked - if (!x($_POST,'statusnet-submit')) return; + if (!x($_POST,'statusnet-submit')) + return; if (isset($_POST['statusnet-disconnect'])) { - /*** - * if the statusnet-disconnect checkbox is set, clear the statusnet configuration - */ - del_pconfig(local_user(), 'statusnet', 'consumerkey'); - del_pconfig(local_user(), 'statusnet', 'consumersecret'); - del_pconfig(local_user(), 'statusnet', 'post'); - del_pconfig(local_user(), 'statusnet', 'post_by_default'); - del_pconfig(local_user(), 'statusnet', 'oauthtoken'); - del_pconfig(local_user(), 'statusnet', 'oauthsecret'); - del_pconfig(local_user(), 'statusnet', 'baseapi'); - del_pconfig(local_user(), 'statusnet', 'post_taglinks'); - del_pconfig(local_user(), 'statusnet', 'lastid'); - del_pconfig(local_user(), 'statusnet', 'mirror_posts'); - del_pconfig(local_user(), 'statusnet', 'intelligent_shortening'); + /*** + * if the statusnet-disconnect checkbox is set, clear the statusnet configuration + */ + del_pconfig(local_user(), 'statusnet', 'consumerkey'); + del_pconfig(local_user(), 'statusnet', 'consumersecret'); + del_pconfig(local_user(), 'statusnet', 'post'); + del_pconfig(local_user(), 'statusnet', 'post_by_default'); + del_pconfig(local_user(), 'statusnet', 'oauthtoken'); + del_pconfig(local_user(), 'statusnet', 'oauthsecret'); + del_pconfig(local_user(), 'statusnet', 'baseapi'); + del_pconfig(local_user(), 'statusnet', 'post_taglinks'); + del_pconfig(local_user(), 'statusnet', 'lastid'); + del_pconfig(local_user(), 'statusnet', 'mirror_posts'); + del_pconfig(local_user(), 'statusnet', 'intelligent_shortening'); + del_pconfig(local_user(), 'statusnet', 'import'); + del_pconfig(local_user(), 'statusnet', 'create_user'); + del_pconfig(local_user(), 'statusnet', 'own_id'); } else { - if (isset($_POST['statusnet-preconf-apiurl'])) { - /*** - * If the user used one of the preconfigured StatusNet server credentials - * use them. All the data are available in the global config. - * Check the API Url never the less and blame the admin if it's not working ^^ - */ - $globalsn = get_config('statusnet', 'sites'); - foreach ( $globalsn as $asn) { - if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl'] ) { - $apibase = $asn['apiurl']; - $c = fetch_url( $apibase . 'statusnet/version.xml' ); - if (strlen($c) > 0) { - set_pconfig(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey'] ); - set_pconfig(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret'] ); - set_pconfig(local_user(), 'statusnet', 'baseapi', $asn['apiurl'] ); - set_pconfig(local_user(), 'statusnet', 'application_name', $asn['applicationname'] ); - } else { - notice( t('Please contact your site administrator.
The provided API URL is not valid.').EOL.$asn['apiurl'].EOL ); - } - } - } - goaway($a->get_baseurl().'/settings/connectors'); - } else { - if (isset($_POST['statusnet-consumersecret'])) { - // check if we can reach the API of the StatusNet server - // we'll check the API Version for that, if we don't get one we'll try to fix the path but will - // resign quickly after this one try to fix the path ;-) - $apibase = $_POST['statusnet-baseapi']; - $c = fetch_url( $apibase . 'statusnet/version.xml' ); - if (strlen($c) > 0) { - // ok the API path is correct, let's save the settings - set_pconfig(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); - set_pconfig(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']); - set_pconfig(local_user(), 'statusnet', 'baseapi', $apibase ); - set_pconfig(local_user(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] ); - } else { - // the API path is not correct, maybe missing trailing / ? - $apibase = $apibase . '/'; - $c = fetch_url( $apibase . 'statusnet/version.xml' ); - if (strlen($c) > 0) { - // ok the API path is now correct, let's save the settings - set_pconfig(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); - set_pconfig(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']); - set_pconfig(local_user(), 'statusnet', 'baseapi', $apibase ); - } else { - // still not the correct API base, let's do noting - notice( t('We could not contact the StatusNet API with the Path you entered.').EOL ); - } - } - goaway($a->get_baseurl().'/settings/connectors'); - } else { - if (isset($_POST['statusnet-pin'])) { - // if the user supplied us with a PIN from StatusNet, let the magic of OAuth happen - $api = get_pconfig(local_user(), 'statusnet', 'baseapi'); - $ckey = get_pconfig(local_user(), 'statusnet', 'consumerkey' ); - $csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' ); - // the token and secret for which the PIN was generated were hidden in the settings - // form as token and token2, we need a new connection to Twitter using these token - // and secret to request a Access Token with the PIN - $connection = new StatusNetOAuth($api, $ckey, $csecret, $_POST['statusnet-token'], $_POST['statusnet-token2']); - $token = $connection->getAccessToken( $_POST['statusnet-pin'] ); - // ok, now that we have the Access Token, save them in the user config - set_pconfig(local_user(),'statusnet', 'oauthtoken', $token['oauth_token']); - set_pconfig(local_user(),'statusnet', 'oauthsecret', $token['oauth_token_secret']); - set_pconfig(local_user(),'statusnet', 'post', 1); - set_pconfig(local_user(),'statusnet', 'post_taglinks', 1); - // reload the Addon Settings page, if we don't do it see Bug #42 - goaway($a->get_baseurl().'/settings/connectors'); + if (isset($_POST['statusnet-preconf-apiurl'])) { + /*** + * If the user used one of the preconfigured StatusNet server credentials + * use them. All the data are available in the global config. + * Check the API Url never the less and blame the admin if it's not working ^^ + */ + $globalsn = get_config('statusnet', 'sites'); + foreach ( $globalsn as $asn) { + if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl'] ) { + $apibase = $asn['apiurl']; + $c = fetch_url( $apibase . 'statusnet/version.xml' ); + if (strlen($c) > 0) { + set_pconfig(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey'] ); + set_pconfig(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret'] ); + set_pconfig(local_user(), 'statusnet', 'baseapi', $asn['apiurl'] ); + set_pconfig(local_user(), 'statusnet', 'application_name', $asn['applicationname'] ); } else { - // if no PIN is supplied in the POST variables, the user has changed the setting - // to post a dent for every new __public__ posting to the wall - set_pconfig(local_user(),'statusnet','post',intval($_POST['statusnet-enable'])); - set_pconfig(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default'])); - set_pconfig(local_user(),'statusnet','post_taglinks',intval($_POST['statusnet-sendtaglinks'])); - set_pconfig(local_user(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror'])); - set_pconfig(local_user(), 'statusnet', 'intelligent_shortening', intval($_POST['statusnet-shortening'])); - info( t('StatusNet settings updated.') . EOL); - }}}} + notice( t('Please contact your site administrator.
The provided API URL is not valid.').EOL.$asn['apiurl'].EOL ); + } + } + } + goaway($a->get_baseurl().'/settings/connectors'); + } else { + if (isset($_POST['statusnet-consumersecret'])) { + // check if we can reach the API of the StatusNet server + // we'll check the API Version for that, if we don't get one we'll try to fix the path but will + // resign quickly after this one try to fix the path ;-) + $apibase = $_POST['statusnet-baseapi']; + $c = fetch_url( $apibase . 'statusnet/version.xml' ); + if (strlen($c) > 0) { + // ok the API path is correct, let's save the settings + set_pconfig(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); + set_pconfig(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']); + set_pconfig(local_user(), 'statusnet', 'baseapi', $apibase ); + set_pconfig(local_user(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] ); + } else { + // the API path is not correct, maybe missing trailing / ? + $apibase = $apibase . '/'; + $c = fetch_url( $apibase . 'statusnet/version.xml' ); + if (strlen($c) > 0) { + // ok the API path is now correct, let's save the settings + set_pconfig(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); + set_pconfig(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']); + set_pconfig(local_user(), 'statusnet', 'baseapi', $apibase ); + } else { + // still not the correct API base, let's do noting + notice( t('We could not contact the StatusNet API with the Path you entered.').EOL ); + } + } + goaway($a->get_baseurl().'/settings/connectors'); + } else { + if (isset($_POST['statusnet-pin'])) { + // if the user supplied us with a PIN from StatusNet, let the magic of OAuth happen + $api = get_pconfig(local_user(), 'statusnet', 'baseapi'); + $ckey = get_pconfig(local_user(), 'statusnet', 'consumerkey' ); + $csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' ); + // the token and secret for which the PIN was generated were hidden in the settings + // form as token and token2, we need a new connection to StatusNet using these token + // and secret to request a Access Token with the PIN + $connection = new StatusNetOAuth($api, $ckey, $csecret, $_POST['statusnet-token'], $_POST['statusnet-token2']); + $token = $connection->getAccessToken( $_POST['statusnet-pin'] ); + // ok, now that we have the Access Token, save them in the user config + set_pconfig(local_user(),'statusnet', 'oauthtoken', $token['oauth_token']); + set_pconfig(local_user(),'statusnet', 'oauthsecret', $token['oauth_token_secret']); + set_pconfig(local_user(),'statusnet', 'post', 1); + set_pconfig(local_user(),'statusnet', 'post_taglinks', 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 dent for every new __public__ posting to the wall + set_pconfig(local_user(),'statusnet','post',intval($_POST['statusnet-enable'])); + set_pconfig(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default'])); + set_pconfig(local_user(),'statusnet','post_taglinks',intval($_POST['statusnet-sendtaglinks'])); + set_pconfig(local_user(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror'])); + set_pconfig(local_user(), 'statusnet', 'intelligent_shortening', intval($_POST['statusnet-shortening'])); + set_pconfig(local_user(), 'statusnet', 'import', intval($_POST['statusnet-import'])); + set_pconfig(local_user(), 'statusnet', 'create_user', intval($_POST['statusnet-create_user'])); + info( t('StatusNet settings updated.') . EOL); + }}}} } function statusnet_settings(&$a,&$s) { - if(! local_user()) - return; - $a->page['htmlhead'] .= '' . "\r\n"; + if(! local_user()) + return; + $a->page['htmlhead'] .= '' . "\r\n"; /*** * 1) Check that we have a base api url and a consumer key & secret * 2) If no OAuthtoken & stuff is present, generate button to get some - * allow the user to cancel the connection process at this step + * allow the user to cancel the connection process at this step * 3) Checkbox for "Send public notices (respect size limitation) */ - $api = get_pconfig(local_user(), 'statusnet', 'baseapi'); + $api = get_pconfig(local_user(), 'statusnet', 'baseapi'); $ckey = get_pconfig(local_user(), 'statusnet', 'consumerkey' ); $csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' ); $otoken = get_pconfig(local_user(), 'statusnet', 'oauthtoken' ); @@ -269,61 +275,67 @@ function statusnet_settings(&$a,&$s) { $enabled = get_pconfig(local_user(), 'statusnet', 'post'); $checked = (($enabled) ? ' checked="checked" ' : ''); $defenabled = get_pconfig(local_user(),'statusnet','post_by_default'); - $defchecked = (($defenabled) ? ' checked="checked" ' : ''); - $linksenabled = get_pconfig(local_user(),'statusnet','post_taglinks'); - $linkschecked = (($linksenabled) ? ' checked="checked" ' : ''); - + $defchecked = (($defenabled) ? ' checked="checked" ' : ''); + $linksenabled = get_pconfig(local_user(),'statusnet','post_taglinks'); + $linkschecked = (($linksenabled) ? ' checked="checked" ' : ''); $mirrorenabled = get_pconfig(local_user(),'statusnet','mirror_posts'); $mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : ''); $shorteningenabled = get_pconfig(local_user(),'statusnet','intelligent_shortening'); $shorteningchecked = (($shorteningenabled) ? ' checked="checked" ' : ''); + $importenabled = get_pconfig(local_user(),'statusnet','import'); + $importchecked = (($importenabled) ? ' checked="checked" ' : ''); + $create_userenabled = get_pconfig(local_user(),'statusnet','create_user'); + $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : ''); + + $globalshortening = get_config('statusnet','intelligent_shortening'); + $s .= ''; - $s .= '

'. t('StatusNet').'

'; + $s .= '

'. t('StatusNet Import/Export/Mirror').'

'; $s .= ''; $s .= ''; + $s .= ''; + $s .= ''; + $s .= '
'; +/* + $s .= ''; + $s .= ''; + $s .= '
'; +*/ $s .= '
'; - $s .= ''; - $s .= ''; + $s .= ''; + $s .= ''; $s .= '
'; $s .= '
'; } } - $s .= '
'; + $s .= '
'; } @@ -413,13 +436,13 @@ function statusnet_post_local(&$a,&$b) { if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'statusnet','post_by_default'))) $statusnet_enable = 1; - if(! $statusnet_enable) - return; + if(! $statusnet_enable) + return; - if(strlen($b['postopts'])) - $b['postopts'] .= ','; - $b['postopts'] .= 'statusnet'; - } + if(strlen($b['postopts'])) + $b['postopts'] .= ','; + $b['postopts'] .= 'statusnet'; + } } if (! function_exists( 'short_link' )) { @@ -428,21 +451,21 @@ function short_link($url) { $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() ) ); + $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() ) ); + // 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(); } }; @@ -492,7 +515,7 @@ function statusnet_shortenmsg($b, $max_char) { $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 + // remove the recycle signs and the names since they aren't helpful on statusnet // recycle 1 $recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8'); $body = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', "\n", $body); @@ -608,26 +631,105 @@ function statusnet_shortenmsg($b, $max_char) { return(array("msg"=>trim($msg." ".$msglink), "image"=>"")); } +function statusnet_action($a, $uid, $pid, $action) { + $api = get_pconfig($uid, 'statusnet', 'baseapi'); + $ckey = get_pconfig($uid, 'statusnet', 'consumerkey'); + $csecret = get_pconfig($uid, 'statusnet', 'consumersecret'); + $otoken = get_pconfig($uid, 'statusnet', 'oauthtoken'); + $osecret = get_pconfig($uid, 'statusnet', 'oauthsecret'); + + $connection = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret); + + logger("statusnet_action '".$action."' ID: ".$pid, LOGGER_DATA); + + switch ($action) { + case "delete": + $result = $connection->post("statuses/destroy/".$pid); + break; + case "like": + $result = $connection->post("favorites/create/".$pid); + break; + case "unlike": + $result = $connection->post("favorites/destroy/".$pid); + break; + } + logger("statusnet_action '".$action."' send, result: " . print_r($result, true), LOGGER_DEBUG); +} + function statusnet_post_hook(&$a,&$b) { /** * Post to statusnet */ - if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) - return; + if (!get_pconfig($b["uid"],'statusnet','import')) { + if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) + return; + } - if(! strstr($b['postopts'],'statusnet')) - return; + $api = get_pconfig($b["uid"], 'statusnet', 'baseapi'); + $hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api); - if($b['parent'] != $b['id']) - return; + if($b['parent'] != $b['id']) { + logger("statusnet_post_hook: parameter ".print_r($b, true), LOGGER_DATA); + + // Looking if its a reply to a statusnet post + $hostlength = strlen($hostname) + 2; + if ((substr($b["parent-uri"], 0, $hostlength) != $hostname."::") AND (substr($b["extid"], 0, $hostlength) != $hostname."::") + AND (substr($b["thr-parent"], 0, $hostlength) != $hostname."::")) { + logger("statusnet_post_hook: no statusnet post ".$b["parent"]); + return; + } + + $r = q("SELECT `item`.`author-link`, `item`.`uri`, `contact`.`nick` AS contact_nick + FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` + WHERE `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1", + dbesc($b["thr-parent"]), + intval($b["uid"])); + + if(!count($r)) { + logger("statusnet_post_hook: no parent found ".$b["thr-parent"]); + return; + } else { + $iscomment = true; + $orig_post = $r[0]; + } + + $nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]"; + $nicknameplain = "@".$orig_post["contact_nick"]; + + logger("statusnet_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("statusnet_post_hook: parent found ".print_r($orig_post, true), LOGGER_DEBUG); + } else { + $iscomment = false; + + if($b['private'] OR !strstr($b['postopts'],'statusnet')) + return; + } + + if (($b['verb'] == ACTIVITY_POST) AND $b['deleted']) + statusnet_action($a, $b["uid"], substr($orig_post["uri"], $hostlength), "delete"); + + if($b['verb'] == ACTIVITY_LIKE) { + logger("statusnet_post_hook: parameter 2 ".substr($b["thr-parent"], $hostlength), LOGGER_DEBUG); + if ($b['deleted']) + statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "unlike"); + else + statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "like"); + return; + } + + if($b['deleted'] || ($b['created'] !== $b['edited'])) + return; // if posts comes from statusnet don't send it back if($b['app'] == "StatusNet") return; - logger('statusnet post invoked'); + logger('statusnet post invoked'); load_pconfig($b['uid'], 'statusnet'); @@ -644,37 +746,41 @@ function statusnet_post_hook(&$a,&$b) { if($ckey && $csecret && $otoken && $osecret) { + // If it's a repeated message from statusnet then do a native retweet and exit + if (statusnet_is_retweet($a, $b['uid'], $b['body'])) + return; + require_once('include/bbcode.php'); $dent = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret); - $max_char = $dent->get_maxlength(); // max. length for a dent - // we will only work with up to two times the length of the dent - // we can later send to StatusNet. 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. + $max_char = $dent->get_maxlength(); // max. length for a dent + // we will only work with up to two times the length of the dent + // we can later send to StatusNet. 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. $tempfile = ""; $intelligent_shortening = get_config('statusnet','intelligent_shortening'); if (!$intelligent_shortening) { - if (! $b['title']=='') { + if (! $b['title']=='') { $tmp = $b['title'].": \n".$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'],'statusnet','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') { + } 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'],'statusnet','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 @@ -685,25 +791,25 @@ function statusnet_post_hook(&$a,&$b) { // recycle 2 (test) $recycle = html_entity_decode("◌ ", ENT_QUOTES, 'UTF-8'); $tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', $recycle.'$2', $tmp); - } - // preserve links to webpages - $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 + } + // preserve links to webpages + $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('
','
'),"\n",$msg); @@ -717,12 +823,12 @@ function statusnet_post_hook(&$a,&$b) { // 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('
','
'),' ',$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 = str_replace(array('
','
'),' ',$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; } @@ -744,20 +850,32 @@ function statusnet_post_hook(&$a,&$b) { // and now dent it :-) if(strlen($msg)) { - // New code that is able to post pictures - require_once("addon/statusnet/codebird.php"); - $cb = \CodebirdSN\CodebirdSN::getInstance(); - $cb->setAPIEndpoint($api); - $cb->setConsumerKey($ckey, $csecret); - $cb->setToken($otoken, $osecret); - $result = $cb->statuses_update($postdata); - //$result = $dent->post('statuses/update', $postdata); - logger('statusnet_post send, result: ' . print_r($result, true). - "\nmessage: ".$msg, LOGGER_DEBUG."\nOriginal post: ".print_r($b, true)."\nPost Data: ".print_r($postdata, true)); - if ($result->error) { - logger('Send to StatusNet failed: "' . $result->error . '"'); - } - } + if ($iscomment) { + $postdata["in_reply_to_status_id"] = substr($orig_post["uri"], $hostlength); + logger('statusnet_post send reply '.print_r($postdata, true), LOGGER_DEBUG); + } + + // New code that is able to post pictures + require_once("addon/statusnet/codebird.php"); + $cb = \CodebirdSN\CodebirdSN::getInstance(); + $cb->setAPIEndpoint($api); + $cb->setConsumerKey($ckey, $csecret); + $cb->setToken($otoken, $osecret); + $result = $cb->statuses_update($postdata); + //$result = $dent->post('statuses/update', $postdata); + logger('statusnet_post send, result: ' . print_r($result, true). + "\nmessage: ".$msg, LOGGER_DEBUG."\nOriginal post: ".print_r($b, true)."\nPost Data: ".print_r($postdata, true)); + if ($result->error) { + logger('Send to StatusNet failed: "'.$result->error.'"'); + } elseif ($iscomment) { + logger('statusnet_post: Update extid '.$result->id." for post id ".$b['id']); + q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d", + dbesc($hostname."::".$result->id), + dbesc($result->text), + intval($b['id']) + ); + } + } if ($tempfile != "") unlink($tempfile); } @@ -774,25 +892,25 @@ function statusnet_plugin_admin_post(&$a){ $apiurl=$apiurl.'/'; $secret=trim($_POST['secret'][$id]); $key=trim($_POST['key'][$id]); - $applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'][$id])):''); + $applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'][$id])):''); if ($sitename!="" && $apiurl!="" && $secret!="" && $key!="" && !x($_POST['delete'][$id])){ - + $sites[] = Array( 'sitename' => $sitename, 'apiurl' => $apiurl, 'consumersecret' => $secret, 'consumerkey' => $key, - 'applicationname' => $applicationname + 'applicationname' => $applicationname ); } } - + $sites = set_config('statusnet','sites', $sites); - + } function statusnet_plugin_admin(&$a, &$o){ @@ -852,6 +970,14 @@ function statusnet_cron($a,$b) { } } + $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()"); + if(count($r)) { + foreach($r as $rr) { + logger('statusnet: importing timeline from user '.$rr['uid']); + statusnet_fetchhometimeline($a, $rr["uid"]); + } + } + logger('statusnet: cron_end'); set_config('statusnet','last_poll', time()); @@ -865,12 +991,15 @@ function statusnet_fetchtimeline($a, $uid) { $osecret = get_pconfig($uid, 'statusnet', 'oauthsecret'); $lastid = get_pconfig($uid, 'statusnet', 'lastid'); - // get the application name for the SN app - // 1st try personal config, then system config and fallback to the - // hostname of the node if neither one is set. - $application_name = get_pconfig( $uid, 'statusnet', 'application_name'); - if ($application_name == "") - $application_name = get_config('statusnet', 'application_name'); + require_once('mod/item.php'); + require_once('include/items.php'); + + // get the application name for the SN app + // 1st try personal config, then system config and fallback to the + // hostname of the node if neither one is set. + $application_name = get_pconfig( $uid, 'statusnet', 'application_name'); + if ($application_name == "") + $application_name = get_config('statusnet', 'application_name'); if ($application_name == "") $application_name = $a->get_hostname(); @@ -890,8 +1019,8 @@ function statusnet_fetchtimeline($a, $uid) { $posts = array_reverse($items); - if (count($posts)) { - foreach ($posts as $post) { + if (count($posts)) { + foreach ($posts as $post) { if ($post->id > $lastid) $lastid = $post->id; @@ -921,7 +1050,7 @@ function statusnet_fetchtimeline($a, $uid) { $_REQUEST["title"] = ""; - $_REQUEST["body"] = $post->text; + $_REQUEST["body"] = add_page_info_to_body($post->text, true); if (is_string($post->place->name)) $_REQUEST["location"] = $post->place->name; @@ -938,12 +1067,788 @@ function statusnet_fetchtimeline($a, $uid) { if ($_REQUEST["body"] != "") { logger('statusnet: posting for user '.$uid); - require_once('mod/item.php'); item_post($a); } - } - } + } + } } set_pconfig($uid, 'statusnet', 'lastid', $lastid); } +function statusnet_address($contact) { + $hostname = normalise_link($contact->statusnet_profile_url); + $nickname = $contact->screen_name; + + $hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $contact->statusnet_profile_url); + + $address = $contact->screen_name."@".$hostname; + + return($address); +} + +function statusnet_fetch_contact($uid, $contact, $create_user) { + // 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", + dbesc(normalise_link($contact->statusnet_profile_url))); + + if (count($r) == 0) + q("INSERT INTO unique_contacts (url, name, nick, avatar) VALUES ('%s', '%s', '%s', '%s')", + dbesc(normalise_link($contact->statusnet_profile_url)), + dbesc($contact->name), + dbesc($contact->screen_name), + dbesc($contact->profile_image_url)); + 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), + dbesc(normalise_link($contact->statusnet_profile_url))); + + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", + intval($uid), dbesc(normalise_link($contact->statusnet_profile_url))); + + if(!count($r) AND !$create_user) + return(0); + + if (count($r) AND ($r[0]["readonly"] OR $r[0]["blocked"])) { + logger("statusnet_fetch_contact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG); + return(-1); + } + + if(!count($r)) { + // create contact record + q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`, + `name`, `nick`, `photo`, `network`, `rel`, `priority`, + `writable`, `blocked`, `readonly`, `pending` ) + VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ", + intval($uid), + dbesc(datetime_convert()), + dbesc($contact->statusnet_profile_url), + dbesc(normalise_link($contact->statusnet_profile_url)), + dbesc(statusnet_address($contact)), + dbesc(normalise_link($contact->statusnet_profile_url)), + dbesc(''), + dbesc(''), + dbesc($contact->name), + dbesc($contact->screen_name), + dbesc($contact->profile_image_url), + dbesc(NETWORK_STATUSNET), + intval(CONTACT_IS_FRIEND), + intval(1), + intval(1) + ); + + $r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d LIMIT 1", + dbesc($contact->statusnet_profile_url), + intval($uid) + ); + + if(! count($r)) + return(false); + + $contact_id = $r[0]['id']; + + $g = q("SELECT def_gid FROM user WHERE uid = %d LIMIT 1", + intval($uid) + ); + + if($g && intval($g[0]['def_gid'])) { + require_once('include/group.php'); + group_add_member($uid,'',$contact_id,$g[0]['def_gid']); + } + + require_once("Photo.php"); + + $photos = import_profile_photo($contact->profile_image_url,$uid,$contact_id); + + q("UPDATE `contact` SET `photo` = '%s', + `thumb` = '%s', + `micro` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s' + WHERE `id` = %d", + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + intval($contact_id) + ); + + } else { + // update profile photos once every two weeks as we have no notification of when they change. + + //$update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -2 days')) ? true : false); + $update_photo = ($r[0]['avatar-date'] < datetime_convert('','','now -12 hours')); + + // check that we have all the photos, this has been known to fail on occasion + + if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) { + + logger("statusnet_fetch_contact: Updating contact ".$contact->screen_name, LOGGER_DEBUG); + + require_once("Photo.php"); + + $photos = import_profile_photo($contact->profile_image_url, $uid, $r[0]['id']); + + q("UPDATE `contact` SET `photo` = '%s', + `thumb` = '%s', + `micro` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s', + `url` = '%s', + `nurl` = '%s', + `addr` = '%s', + `name` = '%s', + `nick` = '%s' + WHERE `id` = %d", + dbesc($photos[0]), + dbesc($photos[1]), + dbesc($photos[2]), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($contact->statusnet_profile_url), + dbesc(normalise_link($contact->statusnet_profile_url)), + dbesc(statusnet_address($contact)), + dbesc($contact->name), + dbesc($contact->screen_name), + intval($r[0]['id']) + ); + } + } + + return($r[0]["id"]); +} + +function statusnet_fetchuser($a, $uid, $screen_name = "", $user_id = "") { + $ckey = get_pconfig($uid, 'statusnet', 'consumerkey'); + $csecret = get_pconfig($uid, 'statusnet', 'consumersecret'); + $api = get_pconfig($uid, 'statusnet', 'baseapi'); + $otoken = get_pconfig($uid, 'statusnet', 'oauthtoken'); + $osecret = get_pconfig($uid, 'statusnet', 'oauthsecret'); + + require_once("addon/statusnet/codebird.php"); + + $cb = \Codebird\Codebird::getInstance(); + $cb->setConsumerKey($ckey, $csecret); + $cb->setToken($otoken, $osecret); + + $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", + intval($uid)); + + if(count($r)) { + $self = $r[0]; + } else + return; + + $parameters = array(); + + if ($screen_name != "") + $parameters["screen_name"] = $screen_name; + + if ($user_id != "") + $parameters["user_id"] = $user_id; + + // Fetching user data + $user = $cb->users_show($parameters); + + if (!is_object($user)) + return; + + $contact_id = statusnet_fetch_contact($uid, $user, true); + + return $contact_id; +} + +function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact) { + + require_once("include/html2bbcode.php"); + + $api = get_pconfig($uid, 'statusnet', 'baseapi'); + $hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api); + + $postarray = array(); + $postarray['network'] = NETWORK_STATUSNET; + $postarray['gravity'] = 0; + $postarray['uid'] = $uid; + $postarray['wall'] = 0; + $postarray['uri'] = $hostname."::".$post->id; + + $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", + dbesc($postarray['uri']), + intval($uid) + ); + + if (count($r)) + return(array()); + + $contactid = 0; + + if ($post->in_reply_to_status_id != "") { + + $parent = $hostname."::".$post->in_reply_to_status_id; + + $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($parent), + intval($uid) + ); + if (count($r)) { + $postarray['thr-parent'] = $r[0]["uri"]; + $postarray['parent-uri'] = $r[0]["parent-uri"]; + } else { + $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", + dbesc($parent), + intval($uid) + ); + if (count($r)) { + $postarray['thr-parent'] = $r[0]['uri']; + $postarray['parent-uri'] = $r[0]['parent-uri']; + } else { + $postarray['thr-parent'] = $postarray['uri']; + $postarray['parent-uri'] = $postarray['uri']; + } + } + + // Is it me? + $own_url = get_pconfig($uid, 'statusnet', 'own_url'); + + if ($post->user->id == $own_url) { + $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", + intval($uid)); + + if(count($r)) { + $contactid = $r[0]["id"]; + + $postarray['owner-name'] = $r[0]["name"]; + $postarray['owner-link'] = $r[0]["url"]; + $postarray['owner-avatar'] = $r[0]["photo"]; + } else + return(array()); + } + } else + $postarray['parent-uri'] = $postarray['uri']; + + if ($contactid == 0) { + $contactid = statusnet_fetch_contact($uid, $post->user, $create_user); + $postarray['owner-name'] = $post->user->name; + $postarray['owner-link'] = $post->user->statusnet_profile_url; + $postarray['owner-avatar'] = $post->user->profile_image_url; + } + if(($contactid == 0) AND !$only_existing_contact) + $contactid = $self['id']; + elseif ($contactid <= 0) + return(array()); + + $postarray['contact-id'] = $contactid; + + $postarray['verb'] = ACTIVITY_POST; + $postarray['author-name'] = $postarray['owner-name']; + $postarray['author-link'] = $postarray['owner-link']; + $postarray['author-avatar'] = $postarray['owner-avatar']; + + // To-Do: Maybe unreliable? Can the api be entered without trailing "/"? + $hostname = str_replace("/api/", "/notice/", get_pconfig($uid, 'statusnet', 'baseapi')); + + $postarray['plink'] = $hostname.$post->id; + $postarray['app'] = strip_tags($post->source); + + if ($post->user->protected) { + $postarray['private'] = 1; + $postarray['allow_cid'] = '<' . $self['id'] . '>'; + } + + $postarray['body'] = html2bbcode($post->statusnet_html); + + $converted = statusnet_convertmsg($a, $postarray['body'], false); + $postarray['body'] = $converted["body"]; + $postarray['tag'] = $converted["tags"]; + + $postarray['created'] = datetime_convert('UTC','UTC',$post->created_at); + $postarray['edited'] = datetime_convert('UTC','UTC',$post->created_at); + + if (is_string($post->place->name)) + $postarray["location"] = $post->place->name; + + if (is_string($post->place->full_name)) + $postarray["location"] = $post->place->full_name; + + if (is_array($post->geo->coordinates)) + $postarray["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1]; + + if (is_array($post->coordinates->coordinates)) + $postarray["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0]; + + if (is_object($post->retweeted_status)) { + $postarray['body'] = html2bbcode($post->retweeted_status->statusnet_html); + + $converted = statusnet_convertmsg($a, $postarray['body'], false); + $postarray['body'] = $converted["body"]; + $postarray['tag'] = $converted["tags"]; + + statusnet_fetch_contact($uid, $post->retweeted_status->user, false); + + // Let retweets look like wall-to-wall posts + $postarray['author-name'] = $post->retweeted_status->user->name; + $postarray['author-link'] = $post->retweeted_status->user->statusnet_profile_url; + $postarray['author-avatar'] = $post->retweeted_status->user->profile_image_url; + } + return($postarray); +} + +function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray) { + + $user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", + intval($uid) + ); + + if(!count($user)) + return; + + // Is it me? + if (link_compare($user[0]["url"], $postarray['author-link'])) + return; + + $own_user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", + intval($uid), + dbesc($own_url) + ); + + if(!count($own_user)) + return; + + // Is it me from statusnet? + if (link_compare($own_user[0]["url"], $postarray['author-link'])) + return; + + $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0", + dbesc($postarray['parent-uri']), + intval($uid) + ); + + if(count($myconv)) { + + foreach($myconv as $conv) { + // now if we find a match, it means we're in this conversation + + if(!link_compare($conv['author-link'],$user[0]["url"]) AND !link_compare($conv['author-link'],$own_user[0]["url"])) + continue; + + require_once('include/enotify.php'); + + $conv_parent = $conv['parent']; + + notification(array( + 'type' => NOTIFY_COMMENT, + 'notify_flags' => $user[0]['notify-flags'], + 'language' => $user[0]['language'], + 'to_name' => $user[0]['username'], + 'to_email' => $user[0]['email'], + 'uid' => $user[0]['uid'], + 'item' => $postarray, + 'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $top_item, + 'source_name' => $postarray['author-name'], + 'source_link' => $postarray['author-link'], + 'source_photo' => $postarray['author-avatar'], + 'verb' => ACTIVITY_POST, + 'otype' => 'item', + 'parent' => $conv_parent, + )); + + // only send one notification + break; + } + } +} + +function statusnet_fetchhometimeline($a, $uid) { + $conversations = array(); + + $ckey = get_pconfig($uid, 'statusnet', 'consumerkey'); + $csecret = get_pconfig($uid, 'statusnet', 'consumersecret'); + $api = get_pconfig($uid, 'statusnet', 'baseapi'); + $otoken = get_pconfig($uid, 'statusnet', 'oauthtoken'); + $osecret = get_pconfig($uid, 'statusnet', 'oauthsecret'); + $create_user = get_pconfig($uid, 'statusnet', 'create_user'); + + // "create_user" is deactivated, since currently you cannot add users manually by now + $create_user = true; + + logger("statusnet_fetchhometimeline: Fetching for user ".$uid, LOGGER_DEBUG); + + require_once('library/twitteroauth.php'); + require_once('include/items.php'); + + $connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret); + + $own_contact = statusnet_fetch_own_contact($a, $uid); + + $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", + intval($own_contact), + intval($uid)); + + if(count($r)) { + $nick = $r[0]["nick"]; + } else { + logger("statusnet_fetchhometimeline: Own statusnet contact not found for user ".$uid, LOGGER_DEBUG); + return; + } + + $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", + intval($uid)); + + if(count($r)) { + $self = $r[0]; + } else { + logger("statusnet_fetchhometimeline: Own contact not found for user ".$uid, LOGGER_DEBUG); + return; + } + + $u = q("SELECT * FROM user WHERE uid = %d LIMIT 1", + intval($uid)); + if(!count($u)) { + logger("statusnet_fetchhometimeline: Own user not found for user ".$uid, LOGGER_DEBUG); + return; + } + + $parameters = array("exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true); + //$parameters["count"] = 200; + + + // Fetching timeline + $lastid = get_pconfig($uid, 'statusnet', 'lasthometimelineid'); + //$lastid = 1; + + $first_time = ($lastid == ""); + + if ($lastid <> "") + $parameters["since_id"] = $lastid; + + $items = $connection->get('statuses/home_timeline', $parameters); + + if (!is_array($items)) { + logger("statusnet_fetchhometimeline: Error fetching home timeline: ".print_r($items, true), LOGGER_DEBUG); + return; + } + + $posts = array_reverse($items); + + logger("statusnet_fetchhometimeline: Fetching timeline for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG); + + if (count($posts)) { + foreach ($posts as $post) { + + if ($post->id > $lastid) + $lastid = $post->id; + + if ($first_time) + continue; + + if (isset($post->statusnet_conversation_id)) { + if (!isset($conversations[$post->statusnet_conversation_id])) { + statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $post->statusnet_conversation_id); + $conversations[$post->statusnet_conversation_id] = $post->statusnet_conversation_id; + } + } else { + $postarray = statusnet_createpost($a, $uid, $post, $self, $create_user, true); + + if (trim($postarray['body']) == "") + continue; + + $item = item_store($postarray); + + logger('statusnet_fetchhometimeline: User '.$self["nick"].' posted home timeline item '.$item); + + if ($item != 0) + statusnet_checknotification($a, $uid, $nick, $item, $postarray); + } + + } + } + set_pconfig($uid, 'statusnet', 'lasthometimelineid', $lastid); + + // Fetching mentions + $lastid = get_pconfig($uid, 'statusnet', 'lastmentionid'); + $first_time = ($lastid == ""); + + if ($lastid <> "") + $parameters["since_id"] = $lastid; + + $items = $connection->get('statuses/mentions_timeline', $parameters); + + if (!is_array($items)) { + logger("statusnet_fetchhometimeline: Error fetching mentions: ".print_r($items, true), LOGGER_DEBUG); + return; + } + + $posts = array_reverse($items); + + logger("statusnet_fetchhometimeline: Fetching mentions for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG); + + if (count($posts)) { + foreach ($posts as $post) { + if ($post->id > $lastid) + $lastid = $post->id; + + if ($first_time) + continue; + + $postarray = statusnet_createpost($a, $uid, $post, $self, false, false); + + if (isset($post->statusnet_conversation_id)) { + if (!isset($conversations[$post->statusnet_conversation_id])) { + statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $post->statusnet_conversation_id); + $conversations[$post->statusnet_conversation_id] = $post->statusnet_conversation_id; + } + } else { + if (trim($postarray['body']) != "") { + continue; + + $item = item_store($postarray); + + logger('statusnet_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item); + } + } + + $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($postarray['uri']), + intval($uid) + ); + if (count($r)) + $item = $r[0]['id']; + + 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'], + 'source_photo' => $postarray['author-avatar'], + 'verb' => ACTIVITY_TAG, + 'otype' => 'item' + )); + } + } + } + + set_pconfig($uid, 'statusnet', 'lastmentionid', $lastid); +} + +function statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $conversation) { + $ckey = get_pconfig($uid, 'statusnet', 'consumerkey'); + $csecret = get_pconfig($uid, 'statusnet', 'consumersecret'); + $api = get_pconfig($uid, 'statusnet', 'baseapi'); + $otoken = get_pconfig($uid, 'statusnet', 'oauthtoken'); + $osecret = get_pconfig($uid, 'statusnet', 'oauthsecret'); + + require_once('library/twitteroauth.php'); + + $connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret); + + $parameters["count"] = 200; + + $items = $connection->get('statusnet/conversation/'.$conversation, $parameters); + $posts = array_reverse($items); + + foreach($posts AS $post) { + $postarray = statusnet_createpost($a, $uid, $post, $self, $create_user, true); + + if (trim($postarray['body']) == "") + continue; + + //print_r($postarray); + $item = item_store($postarray); + + logger('statusnet_complete_conversation: User '.$self["nick"].' posted home timeline item '.$item); + + if ($item != 0) + statusnet_checknotification($a, $uid, $nick, $item, $postarray); + } +} + +function statusnet_convertmsg($a, $body, $no_tags = false) { + + require_once("include/oembed.php"); + require_once("include/items.php"); + require_once("include/network.php"); + + $URLSearchString = "^\[\]"; + $links = preg_match_all("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body,$matches,PREG_SET_ORDER); + + $footer = ""; + $footerurl = ""; + $type = ""; + + if ($links) { + foreach ($matches AS $match) { + $search = "[url=".$match[1]."]".$match[2]."[/url]"; + + $expanded_url = original_url($match[1]); + + $oembed_data = oembed_fetch_url($expanded_url); + + if ($type == "") + $type = $oembed_data->type; + + if ($oembed_data->type == "video") + $body = str_replace($search, "[video]".$expanded_url."[/video]", $body); + elseif (($oembed_data->type == "photo") AND isset($oembed_data->url) AND !$dontincludemedia) + $body = str_replace($search, "[url=".$expanded_url."][img]".$oembed_data->url."[/img][/url]", $body); + elseif ($oembed_data->type != "link") + $body = str_replace($search, "[url=".$expanded_url."]".$expanded_url."[/url]", $body); + else { + $img_str = fetch_url($expanded_url, true, $redirects, 4); + + $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/") { + $type = "photo"; + $body = str_replace($search, "[img]".$expanded_url."[/img]", $body); + } else { + $type = $oembed_data->type; + $footerurl = $expanded_url; + $footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]"; + + $body = str_replace($search, $expanded_url, $body); + } + } + } + + if ($footerurl != "") + $footer = add_page_info($footerurl); + + if (($footerlink != "") AND (trim($footer) != "")) { + $removedlink = trim(str_replace($footerlink, "", $body)); + + if (strstr($body, $removedlink)) + $body = $removedlink; + + $body .= $footer; + } + } + + if ($no_tags) + return(array("body" => $body, "tags" => "")); + + $str_tags = ''; + + $cnt = preg_match_all("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",$body,$matches,PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + if(strlen($str_tags)) + $str_tags .= ','; + + if ($mtch[1] == "#") { + // Replacing the hash tags that are directed to the statusnet server with internal links + $snhash = "#[url=".$mtch[2]."]".$mtch[3]."[/url]"; + $frdchash = '#[url='.$a->get_baseurl().'/search?tag='.rawurlencode($mtch[3]).']'.$mtch[3].'[/url]'; + $body = str_replace($snhash, $frdchash, $body); + + $str_tags .= $frdchash; + } else + $str_tags .= "@[url=".$mtch[2]."]".$mtch[3]."[/url]"; + // To-Do: + // There is a problem with links with to statusnet groups, so these links are stored with "@" like friendica groups + //$str_tags .= $mtch[1]."[url=".$mtch[2]."]".$mtch[3]."[/url]"; + } + } + + return(array("body"=>$body, "tags"=>$str_tags)); + +} + +function statusnet_fetch_own_contact($a, $uid) { + $ckey = get_pconfig($uid, 'statusnet', 'consumerkey'); + $csecret = get_pconfig($uid, 'statusnet', 'consumersecret'); + $api = get_pconfig($uid, 'statusnet', 'baseapi'); + $otoken = get_pconfig($uid, 'statusnet', 'oauthtoken'); + $osecret = get_pconfig($uid, 'statusnet', 'oauthsecret'); + $own_url = get_pconfig($uid, 'statusnet', 'own_url'); + + $contact_id = 0; + + if ($own_url == "") { + require_once('library/twitteroauth.php'); + + $connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret); + + // Fetching user data + $user = $connection->get('account/verify_credentials'); + + set_pconfig($uid, 'statusnet', 'own_url', normalise_link($user->statusnet_profile_url)); + + $contact_id = statusnet_fetch_contact($uid, $user, true); + + } else { + $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1", + intval($uid), dbesc($own_url)); + if(count($r)) + $contact_id = $r[0]["id"]; + else + del_pconfig($uid, 'statusnet', 'own_url'); + + } + return($contact_id); +} + +function statusnet_is_retweet($a, $uid, $body) { + $body = trim($body); + + // Skip if it isn't a pure repeated messages + // Does it start with a share? + if (strpos($body, "[share") > 0) + return(false); + + // Does it end with a share? + if (strlen($body) > (strrpos($body, "[/share]") + 8)) + return(false); + + $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body); + // Skip if there is no shared message in there + if ($body == $attributes) + return(false); + + $link = ""; + preg_match("/link='(.*?)'/ism", $attributes, $matches); + if ($matches[1] != "") + $link = $matches[1]; + + preg_match('/link="(.*?)"/ism', $attributes, $matches); + if ($matches[1] != "") + $link = $matches[1]; + + $ckey = get_pconfig($uid, 'statusnet', 'consumerkey'); + $csecret = get_pconfig($uid, 'statusnet', 'consumersecret'); + $api = get_pconfig($uid, 'statusnet', 'baseapi'); + $otoken = get_pconfig($uid, 'statusnet', 'oauthtoken'); + $osecret = get_pconfig($uid, 'statusnet', 'oauthsecret'); + $hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api); + + $id = preg_replace("=https?://".$hostname."/notice/(.*)=ism", "$1", $link); + + if ($id == $link) + return(false); + + logger('statusnet_is_retweet: Retweeting id '.$id.' for user '.$uid, LOGGER_DEBUG); + + $connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret); + + $result = $connection->post('statuses/retweet/'.$id); + + logger('statusnet_is_retweet: result '.print_r($result, true), LOGGER_DEBUG); + return(isset($result->id)); +} From 7f37e843c7678fff9cc4b88ca8a50d1a33c227e7 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 4 Apr 2014 11:13:39 +0200 Subject: [PATCH 4/6] The function for fetching the original url is removed from the addons and added to the core. --- appnetpost/appnetpost.php | 65 +--------- gpluspost/gpluspost.php | 66 +---------- twitter/twitter.php | 241 +++----------------------------------- 3 files changed, 24 insertions(+), 348 deletions(-) diff --git a/appnetpost/appnetpost.php b/appnetpost/appnetpost.php index dbe06a4e2..849bf2297 100644 --- a/appnetpost/appnetpost.php +++ b/appnetpost/appnetpost.php @@ -53,11 +53,11 @@ function appnetpost_settings(&$a,&$s) { $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); $s .= ''; - $s .= '

' . t('App.net') . '

'; + $s .= '

' . t('App.net Export') . '

'; $s .= ''; $s .= '