forked from friendica/friendica-addons
Revert "Move objects to src"
This commit is contained in:
Michael Vogel
GitHub
parent
0ce8f2cd48
commit
cf45cafea2
4 changed files with 1162 additions and 1317 deletions
|
|
@ -11,7 +11,7 @@ define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
|
||||||
|
|
||||||
use Friendica\Core\Config;
|
use Friendica\Core\Config;
|
||||||
use Friendica\Core\PConfig;
|
use Friendica\Core\PConfig;
|
||||||
use Friendica\Object\Image;
|
use Friendica\Object\Photo;
|
||||||
|
|
||||||
require_once 'mod/share.php';
|
require_once 'mod/share.php';
|
||||||
require_once 'mod/parse_url.php';
|
require_once 'mod/parse_url.php';
|
||||||
|
|
@ -264,12 +264,12 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($cleaned["full"] != "")
|
if ($cleaned["full"] != "")
|
||||||
$infoFull = Image::getInfoFromURL($cleaned["full"]);
|
$infoFull = Photo::getInfoFromURL($cleaned["full"]);
|
||||||
else
|
else
|
||||||
$infoFull = array("0" => 0, "1" => 0);
|
$infoFull = array("0" => 0, "1" => 0);
|
||||||
|
|
||||||
if ($cleaned["preview"] != "")
|
if ($cleaned["preview"] != "")
|
||||||
$infoPreview = Image::getInfoFromURL($cleaned["preview"]);
|
$infoPreview = Photo::getInfoFromURL($cleaned["preview"]);
|
||||||
else
|
else
|
||||||
$infoFull = array("0" => 0, "1" => 0);
|
$infoFull = array("0" => 0, "1" => 0);
|
||||||
|
|
||||||
|
|
@ -352,9 +352,9 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
|
||||||
$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
|
$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
|
||||||
} else {
|
} else {
|
||||||
if ($attachment->fullImage->url != "") {
|
if ($attachment->fullImage->url != "") {
|
||||||
$images = Image::storePhoto($a, $uid, "", $attachment->fullImage->url);
|
$images = Photo::storePhoto($a, $uid, "", $attachment->fullImage->url);
|
||||||
} elseif ($attachment->image->url != "") {
|
} elseif ($attachment->image->url != "") {
|
||||||
$images = Image::storePhoto($a, $uid, "", $attachment->image->url);
|
$images = Photo::storePhoto($a, $uid, "", $attachment->image->url);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,8 @@
|
||||||
use Friendica\Core\Config;
|
use Friendica\Core\Config;
|
||||||
use Friendica\Core\PConfig;
|
use Friendica\Core\PConfig;
|
||||||
use Friendica\Core\Worker;
|
use Friendica\Core\Worker;
|
||||||
use Friendica\Model\Contact;
|
use Friendica\Model\GlobalContact;
|
||||||
use Friendica\Model\GContact;
|
use Friendica\Object\Contact;
|
||||||
|
|
||||||
require 'addon/pumpio/oauth/http.php';
|
require 'addon/pumpio/oauth/http.php';
|
||||||
require 'addon/pumpio/oauth/oauth_client.php';
|
require 'addon/pumpio/oauth/oauth_client.php';
|
||||||
|
|
@ -974,7 +974,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
|
||||||
|
|
||||||
function pumpio_get_contact($uid, $contact, $no_insert = false) {
|
function pumpio_get_contact($uid, $contact, $no_insert = false) {
|
||||||
|
|
||||||
GContact::update(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
|
GlobalContact::update(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
|
||||||
"photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true,
|
"photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true,
|
||||||
"nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
|
"nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
|
||||||
"about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));
|
"about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Name: GNU Social Connector
|
* Name: GNU Social Connector
|
||||||
* Description: Bidirectional (posting, relaying and reading) connector for GNU Social.
|
* Description: Bidirectional (posting, relaying and reading) connector for GNU Social.
|
||||||
|
|
@ -33,7 +32,9 @@
|
||||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
/*
|
|
||||||
|
|
||||||
|
/***
|
||||||
* We have to alter the TwitterOAuth class a little bit to work with any GNU Social
|
* We have to alter the TwitterOAuth class a little bit to work with any GNU Social
|
||||||
* installation abroad. Basically it's only make the API path variable and be happy.
|
* installation abroad. Basically it's only make the API path variable and be happy.
|
||||||
*
|
*
|
||||||
|
|
@ -45,46 +46,24 @@ define('STATUSNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
|
||||||
require_once 'library/twitteroauth.php';
|
require_once 'library/twitteroauth.php';
|
||||||
require_once 'include/enotify.php';
|
require_once 'include/enotify.php';
|
||||||
|
|
||||||
use Friendica\App;
|
|
||||||
use Friendica\Core\Config;
|
use Friendica\Core\Config;
|
||||||
use Friendica\Core\PConfig;
|
use Friendica\Core\PConfig;
|
||||||
use Friendica\Model\GContact;
|
use Friendica\Model\GlobalContact;
|
||||||
use Friendica\Model\Photo;
|
use Friendica\Object\Photo;
|
||||||
|
|
||||||
class StatusNetOAuth extends TwitterOAuth
|
class StatusNetOAuth extends TwitterOAuth {
|
||||||
{
|
function get_maxlength() {
|
||||||
function get_maxlength()
|
|
||||||
{
|
|
||||||
$config = $this->get($this->host . 'statusnet/config.json');
|
$config = $this->get($this->host . 'statusnet/config.json');
|
||||||
return $config->site->textlimit;
|
return $config->site->textlimit;
|
||||||
}
|
}
|
||||||
|
function accessTokenURL() { return $this->host.'oauth/access_token'; }
|
||||||
function accessTokenURL()
|
function authenticateURL() { return $this->host.'oauth/authenticate'; }
|
||||||
{
|
function authorizeURL() { return $this->host.'oauth/authorize'; }
|
||||||
return $this->host . 'oauth/access_token';
|
function requestTokenURL() { return $this->host.'oauth/request_token'; }
|
||||||
}
|
function __construct($apipath, $consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) {
|
||||||
|
|
||||||
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);
|
parent::__construct($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
|
||||||
$this->host = $apipath;
|
$this->host = $apipath;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Make an HTTP request
|
* Make an HTTP request
|
||||||
*
|
*
|
||||||
|
|
@ -92,20 +71,18 @@ class StatusNetOAuth extends TwitterOAuth
|
||||||
*
|
*
|
||||||
* Copied here from the twitteroauth library and complemented by applying the proxy settings of friendica
|
* Copied here from the twitteroauth library and complemented by applying the proxy settings of friendica
|
||||||
*/
|
*/
|
||||||
function http($url, $method, $postfields = NULL)
|
function http($url, $method, $postfields = NULL) {
|
||||||
{
|
|
||||||
$this->http_info = array();
|
$this->http_info = array();
|
||||||
$ci = curl_init();
|
$ci = curl_init();
|
||||||
/* Curl settings */
|
/* Curl settings */
|
||||||
$prx = Config::get('system', 'proxy');
|
$prx = Config::get('system','proxy');
|
||||||
if (strlen($prx)) {
|
if(strlen($prx)) {
|
||||||
curl_setopt($ci, CURLOPT_HTTPPROXYTUNNEL, 1);
|
curl_setopt($ci, CURLOPT_HTTPPROXYTUNNEL, 1);
|
||||||
curl_setopt($ci, CURLOPT_PROXY, $prx);
|
curl_setopt($ci, CURLOPT_PROXY, $prx);
|
||||||
$prxusr = Config::get('system', 'proxyuser');
|
$prxusr = Config::get('system','proxyuser');
|
||||||
if (strlen($prxusr)) {
|
if(strlen($prxusr))
|
||||||
curl_setopt($ci, CURLOPT_PROXYUSERPWD, $prxusr);
|
curl_setopt($ci, CURLOPT_PROXYUSERPWD, $prxusr);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
|
curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
|
||||||
curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
|
curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
|
||||||
curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
|
curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
|
||||||
|
|
@ -134,13 +111,12 @@ class StatusNetOAuth extends TwitterOAuth
|
||||||
$this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
|
$this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
|
||||||
$this->http_info = array_merge($this->http_info, curl_getinfo($ci));
|
$this->http_info = array_merge($this->http_info, curl_getinfo($ci));
|
||||||
$this->url = $url;
|
$this->url = $url;
|
||||||
curl_close($ci);
|
curl_close ($ci);
|
||||||
return $response;
|
return $response;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_install()
|
function statusnet_install() {
|
||||||
{
|
|
||||||
// we need some hooks, for the configuration and for sending tweets
|
// 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('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post');
|
||||||
|
|
@ -149,12 +125,12 @@ function statusnet_install()
|
||||||
register_hook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
|
register_hook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
|
||||||
register_hook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
|
register_hook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
|
||||||
register_hook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body');
|
register_hook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body');
|
||||||
register_hook('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification');
|
register_hook('check_item_notification','addon/statusnet/statusnet.php', 'statusnet_check_item_notification');
|
||||||
logger("installed GNU Social");
|
logger("installed GNU Social");
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_uninstall()
|
|
||||||
{
|
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('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post');
|
||||||
unregister_hook('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
|
unregister_hook('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
|
||||||
|
|
@ -162,46 +138,41 @@ function statusnet_uninstall()
|
||||||
unregister_hook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
|
unregister_hook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
|
||||||
unregister_hook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
|
unregister_hook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
|
||||||
unregister_hook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body');
|
unregister_hook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body');
|
||||||
unregister_hook('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification');
|
unregister_hook('check_item_notification','addon/statusnet/statusnet.php', 'statusnet_check_item_notification');
|
||||||
|
|
||||||
// old setting - remove only
|
// old setting - remove only
|
||||||
unregister_hook('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
|
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');
|
unregister_hook('plugin_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post');
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_check_item_notification(App $a, &$notification_data)
|
function statusnet_check_item_notification($a, &$notification_data) {
|
||||||
{
|
|
||||||
$notification_data["profiles"][] = PConfig::get($notification_data["uid"], 'statusnet', 'own_url');
|
$notification_data["profiles"][] = PConfig::get($notification_data["uid"], 'statusnet', 'own_url');
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_jot_nets(App $a, &$b)
|
function statusnet_jot_nets(&$a,&$b) {
|
||||||
{
|
if(! local_user())
|
||||||
if (!local_user()) {
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$statusnet_post = PConfig::get(local_user(), 'statusnet', 'post');
|
$statusnet_post = PConfig::get(local_user(),'statusnet','post');
|
||||||
if (intval($statusnet_post) == 1) {
|
if(intval($statusnet_post) == 1) {
|
||||||
$statusnet_defpost = PConfig::get(local_user(), 'statusnet', 'post_by_default');
|
$statusnet_defpost = PConfig::get(local_user(),'statusnet','post_by_default');
|
||||||
$selected = ((intval($statusnet_defpost) == 1) ? ' checked="checked" ' : '');
|
$selected = ((intval($statusnet_defpost) == 1) ? ' checked="checked" ' : '');
|
||||||
$b .= '<div class="profile-jot-net"><input type="checkbox" name="statusnet_enable"' . $selected . ' value="1" /> '
|
$b .= '<div class="profile-jot-net"><input type="checkbox" name="statusnet_enable"' . $selected . ' value="1" /> '
|
||||||
. t('Post to GNU Social') . '</div>';
|
. t('Post to GNU Social') . '</div>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_settings_post(App $a, $post)
|
function statusnet_settings_post ($a,$post) {
|
||||||
{
|
if(! local_user())
|
||||||
if (!local_user()) {
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
// don't check GNU Social settings if GNU Social submit button is not clicked
|
// don't check GNU Social settings if GNU Social submit button is not clicked
|
||||||
if (!x($_POST, 'statusnet-submit')) {
|
if (!x($_POST,'statusnet-submit'))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($_POST['statusnet-disconnect'])) {
|
if (isset($_POST['statusnet-disconnect'])) {
|
||||||
/* * *
|
/***
|
||||||
* if the GNU Social-disconnect checkbox is set, clear the GNU Social configuration
|
* if the GNU Social-disconnect checkbox is set, clear the GNU Social configuration
|
||||||
*/
|
*/
|
||||||
PConfig::delete(local_user(), 'statusnet', 'consumerkey');
|
PConfig::delete(local_user(), 'statusnet', 'consumerkey');
|
||||||
|
|
@ -218,99 +189,93 @@ function statusnet_settings_post(App $a, $post)
|
||||||
PConfig::delete(local_user(), 'statusnet', 'own_id');
|
PConfig::delete(local_user(), 'statusnet', 'own_id');
|
||||||
} else {
|
} else {
|
||||||
if (isset($_POST['statusnet-preconf-apiurl'])) {
|
if (isset($_POST['statusnet-preconf-apiurl'])) {
|
||||||
/* * *
|
/***
|
||||||
* If the user used one of the preconfigured GNU Social server credentials
|
* If the user used one of the preconfigured GNU Social server credentials
|
||||||
* use them. All the data are available in the global config.
|
* 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 ^^
|
* Check the API Url never the less and blame the admin if it's not working ^^
|
||||||
*/
|
*/
|
||||||
$globalsn = Config::get('statusnet', 'sites');
|
$globalsn = Config::get('statusnet', 'sites');
|
||||||
foreach ($globalsn as $asn) {
|
foreach ( $globalsn as $asn) {
|
||||||
if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl']) {
|
if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl'] ) {
|
||||||
$apibase = $asn['apiurl'];
|
$apibase = $asn['apiurl'];
|
||||||
$c = fetch_url($apibase . 'statusnet/version.xml');
|
$c = fetch_url( $apibase . 'statusnet/version.xml' );
|
||||||
if (strlen($c) > 0) {
|
if (strlen($c) > 0) {
|
||||||
PConfig::set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey']);
|
PConfig::set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey'] );
|
||||||
PConfig::set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret']);
|
PConfig::set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret'] );
|
||||||
PConfig::set(local_user(), 'statusnet', 'baseapi', $asn['apiurl']);
|
PConfig::set(local_user(), 'statusnet', 'baseapi', $asn['apiurl'] );
|
||||||
//PConfig::set(local_user(), 'statusnet', 'application_name', $asn['applicationname'] );
|
//PConfig::set(local_user(), 'statusnet', 'application_name', $asn['applicationname'] );
|
||||||
} else {
|
} else {
|
||||||
notice(t('Please contact your site administrator.<br />The provided API URL is not valid.') . EOL . $asn['apiurl'] . EOL);
|
notice( t('Please contact your site administrator.<br />The provided API URL is not valid.').EOL.$asn['apiurl'].EOL );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
goaway($a->get_baseurl() . '/settings/connectors');
|
goaway($a->get_baseurl().'/settings/connectors');
|
||||||
} else {
|
} else {
|
||||||
if (isset($_POST['statusnet-consumersecret'])) {
|
if (isset($_POST['statusnet-consumersecret'])) {
|
||||||
// check if we can reach the API of the GNU Social server
|
// check if we can reach the API of the GNU Social server
|
||||||
// we'll check the API Version for that, if we don't get one we'll try to fix the path but will
|
// 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 ;-)
|
// resign quickly after this one try to fix the path ;-)
|
||||||
$apibase = $_POST['statusnet-baseapi'];
|
$apibase = $_POST['statusnet-baseapi'];
|
||||||
$c = fetch_url($apibase . 'statusnet/version.xml');
|
$c = fetch_url( $apibase . 'statusnet/version.xml' );
|
||||||
if (strlen($c) > 0) {
|
if (strlen($c) > 0) {
|
||||||
// ok the API path is correct, let's save the settings
|
// ok the API path is correct, let's save the settings
|
||||||
PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
|
PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
|
||||||
PConfig::set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
|
PConfig::set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
|
||||||
PConfig::set(local_user(), 'statusnet', 'baseapi', $apibase);
|
PConfig::set(local_user(), 'statusnet', 'baseapi', $apibase );
|
||||||
//PConfig::set(local_user(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] );
|
//PConfig::set(local_user(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] );
|
||||||
} else {
|
} else {
|
||||||
// the API path is not correct, maybe missing trailing / ?
|
// the API path is not correct, maybe missing trailing / ?
|
||||||
$apibase = $apibase . '/';
|
$apibase = $apibase . '/';
|
||||||
$c = fetch_url($apibase . 'statusnet/version.xml');
|
$c = fetch_url( $apibase . 'statusnet/version.xml' );
|
||||||
if (strlen($c) > 0) {
|
if (strlen($c) > 0) {
|
||||||
// ok the API path is now correct, let's save the settings
|
// ok the API path is now correct, let's save the settings
|
||||||
PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
|
PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
|
||||||
PConfig::set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
|
PConfig::set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
|
||||||
PConfig::set(local_user(), 'statusnet', 'baseapi', $apibase);
|
PConfig::set(local_user(), 'statusnet', 'baseapi', $apibase );
|
||||||
} else {
|
} else {
|
||||||
// still not the correct API base, let's do noting
|
// still not the correct API base, let's do noting
|
||||||
notice(t('We could not contact the GNU Social API with the Path you entered.') . EOL);
|
notice( t('We could not contact the GNU Social API with the Path you entered.').EOL );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
goaway($a->get_baseurl() . '/settings/connectors');
|
goaway($a->get_baseurl().'/settings/connectors');
|
||||||
} else {
|
} else {
|
||||||
if (isset($_POST['statusnet-pin'])) {
|
if (isset($_POST['statusnet-pin'])) {
|
||||||
// if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
|
// if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
|
||||||
$api = PConfig::get(local_user(), 'statusnet', 'baseapi');
|
$api = PConfig::get(local_user(), 'statusnet', 'baseapi');
|
||||||
$ckey = PConfig::get(local_user(), 'statusnet', 'consumerkey');
|
$ckey = PConfig::get(local_user(), 'statusnet', 'consumerkey' );
|
||||||
$csecret = PConfig::get(local_user(), 'statusnet', 'consumersecret');
|
$csecret = PConfig::get(local_user(), 'statusnet', 'consumersecret' );
|
||||||
// the token and secret for which the PIN was generated were hidden in the settings
|
// 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 GNU Social using these token
|
// form as token and token2, we need a new connection to GNU Social using these token
|
||||||
// and secret to request a Access Token with the PIN
|
// and secret to request a Access Token with the PIN
|
||||||
$connection = new StatusNetOAuth($api, $ckey, $csecret, $_POST['statusnet-token'], $_POST['statusnet-token2']);
|
$connection = new StatusNetOAuth($api, $ckey, $csecret, $_POST['statusnet-token'], $_POST['statusnet-token2']);
|
||||||
$token = $connection->getAccessToken($_POST['statusnet-pin']);
|
$token = $connection->getAccessToken( $_POST['statusnet-pin'] );
|
||||||
// ok, now that we have the Access Token, save them in the user config
|
// ok, now that we have the Access Token, save them in the user config
|
||||||
PConfig::set(local_user(), 'statusnet', 'oauthtoken', $token['oauth_token']);
|
PConfig::set(local_user(),'statusnet', 'oauthtoken', $token['oauth_token']);
|
||||||
PConfig::set(local_user(), 'statusnet', 'oauthsecret', $token['oauth_token_secret']);
|
PConfig::set(local_user(),'statusnet', 'oauthsecret', $token['oauth_token_secret']);
|
||||||
PConfig::set(local_user(), 'statusnet', 'post', 1);
|
PConfig::set(local_user(),'statusnet', 'post', 1);
|
||||||
PConfig::set(local_user(), 'statusnet', 'post_taglinks', 1);
|
PConfig::set(local_user(),'statusnet', 'post_taglinks', 1);
|
||||||
// reload the Addon Settings page, if we don't do it see Bug #42
|
// reload the Addon Settings page, if we don't do it see Bug #42
|
||||||
goaway($a->get_baseurl() . '/settings/connectors');
|
goaway($a->get_baseurl().'/settings/connectors');
|
||||||
} else {
|
} else {
|
||||||
// if no PIN is supplied in the POST variables, the user has changed the setting
|
// 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
|
// to post a dent for every new __public__ posting to the wall
|
||||||
PConfig::set(local_user(), 'statusnet', 'post', intval($_POST['statusnet-enable']));
|
PConfig::set(local_user(),'statusnet','post',intval($_POST['statusnet-enable']));
|
||||||
PConfig::set(local_user(), 'statusnet', 'post_by_default', intval($_POST['statusnet-default']));
|
PConfig::set(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default']));
|
||||||
PConfig::set(local_user(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror']));
|
PConfig::set(local_user(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror']));
|
||||||
PConfig::set(local_user(), 'statusnet', 'import', intval($_POST['statusnet-import']));
|
PConfig::set(local_user(), 'statusnet', 'import', intval($_POST['statusnet-import']));
|
||||||
PConfig::set(local_user(), 'statusnet', 'create_user', intval($_POST['statusnet-create_user']));
|
PConfig::set(local_user(), 'statusnet', 'create_user', intval($_POST['statusnet-create_user']));
|
||||||
|
|
||||||
if (!intval($_POST['statusnet-mirror']))
|
if (!intval($_POST['statusnet-mirror']))
|
||||||
PConfig::delete(local_user(), 'statusnet', 'lastid');
|
PConfig::delete(local_user(),'statusnet','lastid');
|
||||||
|
|
||||||
info(t('GNU Social settings updated.') . EOL);
|
info( t('GNU Social settings updated.') . EOL);
|
||||||
}
|
}}}}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
function statusnet_settings(&$a,&$s) {
|
||||||
function statusnet_settings(App $a, &$s)
|
if(! local_user())
|
||||||
{
|
|
||||||
if (!local_user()) {
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/statusnet/statusnet.css' . '" media="all" />' . "\r\n";
|
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/statusnet/statusnet.css' . '" media="all" />' . "\r\n";
|
||||||
/* * *
|
/***
|
||||||
* 1) Check that we have a base api url and a consumer key & secret
|
* 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
|
* 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
|
||||||
|
|
@ -323,59 +288,59 @@ function statusnet_settings(App $a, &$s)
|
||||||
$osecret = PConfig::get(local_user(), 'statusnet', 'oauthsecret');
|
$osecret = PConfig::get(local_user(), 'statusnet', 'oauthsecret');
|
||||||
$enabled = PConfig::get(local_user(), 'statusnet', 'post');
|
$enabled = PConfig::get(local_user(), 'statusnet', 'post');
|
||||||
$checked = (($enabled) ? ' checked="checked" ' : '');
|
$checked = (($enabled) ? ' checked="checked" ' : '');
|
||||||
$defenabled = PConfig::get(local_user(), 'statusnet', 'post_by_default');
|
$defenabled = PConfig::get(local_user(),'statusnet','post_by_default');
|
||||||
$defchecked = (($defenabled) ? ' checked="checked" ' : '');
|
$defchecked = (($defenabled) ? ' checked="checked" ' : '');
|
||||||
$mirrorenabled = PConfig::get(local_user(), 'statusnet', 'mirror_posts');
|
$mirrorenabled = PConfig::get(local_user(),'statusnet','mirror_posts');
|
||||||
$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
|
$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
|
||||||
$import = PConfig::get(local_user(), 'statusnet', 'import');
|
$import = PConfig::get(local_user(),'statusnet','import');
|
||||||
$importselected = array("", "", "");
|
$importselected = array("", "", "");
|
||||||
$importselected[$import] = ' selected="selected"';
|
$importselected[$import] = ' selected="selected"';
|
||||||
//$importenabled = PConfig::get(local_user(),'statusnet','import');
|
//$importenabled = PConfig::get(local_user(),'statusnet','import');
|
||||||
//$importchecked = (($importenabled) ? ' checked="checked" ' : '');
|
//$importchecked = (($importenabled) ? ' checked="checked" ' : '');
|
||||||
$create_userenabled = PConfig::get(local_user(), 'statusnet', 'create_user');
|
$create_userenabled = PConfig::get(local_user(),'statusnet','create_user');
|
||||||
$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
|
$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
|
||||||
|
|
||||||
$css = (($enabled) ? '' : '-disabled');
|
$css = (($enabled) ? '' : '-disabled');
|
||||||
|
|
||||||
$s .= '<span id="settings_statusnet_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
|
$s .= '<span id="settings_statusnet_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
|
||||||
$s .= '<img class="connector' . $css . '" src="images/gnusocial.png" /><h3 class="connector">' . t('GNU Social Import/Export/Mirror') . '</h3>';
|
$s .= '<img class="connector'.$css.'" src="images/gnusocial.png" /><h3 class="connector">'. t('GNU Social Import/Export/Mirror').'</h3>';
|
||||||
$s .= '</span>';
|
$s .= '</span>';
|
||||||
$s .= '<div id="settings_statusnet_expanded" class="settings-block" style="display: none;">';
|
$s .= '<div id="settings_statusnet_expanded" class="settings-block" style="display: none;">';
|
||||||
$s .= '<span class="fakelink" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
|
$s .= '<span class="fakelink" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
|
||||||
$s .= '<img class="connector' . $css . '" src="images/gnusocial.png" /><h3 class="connector">' . t('GNU Social Import/Export/Mirror') . '</h3>';
|
$s .= '<img class="connector'.$css.'" src="images/gnusocial.png" /><h3 class="connector">'. t('GNU Social Import/Export/Mirror').'</h3>';
|
||||||
$s .= '</span>';
|
$s .= '</span>';
|
||||||
|
|
||||||
if ((!$ckey) && (!$csecret)) {
|
if ( (!$ckey) && (!$csecret) ) {
|
||||||
/* * *
|
/***
|
||||||
* no consumer keys
|
* no consumer keys
|
||||||
*/
|
*/
|
||||||
$globalsn = Config::get('statusnet', 'sites');
|
$globalsn = Config::get('statusnet', 'sites');
|
||||||
/* * *
|
/***
|
||||||
* lets check if we have one or more globally configured GNU Social
|
* lets check if we have one or more globally configured GNU Social
|
||||||
* server OAuth credentials in the configuration. If so offer them
|
* server OAuth credentials in the configuration. If so offer them
|
||||||
* with a little explanation to the user as choice - otherwise
|
* with a little explanation to the user as choice - otherwise
|
||||||
* ignore this option entirely.
|
* ignore this option entirely.
|
||||||
*/
|
*/
|
||||||
if (!$globalsn == null) {
|
if (! $globalsn == null) {
|
||||||
$s .= '<h4>' . t('Globally Available GNU Social OAuthKeys') . '</h4>';
|
$s .= '<h4>' . t('Globally Available GNU Social OAuthKeys') . '</h4>';
|
||||||
$s .= '<p>' . t("There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance \x28see below\x29.") . '</p>';
|
$s .= '<p>'. t("There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance \x28see below\x29.") .'</p>';
|
||||||
$s .= '<div id="statusnet-preconf-wrapper">';
|
$s .= '<div id="statusnet-preconf-wrapper">';
|
||||||
foreach ($globalsn as $asn) {
|
foreach ($globalsn as $asn) {
|
||||||
$s .= '<input type="radio" name="statusnet-preconf-apiurl" value="' . $asn['apiurl'] . '">' . $asn['sitename'] . '<br />';
|
$s .= '<input type="radio" name="statusnet-preconf-apiurl" value="'. $asn['apiurl'] .'">'. $asn['sitename'] .'<br />';
|
||||||
}
|
}
|
||||||
$s .= '<p></p><div class="clear"></div></div>';
|
$s .= '<p></p><div class="clear"></div></div>';
|
||||||
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
|
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
|
||||||
}
|
}
|
||||||
$s .= '<h4>' . t('Provide your own OAuth Credentials') . '</h4>';
|
$s .= '<h4>' . t('Provide your own OAuth Credentials') . '</h4>';
|
||||||
$s .= '<p>' . t('No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation.') . '</p>';
|
$s .= '<p>'. t('No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation.') .'</p>';
|
||||||
$s .= '<div id="statusnet-consumer-wrapper">';
|
$s .= '<div id="statusnet-consumer-wrapper">';
|
||||||
$s .= '<label id="statusnet-consumerkey-label" for="statusnet-consumerkey">' . t('OAuth Consumer Key') . '</label>';
|
$s .= '<label id="statusnet-consumerkey-label" for="statusnet-consumerkey">'. t('OAuth Consumer Key') .'</label>';
|
||||||
$s .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" /><br />';
|
$s .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" /><br />';
|
||||||
$s .= '<div class="clear"></div>';
|
$s .= '<div class="clear"></div>';
|
||||||
$s .= '<label id="statusnet-consumersecret-label" for="statusnet-consumersecret">' . t('OAuth Consumer Secret') . '</label>';
|
$s .= '<label id="statusnet-consumersecret-label" for="statusnet-consumersecret">'. t('OAuth Consumer Secret') .'</label>';
|
||||||
$s .= '<input id="statusnet-consumersecret" type="text" name="statusnet-consumersecret" size="35" /><br />';
|
$s .= '<input id="statusnet-consumersecret" type="text" name="statusnet-consumersecret" size="35" /><br />';
|
||||||
$s .= '<div class="clear"></div>';
|
$s .= '<div class="clear"></div>';
|
||||||
$s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">' . t("Base API Path \x28remember the trailing /\x29") . '</label>';
|
$s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t("Base API Path \x28remember the trailing /\x29") .'</label>';
|
||||||
$s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" /><br />';
|
$s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" /><br />';
|
||||||
$s .= '<div class="clear"></div>';
|
$s .= '<div class="clear"></div>';
|
||||||
//$s .= '<label id="statusnet-applicationname-label" for="statusnet-applicationname">'.t('GNU Socialapplication name').'</label>';
|
//$s .= '<label id="statusnet-applicationname-label" for="statusnet-applicationname">'.t('GNU Socialapplication name').'</label>';
|
||||||
|
|
@ -384,11 +349,11 @@ function statusnet_settings(App $a, &$s)
|
||||||
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
|
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
|
||||||
$s .= '</div>';
|
$s .= '</div>';
|
||||||
} else {
|
} else {
|
||||||
/* * *
|
/***
|
||||||
* ok we have a consumer key pair now look into the OAuth stuff
|
* ok we have a consumer key pair now look into the OAuth stuff
|
||||||
*/
|
*/
|
||||||
if ((!$otoken) && (!$osecret)) {
|
if ( (!$otoken) && (!$osecret) ) {
|
||||||
/* * *
|
/***
|
||||||
* the user has not yet connected the account to GNU Social
|
* the user has not yet connected the account to GNU Social
|
||||||
* get a temporary OAuth key/secret pair and display a button with
|
* get a temporary OAuth key/secret pair and display a button with
|
||||||
* which the user can request a PIN to connect the account to a
|
* which the user can request a PIN to connect the account to a
|
||||||
|
|
@ -397,67 +362,67 @@ function statusnet_settings(App $a, &$s)
|
||||||
$connection = new StatusNetOAuth($api, $ckey, $csecret);
|
$connection = new StatusNetOAuth($api, $ckey, $csecret);
|
||||||
$request_token = $connection->getRequestToken('oob');
|
$request_token = $connection->getRequestToken('oob');
|
||||||
$token = $request_token['oauth_token'];
|
$token = $request_token['oauth_token'];
|
||||||
/* * *
|
/***
|
||||||
* make some nice form
|
* make some nice form
|
||||||
*/
|
*/
|
||||||
$s .= '<p>' . t('To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.') . '</p>';
|
$s .= '<p>'. t('To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.') .'</p>';
|
||||||
$s .= '<a href="' . $connection->getAuthorizeURL($token, False) . '" target="_statusnet"><img src="addon/statusnet/signinwithstatusnet.png" alt="' . t('Log in with GNU Social') . '"></a>';
|
$s .= '<a href="'.$connection->getAuthorizeURL($token,False).'" target="_statusnet"><img src="addon/statusnet/signinwithstatusnet.png" alt="'. t('Log in with GNU Social') .'"></a>';
|
||||||
$s .= '<div id="statusnet-pin-wrapper">';
|
$s .= '<div id="statusnet-pin-wrapper">';
|
||||||
$s .= '<label id="statusnet-pin-label" for="statusnet-pin">' . t('Copy the security code from GNU Social here') . '</label>';
|
$s .= '<label id="statusnet-pin-label" for="statusnet-pin">'. t('Copy the security code from GNU Social here') .'</label>';
|
||||||
$s .= '<input id="statusnet-pin" type="text" name="statusnet-pin" />';
|
$s .= '<input id="statusnet-pin" type="text" name="statusnet-pin" />';
|
||||||
$s .= '<input id="statusnet-token" type="hidden" name="statusnet-token" value="' . $token . '" />';
|
$s .= '<input id="statusnet-token" type="hidden" name="statusnet-token" value="'.$token.'" />';
|
||||||
$s .= '<input id="statusnet-token2" type="hidden" name="statusnet-token2" value="' . $request_token['oauth_token_secret'] . '" />';
|
$s .= '<input id="statusnet-token2" type="hidden" name="statusnet-token2" value="'.$request_token['oauth_token_secret'].'" />';
|
||||||
$s .= '</div><div class="clear"></div>';
|
$s .= '</div><div class="clear"></div>';
|
||||||
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
|
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
|
||||||
$s .= '<h4>' . t('Cancel Connection Process') . '</h4>';
|
$s .= '<h4>'.t('Cancel Connection Process').'</h4>';
|
||||||
$s .= '<div id="statusnet-cancel-wrapper">';
|
$s .= '<div id="statusnet-cancel-wrapper">';
|
||||||
$s .= '<p>' . t('Current GNU Social API is') . ': ' . $api . '</p>';
|
$s .= '<p>'.t('Current GNU Social API is').': '.$api.'</p>';
|
||||||
$s .= '<label id="statusnet-cancel-label" for="statusnet-cancel">' . t('Cancel GNU Social Connection') . '</label>';
|
$s .= '<label id="statusnet-cancel-label" for="statusnet-cancel">'. t('Cancel GNU Social Connection') . '</label>';
|
||||||
$s .= '<input id="statusnet-cancel" type="checkbox" name="statusnet-disconnect" value="1" />';
|
$s .= '<input id="statusnet-cancel" type="checkbox" name="statusnet-disconnect" value="1" />';
|
||||||
$s .= '</div><div class="clear"></div>';
|
$s .= '</div><div class="clear"></div>';
|
||||||
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
|
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
|
||||||
} else {
|
} else {
|
||||||
/* * *
|
/***
|
||||||
* we have an OAuth key / secret pair for the user
|
* we have an OAuth key / secret pair for the user
|
||||||
* so let's give a chance to disable the postings to GNU Social
|
* so let's give a chance to disable the postings to GNU Social
|
||||||
*/
|
*/
|
||||||
$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
|
$connection = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
|
||||||
$details = $connection->get('account/verify_credentials');
|
$details = $connection->get('account/verify_credentials');
|
||||||
$s .= '<div id="statusnet-info" ><img id="statusnet-avatar" src="' . $details->profile_image_url . '" /><p id="statusnet-info-block">' . t('Currently connected to: ') . '<a href="' . $details->statusnet_profile_url . '" target="_statusnet">' . $details->screen_name . '</a><br /><em>' . $details->description . '</em></p></div>';
|
$s .= '<div id="statusnet-info" ><img id="statusnet-avatar" src="'.$details->profile_image_url.'" /><p id="statusnet-info-block">'. t('Currently connected to: ') .'<a href="'.$details->statusnet_profile_url.'" target="_statusnet">'.$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 GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') . '</p>';
|
$s .= '<p>'. t('If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social 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']) {
|
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 GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '</p>';
|
$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 GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') .'</p>';
|
||||||
}
|
}
|
||||||
$s .= '<div id="statusnet-enable-wrapper">';
|
$s .= '<div id="statusnet-enable-wrapper">';
|
||||||
$s .= '<label id="statusnet-enable-label" for="statusnet-checkbox">' . t('Allow posting to GNU Social') . '</label>';
|
$s .= '<label id="statusnet-enable-label" for="statusnet-checkbox">'. t('Allow posting to GNU Social') .'</label>';
|
||||||
$s .= '<input id="statusnet-checkbox" type="checkbox" name="statusnet-enable" value="1" ' . $checked . '/>';
|
$s .= '<input id="statusnet-checkbox" type="checkbox" name="statusnet-enable" value="1" ' . $checked . '/>';
|
||||||
$s .= '<div class="clear"></div>';
|
$s .= '<div class="clear"></div>';
|
||||||
$s .= '<label id="statusnet-default-label" for="statusnet-default">' . t('Send public postings to GNU Social by default') . '</label>';
|
$s .= '<label id="statusnet-default-label" for="statusnet-default">'. t('Send public postings to GNU Social by default') .'</label>';
|
||||||
$s .= '<input id="statusnet-default" type="checkbox" name="statusnet-default" value="1" ' . $defchecked . '/>';
|
$s .= '<input id="statusnet-default" type="checkbox" name="statusnet-default" value="1" ' . $defchecked . '/>';
|
||||||
$s .= '<div class="clear"></div>';
|
$s .= '<div class="clear"></div>';
|
||||||
|
|
||||||
$s .= '<label id="statusnet-mirror-label" for="statusnet-mirror">' . t('Mirror all posts from GNU Social that are no replies or repeated messages') . '</label>';
|
$s .= '<label id="statusnet-mirror-label" for="statusnet-mirror">'.t('Mirror all posts from GNU Social that are no replies or repeated messages').'</label>';
|
||||||
$s .= '<input id="statusnet-mirror" type="checkbox" name="statusnet-mirror" value="1" ' . $mirrorchecked . '/>';
|
$s .= '<input id="statusnet-mirror" type="checkbox" name="statusnet-mirror" value="1" '. $mirrorchecked . '/>';
|
||||||
|
|
||||||
$s .= '<div class="clear"></div>';
|
$s .= '<div class="clear"></div>';
|
||||||
$s .= '</div>';
|
$s .= '</div>';
|
||||||
|
|
||||||
$s .= '<label id="statusnet-import-label" for="statusnet-import">' . t('Import the remote timeline') . '</label>';
|
$s .= '<label id="statusnet-import-label" for="statusnet-import">'.t('Import the remote timeline').'</label>';
|
||||||
//$s .= '<input id="statusnet-import" type="checkbox" name="statusnet-import" value="1" '. $importchecked . '/>';
|
//$s .= '<input id="statusnet-import" type="checkbox" name="statusnet-import" value="1" '. $importchecked . '/>';
|
||||||
|
|
||||||
$s .= '<select name="statusnet-import" id="statusnet-import" />';
|
$s .= '<select name="statusnet-import" id="statusnet-import" />';
|
||||||
$s .= '<option value="0" ' . $importselected[0] . '>' . t("Disabled") . '</option>';
|
$s .= '<option value="0" '.$importselected[0].'>'.t("Disabled").'</option>';
|
||||||
$s .= '<option value="1" ' . $importselected[1] . '>' . t("Full Timeline") . '</option>';
|
$s .= '<option value="1" '.$importselected[1].'>'.t("Full Timeline").'</option>';
|
||||||
$s .= '<option value="2" ' . $importselected[2] . '>' . t("Only Mentions") . '</option>';
|
$s .= '<option value="2" '.$importselected[2].'>'.t("Only Mentions").'</option>';
|
||||||
$s .= '</select>';
|
$s .= '</select>';
|
||||||
$s .= '<div class="clear"></div>';
|
$s .= '<div class="clear"></div>';
|
||||||
/*
|
/*
|
||||||
$s .= '<label id="statusnet-create_user-label" for="statusnet-create_user">'.t('Automatically create contacts').'</label>';
|
$s .= '<label id="statusnet-create_user-label" for="statusnet-create_user">'.t('Automatically create contacts').'</label>';
|
||||||
$s .= '<input id="statusnet-create_user" type="checkbox" name="statusnet-create_user" value="1" '. $create_userchecked . '/>';
|
$s .= '<input id="statusnet-create_user" type="checkbox" name="statusnet-create_user" value="1" '. $create_userchecked . '/>';
|
||||||
$s .= '<div class="clear"></div>';
|
$s .= '<div class="clear"></div>';
|
||||||
*/
|
*/
|
||||||
$s .= '<div id="statusnet-disconnect-wrapper">';
|
$s .= '<div id="statusnet-disconnect-wrapper">';
|
||||||
$s .= '<label id="statusnet-disconnect-label" for="statusnet-disconnect">' . t('Clear OAuth configuration') . '</label>';
|
$s .= '<label id="statusnet-disconnect-label" for="statusnet-disconnect">'. t('Clear OAuth configuration') .'</label>';
|
||||||
$s .= '<input id="statusnet-disconnect" type="checkbox" name="statusnet-disconnect" value="1" />';
|
$s .= '<input id="statusnet-disconnect" type="checkbox" name="statusnet-disconnect" value="1" />';
|
||||||
$s .= '</div><div class="clear"></div>';
|
$s .= '</div><div class="clear"></div>';
|
||||||
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
|
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
|
||||||
|
|
@ -466,8 +431,8 @@ function statusnet_settings(App $a, &$s)
|
||||||
$s .= '</div><div class="clear"></div>';
|
$s .= '</div><div class="clear"></div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_post_local(App $a, &$b)
|
|
||||||
{
|
function statusnet_post_local(&$a, &$b) {
|
||||||
if ($b['edit']) {
|
if ($b['edit']) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -476,11 +441,11 @@ function statusnet_post_local(App $a, &$b)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$statusnet_post = PConfig::get(local_user(), 'statusnet', 'post');
|
$statusnet_post = PConfig::get(local_user(),'statusnet','post');
|
||||||
$statusnet_enable = (($statusnet_post && x($_REQUEST, 'statusnet_enable')) ? intval($_REQUEST['statusnet_enable']) : 0);
|
$statusnet_enable = (($statusnet_post && x($_REQUEST,'statusnet_enable')) ? intval($_REQUEST['statusnet_enable']) : 0);
|
||||||
|
|
||||||
// if API is used, default to the chosen settings
|
// if API is used, default to the chosen settings
|
||||||
if ($b['api_source'] && intval(PConfig::get(local_user(), 'statusnet', 'post_by_default'))) {
|
if ($b['api_source'] && intval(PConfig::get(local_user(),'statusnet','post_by_default'))) {
|
||||||
$statusnet_enable = 1;
|
$statusnet_enable = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -495,61 +460,64 @@ function statusnet_post_local(App $a, &$b)
|
||||||
$b['postopts'] .= 'statusnet';
|
$b['postopts'] .= 'statusnet';
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_action(App $a, $uid, $pid, $action)
|
function statusnet_action($a, $uid, $pid, $action) {
|
||||||
{
|
|
||||||
$api = PConfig::get($uid, 'statusnet', 'baseapi');
|
$api = PConfig::get($uid, 'statusnet', 'baseapi');
|
||||||
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
|
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
|
||||||
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
|
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
|
||||||
$otoken = PConfig::get($uid, 'statusnet', 'oauthtoken');
|
$otoken = PConfig::get($uid, 'statusnet', 'oauthtoken');
|
||||||
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
|
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
|
||||||
|
|
||||||
$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
|
$connection = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
|
||||||
|
|
||||||
logger("statusnet_action '" . $action . "' ID: " . $pid, LOGGER_DATA);
|
logger("statusnet_action '".$action."' ID: ".$pid, LOGGER_DATA);
|
||||||
|
|
||||||
switch ($action) {
|
switch ($action) {
|
||||||
case "delete":
|
case "delete":
|
||||||
$result = $connection->post("statuses/destroy/" . $pid);
|
$result = $connection->post("statuses/destroy/".$pid);
|
||||||
break;
|
break;
|
||||||
case "like":
|
case "like":
|
||||||
$result = $connection->post("favorites/create/" . $pid);
|
$result = $connection->post("favorites/create/".$pid);
|
||||||
break;
|
break;
|
||||||
case "unlike":
|
case "unlike":
|
||||||
$result = $connection->post("favorites/destroy/" . $pid);
|
$result = $connection->post("favorites/destroy/".$pid);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
logger("statusnet_action '" . $action . "' send, result: " . print_r($result, true), LOGGER_DEBUG);
|
logger("statusnet_action '".$action."' send, result: " . print_r($result, true), LOGGER_DEBUG);
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_post_hook(App $a, &$b)
|
function statusnet_post_hook(&$a,&$b) {
|
||||||
{
|
|
||||||
/**
|
/**
|
||||||
* Post to GNU Social
|
* Post to GNU Social
|
||||||
*/
|
*/
|
||||||
if (!PConfig::get($b["uid"], 'statusnet', 'import')) {
|
|
||||||
if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
|
if (!PConfig::get($b["uid"],'statusnet','import')) {
|
||||||
|
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$api = PConfig::get($b["uid"], 'statusnet', 'baseapi');
|
$api = PConfig::get($b["uid"], 'statusnet', 'baseapi');
|
||||||
$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
|
$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
|
||||||
|
|
||||||
if ($b['parent'] != $b['id']) {
|
if($b['parent'] != $b['id']) {
|
||||||
logger("statusnet_post_hook: parameter " . print_r($b, true), LOGGER_DATA);
|
logger("statusnet_post_hook: parameter ".print_r($b, true), LOGGER_DATA);
|
||||||
|
|
||||||
// Looking if its a reply to a GNU Social post
|
// Looking if its a reply to a GNU Social post
|
||||||
$hostlength = strlen($hostname) + 2;
|
$hostlength = strlen($hostname) + 2;
|
||||||
if ((substr($b["parent-uri"], 0, $hostlength) != $hostname . "::") && (substr($b["extid"], 0, $hostlength) != $hostname . "::") && (substr($b["thr-parent"], 0, $hostlength) != $hostname . "::")) {
|
if ((substr($b["parent-uri"], 0, $hostlength) != $hostname."::") && (substr($b["extid"], 0, $hostlength) != $hostname."::")
|
||||||
logger("statusnet_post_hook: no GNU Social post " . $b["parent"]);
|
&& (substr($b["thr-parent"], 0, $hostlength) != $hostname."::")) {
|
||||||
|
logger("statusnet_post_hook: no GNU Social post ".$b["parent"]);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT `item`.`author-link`, `item`.`uri`, `contact`.`nick` AS contact_nick
|
$r = q("SELECT `item`.`author-link`, `item`.`uri`, `contact`.`nick` AS contact_nick
|
||||||
FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
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"]));
|
WHERE `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1",
|
||||||
|
dbesc($b["thr-parent"]),
|
||||||
|
intval($b["uid"]));
|
||||||
|
|
||||||
if (!count($r)) {
|
if(!count($r)) {
|
||||||
logger("statusnet_post_hook: no parent found " . $b["thr-parent"]);
|
logger("statusnet_post_hook: no parent found ".$b["thr-parent"]);
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
$iscomment = true;
|
$iscomment = true;
|
||||||
|
|
@ -561,18 +529,18 @@ function statusnet_post_hook(App $a, &$b)
|
||||||
|
|
||||||
$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
|
$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
|
||||||
|
|
||||||
$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nick . "[/url]";
|
$nickname = "@[url=".$orig_post["author-link"]."]".$nick."[/url]";
|
||||||
$nicknameplain = "@" . $nick;
|
$nicknameplain = "@".$nick;
|
||||||
|
|
||||||
logger("statusnet_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"], LOGGER_DEBUG);
|
logger("statusnet_post_hook: comparing ".$nickname." and ".$nicknameplain." with ".$b["body"], LOGGER_DEBUG);
|
||||||
if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false))
|
if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false))
|
||||||
$b["body"] = $nickname . " " . $b["body"];
|
$b["body"] = $nickname." ".$b["body"];
|
||||||
|
|
||||||
logger("statusnet_post_hook: parent found " . print_r($orig_post, true), LOGGER_DEBUG);
|
logger("statusnet_post_hook: parent found ".print_r($orig_post, true), LOGGER_DEBUG);
|
||||||
} else {
|
} else {
|
||||||
$iscomment = false;
|
$iscomment = false;
|
||||||
|
|
||||||
if ($b['private'] || !strstr($b['postopts'], 'statusnet'))
|
if($b['private'] || !strstr($b['postopts'],'statusnet'))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Dont't post if the post doesn't belong to us.
|
// Dont't post if the post doesn't belong to us.
|
||||||
|
|
@ -583,12 +551,11 @@ function statusnet_post_hook(App $a, &$b)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($b['verb'] == ACTIVITY_POST) && $b['deleted']) {
|
if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])
|
||||||
statusnet_action($a, $b["uid"], substr($orig_post["uri"], $hostlength), "delete");
|
statusnet_action($a, $b["uid"], substr($orig_post["uri"], $hostlength), "delete");
|
||||||
}
|
|
||||||
|
|
||||||
if ($b['verb'] == ACTIVITY_LIKE) {
|
if($b['verb'] == ACTIVITY_LIKE) {
|
||||||
logger("statusnet_post_hook: parameter 2 " . substr($b["thr-parent"], $hostlength), LOGGER_DEBUG);
|
logger("statusnet_post_hook: parameter 2 ".substr($b["thr-parent"], $hostlength), LOGGER_DEBUG);
|
||||||
if ($b['deleted'])
|
if ($b['deleted'])
|
||||||
statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "unlike");
|
statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "unlike");
|
||||||
else
|
else
|
||||||
|
|
@ -596,18 +563,15 @@ function statusnet_post_hook(App $a, &$b)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($b['deleted'] || ($b['created'] !== $b['edited'])) {
|
if($b['deleted'] || ($b['created'] !== $b['edited']))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
// if posts comes from GNU Social don't send it back
|
// if posts comes from GNU Social don't send it back
|
||||||
if ($b['extid'] == NETWORK_STATUSNET) {
|
if($b['extid'] == NETWORK_STATUSNET)
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
if ($b['app'] == "StatusNet") {
|
if($b['app'] == "StatusNet")
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
logger('GNU Socialpost invoked');
|
logger('GNU Socialpost invoked');
|
||||||
|
|
||||||
|
|
@ -619,21 +583,21 @@ function statusnet_post_hook(App $a, &$b)
|
||||||
$otoken = PConfig::get($b['uid'], 'statusnet', 'oauthtoken');
|
$otoken = PConfig::get($b['uid'], 'statusnet', 'oauthtoken');
|
||||||
$osecret = PConfig::get($b['uid'], 'statusnet', 'oauthsecret');
|
$osecret = PConfig::get($b['uid'], 'statusnet', 'oauthsecret');
|
||||||
|
|
||||||
if ($ckey && $csecret && $otoken && $osecret) {
|
if($ckey && $csecret && $otoken && $osecret) {
|
||||||
// If it's a repeated message from GNU Social then do a native retweet and exit
|
|
||||||
if (statusnet_is_retweet($a, $b['uid'], $b['body'])) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
require_once 'include/bbcode.php';
|
// If it's a repeated message from GNU Social then do a native retweet and exit
|
||||||
$dent = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
|
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
|
$max_char = $dent->get_maxlength(); // max. length for a dent
|
||||||
|
|
||||||
PConfig::set($b['uid'], 'statusnet', 'max_char', $max_char);
|
PConfig::set($b['uid'], 'statusnet', 'max_char', $max_char);
|
||||||
|
|
||||||
$tempfile = "";
|
$tempfile = "";
|
||||||
require_once "include/plaintext.php";
|
require_once("include/plaintext.php");
|
||||||
require_once "include/network.php";
|
require_once("include/network.php");
|
||||||
$msgarr = plaintext($a, $b, $max_char, true, 7);
|
$msgarr = plaintext($a, $b, $max_char, true, 7);
|
||||||
$msg = $msgarr["text"];
|
$msg = $msgarr["text"];
|
||||||
|
|
||||||
|
|
@ -644,81 +608,76 @@ function statusnet_post_hook(App $a, &$b)
|
||||||
|
|
||||||
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
|
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
|
||||||
if ((strlen($msgarr["url"]) > 20) &&
|
if ((strlen($msgarr["url"]) > 20) &&
|
||||||
((strlen($msg . " \n" . $msgarr["url"]) > $max_char))) {
|
((strlen($msg." \n".$msgarr["url"]) > $max_char)))
|
||||||
$msg .= " \n" . short_link($msgarr["url"]);
|
$msg .= " \n".short_link($msgarr["url"]);
|
||||||
} else {
|
else
|
||||||
$msg .= " \n" . $msgarr["url"];
|
$msg .= " \n".$msgarr["url"];
|
||||||
}
|
} elseif (isset($msgarr["image"]) && ($msgarr["type"] != "video"))
|
||||||
} elseif (isset($msgarr["image"]) && ($msgarr["type"] != "video")) {
|
|
||||||
$image = $msgarr["image"];
|
$image = $msgarr["image"];
|
||||||
}
|
|
||||||
|
|
||||||
if ($image != "") {
|
if ($image != "") {
|
||||||
$img_str = fetch_url($image);
|
$img_str = fetch_url($image);
|
||||||
$tempfile = tempnam(get_temppath(), "cache");
|
$tempfile = tempnam(get_temppath(), "cache");
|
||||||
file_put_contents($tempfile, $img_str);
|
file_put_contents($tempfile, $img_str);
|
||||||
$postdata = array("status" => $msg, "media[]" => $tempfile);
|
$postdata = array("status" => $msg, "media[]" => $tempfile);
|
||||||
} else {
|
} else
|
||||||
$postdata = array("status" => $msg);
|
$postdata = array("status"=>$msg);
|
||||||
}
|
|
||||||
|
|
||||||
// and now dent it :-)
|
// and now dent it :-)
|
||||||
if (strlen($msg)) {
|
if(strlen($msg)) {
|
||||||
|
|
||||||
if ($iscomment) {
|
if ($iscomment) {
|
||||||
$postdata["in_reply_to_status_id"] = substr($orig_post["uri"], $hostlength);
|
$postdata["in_reply_to_status_id"] = substr($orig_post["uri"], $hostlength);
|
||||||
logger('statusnet_post send reply ' . print_r($postdata, true), LOGGER_DEBUG);
|
logger('statusnet_post send reply '.print_r($postdata, true), LOGGER_DEBUG);
|
||||||
}
|
}
|
||||||
|
|
||||||
// New code that is able to post pictures
|
// New code that is able to post pictures
|
||||||
require_once "addon/statusnet/codebird.php";
|
require_once("addon/statusnet/codebird.php");
|
||||||
$cb = \CodebirdSN\CodebirdSN::getInstance();
|
$cb = \CodebirdSN\CodebirdSN::getInstance();
|
||||||
$cb->setAPIEndpoint($api);
|
$cb->setAPIEndpoint($api);
|
||||||
$cb->setConsumerKey($ckey, $csecret);
|
$cb->setConsumerKey($ckey, $csecret);
|
||||||
$cb->setToken($otoken, $osecret);
|
$cb->setToken($otoken, $osecret);
|
||||||
$result = $cb->statuses_update($postdata);
|
$result = $cb->statuses_update($postdata);
|
||||||
//$result = $dent->post('statuses/update', $postdata);
|
//$result = $dent->post('statuses/update', $postdata);
|
||||||
logger('statusnet_post send, result: ' . print_r($result, true) .
|
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));
|
"\nmessage: ".$msg, LOGGER_DEBUG."\nOriginal post: ".print_r($b, true)."\nPost Data: ".print_r($postdata, true));
|
||||||
|
|
||||||
if ($result->source) {
|
if ($result->source)
|
||||||
PConfig::set($b["uid"], "statusnet", "application_name", strip_tags($result->source));
|
PConfig::set($b["uid"], "statusnet", "application_name", strip_tags($result->source));
|
||||||
}
|
|
||||||
|
|
||||||
if ($result->error) {
|
if ($result->error) {
|
||||||
logger('Send to GNU Social failed: "' . $result->error . '"');
|
logger('Send to GNU Social failed: "'.$result->error.'"');
|
||||||
} elseif ($iscomment) {
|
} elseif ($iscomment) {
|
||||||
logger('statusnet_post: Update extid ' . $result->id . " for post id " . $b['id']);
|
logger('statusnet_post: Update extid '.$result->id." for post id ".$b['id']);
|
||||||
q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d",
|
q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d",
|
||||||
dbesc($hostname . "::" . $result->id),
|
dbesc($hostname."::".$result->id),
|
||||||
dbesc($result->text),
|
dbesc($result->text),
|
||||||
intval($b['id'])
|
intval($b['id'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($tempfile != "") {
|
if ($tempfile != "")
|
||||||
unlink($tempfile);
|
unlink($tempfile);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_plugin_admin_post(App $a)
|
function statusnet_plugin_admin_post(&$a){
|
||||||
{
|
|
||||||
$sites = array();
|
$sites = array();
|
||||||
|
|
||||||
foreach ($_POST['sitename'] as $id => $sitename) {
|
foreach($_POST['sitename'] as $id=>$sitename){
|
||||||
$sitename = trim($sitename);
|
$sitename=trim($sitename);
|
||||||
$apiurl = trim($_POST['apiurl'][$id]);
|
$apiurl=trim($_POST['apiurl'][$id]);
|
||||||
if (!(substr($apiurl, -1) == '/')) {
|
if (! (substr($apiurl, -1)=='/'))
|
||||||
$apiurl = $apiurl . '/';
|
$apiurl=$apiurl.'/';
|
||||||
}
|
$secret=trim($_POST['secret'][$id]);
|
||||||
$secret = trim($_POST['secret'][$id]);
|
$key=trim($_POST['key'][$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 != "" &&
|
if ($sitename!="" &&
|
||||||
$apiurl != "" &&
|
$apiurl!="" &&
|
||||||
$secret != "" &&
|
$secret!="" &&
|
||||||
$key != "" &&
|
$key!="" &&
|
||||||
!x($_POST['delete'][$id])) {
|
!x($_POST['delete'][$id])){
|
||||||
|
|
||||||
$sites[] = Array(
|
$sites[] = Array(
|
||||||
'sitename' => $sitename,
|
'sitename' => $sitename,
|
||||||
|
|
@ -730,22 +689,23 @@ function statusnet_plugin_admin_post(App $a)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$sites = Config::set('statusnet', 'sites', $sites);
|
$sites = Config::set('statusnet','sites', $sites);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_plugin_admin(App $a, &$o)
|
function statusnet_plugin_admin(&$a, &$o){
|
||||||
{
|
|
||||||
$sites = Config::get('statusnet', 'sites');
|
$sites = Config::get('statusnet','sites');
|
||||||
$sitesform = array();
|
$sitesform=array();
|
||||||
if (is_array($sites)) {
|
if (is_array($sites)){
|
||||||
foreach ($sites as $id => $s) {
|
foreach($sites as $id=>$s){
|
||||||
$sitesform[] = Array(
|
$sitesform[] = Array(
|
||||||
'sitename' => Array("sitename[$id]", "Site name", $s['sitename'], ""),
|
'sitename' => Array("sitename[$id]", "Site name", $s['sitename'], ""),
|
||||||
'apiurl' => Array("apiurl[$id]", "Api url", $s['apiurl'], t("Base API Path \x28remember the trailing /\x29")),
|
'apiurl' => Array("apiurl[$id]", "Api url", $s['apiurl'], t("Base API Path \x28remember the trailing /\x29") ),
|
||||||
'secret' => Array("secret[$id]", "Secret", $s['consumersecret'], ""),
|
'secret' => Array("secret[$id]", "Secret", $s['consumersecret'], ""),
|
||||||
'key' => Array("key[$id]", "Key", $s['consumerkey'], ""),
|
'key' => Array("key[$id]", "Key", $s['consumerkey'], ""),
|
||||||
//'applicationname' => Array("applicationname[$id]", "Application name", $s['applicationname'], ""),
|
//'applicationname' => Array("applicationname[$id]", "Application name", $s['applicationname'], ""),
|
||||||
'delete' => Array("delete[$id]", "Delete", False, "Check to delete this preset"),
|
'delete' => Array("delete[$id]", "Delete", False , "Check to delete this preset"),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -753,34 +713,31 @@ function statusnet_plugin_admin(App $a, &$o)
|
||||||
$id++;
|
$id++;
|
||||||
$sitesform[] = Array(
|
$sitesform[] = Array(
|
||||||
'sitename' => Array("sitename[$id]", t("Site name"), "", ""),
|
'sitename' => Array("sitename[$id]", t("Site name"), "", ""),
|
||||||
'apiurl' => Array("apiurl[$id]", "Api url", "", t("Base API Path \x28remember the trailing /\x29")),
|
'apiurl' => Array("apiurl[$id]", "Api url", "", t("Base API Path \x28remember the trailing /\x29") ),
|
||||||
'secret' => Array("secret[$id]", t("Consumer Secret"), "", ""),
|
'secret' => Array("secret[$id]", t("Consumer Secret"), "", ""),
|
||||||
'key' => Array("key[$id]", t("Consumer Key"), "", ""),
|
'key' => Array("key[$id]", t("Consumer Key"), "", ""),
|
||||||
//'applicationname' => Array("applicationname[$id]", t("Application name"), "", ""),
|
//'applicationname' => Array("applicationname[$id]", t("Application name"), "", ""),
|
||||||
);
|
);
|
||||||
|
|
||||||
$t = get_markup_template("admin.tpl", "addon/statusnet/");
|
$t = get_markup_template( "admin.tpl", "addon/statusnet/" );
|
||||||
$o = replace_macros($t, array(
|
$o = replace_macros($t, array(
|
||||||
'$submit' => t('Save Settings'),
|
'$submit' => t('Save Settings'),
|
||||||
'$sites' => $sitesform,
|
'$sites' => $sitesform,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_prepare_body(App $a, &$b)
|
function statusnet_prepare_body(&$a,&$b) {
|
||||||
{
|
if ($b["item"]["network"] != NETWORK_STATUSNET)
|
||||||
if ($b["item"]["network"] != NETWORK_STATUSNET) {
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
if ($b["preview"]) {
|
if ($b["preview"]) {
|
||||||
$max_char = PConfig::get(local_user(), 'statusnet', 'max_char');
|
$max_char = PConfig::get(local_user(),'statusnet','max_char');
|
||||||
if (intval($max_char) == 0) {
|
if (intval($max_char) == 0)
|
||||||
$max_char = 140;
|
$max_char = 140;
|
||||||
}
|
|
||||||
|
|
||||||
require_once "include/plaintext.php";
|
require_once("include/plaintext.php");
|
||||||
$item = $b["item"];
|
$item = $b["item"];
|
||||||
$item["plink"] = $a->get_baseurl() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
|
$item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
|
||||||
|
|
||||||
$r = q("SELECT `item`.`author-link`, `item`.`uri`, `contact`.`nick` AS contact_nick
|
$r = q("SELECT `item`.`author-link`, `item`.`uri`, `contact`.`nick` AS contact_nick
|
||||||
FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||||
|
|
@ -788,48 +745,44 @@ function statusnet_prepare_body(App $a, &$b)
|
||||||
dbesc($item["thr-parent"]),
|
dbesc($item["thr-parent"]),
|
||||||
intval(local_user()));
|
intval(local_user()));
|
||||||
|
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
$orig_post = $r[0];
|
$orig_post = $r[0];
|
||||||
//$nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]";
|
//$nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]";
|
||||||
//$nicknameplain = "@".$orig_post["contact_nick"];
|
//$nicknameplain = "@".$orig_post["contact_nick"];
|
||||||
|
|
||||||
$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
|
$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
|
||||||
|
|
||||||
$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nick . "[/url]";
|
$nickname = "@[url=".$orig_post["author-link"]."]".$nick."[/url]";
|
||||||
$nicknameplain = "@" . $nick;
|
$nicknameplain = "@".$nick;
|
||||||
|
|
||||||
if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false)) {
|
if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false))
|
||||||
$item["body"] = $nickname . " " . $item["body"];
|
$item["body"] = $nickname." ".$item["body"];
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$msgarr = plaintext($a, $item, $max_char, true, 7);
|
$msgarr = plaintext($a, $item, $max_char, true, 7);
|
||||||
$msg = $msgarr["text"];
|
$msg = $msgarr["text"];
|
||||||
|
|
||||||
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
|
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo"))
|
||||||
$msg .= " " . $msgarr["url"];
|
$msg .= " ".$msgarr["url"];
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($msgarr["image"])) {
|
if (isset($msgarr["image"]))
|
||||||
$msg .= " " . $msgarr["image"];
|
$msg .= " ".$msgarr["image"];
|
||||||
}
|
|
||||||
|
|
||||||
$b['html'] = nl2br(htmlspecialchars($msg));
|
$b['html'] = nl2br(htmlspecialchars($msg));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_cron(App $a, $b)
|
function statusnet_cron($a,$b) {
|
||||||
{
|
$last = Config::get('statusnet','last_poll');
|
||||||
$last = Config::get('statusnet', 'last_poll');
|
|
||||||
|
|
||||||
$poll_interval = intval(Config::get('statusnet', 'poll_interval'));
|
$poll_interval = intval(Config::get('statusnet','poll_interval'));
|
||||||
if (!$poll_interval) {
|
if(! $poll_interval)
|
||||||
$poll_interval = STATUSNET_DEFAULT_POLL_INTERVAL;
|
$poll_interval = STATUSNET_DEFAULT_POLL_INTERVAL;
|
||||||
}
|
|
||||||
|
|
||||||
if ($last) {
|
if($last) {
|
||||||
$next = $last + ($poll_interval * 60);
|
$next = $last + ($poll_interval * 60);
|
||||||
if ($next > time()) {
|
if($next > time()) {
|
||||||
logger('statusnet: poll intervall not reached');
|
logger('statusnet: poll intervall not reached');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -837,43 +790,41 @@ function statusnet_cron(App $a, $b)
|
||||||
logger('statusnet: cron_start');
|
logger('statusnet: cron_start');
|
||||||
|
|
||||||
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'mirror_posts' AND `v` = '1' ORDER BY RAND() ");
|
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'mirror_posts' AND `v` = '1' ORDER BY RAND() ");
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
foreach ($r as $rr) {
|
foreach($r as $rr) {
|
||||||
logger('statusnet: fetching for user ' . $rr['uid']);
|
logger('statusnet: fetching for user '.$rr['uid']);
|
||||||
statusnet_fetchtimeline($a, $rr['uid']);
|
statusnet_fetchtimeline($a, $rr['uid']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$abandon_days = intval(Config::get('system', 'account_abandon_days'));
|
$abandon_days = intval(Config::get('system','account_abandon_days'));
|
||||||
if ($abandon_days < 1) {
|
if ($abandon_days < 1)
|
||||||
$abandon_days = 0;
|
$abandon_days = 0;
|
||||||
}
|
|
||||||
|
|
||||||
$abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400);
|
$abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400);
|
||||||
|
|
||||||
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'import' AND `v` ORDER BY RAND()");
|
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'import' AND `v` ORDER BY RAND()");
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
foreach ($r as $rr) {
|
foreach($r as $rr) {
|
||||||
if ($abandon_days != 0) {
|
if ($abandon_days != 0) {
|
||||||
$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
|
$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
|
||||||
if (!count($user)) {
|
if (!count($user)) {
|
||||||
logger('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported');
|
logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logger('statusnet: importing timeline from user ' . $rr['uid']);
|
logger('statusnet: importing timeline from user '.$rr['uid']);
|
||||||
statusnet_fetchhometimeline($a, $rr["uid"], $rr["v"]);
|
statusnet_fetchhometimeline($a, $rr["uid"], $rr["v"]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logger('statusnet: cron_end');
|
logger('statusnet: cron_end');
|
||||||
|
|
||||||
Config::set('statusnet', 'last_poll', time());
|
Config::set('statusnet','last_poll', time());
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_fetchtimeline(App $a, $uid)
|
function statusnet_fetchtimeline($a, $uid) {
|
||||||
{
|
|
||||||
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
|
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
|
||||||
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
|
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
|
||||||
$api = PConfig::get($uid, 'statusnet', 'baseapi');
|
$api = PConfig::get($uid, 'statusnet', 'baseapi');
|
||||||
|
|
@ -881,35 +832,31 @@ function statusnet_fetchtimeline(App $a, $uid)
|
||||||
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
|
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
|
||||||
$lastid = PConfig::get($uid, 'statusnet', 'lastid');
|
$lastid = PConfig::get($uid, 'statusnet', 'lastid');
|
||||||
|
|
||||||
require_once 'mod/item.php';
|
require_once('mod/item.php');
|
||||||
require_once 'include/items.php';
|
require_once('include/items.php');
|
||||||
|
|
||||||
// get the application name for the SN app
|
// get the application name for the SN app
|
||||||
// 1st try personal config, then system config and fallback to the
|
// 1st try personal config, then system config and fallback to the
|
||||||
// hostname of the node if neither one is set.
|
// hostname of the node if neither one is set.
|
||||||
$application_name = PConfig::get($uid, 'statusnet', 'application_name');
|
$application_name = PConfig::get( $uid, 'statusnet', 'application_name');
|
||||||
if ($application_name == "") {
|
if ($application_name == "")
|
||||||
$application_name = Config::get('statusnet', 'application_name');
|
$application_name = Config::get('statusnet', 'application_name');
|
||||||
}
|
if ($application_name == "")
|
||||||
if ($application_name == "") {
|
|
||||||
$application_name = $a->get_hostname();
|
$application_name = $a->get_hostname();
|
||||||
}
|
|
||||||
|
|
||||||
$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
|
$connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
|
||||||
|
|
||||||
$parameters = array("exclude_replies" => true, "trim_user" => true, "contributor_details" => false, "include_rts" => false);
|
$parameters = array("exclude_replies" => true, "trim_user" => true, "contributor_details" => false, "include_rts" => false);
|
||||||
|
|
||||||
$first_time = ($lastid == "");
|
$first_time = ($lastid == "");
|
||||||
|
|
||||||
if ($lastid <> "") {
|
if ($lastid <> "")
|
||||||
$parameters["since_id"] = $lastid;
|
$parameters["since_id"] = $lastid;
|
||||||
}
|
|
||||||
|
|
||||||
$items = $connection->get('statuses/user_timeline', $parameters);
|
$items = $connection->get('statuses/user_timeline', $parameters);
|
||||||
|
|
||||||
if (!is_array($items)) {
|
if (!is_array($items))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$posts = array_reverse($items);
|
$posts = array_reverse($items);
|
||||||
|
|
||||||
|
|
@ -918,21 +865,17 @@ function statusnet_fetchtimeline(App $a, $uid)
|
||||||
if ($post->id > $lastid)
|
if ($post->id > $lastid)
|
||||||
$lastid = $post->id;
|
$lastid = $post->id;
|
||||||
|
|
||||||
if ($first_time) {
|
if ($first_time)
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
if ($post->source == "activity") {
|
if ($post->source == "activity")
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
if (is_object($post->retweeted_status)) {
|
if (is_object($post->retweeted_status))
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
if ($post->in_reply_to_status_id != "") {
|
if ($post->in_reply_to_status_id != "")
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
if (!stristr($post->source, $application_name)) {
|
if (!stristr($post->source, $application_name)) {
|
||||||
$_SESSION["authenticated"] = true;
|
$_SESSION["authenticated"] = true;
|
||||||
|
|
@ -947,7 +890,7 @@ function statusnet_fetchtimeline(App $a, $uid)
|
||||||
$_REQUEST["extid"] = NETWORK_STATUSNET;
|
$_REQUEST["extid"] = NETWORK_STATUSNET;
|
||||||
|
|
||||||
if (isset($post->id)) {
|
if (isset($post->id)) {
|
||||||
$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_STATUSNET . ":" . $post->id);
|
$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_STATUSNET.":".$post->id);
|
||||||
}
|
}
|
||||||
|
|
||||||
//$_REQUEST["date"] = $post->created_at;
|
//$_REQUEST["date"] = $post->created_at;
|
||||||
|
|
@ -955,25 +898,21 @@ function statusnet_fetchtimeline(App $a, $uid)
|
||||||
$_REQUEST["title"] = "";
|
$_REQUEST["title"] = "";
|
||||||
|
|
||||||
$_REQUEST["body"] = add_page_info_to_body($post->text, true);
|
$_REQUEST["body"] = add_page_info_to_body($post->text, true);
|
||||||
if (is_string($post->place->name)) {
|
if (is_string($post->place->name))
|
||||||
$_REQUEST["location"] = $post->place->name;
|
$_REQUEST["location"] = $post->place->name;
|
||||||
}
|
|
||||||
|
|
||||||
if (is_string($post->place->full_name)) {
|
if (is_string($post->place->full_name))
|
||||||
$_REQUEST["location"] = $post->place->full_name;
|
$_REQUEST["location"] = $post->place->full_name;
|
||||||
}
|
|
||||||
|
|
||||||
if (is_array($post->geo->coordinates)) {
|
if (is_array($post->geo->coordinates))
|
||||||
$_REQUEST["coord"] = $post->geo->coordinates[0] . " " . $post->geo->coordinates[1];
|
$_REQUEST["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1];
|
||||||
}
|
|
||||||
|
|
||||||
if (is_array($post->coordinates->coordinates)) {
|
if (is_array($post->coordinates->coordinates))
|
||||||
$_REQUEST["coord"] = $post->coordinates->coordinates[1] . " " . $post->coordinates->coordinates[0];
|
$_REQUEST["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
|
||||||
}
|
|
||||||
|
|
||||||
//print_r($_REQUEST);
|
//print_r($_REQUEST);
|
||||||
if ($_REQUEST["body"] != "") {
|
if ($_REQUEST["body"] != "") {
|
||||||
logger('statusnet: posting for user ' . $uid);
|
logger('statusnet: posting for user '.$uid);
|
||||||
|
|
||||||
item_post($a);
|
item_post($a);
|
||||||
}
|
}
|
||||||
|
|
@ -983,42 +922,39 @@ function statusnet_fetchtimeline(App $a, $uid)
|
||||||
PConfig::set($uid, 'statusnet', 'lastid', $lastid);
|
PConfig::set($uid, 'statusnet', 'lastid', $lastid);
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_address($contact)
|
function statusnet_address($contact) {
|
||||||
{
|
|
||||||
$hostname = normalise_link($contact->statusnet_profile_url);
|
$hostname = normalise_link($contact->statusnet_profile_url);
|
||||||
$nickname = $contact->screen_name;
|
$nickname = $contact->screen_name;
|
||||||
|
|
||||||
$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $contact->statusnet_profile_url);
|
$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $contact->statusnet_profile_url);
|
||||||
|
|
||||||
$address = $contact->screen_name . "@" . $hostname;
|
$address = $contact->screen_name."@".$hostname;
|
||||||
|
|
||||||
return $address;
|
return($address);
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_fetch_contact($uid, $contact, $create_user)
|
function statusnet_fetch_contact($uid, $contact, $create_user) {
|
||||||
{
|
if ($contact->statusnet_profile_url == "")
|
||||||
if ($contact->statusnet_profile_url == "") {
|
return(-1);
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
GContact::update(array("url" => $contact->statusnet_profile_url,
|
GlobalContact::update(array("url" => $contact->statusnet_profile_url,
|
||||||
"network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url,
|
"network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url,
|
||||||
"name" => $contact->name, "nick" => $contact->screen_name,
|
"name" => $contact->name, "nick" => $contact->screen_name,
|
||||||
"location" => $contact->location, "about" => $contact->description,
|
"location" => $contact->location, "about" => $contact->description,
|
||||||
"addr" => statusnet_address($contact), "generation" => 3));
|
"addr" => statusnet_address($contact), "generation" => 3));
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1", intval($uid), dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(NETWORK_STATUSNET));
|
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1",
|
||||||
|
intval($uid), dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(NETWORK_STATUSNET));
|
||||||
|
|
||||||
if (!count($r) && !$create_user) {
|
if(!count($r) && !$create_user)
|
||||||
return 0;
|
return(0);
|
||||||
}
|
|
||||||
|
|
||||||
if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
|
if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
|
||||||
logger("statusnet_fetch_contact: Contact '" . $r[0]["nick"] . "' is blocked or readonly.", LOGGER_DEBUG);
|
logger("statusnet_fetch_contact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
|
||||||
return -1;
|
return(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!count($r)) {
|
if(!count($r)) {
|
||||||
// create contact record
|
// create contact record
|
||||||
q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
|
q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
|
||||||
`name`, `nick`, `photo`, `network`, `rel`, `priority`,
|
`name`, `nick`, `photo`, `network`, `rel`, `priority`,
|
||||||
|
|
@ -1048,9 +984,8 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
|
||||||
intval($uid),
|
intval($uid),
|
||||||
dbesc(NETWORK_STATUSNET));
|
dbesc(NETWORK_STATUSNET));
|
||||||
|
|
||||||
if (!count($r)) {
|
if(! count($r))
|
||||||
return false;
|
return(false);
|
||||||
}
|
|
||||||
|
|
||||||
$contact_id = $r[0]['id'];
|
$contact_id = $r[0]['id'];
|
||||||
|
|
||||||
|
|
@ -1058,12 +993,12 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($g && intval($g[0]['def_gid'])) {
|
if($g && intval($g[0]['def_gid'])) {
|
||||||
require_once 'include/group.php';
|
require_once('include/group.php');
|
||||||
group_add_member($uid, '', $contact_id, $g[0]['def_gid']);
|
group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $contact_id);
|
$photos = Photo::importProfilePhoto($contact->profile_image_url,$uid,$contact_id);
|
||||||
|
|
||||||
q("UPDATE `contact` SET `photo` = '%s',
|
q("UPDATE `contact` SET `photo` = '%s',
|
||||||
`thumb` = '%s',
|
`thumb` = '%s',
|
||||||
|
|
@ -1078,12 +1013,15 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
// update profile photos once every two weeks as we have no notification of when they change.
|
// 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 -2 days')) ? true : false);
|
||||||
$update_photo = ($r[0]['avatar-date'] < datetime_convert('', '', 'now -12 hours'));
|
$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
|
// 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);
|
if((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
|
||||||
|
|
||||||
|
logger("statusnet_fetch_contact: Updating contact ".$contact->screen_name, LOGGER_DEBUG);
|
||||||
|
|
||||||
$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $r[0]['id']);
|
$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $r[0]['id']);
|
||||||
|
|
||||||
|
|
@ -1119,18 +1057,17 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $r[0]["id"];
|
return($r[0]["id"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
|
function statusnet_fetchuser($a, $uid, $screen_name = "", $user_id = "") {
|
||||||
{
|
|
||||||
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
|
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
|
||||||
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
|
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
|
||||||
$api = PConfig::get($uid, 'statusnet', 'baseapi');
|
$api = PConfig::get($uid, 'statusnet', 'baseapi');
|
||||||
$otoken = PConfig::get($uid, 'statusnet', 'oauthtoken');
|
$otoken = PConfig::get($uid, 'statusnet', 'oauthtoken');
|
||||||
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
|
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
|
||||||
|
|
||||||
require_once "addon/statusnet/codebird.php";
|
require_once("addon/statusnet/codebird.php");
|
||||||
|
|
||||||
$cb = \Codebird\Codebird::getInstance();
|
$cb = \Codebird\Codebird::getInstance();
|
||||||
$cb->setConsumerKey($ckey, $csecret);
|
$cb->setConsumerKey($ckey, $csecret);
|
||||||
|
|
@ -1139,37 +1076,33 @@ function statusnet_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
|
||||||
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
||||||
intval($uid));
|
intval($uid));
|
||||||
|
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
$self = $r[0];
|
$self = $r[0];
|
||||||
} else {
|
} else
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$parameters = array();
|
$parameters = array();
|
||||||
|
|
||||||
if ($screen_name != "") {
|
if ($screen_name != "")
|
||||||
$parameters["screen_name"] = $screen_name;
|
$parameters["screen_name"] = $screen_name;
|
||||||
}
|
|
||||||
|
|
||||||
if ($user_id != "") {
|
if ($user_id != "")
|
||||||
$parameters["user_id"] = $user_id;
|
$parameters["user_id"] = $user_id;
|
||||||
}
|
|
||||||
|
|
||||||
// Fetching user data
|
// Fetching user data
|
||||||
$user = $cb->users_show($parameters);
|
$user = $cb->users_show($parameters);
|
||||||
|
|
||||||
if (!is_object($user)) {
|
if (!is_object($user))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$contact_id = statusnet_fetch_contact($uid, $user, true);
|
$contact_id = statusnet_fetch_contact($uid, $user, true);
|
||||||
|
|
||||||
return $contact_id;
|
return $contact_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_existing_contact)
|
function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact) {
|
||||||
{
|
|
||||||
require_once "include/html2bbcode.php";
|
require_once("include/html2bbcode.php");
|
||||||
|
|
||||||
logger("statusnet_createpost: start", LOGGER_DEBUG);
|
logger("statusnet_createpost: start", LOGGER_DEBUG);
|
||||||
|
|
||||||
|
|
@ -1185,26 +1118,24 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
|
||||||
if (is_object($post->retweeted_status)) {
|
if (is_object($post->retweeted_status)) {
|
||||||
$content = $post->retweeted_status;
|
$content = $post->retweeted_status;
|
||||||
statusnet_fetch_contact($uid, $content->user, false);
|
statusnet_fetch_contact($uid, $content->user, false);
|
||||||
} else {
|
} else
|
||||||
$content = $post;
|
$content = $post;
|
||||||
}
|
|
||||||
|
|
||||||
$postarray['uri'] = $hostname . "::" . $content->id;
|
$postarray['uri'] = $hostname."::".$content->id;
|
||||||
|
|
||||||
$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
|
||||||
dbesc($postarray['uri']),
|
dbesc($postarray['uri']),
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (count($r)) {
|
if (count($r))
|
||||||
return array();
|
return(array());
|
||||||
}
|
|
||||||
|
|
||||||
$contactid = 0;
|
$contactid = 0;
|
||||||
|
|
||||||
if ($content->in_reply_to_status_id != "") {
|
if ($content->in_reply_to_status_id != "") {
|
||||||
|
|
||||||
$parent = $hostname . "::" . $content->in_reply_to_status_id;
|
$parent = $hostname."::".$content->in_reply_to_status_id;
|
||||||
|
|
||||||
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
|
||||||
dbesc($parent),
|
dbesc($parent),
|
||||||
|
|
@ -1239,15 +1170,14 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
|
||||||
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
||||||
intval($uid));
|
intval($uid));
|
||||||
|
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
$contactid = $r[0]["id"];
|
$contactid = $r[0]["id"];
|
||||||
|
|
||||||
$postarray['owner-name'] = $r[0]["name"];
|
$postarray['owner-name'] = $r[0]["name"];
|
||||||
$postarray['owner-link'] = $r[0]["url"];
|
$postarray['owner-link'] = $r[0]["url"];
|
||||||
$postarray['owner-avatar'] = $r[0]["photo"];
|
$postarray['owner-avatar'] = $r[0]["photo"];
|
||||||
} else {
|
} else
|
||||||
return array();
|
return(array());
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// Don't create accounts of people who just comment something
|
// Don't create accounts of people who just comment something
|
||||||
$create_user = false;
|
$create_user = false;
|
||||||
|
|
@ -1262,11 +1192,10 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
|
||||||
$postarray['owner-link'] = $post->user->statusnet_profile_url;
|
$postarray['owner-link'] = $post->user->statusnet_profile_url;
|
||||||
$postarray['owner-avatar'] = $post->user->profile_image_url;
|
$postarray['owner-avatar'] = $post->user->profile_image_url;
|
||||||
}
|
}
|
||||||
if (($contactid == 0) && !$only_existing_contact) {
|
if(($contactid == 0) && !$only_existing_contact)
|
||||||
$contactid = $self['id'];
|
$contactid = $self['id'];
|
||||||
} elseif ($contactid <= 0) {
|
elseif ($contactid <= 0)
|
||||||
return array();
|
return(array());
|
||||||
}
|
|
||||||
|
|
||||||
$postarray['contact-id'] = $contactid;
|
$postarray['contact-id'] = $contactid;
|
||||||
|
|
||||||
|
|
@ -1279,7 +1208,7 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
|
||||||
// To-Do: Maybe unreliable? Can the api be entered without trailing "/"?
|
// To-Do: Maybe unreliable? Can the api be entered without trailing "/"?
|
||||||
$hostname = str_replace("/api/", "/notice/", PConfig::get($uid, 'statusnet', 'baseapi'));
|
$hostname = str_replace("/api/", "/notice/", PConfig::get($uid, 'statusnet', 'baseapi'));
|
||||||
|
|
||||||
$postarray['plink'] = $hostname . $content->id;
|
$postarray['plink'] = $hostname.$content->id;
|
||||||
$postarray['app'] = strip_tags($content->source);
|
$postarray['app'] = strip_tags($content->source);
|
||||||
|
|
||||||
if ($content->user->protected) {
|
if ($content->user->protected) {
|
||||||
|
|
@ -1293,73 +1222,80 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
|
||||||
$postarray['body'] = $converted["body"];
|
$postarray['body'] = $converted["body"];
|
||||||
$postarray['tag'] = $converted["tags"];
|
$postarray['tag'] = $converted["tags"];
|
||||||
|
|
||||||
$postarray['created'] = datetime_convert('UTC', 'UTC', $content->created_at);
|
$postarray['created'] = datetime_convert('UTC','UTC',$content->created_at);
|
||||||
$postarray['edited'] = datetime_convert('UTC', 'UTC', $content->created_at);
|
$postarray['edited'] = datetime_convert('UTC','UTC',$content->created_at);
|
||||||
|
|
||||||
if (is_string($content->place->name)) {
|
if (is_string($content->place->name))
|
||||||
$postarray["location"] = $content->place->name;
|
$postarray["location"] = $content->place->name;
|
||||||
}
|
|
||||||
|
|
||||||
if (is_string($content->place->full_name)) {
|
if (is_string($content->place->full_name))
|
||||||
$postarray["location"] = $content->place->full_name;
|
$postarray["location"] = $content->place->full_name;
|
||||||
}
|
|
||||||
|
|
||||||
if (is_array($content->geo->coordinates)) {
|
if (is_array($content->geo->coordinates))
|
||||||
$postarray["coord"] = $content->geo->coordinates[0] . " " . $content->geo->coordinates[1];
|
$postarray["coord"] = $content->geo->coordinates[0]." ".$content->geo->coordinates[1];
|
||||||
}
|
|
||||||
|
|
||||||
if (is_array($content->coordinates->coordinates)) {
|
if (is_array($content->coordinates->coordinates))
|
||||||
$postarray["coord"] = $content->coordinates->coordinates[1] . " " . $content->coordinates->coordinates[0];
|
$postarray["coord"] = $content->coordinates->coordinates[1]." ".$content->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;
|
||||||
|
}*/
|
||||||
logger("statusnet_createpost: end", LOGGER_DEBUG);
|
logger("statusnet_createpost: end", LOGGER_DEBUG);
|
||||||
|
return($postarray);
|
||||||
return $postarray;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_checknotification(App $a, $uid, $own_url, $top_item, $postarray)
|
function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray) {
|
||||||
{
|
|
||||||
// This function necer worked and need cleanup
|
// This function necer worked and need cleanup
|
||||||
|
|
||||||
$user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
|
$user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!count($user)) {
|
if(!count($user))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
// Is it me?
|
// Is it me?
|
||||||
if (link_compare($user[0]["url"], $postarray['author-link'])) {
|
if (link_compare($user[0]["url"], $postarray['author-link']))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$own_user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
|
$own_user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
|
||||||
intval($uid),
|
intval($uid),
|
||||||
dbesc($own_url)
|
dbesc($own_url)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!count($own_user)) {
|
if(!count($own_user))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
// Is it me from GNU Social?
|
// Is it me from GNU Social?
|
||||||
if (link_compare($own_user[0]["url"], $postarray['author-link'])) {
|
if (link_compare($own_user[0]["url"], $postarray['author-link']))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
|
$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']),
|
dbesc($postarray['parent-uri']),
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (count($myconv)) {
|
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"]) && !link_compare($conv['author-link'], $own_user[0]["url"])) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
require_once 'include/enotify.php';
|
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"]) && !link_compare($conv['author-link'],$own_user[0]["url"]))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
require_once('include/enotify.php');
|
||||||
|
|
||||||
$conv_parent = $conv['parent'];
|
$conv_parent = $conv['parent'];
|
||||||
|
|
||||||
|
|
@ -1371,7 +1307,7 @@ function statusnet_checknotification(App $a, $uid, $own_url, $top_item, $postarr
|
||||||
'to_email' => $user[0]['email'],
|
'to_email' => $user[0]['email'],
|
||||||
'uid' => $user[0]['uid'],
|
'uid' => $user[0]['uid'],
|
||||||
'item' => $postarray,
|
'item' => $postarray,
|
||||||
'link' => $a->get_baseurl() . '/display/' . urlencode(get_item_guid($top_item)),
|
'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
|
||||||
'source_name' => $postarray['author-name'],
|
'source_name' => $postarray['author-name'],
|
||||||
'source_link' => $postarray['author-link'],
|
'source_link' => $postarray['author-link'],
|
||||||
'source_photo' => $postarray['author-avatar'],
|
'source_photo' => $postarray['author-avatar'],
|
||||||
|
|
@ -1386,8 +1322,7 @@ function statusnet_checknotification(App $a, $uid, $own_url, $top_item, $postarr
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
|
function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
|
||||||
{
|
|
||||||
$conversations = array();
|
$conversations = array();
|
||||||
|
|
||||||
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
|
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
|
||||||
|
|
@ -1400,12 +1335,12 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
|
||||||
// "create_user" is deactivated, since currently you cannot add users manually by now
|
// "create_user" is deactivated, since currently you cannot add users manually by now
|
||||||
$create_user = true;
|
$create_user = true;
|
||||||
|
|
||||||
logger("statusnet_fetchhometimeline: Fetching for user " . $uid, LOGGER_DEBUG);
|
logger("statusnet_fetchhometimeline: Fetching for user ".$uid, LOGGER_DEBUG);
|
||||||
|
|
||||||
require_once 'library/twitteroauth.php';
|
require_once('library/twitteroauth.php');
|
||||||
require_once 'include/items.php';
|
require_once('include/items.php');
|
||||||
|
|
||||||
$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
|
$connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
|
||||||
|
|
||||||
$own_contact = statusnet_fetch_own_contact($a, $uid);
|
$own_contact = statusnet_fetch_own_contact($a, $uid);
|
||||||
|
|
||||||
|
|
@ -1413,27 +1348,27 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
|
||||||
intval($own_contact),
|
intval($own_contact),
|
||||||
intval($uid));
|
intval($uid));
|
||||||
|
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
$nick = $r[0]["nick"];
|
$nick = $r[0]["nick"];
|
||||||
} else {
|
} else {
|
||||||
logger("statusnet_fetchhometimeline: Own GNU Social contact not found for user " . $uid, LOGGER_DEBUG);
|
logger("statusnet_fetchhometimeline: Own GNU Social contact not found for user ".$uid, LOGGER_DEBUG);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
||||||
intval($uid));
|
intval($uid));
|
||||||
|
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
$self = $r[0];
|
$self = $r[0];
|
||||||
} else {
|
} else {
|
||||||
logger("statusnet_fetchhometimeline: Own contact not found for user " . $uid, LOGGER_DEBUG);
|
logger("statusnet_fetchhometimeline: Own contact not found for user ".$uid, LOGGER_DEBUG);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$u = q("SELECT * FROM user WHERE uid = %d LIMIT 1",
|
$u = q("SELECT * FROM user WHERE uid = %d LIMIT 1",
|
||||||
intval($uid));
|
intval($uid));
|
||||||
if (!count($u)) {
|
if(!count($u)) {
|
||||||
logger("statusnet_fetchhometimeline: Own user not found for user " . $uid, LOGGER_DEBUG);
|
logger("statusnet_fetchhometimeline: Own user not found for user ".$uid, LOGGER_DEBUG);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1447,41 +1382,37 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
|
||||||
|
|
||||||
$first_time = ($lastid == "");
|
$first_time = ($lastid == "");
|
||||||
|
|
||||||
if ($lastid != "") {
|
if ($lastid <> "")
|
||||||
$parameters["since_id"] = $lastid;
|
$parameters["since_id"] = $lastid;
|
||||||
}
|
|
||||||
|
|
||||||
$items = $connection->get('statuses/home_timeline', $parameters);
|
$items = $connection->get('statuses/home_timeline', $parameters);
|
||||||
|
|
||||||
if (!is_array($items)) {
|
if (!is_array($items)) {
|
||||||
if (is_object($items) && isset($items->error)) {
|
if (is_object($items) && isset($items->error))
|
||||||
$errormsg = $items->error;
|
$errormsg = $items->error;
|
||||||
} elseif (is_object($items)) {
|
elseif (is_object($items))
|
||||||
$errormsg = print_r($items, true);
|
$errormsg = print_r($items, true);
|
||||||
} elseif (is_string($items) || is_float($items) || is_int($items)) {
|
elseif (is_string($items) || is_float($items) || is_int($items))
|
||||||
$errormsg = $items;
|
$errormsg = $items;
|
||||||
} else {
|
else
|
||||||
$errormsg = "Unknown error";
|
$errormsg = "Unknown error";
|
||||||
}
|
|
||||||
|
|
||||||
logger("statusnet_fetchhometimeline: Error fetching home timeline: " . $errormsg, LOGGER_DEBUG);
|
logger("statusnet_fetchhometimeline: Error fetching home timeline: ".$errormsg, LOGGER_DEBUG);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$posts = array_reverse($items);
|
$posts = array_reverse($items);
|
||||||
|
|
||||||
logger("statusnet_fetchhometimeline: Fetching timeline for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
|
logger("statusnet_fetchhometimeline: Fetching timeline for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
|
||||||
|
|
||||||
if (count($posts)) {
|
if (count($posts)) {
|
||||||
foreach ($posts as $post) {
|
foreach ($posts as $post) {
|
||||||
|
|
||||||
if ($post->id > $lastid) {
|
if ($post->id > $lastid)
|
||||||
$lastid = $post->id;
|
$lastid = $post->id;
|
||||||
}
|
|
||||||
|
|
||||||
if ($first_time) {
|
if ($first_time)
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($post->statusnet_conversation_id)) {
|
if (isset($post->statusnet_conversation_id)) {
|
||||||
if (!isset($conversations[$post->statusnet_conversation_id])) {
|
if (!isset($conversations[$post->statusnet_conversation_id])) {
|
||||||
|
|
@ -1491,19 +1422,18 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
|
||||||
} else {
|
} else {
|
||||||
$postarray = statusnet_createpost($a, $uid, $post, $self, $create_user, true);
|
$postarray = statusnet_createpost($a, $uid, $post, $self, $create_user, true);
|
||||||
|
|
||||||
if (trim($postarray['body']) == "") {
|
if (trim($postarray['body']) == "")
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
$item = item_store($postarray);
|
$item = item_store($postarray);
|
||||||
$postarray["id"] = $item;
|
$postarray["id"] = $item;
|
||||||
|
|
||||||
logger('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted home timeline item ' . $item);
|
logger('statusnet_fetchhometimeline: User '.$self["nick"].' posted home timeline item '.$item);
|
||||||
|
|
||||||
if ($item && !function_exists("check_item_notification")) {
|
if ($item && !function_exists("check_item_notification"))
|
||||||
statusnet_checknotification($a, $uid, $nick, $item, $postarray);
|
statusnet_checknotification($a, $uid, $nick, $item, $postarray);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PConfig::set($uid, 'statusnet', 'lasthometimelineid', $lastid);
|
PConfig::set($uid, 'statusnet', 'lasthometimelineid', $lastid);
|
||||||
|
|
@ -1513,30 +1443,27 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
|
||||||
$lastid = PConfig::get($uid, 'statusnet', 'lastmentionid');
|
$lastid = PConfig::get($uid, 'statusnet', 'lastmentionid');
|
||||||
$first_time = ($lastid == "");
|
$first_time = ($lastid == "");
|
||||||
|
|
||||||
if ($lastid != "") {
|
if ($lastid <> "")
|
||||||
$parameters["since_id"] = $lastid;
|
$parameters["since_id"] = $lastid;
|
||||||
}
|
|
||||||
|
|
||||||
$items = $connection->get('statuses/mentions_timeline', $parameters);
|
$items = $connection->get('statuses/mentions_timeline', $parameters);
|
||||||
|
|
||||||
if (!is_array($items)) {
|
if (!is_array($items)) {
|
||||||
logger("statusnet_fetchhometimeline: Error fetching mentions: " . print_r($items, true), LOGGER_DEBUG);
|
logger("statusnet_fetchhometimeline: Error fetching mentions: ".print_r($items, true), LOGGER_DEBUG);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$posts = array_reverse($items);
|
$posts = array_reverse($items);
|
||||||
|
|
||||||
logger("statusnet_fetchhometimeline: Fetching mentions for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
|
logger("statusnet_fetchhometimeline: Fetching mentions for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
|
||||||
|
|
||||||
if (count($posts)) {
|
if (count($posts)) {
|
||||||
foreach ($posts as $post) {
|
foreach ($posts as $post) {
|
||||||
if ($post->id > $lastid) {
|
if ($post->id > $lastid)
|
||||||
$lastid = $post->id;
|
$lastid = $post->id;
|
||||||
}
|
|
||||||
|
|
||||||
if ($first_time) {
|
if ($first_time)
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
$postarray = statusnet_createpost($a, $uid, $post, $self, false, false);
|
$postarray = statusnet_createpost($a, $uid, $post, $self, false, false);
|
||||||
|
|
||||||
|
|
@ -1546,16 +1473,15 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
|
||||||
$conversations[$post->statusnet_conversation_id] = $post->statusnet_conversation_id;
|
$conversations[$post->statusnet_conversation_id] = $post->statusnet_conversation_id;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (trim($postarray['body']) == "") {
|
if (trim($postarray['body']) != "") {
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
$item = item_store($postarray);
|
$item = item_store($postarray);
|
||||||
$postarray["id"] = $item;
|
$postarray["id"] = $item;
|
||||||
|
|
||||||
logger('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted mention timeline item ' . $item);
|
logger('statusnet_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item);
|
||||||
|
|
||||||
if ($item && function_exists("check_item_notification")) {
|
if ($item && function_exists("check_item_notification"))
|
||||||
check_item_notification($item, $uid, NOTIFY_TAGSELF);
|
check_item_notification($item, $uid, NOTIFY_TAGSELF);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1570,7 +1496,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($item != 0) && !function_exists("check_item_notification")) {
|
if (($item != 0) && !function_exists("check_item_notification")) {
|
||||||
require_once 'include/enotify.php';
|
require_once('include/enotify.php');
|
||||||
notification(array(
|
notification(array(
|
||||||
'type' => NOTIFY_TAGSELF,
|
'type' => NOTIFY_TAGSELF,
|
||||||
'notify_flags' => $u[0]['notify-flags'],
|
'notify_flags' => $u[0]['notify-flags'],
|
||||||
|
|
@ -1579,7 +1505,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
|
||||||
'to_email' => $u[0]['email'],
|
'to_email' => $u[0]['email'],
|
||||||
'uid' => $u[0]['uid'],
|
'uid' => $u[0]['uid'],
|
||||||
'item' => $postarray,
|
'item' => $postarray,
|
||||||
'link' => $a->get_baseurl() . '/display/' . urlencode(get_item_guid($item)),
|
'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
|
||||||
'source_name' => $postarray['author-name'],
|
'source_name' => $postarray['author-name'],
|
||||||
'source_link' => $postarray['author-link'],
|
'source_link' => $postarray['author-link'],
|
||||||
'source_photo' => $postarray['author-avatar'],
|
'source_photo' => $postarray['author-avatar'],
|
||||||
|
|
@ -1594,8 +1520,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
|
||||||
PConfig::set($uid, 'statusnet', 'lastmentionid', $lastid);
|
PConfig::set($uid, 'statusnet', 'lastmentionid', $lastid);
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nick, $conversation)
|
function statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $conversation) {
|
||||||
{
|
|
||||||
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
|
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
|
||||||
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
|
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
|
||||||
$api = PConfig::get($uid, 'statusnet', 'baseapi');
|
$api = PConfig::get($uid, 'statusnet', 'baseapi');
|
||||||
|
|
@ -1603,45 +1528,44 @@ function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nic
|
||||||
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
|
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
|
||||||
$own_url = PConfig::get($uid, 'statusnet', 'own_url');
|
$own_url = PConfig::get($uid, 'statusnet', 'own_url');
|
||||||
|
|
||||||
require_once 'library/twitteroauth.php';
|
require_once('library/twitteroauth.php');
|
||||||
|
|
||||||
$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
|
$connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
|
||||||
|
|
||||||
$parameters["count"] = 200;
|
$parameters["count"] = 200;
|
||||||
|
|
||||||
$items = $connection->get('statusnet/conversation/' . $conversation, $parameters);
|
$items = $connection->get('statusnet/conversation/'.$conversation, $parameters);
|
||||||
if (is_array($items)) {
|
if (is_array($items)) {
|
||||||
$posts = array_reverse($items);
|
$posts = array_reverse($items);
|
||||||
|
|
||||||
foreach ($posts AS $post) {
|
foreach($posts AS $post) {
|
||||||
$postarray = statusnet_createpost($a, $uid, $post, $self, false, false);
|
$postarray = statusnet_createpost($a, $uid, $post, $self, false, false);
|
||||||
|
|
||||||
if (trim($postarray['body']) == "") {
|
if (trim($postarray['body']) == "")
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
|
//print_r($postarray);
|
||||||
$item = item_store($postarray);
|
$item = item_store($postarray);
|
||||||
$postarray["id"] = $item;
|
$postarray["id"] = $item;
|
||||||
|
|
||||||
logger('statusnet_complete_conversation: User ' . $self["nick"] . ' posted home timeline item ' . $item);
|
logger('statusnet_complete_conversation: User '.$self["nick"].' posted home timeline item '.$item);
|
||||||
|
|
||||||
if ($item && !function_exists("check_item_notification")) {
|
if ($item && !function_exists("check_item_notification"))
|
||||||
statusnet_checknotification($a, $uid, $nick, $item, $postarray);
|
statusnet_checknotification($a, $uid, $nick, $item, $postarray);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_convertmsg(App $a, $body, $no_tags = false)
|
function statusnet_convertmsg($a, $body, $no_tags = false) {
|
||||||
{
|
|
||||||
require_once "include/oembed.php";
|
|
||||||
require_once "include/items.php";
|
|
||||||
require_once "include/network.php";
|
|
||||||
|
|
||||||
$body = preg_replace("=\[url\=https?://([0-9]*).([0-9]*).([0-9]*).([0-9]*)/([0-9]*)\](.*?)\[\/url\]=ism", "$1.$2.$3.$4/$5", $body);
|
require_once("include/oembed.php");
|
||||||
|
require_once("include/items.php");
|
||||||
|
require_once("include/network.php");
|
||||||
|
|
||||||
|
$body = preg_replace("=\[url\=https?://([0-9]*).([0-9]*).([0-9]*).([0-9]*)/([0-9]*)\](.*?)\[\/url\]=ism","$1.$2.$3.$4/$5",$body);
|
||||||
|
|
||||||
$URLSearchString = "^\[\]";
|
$URLSearchString = "^\[\]";
|
||||||
$links = preg_match_all("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER);
|
$links = preg_match_all("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body,$matches,PREG_SET_ORDER);
|
||||||
|
|
||||||
$footer = "";
|
$footer = "";
|
||||||
$footerurl = "";
|
$footerurl = "";
|
||||||
|
|
@ -1650,34 +1574,32 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false)
|
||||||
|
|
||||||
if ($links) {
|
if ($links) {
|
||||||
foreach ($matches AS $match) {
|
foreach ($matches AS $match) {
|
||||||
$search = "[url=" . $match[1] . "]" . $match[2] . "[/url]";
|
$search = "[url=".$match[1]."]".$match[2]."[/url]";
|
||||||
|
|
||||||
logger("statusnet_convertmsg: expanding url " . $match[1], LOGGER_DEBUG);
|
logger("statusnet_convertmsg: expanding url ".$match[1], LOGGER_DEBUG);
|
||||||
|
|
||||||
$expanded_url = original_url($match[1]);
|
$expanded_url = original_url($match[1]);
|
||||||
|
|
||||||
logger("statusnet_convertmsg: fetching data for " . $expanded_url, LOGGER_DEBUG);
|
logger("statusnet_convertmsg: fetching data for ".$expanded_url, LOGGER_DEBUG);
|
||||||
|
|
||||||
$oembed_data = oembed_fetch_url($expanded_url, true);
|
$oembed_data = oembed_fetch_url($expanded_url, true);
|
||||||
|
|
||||||
logger("statusnet_convertmsg: fetching data: done", LOGGER_DEBUG);
|
logger("statusnet_convertmsg: fetching data: done", LOGGER_DEBUG);
|
||||||
|
|
||||||
if ($type == "") {
|
if ($type == "")
|
||||||
$type = $oembed_data->type;
|
$type = $oembed_data->type;
|
||||||
}
|
|
||||||
|
|
||||||
if ($oembed_data->type == "video") {
|
if ($oembed_data->type == "video") {
|
||||||
//$body = str_replace($search, "[video]".$expanded_url."[/video]", $body);
|
//$body = str_replace($search, "[video]".$expanded_url."[/video]", $body);
|
||||||
$type = $oembed_data->type;
|
$type = $oembed_data->type;
|
||||||
$footerurl = $expanded_url;
|
$footerurl = $expanded_url;
|
||||||
$footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]";
|
$footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
|
||||||
|
|
||||||
$body = str_replace($search, $footerlink, $body);
|
$body = str_replace($search, $footerlink, $body);
|
||||||
} elseif (($oembed_data->type == "photo") && isset($oembed_data->url) && !$dontincludemedia) {
|
} elseif (($oembed_data->type == "photo") && isset($oembed_data->url) && !$dontincludemedia)
|
||||||
$body = str_replace($search, "[url=" . $expanded_url . "][img]" . $oembed_data->url . "[/img][/url]", $body);
|
$body = str_replace($search, "[url=".$expanded_url."][img]".$oembed_data->url."[/img][/url]", $body);
|
||||||
} elseif ($oembed_data->type != "link") {
|
elseif ($oembed_data->type != "link")
|
||||||
$body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
|
$body = str_replace($search, "[url=".$expanded_url."]".$expanded_url."[/url]", $body);
|
||||||
} else {
|
else {
|
||||||
$img_str = fetch_url($expanded_url, true, $redirects, 4);
|
$img_str = fetch_url($expanded_url, true, $redirects, 4);
|
||||||
|
|
||||||
$tempfile = tempnam(get_temppath(), "cache");
|
$tempfile = tempnam(get_temppath(), "cache");
|
||||||
|
|
@ -1687,66 +1609,61 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false)
|
||||||
|
|
||||||
if (substr($mime, 0, 6) == "image/") {
|
if (substr($mime, 0, 6) == "image/") {
|
||||||
$type = "photo";
|
$type = "photo";
|
||||||
$body = str_replace($search, "[img]" . $expanded_url . "[/img]", $body);
|
$body = str_replace($search, "[img]".$expanded_url."[/img]", $body);
|
||||||
} else {
|
} else {
|
||||||
$type = $oembed_data->type;
|
$type = $oembed_data->type;
|
||||||
$footerurl = $expanded_url;
|
$footerurl = $expanded_url;
|
||||||
$footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]";
|
$footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
|
||||||
|
|
||||||
$body = str_replace($search, $footerlink, $body);
|
$body = str_replace($search, $footerlink, $body);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($footerurl != "") {
|
if ($footerurl != "")
|
||||||
$footer = add_page_info($footerurl);
|
$footer = add_page_info($footerurl);
|
||||||
}
|
|
||||||
|
|
||||||
if (($footerlink != "") && (trim($footer) != "")) {
|
if (($footerlink != "") && (trim($footer) != "")) {
|
||||||
$removedlink = trim(str_replace($footerlink, "", $body));
|
$removedlink = trim(str_replace($footerlink, "", $body));
|
||||||
|
|
||||||
if (($removedlink == "") || strstr($body, $removedlink)) {
|
if (($removedlink == "") || strstr($body, $removedlink))
|
||||||
$body = $removedlink;
|
$body = $removedlink;
|
||||||
}
|
|
||||||
|
|
||||||
$body .= $footer;
|
$body .= $footer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($no_tags) {
|
if ($no_tags)
|
||||||
return array("body" => $body, "tags" => "");
|
return(array("body" => $body, "tags" => ""));
|
||||||
}
|
|
||||||
|
|
||||||
$str_tags = '';
|
$str_tags = '';
|
||||||
|
|
||||||
$cnt = preg_match_all("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER);
|
$cnt = preg_match_all("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",$body,$matches,PREG_SET_ORDER);
|
||||||
if ($cnt) {
|
if($cnt) {
|
||||||
foreach ($matches as $mtch) {
|
foreach($matches as $mtch) {
|
||||||
if (strlen($str_tags)) {
|
if(strlen($str_tags))
|
||||||
$str_tags .= ',';
|
$str_tags .= ',';
|
||||||
}
|
|
||||||
|
|
||||||
if ($mtch[1] == "#") {
|
if ($mtch[1] == "#") {
|
||||||
// Replacing the hash tags that are directed to the GNU Social server with internal links
|
// Replacing the hash tags that are directed to the GNU Social server with internal links
|
||||||
$snhash = "#[url=" . $mtch[2] . "]" . $mtch[3] . "[/url]";
|
$snhash = "#[url=".$mtch[2]."]".$mtch[3]."[/url]";
|
||||||
$frdchash = '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($mtch[3]) . ']' . $mtch[3] . '[/url]';
|
$frdchash = '#[url='.$a->get_baseurl().'/search?tag='.rawurlencode($mtch[3]).']'.$mtch[3].'[/url]';
|
||||||
$body = str_replace($snhash, $frdchash, $body);
|
$body = str_replace($snhash, $frdchash, $body);
|
||||||
|
|
||||||
$str_tags .= $frdchash;
|
$str_tags .= $frdchash;
|
||||||
} else {
|
} else
|
||||||
$str_tags .= "@[url=" . $mtch[2] . "]" . $mtch[3] . "[/url]";
|
$str_tags .= "@[url=".$mtch[2]."]".$mtch[3]."[/url]";
|
||||||
}
|
|
||||||
// To-Do:
|
// To-Do:
|
||||||
// There is a problem with links with to GNU Social groups, so these links are stored with "@" like friendica groups
|
// There is a problem with links with to GNU Social groups, so these links are stored with "@" like friendica groups
|
||||||
//$str_tags .= $mtch[1]."[url=".$mtch[2]."]".$mtch[3]."[/url]";
|
//$str_tags .= $mtch[1]."[url=".$mtch[2]."]".$mtch[3]."[/url]";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return array("body" => $body, "tags" => $str_tags);
|
return(array("body"=>$body, "tags"=>$str_tags));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_fetch_own_contact(App $a, $uid)
|
function statusnet_fetch_own_contact($a, $uid) {
|
||||||
{
|
|
||||||
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
|
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
|
||||||
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
|
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
|
||||||
$api = PConfig::get($uid, 'statusnet', 'baseapi');
|
$api = PConfig::get($uid, 'statusnet', 'baseapi');
|
||||||
|
|
@ -1757,9 +1674,9 @@ function statusnet_fetch_own_contact(App $a, $uid)
|
||||||
$contact_id = 0;
|
$contact_id = 0;
|
||||||
|
|
||||||
if ($own_url == "") {
|
if ($own_url == "") {
|
||||||
require_once 'library/twitteroauth.php';
|
require_once('library/twitteroauth.php');
|
||||||
|
|
||||||
$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
|
$connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
|
||||||
|
|
||||||
// Fetching user data
|
// Fetching user data
|
||||||
$user = $connection->get('account/verify_credentials');
|
$user = $connection->get('account/verify_credentials');
|
||||||
|
|
@ -1767,49 +1684,44 @@ function statusnet_fetch_own_contact(App $a, $uid)
|
||||||
PConfig::set($uid, 'statusnet', 'own_url', normalise_link($user->statusnet_profile_url));
|
PConfig::set($uid, 'statusnet', 'own_url', normalise_link($user->statusnet_profile_url));
|
||||||
|
|
||||||
$contact_id = statusnet_fetch_contact($uid, $user, true);
|
$contact_id = statusnet_fetch_contact($uid, $user, true);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
|
||||||
intval($uid), dbesc($own_url));
|
intval($uid), dbesc($own_url));
|
||||||
if (count($r)) {
|
if(count($r))
|
||||||
$contact_id = $r[0]["id"];
|
$contact_id = $r[0]["id"];
|
||||||
} else {
|
else
|
||||||
PConfig::delete($uid, 'statusnet', 'own_url');
|
PConfig::delete($uid, 'statusnet', 'own_url');
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
return($contact_id);
|
||||||
return $contact_id;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function statusnet_is_retweet(App $a, $uid, $body)
|
function statusnet_is_retweet($a, $uid, $body) {
|
||||||
{
|
|
||||||
$body = trim($body);
|
$body = trim($body);
|
||||||
|
|
||||||
// Skip if it isn't a pure repeated messages
|
// Skip if it isn't a pure repeated messages
|
||||||
// Does it start with a share?
|
// Does it start with a share?
|
||||||
if (strpos($body, "[share") > 0) {
|
if (strpos($body, "[share") > 0)
|
||||||
return false;
|
return(false);
|
||||||
}
|
|
||||||
|
|
||||||
// Does it end with a share?
|
// Does it end with a share?
|
||||||
if (strlen($body) > (strrpos($body, "[/share]") + 8)) {
|
if (strlen($body) > (strrpos($body, "[/share]") + 8))
|
||||||
return false;
|
return(false);
|
||||||
}
|
|
||||||
|
|
||||||
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
|
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
|
||||||
// Skip if there is no shared message in there
|
// Skip if there is no shared message in there
|
||||||
if ($body == $attributes) {
|
if ($body == $attributes)
|
||||||
return false;
|
return(false);
|
||||||
}
|
|
||||||
|
|
||||||
$link = "";
|
$link = "";
|
||||||
preg_match("/link='(.*?)'/ism", $attributes, $matches);
|
preg_match("/link='(.*?)'/ism", $attributes, $matches);
|
||||||
if ($matches[1] != "") {
|
if ($matches[1] != "")
|
||||||
$link = $matches[1];
|
$link = $matches[1];
|
||||||
}
|
|
||||||
|
|
||||||
preg_match('/link="(.*?)"/ism', $attributes, $matches);
|
preg_match('/link="(.*?)"/ism', $attributes, $matches);
|
||||||
if ($matches[1] != "") {
|
if ($matches[1] != "")
|
||||||
$link = $matches[1];
|
$link = $matches[1];
|
||||||
}
|
|
||||||
|
|
||||||
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
|
$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
|
||||||
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
|
$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
|
||||||
|
|
@ -1818,19 +1730,17 @@ function statusnet_is_retweet(App $a, $uid, $body)
|
||||||
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
|
$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
|
||||||
$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
|
$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
|
||||||
|
|
||||||
$id = preg_replace("=https?://" . $hostname . "/notice/(.*)=ism", "$1", $link);
|
$id = preg_replace("=https?://".$hostname."/notice/(.*)=ism", "$1", $link);
|
||||||
|
|
||||||
if ($id == $link) {
|
if ($id == $link)
|
||||||
return false;
|
return(false);
|
||||||
}
|
|
||||||
|
|
||||||
logger('statusnet_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, LOGGER_DEBUG);
|
logger('statusnet_is_retweet: Retweeting id '.$id.' for user '.$uid, LOGGER_DEBUG);
|
||||||
|
|
||||||
$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
|
$connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
|
||||||
|
|
||||||
$result = $connection->post('statuses/retweet/' . $id);
|
$result = $connection->post('statuses/retweet/'.$id);
|
||||||
|
|
||||||
logger('statusnet_is_retweet: result ' . print_r($result, true), LOGGER_DEBUG);
|
logger('statusnet_is_retweet: result '.print_r($result, true), LOGGER_DEBUG);
|
||||||
|
return(isset($result->id));
|
||||||
return isset($result->id);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Name: Twitter Connector
|
* Name: Twitter Connector
|
||||||
* Description: Bidirectional (posting, relaying and reading) connector for Twitter.
|
* Description: Bidirectional (posting, relaying and reading) connector for Twitter.
|
||||||
|
|
@ -33,6 +32,7 @@
|
||||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Twitter Plugin for Friendica
|
/* Twitter Plugin for Friendica
|
||||||
*
|
*
|
||||||
* Author: Tobias Diekershoff
|
* Author: Tobias Diekershoff
|
||||||
|
|
@ -60,20 +60,18 @@
|
||||||
* Requirements: PHP5, curl [Slinky library]
|
* Requirements: PHP5, curl [Slinky library]
|
||||||
*/
|
*/
|
||||||
|
|
||||||
use Friendica\App;
|
|
||||||
use Friendica\Core\Config;
|
use Friendica\Core\Config;
|
||||||
use Friendica\Core\PConfig;
|
use Friendica\Core\PConfig;
|
||||||
use Friendica\Core\Worker;
|
use Friendica\Core\Worker;
|
||||||
use Friendica\Model\GContact;
|
use Friendica\Model\GlobalContact;
|
||||||
use Friendica\Model\Photo;
|
use Friendica\Object\Photo;
|
||||||
use Friendica\Object\Image;
|
|
||||||
|
|
||||||
require_once 'include/enotify.php';
|
require_once 'include/enotify.php';
|
||||||
|
|
||||||
|
|
||||||
define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
|
define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
|
||||||
|
|
||||||
function twitter_install()
|
function twitter_install() {
|
||||||
{
|
|
||||||
// we need some hooks, for the configuration and for sending tweets
|
// we need some hooks, for the configuration and for sending tweets
|
||||||
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('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
|
||||||
|
|
@ -85,12 +83,12 @@ function twitter_install()
|
||||||
register_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
|
register_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
|
||||||
register_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
|
register_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
|
||||||
register_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
|
register_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
|
||||||
register_hook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification');
|
register_hook('check_item_notification','addon/twitter/twitter.php', 'twitter_check_item_notification');
|
||||||
logger("installed twitter");
|
logger("installed twitter");
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_uninstall()
|
|
||||||
{
|
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('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
|
||||||
unregister_hook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local');
|
unregister_hook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local');
|
||||||
|
|
@ -101,16 +99,16 @@ function twitter_uninstall()
|
||||||
unregister_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
|
unregister_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
|
||||||
unregister_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
|
unregister_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
|
||||||
unregister_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
|
unregister_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
|
||||||
unregister_hook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification');
|
unregister_hook('check_item_notification','addon/twitter/twitter.php', 'twitter_check_item_notification');
|
||||||
|
|
||||||
// old setting - remove only
|
// old setting - remove only
|
||||||
unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
|
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');
|
unregister_hook('plugin_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_check_item_notification(App $a, &$notification_data)
|
function twitter_check_item_notification($a, &$notification_data) {
|
||||||
{
|
|
||||||
$own_id = PConfig::get($notification_data["uid"], 'twitter', 'own_id');
|
$own_id = PConfig::get($notification_data["uid"], 'twitter', 'own_id');
|
||||||
|
|
||||||
$own_user = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
|
$own_user = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
|
||||||
|
|
@ -118,18 +116,16 @@ function twitter_check_item_notification(App $a, &$notification_data)
|
||||||
dbesc("twitter::".$own_id)
|
dbesc("twitter::".$own_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($own_user) {
|
if ($own_user)
|
||||||
$notification_data["profiles"][] = $own_user[0]["url"];
|
$notification_data["profiles"][] = $own_user[0]["url"];
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_follow(App $a, &$contact)
|
function twitter_follow($a, &$contact) {
|
||||||
{
|
|
||||||
logger("twitter_follow: Check if contact is twitter contact. " . $contact["url"], LOGGER_DEBUG);
|
|
||||||
|
|
||||||
if (!strstr($contact["url"], "://twitter.com") && !strstr($contact["url"], "@twitter.com")) {
|
logger("twitter_follow: Check if contact is twitter contact. ".$contact["url"], LOGGER_DEBUG);
|
||||||
|
|
||||||
|
if (!strstr($contact["url"], "://twitter.com") && !strstr($contact["url"], "@twitter.com"))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
// contact seems to be a twitter contact, so continue
|
// contact seems to be a twitter contact, so continue
|
||||||
$nickname = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $contact["url"]);
|
$nickname = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $contact["url"]);
|
||||||
|
|
@ -142,7 +138,7 @@ function twitter_follow(App $a, &$contact)
|
||||||
$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
|
$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
|
||||||
$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
|
$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
|
||||||
|
|
||||||
require_once "addon/twitter/codebird.php";
|
require_once("addon/twitter/codebird.php");
|
||||||
|
|
||||||
$cb = \Codebird\Codebird::getInstance();
|
$cb = \Codebird\Codebird::getInstance();
|
||||||
$cb->setConsumerKey($ckey, $csecret);
|
$cb->setConsumerKey($ckey, $csecret);
|
||||||
|
|
@ -159,38 +155,32 @@ function twitter_follow(App $a, &$contact)
|
||||||
FROM `contact` WHERE `uid` = %d AND `nick` = '%s'",
|
FROM `contact` WHERE `uid` = %d AND `nick` = '%s'",
|
||||||
intval($uid),
|
intval($uid),
|
||||||
dbesc($nickname));
|
dbesc($nickname));
|
||||||
if (count($r)) {
|
if (count($r))
|
||||||
$contact["contact"] = $r[0];
|
$contact["contact"] = $r[0];
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_jot_nets(App $a, &$b)
|
function twitter_jot_nets(&$a,&$b) {
|
||||||
{
|
if(! local_user())
|
||||||
if (!local_user()) {
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$tw_post = PConfig::get(local_user(), 'twitter', 'post');
|
$tw_post = PConfig::get(local_user(),'twitter','post');
|
||||||
if (intval($tw_post) == 1) {
|
if(intval($tw_post) == 1) {
|
||||||
$tw_defpost = PConfig::get(local_user(), 'twitter', 'post_by_default');
|
$tw_defpost = PConfig::get(local_user(),'twitter','post_by_default');
|
||||||
$selected = ((intval($tw_defpost) == 1) ? ' checked="checked" ' : '');
|
$selected = ((intval($tw_defpost) == 1) ? ' checked="checked" ' : '');
|
||||||
$b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . ' value="1" /> '
|
$b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . ' value="1" /> '
|
||||||
. t('Post to Twitter') . '</div>';
|
. t('Post to Twitter') . '</div>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_settings_post(App $a, $post)
|
function twitter_settings_post($a,$post) {
|
||||||
{
|
if(! local_user())
|
||||||
if (!local_user()) {
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
// don't check twitter settings if twitter submit button is not clicked
|
// don't check twitter settings if twitter submit button is not clicked
|
||||||
if (!x($_POST, 'twitter-submit')) {
|
if (!x($_POST,'twitter-submit'))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($_POST['twitter-disconnect'])) {
|
if (isset($_POST['twitter-disconnect'])) {
|
||||||
/* * *
|
/***
|
||||||
* if the twitter-disconnect checkbox is set, clear the OAuth key/secret pair
|
* if the twitter-disconnect checkbox is set, clear the OAuth key/secret pair
|
||||||
* from the user configuration
|
* from the user configuration
|
||||||
*/
|
*/
|
||||||
|
|
@ -209,45 +199,40 @@ function twitter_settings_post(App $a, $post)
|
||||||
if (isset($_POST['twitter-pin'])) {
|
if (isset($_POST['twitter-pin'])) {
|
||||||
// if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
|
// if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
|
||||||
logger('got a Twitter PIN');
|
logger('got a Twitter PIN');
|
||||||
require_once 'library/twitteroauth.php';
|
require_once('library/twitteroauth.php');
|
||||||
$ckey = Config::get('twitter', 'consumerkey');
|
$ckey = Config::get('twitter', 'consumerkey');
|
||||||
$csecret = Config::get('twitter', 'consumersecret');
|
$csecret = Config::get('twitter', 'consumersecret');
|
||||||
// the token and secret for which the PIN was generated were hidden in the settings
|
// 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
|
// 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
|
// and secret to request a Access Token with the PIN
|
||||||
$connection = new TwitterOAuth($ckey, $csecret, $_POST['twitter-token'], $_POST['twitter-token2']);
|
$connection = new TwitterOAuth($ckey, $csecret, $_POST['twitter-token'], $_POST['twitter-token2']);
|
||||||
$token = $connection->getAccessToken($_POST['twitter-pin']);
|
$token = $connection->getAccessToken( $_POST['twitter-pin'] );
|
||||||
// ok, now that we have the Access Token, save them in the user config
|
// ok, now that we have the Access Token, save them in the user config
|
||||||
PConfig::set(local_user(), 'twitter', 'oauthtoken', $token['oauth_token']);
|
PConfig::set(local_user(),'twitter', 'oauthtoken', $token['oauth_token']);
|
||||||
PConfig::set(local_user(), 'twitter', 'oauthsecret', $token['oauth_token_secret']);
|
PConfig::set(local_user(),'twitter', 'oauthsecret', $token['oauth_token_secret']);
|
||||||
PConfig::set(local_user(), 'twitter', 'post', 1);
|
PConfig::set(local_user(),'twitter', 'post', 1);
|
||||||
// reload the Addon Settings page, if we don't do it see Bug #42
|
// reload the Addon Settings page, if we don't do it see Bug #42
|
||||||
goaway($a->get_baseurl() . '/settings/connectors');
|
goaway($a->get_baseurl().'/settings/connectors');
|
||||||
} else {
|
} else {
|
||||||
// if no PIN is supplied in the POST variables, the user has changed the setting
|
// 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
|
// to post a tweet for every new __public__ posting to the wall
|
||||||
PConfig::set(local_user(), 'twitter', 'post', intval($_POST['twitter-enable']));
|
PConfig::set(local_user(),'twitter','post',intval($_POST['twitter-enable']));
|
||||||
PConfig::set(local_user(), 'twitter', 'post_by_default', intval($_POST['twitter-default']));
|
PConfig::set(local_user(),'twitter','post_by_default',intval($_POST['twitter-default']));
|
||||||
PConfig::set(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
|
PConfig::set(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
|
||||||
PConfig::set(local_user(), 'twitter', 'import', intval($_POST['twitter-import']));
|
PConfig::set(local_user(), 'twitter', 'import', intval($_POST['twitter-import']));
|
||||||
PConfig::set(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user']));
|
PConfig::set(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user']));
|
||||||
|
|
||||||
if (!intval($_POST['twitter-mirror'])) {
|
if (!intval($_POST['twitter-mirror']))
|
||||||
PConfig::delete(local_user(), 'twitter', 'lastid');
|
PConfig::delete(local_user(),'twitter','lastid');
|
||||||
}
|
|
||||||
|
|
||||||
info(t('Twitter settings updated.') . EOL);
|
info(t('Twitter settings updated.') . EOL);
|
||||||
}
|
}}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
function twitter_settings(&$a,&$s) {
|
||||||
function twitter_settings(App $a, &$s)
|
if(! local_user())
|
||||||
{
|
|
||||||
if (!local_user()) {
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/twitter/twitter.css' . '" media="all" />' . "\r\n";
|
$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
|
* 1) Check that we have global consumer key & secret
|
||||||
* 2) If no OAuthtoken & stuff is present, generate button to get some
|
* 2) If no OAuthtoken & stuff is present, generate button to get some
|
||||||
* 3) Checkbox for "Send public notices (280 chars only)
|
* 3) Checkbox for "Send public notices (280 chars only)
|
||||||
|
|
@ -258,94 +243,94 @@ function twitter_settings(App $a, &$s)
|
||||||
$osecret = PConfig::get(local_user(), 'twitter', 'oauthsecret' );
|
$osecret = PConfig::get(local_user(), 'twitter', 'oauthsecret' );
|
||||||
$enabled = PConfig::get(local_user(), 'twitter', 'post');
|
$enabled = PConfig::get(local_user(), 'twitter', 'post');
|
||||||
$checked = (($enabled) ? ' checked="checked" ' : '');
|
$checked = (($enabled) ? ' checked="checked" ' : '');
|
||||||
$defenabled = PConfig::get(local_user(), 'twitter', 'post_by_default');
|
$defenabled = PConfig::get(local_user(),'twitter','post_by_default');
|
||||||
$defchecked = (($defenabled) ? ' checked="checked" ' : '');
|
$defchecked = (($defenabled) ? ' checked="checked" ' : '');
|
||||||
$mirrorenabled = PConfig::get(local_user(), 'twitter', 'mirror_posts');
|
$mirrorenabled = PConfig::get(local_user(),'twitter','mirror_posts');
|
||||||
$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
|
$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
|
||||||
$importenabled = PConfig::get(local_user(), 'twitter', 'import');
|
$importenabled = PConfig::get(local_user(),'twitter','import');
|
||||||
$importchecked = (($importenabled) ? ' checked="checked" ' : '');
|
$importchecked = (($importenabled) ? ' checked="checked" ' : '');
|
||||||
$create_userenabled = PConfig::get(local_user(), 'twitter', 'create_user');
|
$create_userenabled = PConfig::get(local_user(),'twitter','create_user');
|
||||||
$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
|
$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
|
||||||
|
|
||||||
$css = (($enabled) ? '' : '-disabled');
|
$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 .= '<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' . $css . '" 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 .= '</span>';
|
||||||
$s .= '<div id="settings_twitter_expanded" class="settings-block" style="display: none;">';
|
$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 .= '<span class="fakelink" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
|
||||||
$s .= '<img class="connector' . $css . '" 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 .= '</span>';
|
||||||
|
|
||||||
if ((!$ckey) && (!$csecret)) {
|
if ( (!$ckey) && (!$csecret) ) {
|
||||||
/* * *
|
/***
|
||||||
* no global consumer keys
|
* no global consumer keys
|
||||||
* display warning and skip personal config
|
* display warning and skip personal config
|
||||||
*/
|
*/
|
||||||
$s .= '<p>' . t('No consumer key pair for Twitter found. Please contact your site administrator.') . '</p>';
|
$s .= '<p>'. t('No consumer key pair for Twitter found. Please contact your site administrator.') .'</p>';
|
||||||
} else {
|
} else {
|
||||||
/* * *
|
/***
|
||||||
* ok we have a consumer key pair now look into the OAuth stuff
|
* ok we have a consumer key pair now look into the OAuth stuff
|
||||||
*/
|
*/
|
||||||
if ((!$otoken) && (!$osecret)) {
|
if ( (!$otoken) && (!$osecret) ) {
|
||||||
/* * *
|
/***
|
||||||
* the user has not yet connected the account to twitter...
|
* the user has not yet connected the account to twitter...
|
||||||
* get a temporary OAuth key/secret pair and display a button with
|
* get a temporary OAuth key/secret pair and display a button with
|
||||||
* which the user can request a PIN to connect the account to a
|
* which the user can request a PIN to connect the account to a
|
||||||
* account at Twitter.
|
* account at Twitter.
|
||||||
*/
|
*/
|
||||||
require_once 'library/twitteroauth.php';
|
require_once('library/twitteroauth.php');
|
||||||
$connection = new TwitterOAuth($ckey, $csecret);
|
$connection = new TwitterOAuth($ckey, $csecret);
|
||||||
$request_token = $connection->getRequestToken();
|
$request_token = $connection->getRequestToken();
|
||||||
$token = $request_token['oauth_token'];
|
$token = $request_token['oauth_token'];
|
||||||
/* * *
|
/***
|
||||||
* make some nice form
|
* make some nice form
|
||||||
*/
|
*/
|
||||||
$s .= '<p>' . t('At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.') . '</p>';
|
$s .= '<p>'. t('At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.') .'</p>';
|
||||||
$s .= '<a href="' . $connection->getAuthorizeURL($token) . '" target="_twitter"><img src="addon/twitter/lighter.png" alt="' . t('Log in with Twitter') . '"></a>';
|
$s .= '<a href="'.$connection->getAuthorizeURL($token).'" target="_twitter"><img src="addon/twitter/lighter.png" alt="'.t('Log in with Twitter').'"></a>';
|
||||||
$s .= '<div id="twitter-pin-wrapper">';
|
$s .= '<div id="twitter-pin-wrapper">';
|
||||||
$s .= '<label id="twitter-pin-label" for="twitter-pin">' . t('Copy the PIN from Twitter here') . '</label>';
|
$s .= '<label id="twitter-pin-label" for="twitter-pin">'. t('Copy the PIN from Twitter here') .'</label>';
|
||||||
$s .= '<input id="twitter-pin" type="text" name="twitter-pin" />';
|
$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-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 .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="'.$request_token['oauth_token_secret'].'" />';
|
||||||
$s .= '</div><div class="clear"></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>';
|
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
|
||||||
} else {
|
} else {
|
||||||
/* * *
|
/***
|
||||||
* we have an OAuth key / secret pair for the user
|
* we have an OAuth key / secret pair for the user
|
||||||
* so let's give a chance to disable the postings to Twitter
|
* 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);
|
$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
|
||||||
$details = $connection->get('account/verify_credentials');
|
$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 .= '<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>';
|
$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']) {
|
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 .= '<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 .= '<div id="twitter-enable-wrapper">';
|
||||||
$s .= '<label id="twitter-enable-label" for="twitter-checkbox">' . t('Allow posting to Twitter') . '</label>';
|
$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 .= '<input id="twitter-checkbox" type="checkbox" name="twitter-enable" value="1" ' . $checked . '/>';
|
||||||
$s .= '<div class="clear"></div>';
|
$s .= '<div class="clear"></div>';
|
||||||
$s .= '<label id="twitter-default-label" for="twitter-default">' . t('Send public postings to Twitter by default') . '</label>';
|
$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 .= '<input id="twitter-default" type="checkbox" name="twitter-default" value="1" ' . $defchecked . '/>';
|
||||||
$s .= '<div class="clear"></div>';
|
$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 .= '<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 .= '<input id="twitter-mirror" type="checkbox" name="twitter-mirror" value="1" '. $mirrorchecked . '/>';
|
||||||
$s .= '<div class="clear"></div>';
|
$s .= '<div class="clear"></div>';
|
||||||
$s .= '</div>';
|
$s .= '</div>';
|
||||||
|
|
||||||
$s .= '<label id="twitter-import-label" for="twitter-import">' . t('Import the remote timeline') . '</label>';
|
$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 .= '<input id="twitter-import" type="checkbox" name="twitter-import" value="1" '. $importchecked . '/>';
|
||||||
$s .= '<div class="clear"></div>';
|
$s .= '<div class="clear"></div>';
|
||||||
|
|
||||||
$s .= '<label id="twitter-create_user-label" for="twitter-create_user">' . t('Automatically create contacts') . '</label>';
|
$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 .= '<input id="twitter-create_user" type="checkbox" name="twitter-create_user" value="1" '. $create_userchecked . '/>';
|
||||||
$s .= '<div class="clear"></div>';
|
$s .= '<div class="clear"></div>';
|
||||||
|
|
||||||
$s .= '<div id="twitter-disconnect-wrapper">';
|
$s .= '<div id="twitter-disconnect-wrapper">';
|
||||||
$s .= '<label id="twitter-disconnect-label" for="twitter-disconnect">' . t('Clear OAuth configuration') . '</label>';
|
$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 .= '<input id="twitter-disconnect" type="checkbox" name="twitter-disconnect" value="1" />';
|
||||||
$s .= '</div><div class="clear"></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>';
|
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
|
||||||
|
|
@ -354,8 +339,9 @@ function twitter_settings(App $a, &$s)
|
||||||
$s .= '</div><div class="clear"></div>';
|
$s .= '</div><div class="clear"></div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_post_local(App $a, &$b)
|
|
||||||
{
|
function twitter_post_local(&$a, &$b) {
|
||||||
|
|
||||||
if ($b['edit']) {
|
if ($b['edit']) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -383,14 +369,14 @@ function twitter_post_local(App $a, &$b)
|
||||||
$b['postopts'] .= 'twitter';
|
$b['postopts'] .= 'twitter';
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_action(App $a, $uid, $pid, $action)
|
function twitter_action($a, $uid, $pid, $action) {
|
||||||
{
|
|
||||||
$ckey = Config::get('twitter', 'consumerkey');
|
$ckey = Config::get('twitter', 'consumerkey');
|
||||||
$csecret = Config::get('twitter', 'consumersecret');
|
$csecret = Config::get('twitter', 'consumersecret');
|
||||||
$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
|
$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
|
||||||
$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
|
$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
|
||||||
|
|
||||||
require_once "addon/twitter/codebird.php";
|
require_once("addon/twitter/codebird.php");
|
||||||
|
|
||||||
$cb = \Codebird\Codebird::getInstance();
|
$cb = \Codebird\Codebird::getInstance();
|
||||||
$cb->setConsumerKey($ckey, $csecret);
|
$cb->setConsumerKey($ckey, $csecret);
|
||||||
|
|
@ -398,7 +384,7 @@ function twitter_action(App $a, $uid, $pid, $action)
|
||||||
|
|
||||||
$post = array('id' => $pid);
|
$post = array('id' => $pid);
|
||||||
|
|
||||||
logger("twitter_action '" . $action . "' ID: " . $pid . " data: " . print_r($post, true), LOGGER_DATA);
|
logger("twitter_action '".$action."' ID: ".$pid." data: " . print_r($post, true), LOGGER_DATA);
|
||||||
|
|
||||||
switch ($action) {
|
switch ($action) {
|
||||||
case "delete":
|
case "delete":
|
||||||
|
|
@ -411,25 +397,28 @@ function twitter_action(App $a, $uid, $pid, $action)
|
||||||
$result = $cb->favorites_destroy($post);
|
$result = $cb->favorites_destroy($post);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
logger("twitter_action '" . $action . "' send, result: " . print_r($result, true), LOGGER_DEBUG);
|
logger("twitter_action '".$action."' send, result: " . print_r($result, true), LOGGER_DEBUG);
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_post_hook(App $a, &$b)
|
function twitter_post_hook(&$a,&$b) {
|
||||||
{
|
|
||||||
// Post to Twitter
|
|
||||||
require_once "include/network.php";
|
|
||||||
|
|
||||||
if (!PConfig::get($b["uid"], 'twitter', 'import')
|
/**
|
||||||
&& ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))) {
|
* Post to Twitter
|
||||||
|
*/
|
||||||
|
|
||||||
|
require_once("include/network.php");
|
||||||
|
|
||||||
|
if (!PConfig::get($b["uid"],'twitter','import')) {
|
||||||
|
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($b['parent'] != $b['id']) {
|
if ($b['parent'] != $b['id']) {
|
||||||
logger("twitter_post_hook: parameter " . print_r($b, true), LOGGER_DATA);
|
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::") && (substr($b["extid"], 0, 9) != "twitter::") && (substr($b["thr-parent"], 0, 9) != "twitter::")) {
|
if ((substr($b["parent-uri"], 0, 9) != "twitter::") && (substr($b["extid"], 0, 9) != "twitter::") && (substr($b["thr-parent"], 0, 9) != "twitter::")) {
|
||||||
logger("twitter_post_hook: no twitter post " . $b["parent"]);
|
logger("twitter_post_hook: no twitter post ".$b["parent"]);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -437,8 +426,8 @@ function twitter_post_hook(App $a, &$b)
|
||||||
dbesc($b["thr-parent"]),
|
dbesc($b["thr-parent"]),
|
||||||
intval($b["uid"]));
|
intval($b["uid"]));
|
||||||
|
|
||||||
if (!count($r)) {
|
if(!count($r)) {
|
||||||
logger("twitter_post_hook: no parent found " . $b["thr-parent"]);
|
logger("twitter_post_hook: no parent found ".$b["thr-parent"]);
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
$iscomment = true;
|
$iscomment = true;
|
||||||
|
|
@ -447,19 +436,18 @@ function twitter_post_hook(App $a, &$b)
|
||||||
|
|
||||||
|
|
||||||
$nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
|
$nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
|
||||||
$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nicknameplain . "[/url]";
|
$nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
|
||||||
$nicknameplain = "@" . $nicknameplain;
|
$nicknameplain = "@".$nicknameplain;
|
||||||
|
|
||||||
logger("twitter_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"], LOGGER_DEBUG);
|
logger("twitter_post_hook: comparing ".$nickname." and ".$nicknameplain." with ".$b["body"], LOGGER_DEBUG);
|
||||||
if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false)) {
|
if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false))
|
||||||
$b["body"] = $nickname . " " . $b["body"];
|
$b["body"] = $nickname." ".$b["body"];
|
||||||
}
|
|
||||||
|
|
||||||
logger("twitter_post_hook: parent found " . print_r($orig_post, true), LOGGER_DATA);
|
logger("twitter_post_hook: parent found ".print_r($orig_post, true), LOGGER_DATA);
|
||||||
} else {
|
} else {
|
||||||
$iscomment = false;
|
$iscomment = false;
|
||||||
|
|
||||||
if ($b['private'] || !strstr($b['postopts'], 'twitter')) {
|
if ($b['private'] || !strstr($b['postopts'],'twitter')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -471,12 +459,11 @@ function twitter_post_hook(App $a, &$b)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($b['verb'] == ACTIVITY_POST) && $b['deleted']) {
|
if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])
|
||||||
twitter_action($a, $b["uid"], substr($orig_post["uri"], 9), "delete");
|
twitter_action($a, $b["uid"], substr($orig_post["uri"], 9), "delete");
|
||||||
}
|
|
||||||
|
|
||||||
if ($b['verb'] == ACTIVITY_LIKE) {
|
if($b['verb'] == ACTIVITY_LIKE) {
|
||||||
logger("twitter_post_hook: parameter 2 " . substr($b["thr-parent"], 9), LOGGER_DEBUG);
|
logger("twitter_post_hook: parameter 2 ".substr($b["thr-parent"], 9), LOGGER_DEBUG);
|
||||||
if ($b['deleted'])
|
if ($b['deleted'])
|
||||||
twitter_action($a, $b["uid"], substr($b["thr-parent"], 9), "unlike");
|
twitter_action($a, $b["uid"], substr($b["thr-parent"], 9), "unlike");
|
||||||
else
|
else
|
||||||
|
|
@ -484,21 +471,19 @@ function twitter_post_hook(App $a, &$b)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($b['deleted'] || ($b['created'] !== $b['edited'])) {
|
if($b['deleted'] || ($b['created'] !== $b['edited']))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
// if post comes from twitter don't send it back
|
// if post comes from twitter don't send it back
|
||||||
if ($b['extid'] == NETWORK_TWITTER) {
|
if($b['extid'] == NETWORK_TWITTER)
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
if ($b['app'] == "Twitter") {
|
if($b['app'] == "Twitter")
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
logger('twitter post invoked');
|
logger('twitter post invoked');
|
||||||
|
|
||||||
|
|
||||||
PConfig::load($b['uid'], 'twitter');
|
PConfig::load($b['uid'], 'twitter');
|
||||||
|
|
||||||
$ckey = Config::get('twitter', 'consumerkey');
|
$ckey = Config::get('twitter', 'consumerkey');
|
||||||
|
|
@ -506,39 +491,35 @@ function twitter_post_hook(App $a, &$b)
|
||||||
$otoken = PConfig::get($b['uid'], 'twitter', 'oauthtoken');
|
$otoken = PConfig::get($b['uid'], 'twitter', 'oauthtoken');
|
||||||
$osecret = PConfig::get($b['uid'], 'twitter', 'oauthsecret');
|
$osecret = PConfig::get($b['uid'], 'twitter', 'oauthsecret');
|
||||||
|
|
||||||
if ($ckey && $csecret && $otoken && $osecret) {
|
if($ckey && $csecret && $otoken && $osecret) {
|
||||||
logger('twitter: we have customer key and oauth stuff, going to send.', LOGGER_DEBUG);
|
logger('twitter: we have customer key and oauth stuff, going to send.', LOGGER_DEBUG);
|
||||||
|
|
||||||
// If it's a repeated message from twitter then do a native retweet and exit
|
// If it's a repeated message from twitter then do a native retweet and exit
|
||||||
if (twitter_is_retweet($a, $b['uid'], $b['body'])) {
|
if (twitter_is_retweet($a, $b['uid'], $b['body']))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
require_once 'library/twitteroauth.php';
|
require_once('library/twitteroauth.php');
|
||||||
require_once 'include/bbcode.php';
|
require_once('include/bbcode.php');
|
||||||
$tweet = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
|
$tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
|
||||||
|
|
||||||
$max_char = 280;
|
$max_char = 280;
|
||||||
require_once "include/plaintext.php";
|
require_once("include/plaintext.php");
|
||||||
$msgarr = plaintext($a, $b, $max_char, true, 8);
|
$msgarr = plaintext($a, $b, $max_char, true, 8);
|
||||||
$msg = $msgarr["text"];
|
$msg = $msgarr["text"];
|
||||||
|
|
||||||
if (($msg == "") && isset($msgarr["title"])) {
|
if (($msg == "") && isset($msgarr["title"]))
|
||||||
$msg = shortenmsg($msgarr["title"], $max_char - 50);
|
$msg = shortenmsg($msgarr["title"], $max_char - 50);
|
||||||
}
|
|
||||||
|
|
||||||
$image = "";
|
$image = "";
|
||||||
|
|
||||||
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
|
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo"))
|
||||||
$msg .= "\n" . $msgarr["url"];
|
$msg .= "\n".$msgarr["url"];
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($msgarr["image"]) && ($msgarr["type"] != "video")) {
|
if (isset($msgarr["image"]) && ($msgarr["type"] != "video"))
|
||||||
$image = $msgarr["image"];
|
$image = $msgarr["image"];
|
||||||
}
|
|
||||||
|
|
||||||
// and now tweet it :-)
|
// and now tweet it :-)
|
||||||
if (strlen($msg) && ($image != "")) {
|
if(strlen($msg) && ($image != "")) {
|
||||||
$img_str = fetch_url($image);
|
$img_str = fetch_url($image);
|
||||||
|
|
||||||
$tempfile = tempnam(get_temppath(), "cache");
|
$tempfile = tempnam(get_temppath(), "cache");
|
||||||
|
|
@ -548,7 +529,7 @@ function twitter_post_hook(App $a, &$b)
|
||||||
// so we are using a new library for twitter
|
// so we are using a new library for twitter
|
||||||
// To-Do:
|
// To-Do:
|
||||||
// Switching completely to this library with all functions
|
// 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 = \Codebird\Codebird::getInstance();
|
||||||
$cb->setConsumerKey($ckey, $csecret);
|
$cb->setConsumerKey($ckey, $csecret);
|
||||||
|
|
@ -556,120 +537,116 @@ function twitter_post_hook(App $a, &$b)
|
||||||
|
|
||||||
$post = array('status' => $msg, 'media[]' => $tempfile);
|
$post = array('status' => $msg, 'media[]' => $tempfile);
|
||||||
|
|
||||||
if ($iscomment) {
|
if ($iscomment)
|
||||||
$post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
|
$post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
|
||||||
}
|
|
||||||
|
|
||||||
$result = $cb->statuses_updateWithMedia($post);
|
$result = $cb->statuses_updateWithMedia($post);
|
||||||
unlink($tempfile);
|
unlink($tempfile);
|
||||||
|
|
||||||
logger('twitter_post_with_media send, result: ' . print_r($result, true), LOGGER_DEBUG);
|
logger('twitter_post_with_media send, result: ' . print_r($result, true), LOGGER_DEBUG);
|
||||||
|
|
||||||
if ($result->source) {
|
if ($result->source)
|
||||||
Config::set("twitter", "application_name", strip_tags($result->source));
|
Config::set("twitter", "application_name", strip_tags($result->source));
|
||||||
}
|
|
||||||
|
|
||||||
if ($result->errors || $result->error) {
|
if ($result->errors || $result->error) {
|
||||||
logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
|
logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
|
||||||
|
|
||||||
// Workaround: Remove the picture link so that the post can be reposted without it
|
// Workaround: Remove the picture link so that the post can be reposted without it
|
||||||
$msg .= " " . $image;
|
$msg .= " ".$image;
|
||||||
$image = "";
|
$image = "";
|
||||||
} elseif ($iscomment) {
|
} elseif ($iscomment) {
|
||||||
logger('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']);
|
logger('twitter_post: Update extid '.$result->id_str." for post id ".$b['id']);
|
||||||
q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d",
|
q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d",
|
||||||
dbesc("twitter::" . $result->id_str),
|
dbesc("twitter::".$result->id_str),
|
||||||
dbesc($result->text),
|
dbesc($result->text),
|
||||||
intval($b['id'])
|
intval($b['id'])
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strlen($msg) && ($image == "")) {
|
if(strlen($msg) && ($image == "")) {
|
||||||
// -----------------
|
// -----------------
|
||||||
$max_char = 280;
|
$max_char = 280;
|
||||||
require_once "include/plaintext.php";
|
require_once("include/plaintext.php");
|
||||||
$msgarr = plaintext($a, $b, $max_char, true, 8);
|
$msgarr = plaintext($a, $b, $max_char, true, 8);
|
||||||
$msg = $msgarr["text"];
|
$msg = $msgarr["text"];
|
||||||
|
|
||||||
if (($msg == "") && isset($msgarr["title"])) {
|
if (($msg == "") && isset($msgarr["title"]))
|
||||||
$msg = shortenmsg($msgarr["title"], $max_char - 50);
|
$msg = shortenmsg($msgarr["title"], $max_char - 50);
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($msgarr["url"])) {
|
if (isset($msgarr["url"]))
|
||||||
$msg .= "\n" . $msgarr["url"];
|
$msg .= "\n".$msgarr["url"];
|
||||||
}
|
|
||||||
// -----------------
|
// -----------------
|
||||||
$url = 'statuses/update';
|
$url = 'statuses/update';
|
||||||
$post = array('status' => $msg, 'weighted_character_count' => 'true');
|
$post = array('status' => $msg, 'weighted_character_count' => 'true');
|
||||||
|
|
||||||
if ($iscomment) {
|
if ($iscomment)
|
||||||
$post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
|
$post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
|
||||||
}
|
|
||||||
|
|
||||||
$result = $tweet->post($url, $post);
|
$result = $tweet->post($url, $post);
|
||||||
logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG);
|
logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG);
|
||||||
|
|
||||||
if ($result->source) {
|
if ($result->source)
|
||||||
Config::set("twitter", "application_name", strip_tags($result->source));
|
Config::set("twitter", "application_name", strip_tags($result->source));
|
||||||
}
|
|
||||||
|
|
||||||
if ($result->errors) {
|
if ($result->errors) {
|
||||||
logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
|
logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
|
||||||
|
|
||||||
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($b['uid']));
|
$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($b['uid']));
|
||||||
if (count($r)) {
|
if (count($r))
|
||||||
$a->contact = $r[0]["id"];
|
$a->contact = $r[0]["id"];
|
||||||
}
|
|
||||||
|
|
||||||
$s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $post));
|
$s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $post));
|
||||||
require_once 'include/queue_fn.php';
|
require_once('include/queue_fn.php');
|
||||||
add_to_queue($a->contact, NETWORK_TWITTER, $s);
|
add_to_queue($a->contact,NETWORK_TWITTER,$s);
|
||||||
notice(t('Twitter post failed. Queued for retry.') . EOL);
|
notice(t('Twitter post failed. Queued for retry.').EOL);
|
||||||
} elseif ($iscomment) {
|
} elseif ($iscomment) {
|
||||||
logger('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']);
|
logger('twitter_post: Update extid '.$result->id_str." for post id ".$b['id']);
|
||||||
q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
|
q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
|
||||||
dbesc("twitter::" . $result->id_str),
|
dbesc("twitter::".$result->id_str),
|
||||||
intval($b['id'])
|
intval($b['id'])
|
||||||
);
|
);
|
||||||
|
//q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d",
|
||||||
|
// dbesc("twitter::".$result->id_str),
|
||||||
|
// dbesc($result->text),
|
||||||
|
// intval($b['id'])
|
||||||
|
//);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_plugin_admin_post(App $a)
|
function twitter_plugin_admin_post(&$a){
|
||||||
{
|
$consumerkey = ((x($_POST,'consumerkey')) ? notags(trim($_POST['consumerkey'])) : '');
|
||||||
$consumerkey = x($_POST, 'consumerkey') ? notags(trim($_POST['consumerkey'])) : '';
|
$consumersecret = ((x($_POST,'consumersecret')) ? notags(trim($_POST['consumersecret'])): '');
|
||||||
$consumersecret = x($_POST, 'consumersecret') ? notags(trim($_POST['consumersecret'])) : '';
|
$applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'])):'');
|
||||||
Config::set('twitter', 'consumerkey', $consumerkey);
|
Config::set('twitter','consumerkey',$consumerkey);
|
||||||
Config::set('twitter', 'consumersecret', $consumersecret);
|
Config::set('twitter','consumersecret',$consumersecret);
|
||||||
info(t('Settings updated.') . EOL);
|
//Config::set('twitter','application_name',$applicationname);
|
||||||
|
info( t('Settings updated.'). EOL );
|
||||||
}
|
}
|
||||||
|
function twitter_plugin_admin(&$a, &$o){
|
||||||
function twitter_plugin_admin(App $a, &$o)
|
$t = get_markup_template( "admin.tpl", "addon/twitter/" );
|
||||||
{
|
|
||||||
$t = get_markup_template("admin.tpl", "addon/twitter/");
|
|
||||||
|
|
||||||
$o = replace_macros($t, array(
|
$o = replace_macros($t, array(
|
||||||
'$submit' => t('Save Settings'),
|
'$submit' => t('Save Settings'),
|
||||||
// name, label, value, help, [extra values]
|
// name, label, value, help, [extra values]
|
||||||
'$consumerkey' => array('consumerkey', t('Consumer key'), Config::get('twitter', 'consumerkey'), ''),
|
'$consumerkey' => array('consumerkey', t('Consumer key'), Config::get('twitter', 'consumerkey' ), ''),
|
||||||
'$consumersecret' => array('consumersecret', t('Consumer secret'), Config::get('twitter', 'consumersecret'), ''),
|
'$consumersecret' => array('consumersecret', t('Consumer secret'), Config::get('twitter', 'consumersecret' ), ''),
|
||||||
|
//'$applicationname' => array('applicationname', t('Name of the Twitter Application'), Config::get('twitter','application_name'),t('Set this to the exact name you gave the app on twitter.com/apps to avoid mirroring postings from ~friendica back to ~friendica'))
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_cron(App $a, $b)
|
function twitter_cron($a,$b) {
|
||||||
{
|
$last = Config::get('twitter','last_poll');
|
||||||
$last = Config::get('twitter', 'last_poll');
|
|
||||||
|
|
||||||
$poll_interval = intval(Config::get('twitter', 'poll_interval'));
|
$poll_interval = intval(Config::get('twitter','poll_interval'));
|
||||||
if (!$poll_interval) {
|
if(! $poll_interval)
|
||||||
$poll_interval = TWITTER_DEFAULT_POLL_INTERVAL;
|
$poll_interval = TWITTER_DEFAULT_POLL_INTERVAL;
|
||||||
}
|
|
||||||
|
|
||||||
if ($last) {
|
if($last) {
|
||||||
$next = $last + ($poll_interval * 60);
|
$next = $last + ($poll_interval * 60);
|
||||||
if ($next > time()) {
|
if($next > time()) {
|
||||||
logger('twitter: poll intervall not reached');
|
logger('twitter: poll intervall not reached');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
@ -677,33 +654,33 @@ function twitter_cron(App $a, $b)
|
||||||
logger('twitter: cron_start');
|
logger('twitter: cron_start');
|
||||||
|
|
||||||
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'mirror_posts' AND `v` = '1'");
|
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'mirror_posts' AND `v` = '1'");
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
foreach ($r as $rr) {
|
foreach($r as $rr) {
|
||||||
logger('twitter: fetching for user ' . $rr['uid']);
|
logger('twitter: fetching for user '.$rr['uid']);
|
||||||
Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int) $rr['uid']);
|
Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int)$rr['uid']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$abandon_days = intval(Config::get('system', 'account_abandon_days'));
|
$abandon_days = intval(Config::get('system','account_abandon_days'));
|
||||||
if ($abandon_days < 1)
|
if ($abandon_days < 1)
|
||||||
$abandon_days = 0;
|
$abandon_days = 0;
|
||||||
|
|
||||||
$abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400);
|
$abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400);
|
||||||
|
|
||||||
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1'");
|
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1'");
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
foreach ($r as $rr) {
|
foreach($r as $rr) {
|
||||||
if ($abandon_days != 0) {
|
if ($abandon_days != 0) {
|
||||||
$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
|
$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
|
||||||
if (!count($user)) {
|
if (!count($user)) {
|
||||||
logger('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported');
|
logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logger('twitter: importing timeline from user ' . $rr['uid']);
|
logger('twitter: importing timeline from user '.$rr['uid']);
|
||||||
Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, (int) $rr['uid']);
|
Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, (int)$rr['uid']);
|
||||||
/*
|
/*
|
||||||
// To-Do
|
// To-Do
|
||||||
// check for new contacts once a day
|
// check for new contacts once a day
|
||||||
$last_contact_check = PConfig::get($rr['uid'],'pumpio','contact_check');
|
$last_contact_check = PConfig::get($rr['uid'],'pumpio','contact_check');
|
||||||
|
|
@ -716,22 +693,22 @@ function twitter_cron(App $a, $b)
|
||||||
pumpio_getallusers($a, $rr["uid"]);
|
pumpio_getallusers($a, $rr["uid"]);
|
||||||
PConfig::set($rr['uid'],'pumpio','contact_check',time());
|
PConfig::set($rr['uid'],'pumpio','contact_check',time());
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logger('twitter: cron_end');
|
logger('twitter: cron_end');
|
||||||
|
|
||||||
Config::set('twitter', 'last_poll', time());
|
Config::set('twitter','last_poll', time());
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_expire(App $a, $b)
|
function twitter_expire($a,$b) {
|
||||||
{
|
|
||||||
$days = Config::get('twitter', 'expire');
|
$days = Config::get('twitter', 'expire');
|
||||||
|
|
||||||
if ($days == 0) {
|
if ($days == 0)
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
if (method_exists('dba', 'delete')) {
|
if (method_exists('dba', 'delete')) {
|
||||||
$r = dba::select('item', array('id'), array('deleted' => true, 'network' => NETWORK_TWITTER));
|
$r = dba::select('item', array('id'), array('deleted' => true, 'network' => NETWORK_TWITTER));
|
||||||
|
|
@ -743,14 +720,14 @@ function twitter_expire(App $a, $b)
|
||||||
$r = q("DELETE FROM `item` WHERE `deleted` AND `network` = '%s'", dbesc(NETWORK_TWITTER));
|
$r = q("DELETE FROM `item` WHERE `deleted` AND `network` = '%s'", dbesc(NETWORK_TWITTER));
|
||||||
}
|
}
|
||||||
|
|
||||||
require_once "include/items.php";
|
require_once("include/items.php");
|
||||||
|
|
||||||
logger('twitter_expire: expire_start');
|
logger('twitter_expire: expire_start');
|
||||||
|
|
||||||
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
|
$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
foreach ($r as $rr) {
|
foreach($r as $rr) {
|
||||||
logger('twitter_expire: user ' . $rr['uid']);
|
logger('twitter_expire: user '.$rr['uid']);
|
||||||
item_expire($rr['uid'], $days, NETWORK_TWITTER, true);
|
item_expire($rr['uid'], $days, NETWORK_TWITTER, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -758,44 +735,40 @@ function twitter_expire(App $a, $b)
|
||||||
logger('twitter_expire: expire_end');
|
logger('twitter_expire: expire_end');
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_prepare_body(App $a, &$b)
|
function twitter_prepare_body(&$a,&$b) {
|
||||||
{
|
if ($b["item"]["network"] != NETWORK_TWITTER)
|
||||||
if ($b["item"]["network"] != NETWORK_TWITTER) {
|
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
if ($b["preview"]) {
|
if ($b["preview"]) {
|
||||||
$max_char = 280;
|
$max_char = 280;
|
||||||
require_once "include/plaintext.php";
|
require_once("include/plaintext.php");
|
||||||
$item = $b["item"];
|
$item = $b["item"];
|
||||||
$item["plink"] = $a->get_baseurl() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
|
$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",
|
$r = q("SELECT `author-link` FROM item WHERE item.uri = '%s' AND item.uid = %d LIMIT 1",
|
||||||
dbesc($item["thr-parent"]),
|
dbesc($item["thr-parent"]),
|
||||||
intval(local_user()));
|
intval(local_user()));
|
||||||
|
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
$orig_post = $r[0];
|
$orig_post = $r[0];
|
||||||
|
|
||||||
$nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
|
$nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
|
||||||
$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nicknameplain . "[/url]";
|
$nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
|
||||||
$nicknameplain = "@" . $nicknameplain;
|
$nicknameplain = "@".$nicknameplain;
|
||||||
|
|
||||||
if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false)) {
|
if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false))
|
||||||
$item["body"] = $nickname . " " . $item["body"];
|
$item["body"] = $nickname." ".$item["body"];
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$msgarr = plaintext($a, $item, $max_char, true, 8);
|
$msgarr = plaintext($a, $item, $max_char, true, 8);
|
||||||
$msg = $msgarr["text"];
|
$msg = $msgarr["text"];
|
||||||
|
|
||||||
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
|
if (isset($msgarr["url"]) && ($msgarr["type"] != "photo"))
|
||||||
$msg .= " " . $msgarr["url"];
|
$msg .= " ".$msgarr["url"];
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($msgarr["image"])) {
|
if (isset($msgarr["image"]))
|
||||||
$msg .= " " . $msgarr["image"];
|
$msg .= " ".$msgarr["image"];
|
||||||
}
|
|
||||||
|
|
||||||
$b['html'] = nl2br(htmlspecialchars($msg));
|
$b['html'] = nl2br(htmlspecialchars($msg));
|
||||||
}
|
}
|
||||||
|
|
@ -804,19 +777,18 @@ function twitter_prepare_body(App $a, &$b)
|
||||||
/**
|
/**
|
||||||
* @brief Build the item array for the mirrored post
|
* @brief Build the item array for the mirrored post
|
||||||
*
|
*
|
||||||
* @param App $a Application class
|
* @param object $a Application class
|
||||||
* @param integer $uid User id
|
* @param integer $uid User id
|
||||||
* @param object $post Twitter object with the post
|
* @param object $post Twitter object with the post
|
||||||
*
|
*
|
||||||
* @return array item data to be posted
|
* @return array item data to be posted
|
||||||
*/
|
*/
|
||||||
function twitter_do_mirrorpost(App $a, $uid, $post)
|
function twitter_do_mirrorpost($a, $uid, $post) {
|
||||||
{
|
|
||||||
$datarray["type"] = "wall";
|
$datarray["type"] = "wall";
|
||||||
$datarray["api_source"] = true;
|
$datarray["api_source"] = true;
|
||||||
$datarray["profile_uid"] = $uid;
|
$datarray["profile_uid"] = $uid;
|
||||||
$datarray["extid"] = NETWORK_TWITTER;
|
$datarray["extid"] = NETWORK_TWITTER;
|
||||||
$datarray['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER . ":" . $post->id);
|
$datarray['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER.":".$post->id);
|
||||||
$datarray['object'] = json_encode($post);
|
$datarray['object'] = json_encode($post);
|
||||||
$datarray["title"] = "";
|
$datarray["title"] = "";
|
||||||
|
|
||||||
|
|
@ -824,9 +796,10 @@ function twitter_do_mirrorpost(App $a, $uid, $post)
|
||||||
// We don't support nested shares, so we mustn't show quotes as shares on retweets
|
// We don't support nested shares, so we mustn't show quotes as shares on retweets
|
||||||
$item = twitter_createpost($a, $uid, $post->retweeted_status, array('id' => 0), false, false, true);
|
$item = twitter_createpost($a, $uid, $post->retweeted_status, array('id' => 0), false, false, true);
|
||||||
|
|
||||||
$datarray['body'] = "\n" . share_header($item['author-name'], $item['author-link'], $item['author-avatar'], "", $item['created'], $item['plink']);
|
$datarray['body'] = "\n".share_header($item['author-name'], $item['author-link'], $item['author-avatar'], "",
|
||||||
|
$item['created'], $item['plink']);
|
||||||
|
|
||||||
$datarray['body'] .= $item['body'] . '[/share]';
|
$datarray['body'] .= $item['body'].'[/share]';
|
||||||
} else {
|
} else {
|
||||||
$item = twitter_createpost($a, $uid, $post, array('id' => 0), false, false, false);
|
$item = twitter_createpost($a, $uid, $post, array('id' => 0), false, false, false);
|
||||||
|
|
||||||
|
|
@ -847,8 +820,7 @@ function twitter_do_mirrorpost(App $a, $uid, $post)
|
||||||
return $datarray;
|
return $datarray;
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_fetchtimeline(App $a, $uid)
|
function twitter_fetchtimeline($a, $uid) {
|
||||||
{
|
|
||||||
$ckey = Config::get('twitter', 'consumerkey');
|
$ckey = Config::get('twitter', 'consumerkey');
|
||||||
$csecret = Config::get('twitter', 'consumersecret');
|
$csecret = Config::get('twitter', 'consumersecret');
|
||||||
$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
|
$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
|
||||||
|
|
@ -857,32 +829,29 @@ function twitter_fetchtimeline(App $a, $uid)
|
||||||
|
|
||||||
$application_name = Config::get('twitter', 'application_name');
|
$application_name = Config::get('twitter', 'application_name');
|
||||||
|
|
||||||
if ($application_name == "") {
|
if ($application_name == "")
|
||||||
$application_name = $a->get_hostname();
|
$application_name = $a->get_hostname();
|
||||||
}
|
|
||||||
|
|
||||||
$has_picture = false;
|
$has_picture = false;
|
||||||
|
|
||||||
require_once 'mod/item.php';
|
require_once('mod/item.php');
|
||||||
require_once 'include/items.php';
|
require_once('include/items.php');
|
||||||
require_once 'mod/share.php';
|
require_once('mod/share.php');
|
||||||
|
|
||||||
require_once 'library/twitteroauth.php';
|
require_once('library/twitteroauth.php');
|
||||||
$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
|
$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
|
||||||
|
|
||||||
$parameters = array("exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended");
|
$parameters = array("exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended");
|
||||||
|
|
||||||
$first_time = ($lastid == "");
|
$first_time = ($lastid == "");
|
||||||
|
|
||||||
if ($lastid != "") {
|
if ($lastid <> "")
|
||||||
$parameters["since_id"] = $lastid;
|
$parameters["since_id"] = $lastid;
|
||||||
}
|
|
||||||
|
|
||||||
$items = $connection->get('statuses/user_timeline', $parameters);
|
$items = $connection->get('statuses/user_timeline', $parameters);
|
||||||
|
|
||||||
if (!is_array($items)) {
|
if (!is_array($items))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$posts = array_reverse($items);
|
$posts = array_reverse($items);
|
||||||
|
|
||||||
|
|
@ -893,17 +862,17 @@ function twitter_fetchtimeline(App $a, $uid)
|
||||||
PConfig::set($uid, 'twitter', 'lastid', $lastid);
|
PConfig::set($uid, 'twitter', 'lastid', $lastid);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($first_time) {
|
if ($first_time)
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
if (!stristr($post->source, $application_name)) {
|
if (!stristr($post->source, $application_name)) {
|
||||||
|
|
||||||
$_SESSION["authenticated"] = true;
|
$_SESSION["authenticated"] = true;
|
||||||
$_SESSION["uid"] = $uid;
|
$_SESSION["uid"] = $uid;
|
||||||
|
|
||||||
$_REQUEST = twitter_do_mirrorpost($a, $uid, $post);
|
$_REQUEST = twitter_do_mirrorpost($a, $uid, $post);
|
||||||
|
|
||||||
logger('twitter: posting for user ' . $uid);
|
logger('twitter: posting for user '.$uid);
|
||||||
|
|
||||||
item_post($a);
|
item_post($a);
|
||||||
}
|
}
|
||||||
|
|
@ -912,21 +881,19 @@ function twitter_fetchtimeline(App $a, $uid)
|
||||||
PConfig::set($uid, 'twitter', 'lastid', $lastid);
|
PConfig::set($uid, 'twitter', 'lastid', $lastid);
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_queue_hook(App $a, &$b)
|
function twitter_queue_hook(&$a,&$b) {
|
||||||
{
|
|
||||||
$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
|
$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
|
||||||
dbesc(NETWORK_TWITTER)
|
dbesc(NETWORK_TWITTER)
|
||||||
);
|
);
|
||||||
if (!count($qi)) {
|
if(! count($qi))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
require_once 'include/queue_fn.php';
|
require_once('include/queue_fn.php');
|
||||||
|
|
||||||
foreach ($qi as $x) {
|
foreach($qi as $x) {
|
||||||
if ($x['network'] !== NETWORK_TWITTER) {
|
if($x['network'] !== NETWORK_TWITTER)
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
logger('twitter_queue: run');
|
logger('twitter_queue: run');
|
||||||
|
|
||||||
|
|
@ -934,9 +901,8 @@ function twitter_queue_hook(App $a, &$b)
|
||||||
WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
|
WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
|
||||||
intval($x['cid'])
|
intval($x['cid'])
|
||||||
);
|
);
|
||||||
if (!count($r)) {
|
if(! count($r))
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
$user = $r[0];
|
$user = $r[0];
|
||||||
|
|
||||||
|
|
@ -948,31 +914,30 @@ function twitter_queue_hook(App $a, &$b)
|
||||||
$success = false;
|
$success = false;
|
||||||
|
|
||||||
if ($ckey && $csecret && $otoken && $osecret) {
|
if ($ckey && $csecret && $otoken && $osecret) {
|
||||||
|
|
||||||
logger('twitter_queue: able to post');
|
logger('twitter_queue: able to post');
|
||||||
|
|
||||||
$z = unserialize($x['content']);
|
$z = unserialize($x['content']);
|
||||||
|
|
||||||
require_once "addon/twitter/codebird.php";
|
require_once("addon/twitter/codebird.php");
|
||||||
|
|
||||||
$cb = \Codebird\Codebird::getInstance();
|
$cb = \Codebird\Codebird::getInstance();
|
||||||
$cb->setConsumerKey($ckey, $csecret);
|
$cb->setConsumerKey($ckey, $csecret);
|
||||||
$cb->setToken($otoken, $osecret);
|
$cb->setToken($otoken, $osecret);
|
||||||
|
|
||||||
if ($z['url'] == "statuses/update") {
|
if ($z['url'] == "statuses/update")
|
||||||
$result = $cb->statuses_update($z['post']);
|
$result = $cb->statuses_update($z['post']);
|
||||||
}
|
|
||||||
|
|
||||||
logger('twitter_queue: post result: ' . print_r($result, true), LOGGER_DEBUG);
|
logger('twitter_queue: post result: ' . print_r($result, true), LOGGER_DEBUG);
|
||||||
|
|
||||||
if ($result->errors) {
|
if ($result->errors)
|
||||||
logger('twitter_queue: Send to Twitter failed: "' . print_r($result->errors, true) . '"');
|
logger('twitter_queue: Send to Twitter failed: "' . print_r($result->errors, true) . '"');
|
||||||
} else {
|
else {
|
||||||
$success = true;
|
$success = true;
|
||||||
remove_queue_item($x['id']);
|
remove_queue_item($x['id']);
|
||||||
}
|
}
|
||||||
} else {
|
} else
|
||||||
logger("twitter_queue: Error getting tokens for user " . $user['uid']);
|
logger("twitter_queue: Error getting tokens for user ".$user['uid']);
|
||||||
}
|
|
||||||
|
|
||||||
if (!$success) {
|
if (!$success) {
|
||||||
logger('twitter_queue: delayed');
|
logger('twitter_queue: delayed');
|
||||||
|
|
@ -981,45 +946,41 @@ function twitter_queue_hook(App $a, &$b)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_fix_avatar($avatar)
|
function twitter_fix_avatar($avatar) {
|
||||||
{
|
|
||||||
$new_avatar = str_replace("_normal.", ".", $avatar);
|
$new_avatar = str_replace("_normal.", ".", $avatar);
|
||||||
|
|
||||||
$info = Image::getInfoFromURL($new_avatar);
|
$info = Photo::getInfoFromURL($new_avatar);
|
||||||
if (!$info) {
|
if (!$info)
|
||||||
$new_avatar = $avatar;
|
$new_avatar = $avatar;
|
||||||
}
|
|
||||||
|
|
||||||
return $new_avatar;
|
return $new_avatar;
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_fetch_contact($uid, $contact, $create_user)
|
function twitter_fetch_contact($uid, $contact, $create_user) {
|
||||||
{
|
|
||||||
if ($contact->id_str == "") {
|
if ($contact->id_str == "")
|
||||||
return -1;
|
return(-1);
|
||||||
}
|
|
||||||
|
|
||||||
$avatar = twitter_fix_avatar($contact->profile_image_url_https);
|
$avatar = twitter_fix_avatar($contact->profile_image_url_https);
|
||||||
|
|
||||||
GContact::update(array("url" => "https://twitter.com/" . $contact->screen_name,
|
GlobalContact::update(array("url" => "https://twitter.com/".$contact->screen_name,
|
||||||
"network" => NETWORK_TWITTER, "photo" => $avatar, "hide" => true,
|
"network" => NETWORK_TWITTER, "photo" => $avatar, "hide" => true,
|
||||||
"name" => $contact->name, "nick" => $contact->screen_name,
|
"name" => $contact->name, "nick" => $contact->screen_name,
|
||||||
"location" => $contact->location, "about" => $contact->description,
|
"location" => $contact->location, "about" => $contact->description,
|
||||||
"addr" => $contact->screen_name . "@twitter.com", "generation" => 2));
|
"addr" => $contact->screen_name."@twitter.com", "generation" => 2));
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
|
||||||
intval($uid), dbesc("twitter::" . $contact->id_str));
|
intval($uid), dbesc("twitter::".$contact->id_str));
|
||||||
|
|
||||||
if (!count($r) && !$create_user) {
|
if(!count($r) && !$create_user)
|
||||||
return 0;
|
return(0);
|
||||||
}
|
|
||||||
|
|
||||||
if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
|
if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
|
||||||
logger("twitter_fetch_contact: Contact '" . $r[0]["nick"] . "' is blocked or readonly.", LOGGER_DEBUG);
|
logger("twitter_fetch_contact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
|
||||||
return -1;
|
return(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!count($r)) {
|
if(!count($r)) {
|
||||||
// create contact record
|
// create contact record
|
||||||
q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
|
q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
|
||||||
`name`, `nick`, `photo`, `network`, `rel`, `priority`,
|
`name`, `nick`, `photo`, `network`, `rel`, `priority`,
|
||||||
|
|
@ -1027,12 +988,12 @@ function twitter_fetch_contact($uid, $contact, $create_user)
|
||||||
VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
|
VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
|
||||||
intval($uid),
|
intval($uid),
|
||||||
dbesc(datetime_convert()),
|
dbesc(datetime_convert()),
|
||||||
dbesc("https://twitter.com/" . $contact->screen_name),
|
dbesc("https://twitter.com/".$contact->screen_name),
|
||||||
dbesc(normalise_link("https://twitter.com/" . $contact->screen_name)),
|
dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
|
||||||
dbesc($contact->screen_name."@twitter.com"),
|
dbesc($contact->screen_name."@twitter.com"),
|
||||||
dbesc("twitter::" . $contact->id_str),
|
dbesc("twitter::".$contact->id_str),
|
||||||
dbesc(''),
|
dbesc(''),
|
||||||
dbesc("twitter::" . $contact->id_str),
|
dbesc("twitter::".$contact->id_str),
|
||||||
dbesc($contact->name),
|
dbesc($contact->name),
|
||||||
dbesc($contact->screen_name),
|
dbesc($contact->screen_name),
|
||||||
dbesc($avatar),
|
dbesc($avatar),
|
||||||
|
|
@ -1049,9 +1010,8 @@ function twitter_fetch_contact($uid, $contact, $create_user)
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!count($r)) {
|
if(! count($r))
|
||||||
return false;
|
return(false);
|
||||||
}
|
|
||||||
|
|
||||||
$contact_id = $r[0]['id'];
|
$contact_id = $r[0]['id'];
|
||||||
|
|
||||||
|
|
@ -1059,9 +1019,9 @@ function twitter_fetch_contact($uid, $contact, $create_user)
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
if ($g && intval($g[0]['def_gid'])) {
|
if($g && intval($g[0]['def_gid'])) {
|
||||||
require_once 'include/group.php';
|
require_once('include/group.php');
|
||||||
group_add_member($uid, '', $contact_id, $g[0]['def_gid']);
|
group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
|
||||||
}
|
}
|
||||||
|
|
||||||
$photos = Photo::importProfilePhoto($avatar, $uid, $contact_id, true);
|
$photos = Photo::importProfilePhoto($avatar, $uid, $contact_id, true);
|
||||||
|
|
@ -1085,12 +1045,15 @@ function twitter_fetch_contact($uid, $contact, $create_user)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// update profile photos once every two weeks as we have no notification of when they change.
|
// 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 -2 days')) ? true : false);
|
||||||
$update_photo = ($r[0]['avatar-date'] < datetime_convert('', '', 'now -12 hours'));
|
$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
|
// 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("twitter_fetch_contact: Updating contact " . $contact->screen_name, LOGGER_DEBUG);
|
if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) {
|
||||||
|
|
||||||
|
logger("twitter_fetch_contact: Updating contact ".$contact->screen_name, LOGGER_DEBUG);
|
||||||
|
|
||||||
$photos = Photo::importProfilePhoto($avatar, $uid, $r[0]['id'], true);
|
$photos = Photo::importProfilePhoto($avatar, $uid, $r[0]['id'], true);
|
||||||
|
|
||||||
|
|
@ -1128,17 +1091,16 @@ function twitter_fetch_contact($uid, $contact, $create_user)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $r[0]["id"];
|
return($r[0]["id"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
|
function twitter_fetchuser($a, $uid, $screen_name = "", $user_id = "") {
|
||||||
{
|
|
||||||
$ckey = Config::get('twitter', 'consumerkey');
|
$ckey = Config::get('twitter', 'consumerkey');
|
||||||
$csecret = Config::get('twitter', 'consumersecret');
|
$csecret = Config::get('twitter', 'consumersecret');
|
||||||
$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
|
$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
|
||||||
$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
|
$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
|
||||||
|
|
||||||
require_once "addon/twitter/codebird.php";
|
require_once("addon/twitter/codebird.php");
|
||||||
|
|
||||||
$cb = \Codebird\Codebird::getInstance();
|
$cb = \Codebird\Codebird::getInstance();
|
||||||
$cb->setConsumerKey($ckey, $csecret);
|
$cb->setConsumerKey($ckey, $csecret);
|
||||||
|
|
@ -1147,38 +1109,33 @@ function twitter_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
|
||||||
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
||||||
intval($uid));
|
intval($uid));
|
||||||
|
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
$self = $r[0];
|
$self = $r[0];
|
||||||
} else {
|
} else
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$parameters = array();
|
$parameters = array();
|
||||||
|
|
||||||
if ($screen_name != "") {
|
if ($screen_name != "")
|
||||||
$parameters["screen_name"] = $screen_name;
|
$parameters["screen_name"] = $screen_name;
|
||||||
}
|
|
||||||
|
|
||||||
if ($user_id != "") {
|
if ($user_id != "")
|
||||||
$parameters["user_id"] = $user_id;
|
$parameters["user_id"] = $user_id;
|
||||||
}
|
|
||||||
|
|
||||||
// Fetching user data
|
// Fetching user data
|
||||||
$user = $cb->users_show($parameters);
|
$user = $cb->users_show($parameters);
|
||||||
|
|
||||||
if (!is_object($user)) {
|
if (!is_object($user))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$contact_id = twitter_fetch_contact($uid, $user, true);
|
$contact_id = twitter_fetch_contact($uid, $user, true);
|
||||||
|
|
||||||
return $contact_id;
|
return $contact_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $picture)
|
function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
|
||||||
{
|
require_once("include/oembed.php");
|
||||||
require_once "include/oembed.php";
|
require_once("include/network.php");
|
||||||
require_once "include/network.php";
|
|
||||||
|
|
||||||
$tags = "";
|
$tags = "";
|
||||||
|
|
||||||
|
|
@ -1191,21 +1148,21 @@ function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $pictur
|
||||||
$footer = "";
|
$footer = "";
|
||||||
|
|
||||||
foreach ($item->entities->urls AS $url) {
|
foreach ($item->entities->urls AS $url) {
|
||||||
|
|
||||||
$plain = str_replace($url->url, '', $plain);
|
$plain = str_replace($url->url, '', $plain);
|
||||||
|
|
||||||
if ($url->url && $url->expanded_url && $url->display_url) {
|
if ($url->url && $url->expanded_url && $url->display_url) {
|
||||||
|
|
||||||
$expanded_url = original_url($url->expanded_url);
|
$expanded_url = original_url($url->expanded_url);
|
||||||
|
|
||||||
$oembed_data = oembed_fetch_url($expanded_url);
|
$oembed_data = oembed_fetch_url($expanded_url);
|
||||||
|
|
||||||
// Quickfix: Workaround for URL with "[" and "]" in it
|
// Quickfix: Workaround for URL with "[" and "]" in it
|
||||||
if (strpos($expanded_url, "[") || strpos($expanded_url, "]")) {
|
if (strpos($expanded_url, "[") || strpos($expanded_url, "]"))
|
||||||
$expanded_url = $url->url;
|
$expanded_url = $url->url;
|
||||||
}
|
|
||||||
|
|
||||||
if ($type == "") {
|
if ($type == "")
|
||||||
$type = $oembed_data->type;
|
$type = $oembed_data->type;
|
||||||
}
|
|
||||||
|
|
||||||
if ($oembed_data->type == "video") {
|
if ($oembed_data->type == "video") {
|
||||||
//$body = str_replace($url->url,
|
//$body = str_replace($url->url,
|
||||||
|
|
@ -1213,16 +1170,20 @@ function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $pictur
|
||||||
//$dontincludemedia = true;
|
//$dontincludemedia = true;
|
||||||
$type = $oembed_data->type;
|
$type = $oembed_data->type;
|
||||||
$footerurl = $expanded_url;
|
$footerurl = $expanded_url;
|
||||||
$footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]";
|
$footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
|
||||||
|
|
||||||
$body = str_replace($url->url, $footerlink, $body);
|
$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) AND !$dontincludemedia) {
|
||||||
} elseif (($oembed_data->type == "photo") && isset($oembed_data->url)) {
|
} elseif (($oembed_data->type == "photo") && isset($oembed_data->url)) {
|
||||||
$body = str_replace($url->url, "[url=" . $expanded_url . "][img]" . $oembed_data->url . "[/img][/url]", $body);
|
$body = str_replace($url->url,
|
||||||
|
"[url=".$expanded_url."][img]".$oembed_data->url."[/img][/url]",
|
||||||
|
$body);
|
||||||
//$dontincludemedia = true;
|
//$dontincludemedia = true;
|
||||||
} elseif ($oembed_data->type != "link") {
|
} elseif ($oembed_data->type != "link")
|
||||||
$body = str_replace($url->url, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
|
$body = str_replace($url->url,
|
||||||
} else {
|
"[url=".$expanded_url."]".$expanded_url."[/url]",
|
||||||
|
$body);
|
||||||
|
else {
|
||||||
$img_str = fetch_url($expanded_url, true, $redirects, 4);
|
$img_str = fetch_url($expanded_url, true, $redirects, 4);
|
||||||
|
|
||||||
$tempfile = tempnam(get_temppath(), "cache");
|
$tempfile = tempnam(get_temppath(), "cache");
|
||||||
|
|
@ -1232,12 +1193,12 @@ function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $pictur
|
||||||
|
|
||||||
if (substr($mime, 0, 6) == "image/") {
|
if (substr($mime, 0, 6) == "image/") {
|
||||||
$type = "photo";
|
$type = "photo";
|
||||||
$body = str_replace($url->url, "[img]" . $expanded_url . "[/img]", $body);
|
$body = str_replace($url->url, "[img]".$expanded_url."[/img]", $body);
|
||||||
//$dontincludemedia = true;
|
//$dontincludemedia = true;
|
||||||
} else {
|
} else {
|
||||||
$type = $oembed_data->type;
|
$type = $oembed_data->type;
|
||||||
$footerurl = $expanded_url;
|
$footerurl = $expanded_url;
|
||||||
$footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]";
|
$footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
|
||||||
|
|
||||||
$body = str_replace($url->url, $footerlink, $body);
|
$body = str_replace($url->url, $footerlink, $body);
|
||||||
}
|
}
|
||||||
|
|
@ -1245,84 +1206,79 @@ function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $pictur
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($footerurl != "") {
|
if ($footerurl != "")
|
||||||
$footer = add_page_info($footerurl, false, $picture);
|
$footer = add_page_info($footerurl, false, $picture);
|
||||||
}
|
|
||||||
|
|
||||||
if (($footerlink != "") && (trim($footer) != "")) {
|
if (($footerlink != "") && (trim($footer) != "")) {
|
||||||
$removedlink = trim(str_replace($footerlink, "", $body));
|
$removedlink = trim(str_replace($footerlink, "", $body));
|
||||||
|
|
||||||
if (($removedlink == "") || strstr($body, $removedlink)) {
|
if (($removedlink == "") || strstr($body, $removedlink))
|
||||||
$body = $removedlink;
|
$body = $removedlink;
|
||||||
}
|
|
||||||
|
|
||||||
$body .= $footer;
|
$body .= $footer;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($footer == "") && ($picture != "")) {
|
if (($footer == "") && ($picture != ""))
|
||||||
$body .= "\n\n[img]" . $picture . "[/img]\n";
|
$body .= "\n\n[img]".$picture."[/img]\n";
|
||||||
} elseif (($footer == "") && ($picture == "")) {
|
elseif (($footer == "") && ($picture == ""))
|
||||||
$body = add_page_info_to_body($body);
|
$body = add_page_info_to_body($body);
|
||||||
}
|
|
||||||
|
|
||||||
if ($no_tags) {
|
if ($no_tags)
|
||||||
return array("body" => $body, "tags" => "", "plain" => $plain);
|
return array("body" => $body, "tags" => "", "plain" => $plain);
|
||||||
}
|
|
||||||
|
|
||||||
$tags_arr = array();
|
$tags_arr = array();
|
||||||
|
|
||||||
foreach ($item->entities->hashtags AS $hashtag) {
|
foreach ($item->entities->hashtags AS $hashtag) {
|
||||||
$url = "#[url=" . $a->get_baseurl() . "/search?tag=" . rawurlencode($hashtag->text) . "]" . $hashtag->text . "[/url]";
|
$url = "#[url=".$a->get_baseurl()."/search?tag=".rawurlencode($hashtag->text)."]".$hashtag->text."[/url]";
|
||||||
$tags_arr["#" . $hashtag->text] = $url;
|
$tags_arr["#".$hashtag->text] = $url;
|
||||||
$body = str_replace("#" . $hashtag->text, $url, $body);
|
$body = str_replace("#".$hashtag->text, $url, $body);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($item->entities->user_mentions AS $mention) {
|
foreach ($item->entities->user_mentions AS $mention) {
|
||||||
$url = "@[url=https://twitter.com/" . rawurlencode($mention->screen_name) . "]" . $mention->screen_name . "[/url]";
|
$url = "@[url=https://twitter.com/".rawurlencode($mention->screen_name)."]".$mention->screen_name."[/url]";
|
||||||
$tags_arr["@" . $mention->screen_name] = $url;
|
$tags_arr["@".$mention->screen_name] = $url;
|
||||||
$body = str_replace("@" . $mention->screen_name, $url, $body);
|
$body = str_replace("@".$mention->screen_name, $url, $body);
|
||||||
}
|
}
|
||||||
|
|
||||||
// it seems as if the entities aren't always covering all mentions. So the rest will be checked here
|
// 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) {
|
foreach($tags as $tag) {
|
||||||
if (strstr(trim($tag), " ")) {
|
if (strstr(trim($tag), " "))
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
if (strpos($tag, '#') === 0) {
|
if(strpos($tag,'#') === 0) {
|
||||||
if (strpos($tag, '[url=')) {
|
if(strpos($tag,'[url='))
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
// don't link tags that are already embedded in links
|
// don't link tags that are already embedded in links
|
||||||
if (preg_match('/\[(.*?)' . preg_quote($tag, '/') . '(.*?)\]/', $body)) {
|
|
||||||
|
if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body))
|
||||||
continue;
|
continue;
|
||||||
|
if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
$basetag = str_replace('_',' ',substr($tag,1));
|
||||||
|
$url = '#[url='.$a->get_baseurl().'/search?tag='.rawurlencode($basetag).']'.$basetag.'[/url]';
|
||||||
|
$body = str_replace($tag,$url,$body);
|
||||||
|
$tags_arr["#".$basetag] = $url;
|
||||||
|
continue;
|
||||||
|
} elseif(strpos($tag,'@') === 0) {
|
||||||
|
if(strpos($tag,'[url='))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
$basetag = substr($tag,1);
|
||||||
|
$url = '@[url=https://twitter.com/'.rawurlencode($basetag).']'.$basetag.'[/url]';
|
||||||
|
$body = str_replace($tag,$url,$body);
|
||||||
|
$tags_arr["@".$basetag] = $url;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag, '/') . '(.*?)\)/', $body)) {
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$basetag = str_replace('_', ' ', substr($tag, 1));
|
|
||||||
$url = '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
|
|
||||||
$body = str_replace($tag, $url, $body);
|
|
||||||
$tags_arr["#" . $basetag] = $url;
|
|
||||||
} elseif (strpos($tag, '@') === 0) {
|
|
||||||
if (strpos($tag, '[url=')) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
$basetag = substr($tag, 1);
|
|
||||||
$url = '@[url=https://twitter.com/' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
|
|
||||||
$body = str_replace($tag, $url, $body);
|
|
||||||
$tags_arr["@" . $basetag] = $url;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$tags = implode($tags_arr, ",");
|
$tags = implode($tags_arr, ",");
|
||||||
|
|
||||||
}
|
}
|
||||||
return array("body" => $body, "tags" => $tags, "plain" => $plain);
|
return array("body" => $body, "tags" => $tags, "plain" => $plain);
|
||||||
}
|
}
|
||||||
|
|
@ -1335,8 +1291,8 @@ function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $pictur
|
||||||
*
|
*
|
||||||
* @return $picture string Returns a a single picture string if it isn't a media post
|
* @return $picture string Returns a a single picture string if it isn't a media post
|
||||||
*/
|
*/
|
||||||
function twitter_media_entities($post, &$postarray)
|
function twitter_media_entities($post, &$postarray) {
|
||||||
{
|
|
||||||
// There are no media entities? So we quit.
|
// There are no media entities? So we quit.
|
||||||
if (!is_array($post->extended_entities->media)) {
|
if (!is_array($post->extended_entities->media)) {
|
||||||
return "";
|
return "";
|
||||||
|
|
@ -1346,7 +1302,7 @@ function twitter_media_entities($post, &$postarray)
|
||||||
// We only do this when there is exactly one media.
|
// We only do this when there is exactly one media.
|
||||||
if ((count($post->entities->urls) > 0) && (count($post->extended_entities->media) == 1)) {
|
if ((count($post->entities->urls) > 0) && (count($post->extended_entities->media) == 1)) {
|
||||||
$picture = "";
|
$picture = "";
|
||||||
foreach ($post->extended_entities->media AS $medium) {
|
foreach($post->extended_entities->media AS $medium) {
|
||||||
if (isset($medium->media_url_https)) {
|
if (isset($medium->media_url_https)) {
|
||||||
$picture = $medium->media_url_https;
|
$picture = $medium->media_url_https;
|
||||||
$postarray['body'] = str_replace($medium->url, "", $postarray['body']);
|
$postarray['body'] = str_replace($medium->url, "", $postarray['body']);
|
||||||
|
|
@ -1357,22 +1313,22 @@ function twitter_media_entities($post, &$postarray)
|
||||||
|
|
||||||
// This is a pure media post, first search for all media urls
|
// This is a pure media post, first search for all media urls
|
||||||
$media = array();
|
$media = array();
|
||||||
foreach ($post->extended_entities->media AS $medium) {
|
foreach($post->extended_entities->media AS $medium) {
|
||||||
switch ($medium->type) {
|
switch($medium->type) {
|
||||||
case 'photo':
|
case 'photo':
|
||||||
$media[$medium->url] .= "\n[img]" . $medium->media_url_https . "[/img]";
|
$media[$medium->url] .= "\n[img]".$medium->media_url_https."[/img]";
|
||||||
$postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
|
$postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
|
||||||
break;
|
break;
|
||||||
case 'video':
|
case 'video':
|
||||||
case 'animated_gif':
|
case 'animated_gif':
|
||||||
$media[$medium->url] .= "\n[img]" . $medium->media_url_https . "[/img]";
|
$media[$medium->url] .= "\n[img]".$medium->media_url_https."[/img]";
|
||||||
$postarray['object-type'] = ACTIVITY_OBJ_VIDEO;
|
$postarray['object-type'] = ACTIVITY_OBJ_VIDEO;
|
||||||
if (is_array($medium->video_info->variants)) {
|
if (is_array($medium->video_info->variants)) {
|
||||||
$bitrate = 0;
|
$bitrate = 0;
|
||||||
// We take the video with the highest bitrate
|
// We take the video with the highest bitrate
|
||||||
foreach ($medium->video_info->variants AS $variant) {
|
foreach ($medium->video_info->variants AS $variant) {
|
||||||
if (($variant->content_type == "video/mp4") && ($variant->bitrate >= $bitrate)) {
|
if (($variant->content_type == "video/mp4") && ($variant->bitrate >= $bitrate)) {
|
||||||
$media[$medium->url] = "\n[video]" . $variant->url . "[/video]";
|
$media[$medium->url] = "\n[video]".$variant->url."[/video]";
|
||||||
$bitrate = $variant->bitrate;
|
$bitrate = $variant->bitrate;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1386,19 +1342,19 @@ function twitter_media_entities($post, &$postarray)
|
||||||
|
|
||||||
// Now we replace the media urls.
|
// Now we replace the media urls.
|
||||||
foreach ($media AS $key => $value) {
|
foreach ($media AS $key => $value) {
|
||||||
$postarray['body'] = str_replace($key, "\n" . $value . "\n", $postarray['body']);
|
$postarray['body'] = str_replace($key, "\n".$value."\n", $postarray['body']);
|
||||||
}
|
}
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_existing_contact, $noquote)
|
function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact, $noquote) {
|
||||||
{
|
|
||||||
$postarray = array();
|
$postarray = array();
|
||||||
$postarray['network'] = NETWORK_TWITTER;
|
$postarray['network'] = NETWORK_TWITTER;
|
||||||
$postarray['gravity'] = 0;
|
$postarray['gravity'] = 0;
|
||||||
$postarray['uid'] = $uid;
|
$postarray['uid'] = $uid;
|
||||||
$postarray['wall'] = 0;
|
$postarray['wall'] = 0;
|
||||||
$postarray['uri'] = "twitter::" . $post->id_str;
|
$postarray['uri'] = "twitter::".$post->id_str;
|
||||||
$postarray['object'] = json_encode($post);
|
$postarray['object'] = json_encode($post);
|
||||||
|
|
||||||
// Don't import our own comments
|
// Don't import our own comments
|
||||||
|
|
@ -1408,14 +1364,15 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
|
||||||
);
|
);
|
||||||
|
|
||||||
if (count($r)) {
|
if (count($r)) {
|
||||||
logger("Item with extid " . $postarray['uri'] . " found.", LOGGER_DEBUG);
|
logger("Item with extid ".$postarray['uri']." found.", LOGGER_DEBUG);
|
||||||
return array();
|
return(array());
|
||||||
}
|
}
|
||||||
|
|
||||||
$contactid = 0;
|
$contactid = 0;
|
||||||
|
|
||||||
if ($post->in_reply_to_status_id_str != "") {
|
if ($post->in_reply_to_status_id_str != "") {
|
||||||
$parent = "twitter::" . $post->in_reply_to_status_id_str;
|
|
||||||
|
$parent = "twitter::".$post->in_reply_to_status_id_str;
|
||||||
|
|
||||||
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
|
||||||
dbesc($parent),
|
dbesc($parent),
|
||||||
|
|
@ -1450,15 +1407,15 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
|
||||||
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
||||||
intval($uid));
|
intval($uid));
|
||||||
|
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
$contactid = $r[0]["id"];
|
$contactid = $r[0]["id"];
|
||||||
|
|
||||||
$postarray['owner-name'] = $r[0]["name"];
|
$postarray['owner-name'] = $r[0]["name"];
|
||||||
$postarray['owner-link'] = $r[0]["url"];
|
$postarray['owner-link'] = $r[0]["url"];
|
||||||
$postarray['owner-avatar'] = $r[0]["photo"];
|
$postarray['owner-avatar'] = $r[0]["photo"];
|
||||||
} else {
|
} else {
|
||||||
logger("No self contact for user " . $uid, LOGGER_DEBUG);
|
logger("No self contact for user ".$uid, LOGGER_DEBUG);
|
||||||
return array();
|
return(array());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Don't create accounts of people who just comment something
|
// Don't create accounts of people who just comment something
|
||||||
|
|
@ -1472,15 +1429,15 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
|
||||||
$contactid = twitter_fetch_contact($uid, $post->user, $create_user);
|
$contactid = twitter_fetch_contact($uid, $post->user, $create_user);
|
||||||
|
|
||||||
$postarray['owner-name'] = $post->user->name;
|
$postarray['owner-name'] = $post->user->name;
|
||||||
$postarray['owner-link'] = "https://twitter.com/" . $post->user->screen_name;
|
$postarray['owner-link'] = "https://twitter.com/".$post->user->screen_name;
|
||||||
$postarray['owner-avatar'] = twitter_fix_avatar($post->user->profile_image_url_https);
|
$postarray['owner-avatar'] = twitter_fix_avatar($post->user->profile_image_url_https);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($contactid == 0) && !$only_existing_contact) {
|
if(($contactid == 0) && !$only_existing_contact) {
|
||||||
$contactid = $self['id'];
|
$contactid = $self['id'];
|
||||||
} elseif ($contactid <= 0) {
|
} elseif ($contactid <= 0) {
|
||||||
logger("Contact ID is zero or less than zero.", LOGGER_DEBUG);
|
logger("Contact ID is zero or less than zero.", LOGGER_DEBUG);
|
||||||
return array();
|
return(array());
|
||||||
}
|
}
|
||||||
|
|
||||||
$postarray['contact-id'] = $contactid;
|
$postarray['contact-id'] = $contactid;
|
||||||
|
|
@ -1489,7 +1446,7 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
|
||||||
$postarray['author-name'] = $postarray['owner-name'];
|
$postarray['author-name'] = $postarray['owner-name'];
|
||||||
$postarray['author-link'] = $postarray['owner-link'];
|
$postarray['author-link'] = $postarray['owner-link'];
|
||||||
$postarray['author-avatar'] = $postarray['owner-avatar'];
|
$postarray['author-avatar'] = $postarray['owner-avatar'];
|
||||||
$postarray['plink'] = "https://twitter.com/" . $post->user->screen_name . "/status/" . $post->id_str;
|
$postarray['plink'] = "https://twitter.com/".$post->user->screen_name."/status/".$post->id_str;
|
||||||
$postarray['app'] = strip_tags($post->source);
|
$postarray['app'] = strip_tags($post->source);
|
||||||
|
|
||||||
if ($post->user->protected) {
|
if ($post->user->protected) {
|
||||||
|
|
@ -1514,8 +1471,8 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
|
||||||
$converted = twitter_expand_entities($a, $postarray['body'], $post, false, $picture);
|
$converted = twitter_expand_entities($a, $postarray['body'], $post, false, $picture);
|
||||||
$postarray['body'] = $converted["body"];
|
$postarray['body'] = $converted["body"];
|
||||||
$postarray['tag'] = $converted["tags"];
|
$postarray['tag'] = $converted["tags"];
|
||||||
$postarray['created'] = datetime_convert('UTC', 'UTC', $post->created_at);
|
$postarray['created'] = datetime_convert('UTC','UTC',$post->created_at);
|
||||||
$postarray['edited'] = datetime_convert('UTC', 'UTC', $post->created_at);
|
$postarray['edited'] = datetime_convert('UTC','UTC',$post->created_at);
|
||||||
|
|
||||||
$statustext = $converted["plain"];
|
$statustext = $converted["plain"];
|
||||||
|
|
||||||
|
|
@ -1526,10 +1483,10 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
|
||||||
$postarray["location"] = $post->place->full_name;
|
$postarray["location"] = $post->place->full_name;
|
||||||
}
|
}
|
||||||
if (is_array($post->geo->coordinates)) {
|
if (is_array($post->geo->coordinates)) {
|
||||||
$postarray["coord"] = $post->geo->coordinates[0] . " " . $post->geo->coordinates[1];
|
$postarray["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1];
|
||||||
}
|
}
|
||||||
if (is_array($post->coordinates->coordinates)) {
|
if (is_array($post->coordinates->coordinates)) {
|
||||||
$postarray["coord"] = $post->coordinates->coordinates[1] . " " . $post->coordinates->coordinates[0];
|
$postarray["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
|
||||||
}
|
}
|
||||||
if (is_object($post->retweeted_status)) {
|
if (is_object($post->retweeted_status)) {
|
||||||
$retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote);
|
$retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote);
|
||||||
|
|
@ -1550,57 +1507,56 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
|
||||||
|
|
||||||
$postarray['body'] = $statustext;
|
$postarray['body'] = $statustext;
|
||||||
|
|
||||||
$postarray['body'] .= "\n" . share_header($quoted['author-name'], $quoted['author-link'], $quoted['author-avatar'], "", $quoted['created'], $quoted['plink']);
|
$postarray['body'] .= "\n".share_header($quoted['author-name'], $quoted['author-link'], $quoted['author-avatar'], "",
|
||||||
|
$quoted['created'], $quoted['plink']);
|
||||||
|
|
||||||
$postarray['body'] .= $quoted['body'] . '[/share]';
|
$postarray['body'] .= $quoted['body'].'[/share]';
|
||||||
}
|
}
|
||||||
|
|
||||||
return $postarray;
|
return($postarray);
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_checknotification(App $a, $uid, $own_id, $top_item, $postarray)
|
function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) {
|
||||||
{
|
|
||||||
/// TODO: this whole function doesn't seem to work. Needs complete check
|
// this whole function doesn't seem to work. Needs complete check
|
||||||
|
|
||||||
$user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
|
$user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!count($user)) {
|
if(!count($user))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
// Is it me?
|
// Is it me?
|
||||||
if (link_compare($user[0]["url"], $postarray['author-link'])) {
|
if (link_compare($user[0]["url"], $postarray['author-link']))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$own_user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
|
$own_user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
|
||||||
intval($uid),
|
intval($uid),
|
||||||
dbesc("twitter::".$own_id)
|
dbesc("twitter::".$own_id)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!count($own_user)) {
|
if(!count($own_user))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
// Is it me from twitter?
|
// Is it me from twitter?
|
||||||
if (link_compare($own_user[0]["url"], $postarray['author-link'])) {
|
if (link_compare($own_user[0]["url"], $postarray['author-link']))
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
|
|
||||||
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
|
$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']),
|
dbesc($postarray['parent-uri']),
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (count($myconv)) {
|
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"]) && !link_compare($conv['author-link'], $own_user[0]["url"])) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
require_once 'include/enotify.php';
|
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"]) && !link_compare($conv['author-link'],$own_user[0]["url"]))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
require_once('include/enotify.php');
|
||||||
|
|
||||||
$conv_parent = $conv['parent'];
|
$conv_parent = $conv['parent'];
|
||||||
|
|
||||||
|
|
@ -1612,7 +1568,7 @@ function twitter_checknotification(App $a, $uid, $own_id, $top_item, $postarray)
|
||||||
'to_email' => $user[0]['email'],
|
'to_email' => $user[0]['email'],
|
||||||
'uid' => $user[0]['uid'],
|
'uid' => $user[0]['uid'],
|
||||||
'item' => $postarray,
|
'item' => $postarray,
|
||||||
'link' => $a->get_baseurl() . '/display/' . urlencode(get_item_guid($top_item)),
|
'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
|
||||||
'source_name' => $postarray['author-name'],
|
'source_name' => $postarray['author-name'],
|
||||||
'source_link' => $postarray['author-link'],
|
'source_link' => $postarray['author-link'],
|
||||||
'source_photo' => $postarray['author-avatar'],
|
'source_photo' => $postarray['author-avatar'],
|
||||||
|
|
@ -1627,9 +1583,8 @@ function twitter_checknotification(App $a, $uid, $own_id, $top_item, $postarray)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_fetchparentposts(App $a, $uid, $post, $connection, $self, $own_id)
|
function twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id) {
|
||||||
{
|
logger("twitter_fetchparentposts: Fetching for user ".$uid." and post ".$post->id_str, LOGGER_DEBUG);
|
||||||
logger("twitter_fetchparentposts: Fetching for user " . $uid . " and post " . $post->id_str, LOGGER_DEBUG);
|
|
||||||
|
|
||||||
$posts = array();
|
$posts = array();
|
||||||
|
|
||||||
|
|
@ -1639,7 +1594,7 @@ function twitter_fetchparentposts(App $a, $uid, $post, $connection, $self, $own_
|
||||||
$post = $connection->get('statuses/show', $parameters);
|
$post = $connection->get('statuses/show', $parameters);
|
||||||
|
|
||||||
if (!count($post)) {
|
if (!count($post)) {
|
||||||
logger("twitter_fetchparentposts: Can't fetch post " . $parameters->id, LOGGER_DEBUG);
|
logger("twitter_fetchparentposts: Can't fetch post ".$parameters->id, LOGGER_DEBUG);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1648,14 +1603,13 @@ function twitter_fetchparentposts(App $a, $uid, $post, $connection, $self, $own_
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (count($r)) {
|
if (count($r))
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
|
|
||||||
$posts[] = $post;
|
$posts[] = $post;
|
||||||
}
|
}
|
||||||
|
|
||||||
logger("twitter_fetchparentposts: Fetching " . count($posts) . " parents", LOGGER_DEBUG);
|
logger("twitter_fetchparentposts: Fetching ".count($posts)." parents", LOGGER_DEBUG);
|
||||||
|
|
||||||
$posts = array_reverse($posts);
|
$posts = array_reverse($posts);
|
||||||
|
|
||||||
|
|
@ -1669,17 +1623,15 @@ function twitter_fetchparentposts(App $a, $uid, $post, $connection, $self, $own_
|
||||||
$item = item_store($postarray);
|
$item = item_store($postarray);
|
||||||
$postarray["id"] = $item;
|
$postarray["id"] = $item;
|
||||||
|
|
||||||
logger('twitter_fetchparentpost: User ' . $self["nick"] . ' posted parent timeline item ' . $item);
|
logger('twitter_fetchparentpost: User '.$self["nick"].' posted parent timeline item '.$item);
|
||||||
|
|
||||||
if ($item && !function_exists("check_item_notification")) {
|
if ($item && !function_exists("check_item_notification"))
|
||||||
twitter_checknotification($a, $uid, $own_id, $item, $postarray);
|
twitter_checknotification($a, $uid, $own_id, $item, $postarray);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_fetchhometimeline(App $a, $uid)
|
function twitter_fetchhometimeline($a, $uid) {
|
||||||
{
|
|
||||||
$ckey = Config::get('twitter', 'consumerkey');
|
$ckey = Config::get('twitter', 'consumerkey');
|
||||||
$csecret = Config::get('twitter', 'consumersecret');
|
$csecret = Config::get('twitter', 'consumersecret');
|
||||||
$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
|
$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
|
||||||
|
|
@ -1687,18 +1639,17 @@ function twitter_fetchhometimeline(App $a, $uid)
|
||||||
$create_user = PConfig::get($uid, 'twitter', 'create_user');
|
$create_user = PConfig::get($uid, 'twitter', 'create_user');
|
||||||
$mirror_posts = PConfig::get($uid, 'twitter', 'mirror_posts');
|
$mirror_posts = PConfig::get($uid, 'twitter', 'mirror_posts');
|
||||||
|
|
||||||
logger("twitter_fetchhometimeline: Fetching for user " . $uid, LOGGER_DEBUG);
|
logger("twitter_fetchhometimeline: Fetching for user ".$uid, LOGGER_DEBUG);
|
||||||
|
|
||||||
$application_name = Config::get('twitter', 'application_name');
|
$application_name = Config::get('twitter', 'application_name');
|
||||||
|
|
||||||
if ($application_name == "") {
|
if ($application_name == "")
|
||||||
$application_name = $a->get_hostname();
|
$application_name = $a->get_hostname();
|
||||||
}
|
|
||||||
|
|
||||||
require_once 'library/twitteroauth.php';
|
require_once('library/twitteroauth.php');
|
||||||
require_once 'include/items.php';
|
require_once('include/items.php');
|
||||||
|
|
||||||
$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
|
$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
|
||||||
|
|
||||||
$own_contact = twitter_fetch_own_contact($a, $uid);
|
$own_contact = twitter_fetch_own_contact($a, $uid);
|
||||||
|
|
||||||
|
|
@ -1706,51 +1657,52 @@ function twitter_fetchhometimeline(App $a, $uid)
|
||||||
intval($own_contact),
|
intval($own_contact),
|
||||||
intval($uid));
|
intval($uid));
|
||||||
|
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
$own_id = $r[0]["nick"];
|
$own_id = $r[0]["nick"];
|
||||||
} else {
|
} else {
|
||||||
logger("twitter_fetchhometimeline: Own twitter contact not found for user " . $uid, LOGGER_DEBUG);
|
logger("twitter_fetchhometimeline: Own twitter contact not found for user ".$uid, LOGGER_DEBUG);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
|
||||||
intval($uid));
|
intval($uid));
|
||||||
|
|
||||||
if (count($r)) {
|
if(count($r)) {
|
||||||
$self = $r[0];
|
$self = $r[0];
|
||||||
} else {
|
} else {
|
||||||
logger("twitter_fetchhometimeline: Own contact not found for user " . $uid, LOGGER_DEBUG);
|
logger("twitter_fetchhometimeline: Own contact not found for user ".$uid, LOGGER_DEBUG);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$u = q("SELECT * FROM user WHERE uid = %d LIMIT 1",
|
$u = q("SELECT * FROM user WHERE uid = %d LIMIT 1",
|
||||||
intval($uid));
|
intval($uid));
|
||||||
if (!count($u)) {
|
if(!count($u)) {
|
||||||
logger("twitter_fetchhometimeline: Own user not found for user " . $uid, LOGGER_DEBUG);
|
logger("twitter_fetchhometimeline: Own user not found for user ".$uid, LOGGER_DEBUG);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$parameters = array("exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended");
|
$parameters = array("exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended");
|
||||||
//$parameters["count"] = 200;
|
//$parameters["count"] = 200;
|
||||||
|
|
||||||
|
|
||||||
// Fetching timeline
|
// Fetching timeline
|
||||||
$lastid = PConfig::get($uid, 'twitter', 'lasthometimelineid');
|
$lastid = PConfig::get($uid, 'twitter', 'lasthometimelineid');
|
||||||
|
|
||||||
$first_time = ($lastid == "");
|
$first_time = ($lastid == "");
|
||||||
|
|
||||||
if ($lastid != "") {
|
if ($lastid <> "")
|
||||||
$parameters["since_id"] = $lastid;
|
$parameters["since_id"] = $lastid;
|
||||||
}
|
|
||||||
|
|
||||||
$items = $connection->get('statuses/home_timeline', $parameters);
|
$items = $connection->get('statuses/home_timeline', $parameters);
|
||||||
|
|
||||||
if (!is_array($items)) {
|
if (!is_array($items)) {
|
||||||
logger("twitter_fetchhometimeline: Error fetching home timeline: " . print_r($items, true), LOGGER_DEBUG);
|
logger("twitter_fetchhometimeline: Error fetching home timeline: ".print_r($items, true), LOGGER_DEBUG);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$posts = array_reverse($items);
|
$posts = array_reverse($items);
|
||||||
|
|
||||||
logger("twitter_fetchhometimeline: Fetching timeline for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
|
logger("twitter_fetchhometimeline: Fetching timeline for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
|
||||||
|
|
||||||
if (count($posts)) {
|
if (count($posts)) {
|
||||||
foreach ($posts as $post) {
|
foreach ($posts as $post) {
|
||||||
|
|
@ -1759,9 +1711,8 @@ function twitter_fetchhometimeline(App $a, $uid)
|
||||||
PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
|
PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($first_time) {
|
if ($first_time)
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
if (stristr($post->source, $application_name) && $post->user->screen_name == $own_id) {
|
if (stristr($post->source, $application_name) && $post->user->screen_name == $own_id) {
|
||||||
logger("twitter_fetchhometimeline: Skip previously sended post", LOGGER_DEBUG);
|
logger("twitter_fetchhometimeline: Skip previously sended post", LOGGER_DEBUG);
|
||||||
|
|
@ -1773,24 +1724,22 @@ function twitter_fetchhometimeline(App $a, $uid)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($post->in_reply_to_status_id_str != "") {
|
if ($post->in_reply_to_status_id_str != "")
|
||||||
twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id);
|
twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id);
|
||||||
}
|
|
||||||
|
|
||||||
$postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true, false);
|
$postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true, false);
|
||||||
|
|
||||||
if (trim($postarray['body']) == "") {
|
if (trim($postarray['body']) == "")
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
$item = item_store($postarray);
|
$item = item_store($postarray);
|
||||||
$postarray["id"] = $item;
|
$postarray["id"] = $item;
|
||||||
|
|
||||||
logger('twitter_fetchhometimeline: User ' . $self["nick"] . ' posted home timeline item ' . $item);
|
logger('twitter_fetchhometimeline: User '.$self["nick"].' posted home timeline item '.$item);
|
||||||
|
|
||||||
if ($item && !function_exists("check_item_notification")) {
|
if ($item && !function_exists("check_item_notification"))
|
||||||
twitter_checknotification($a, $uid, $own_id, $item, $postarray);
|
twitter_checknotification($a, $uid, $own_id, $item, $postarray);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
|
PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
|
||||||
|
|
@ -1800,53 +1749,46 @@ function twitter_fetchhometimeline(App $a, $uid)
|
||||||
|
|
||||||
$first_time = ($lastid == "");
|
$first_time = ($lastid == "");
|
||||||
|
|
||||||
if ($lastid != "") {
|
if ($lastid <> "")
|
||||||
$parameters["since_id"] = $lastid;
|
$parameters["since_id"] = $lastid;
|
||||||
}
|
|
||||||
|
|
||||||
$items = $connection->get('statuses/mentions_timeline', $parameters);
|
$items = $connection->get('statuses/mentions_timeline', $parameters);
|
||||||
|
|
||||||
if (!is_array($items)) {
|
if (!is_array($items)) {
|
||||||
logger("twitter_fetchhometimeline: Error fetching mentions: " . print_r($items, true), LOGGER_DEBUG);
|
logger("twitter_fetchhometimeline: Error fetching mentions: ".print_r($items, true), LOGGER_DEBUG);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$posts = array_reverse($items);
|
$posts = array_reverse($items);
|
||||||
|
|
||||||
logger("twitter_fetchhometimeline: Fetching mentions for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
|
logger("twitter_fetchhometimeline: Fetching mentions for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
|
||||||
|
|
||||||
if (count($posts)) {
|
if (count($posts)) {
|
||||||
foreach ($posts as $post) {
|
foreach ($posts as $post) {
|
||||||
if ($post->id_str > $lastid) {
|
if ($post->id_str > $lastid)
|
||||||
$lastid = $post->id_str;
|
$lastid = $post->id_str;
|
||||||
}
|
|
||||||
|
|
||||||
if ($first_time) {
|
if ($first_time)
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
if ($post->in_reply_to_status_id_str != "") {
|
if ($post->in_reply_to_status_id_str != "")
|
||||||
twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id);
|
twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id);
|
||||||
}
|
|
||||||
|
|
||||||
$postarray = twitter_createpost($a, $uid, $post, $self, false, false, false);
|
$postarray = twitter_createpost($a, $uid, $post, $self, false, false, false);
|
||||||
|
|
||||||
if (trim($postarray['body']) == "") {
|
if (trim($postarray['body']) == "")
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
$item = item_store($postarray);
|
$item = item_store($postarray);
|
||||||
$postarray["id"] = $item;
|
$postarray["id"] = $item;
|
||||||
|
|
||||||
if ($item && function_exists("check_item_notification")) {
|
if ($item && function_exists("check_item_notification"))
|
||||||
check_item_notification($item, $uid, NOTIFY_TAGSELF);
|
check_item_notification($item, $uid, NOTIFY_TAGSELF);
|
||||||
}
|
|
||||||
|
|
||||||
if (!isset($postarray["parent"]) || ($postarray["parent"] == 0)) {
|
if (!isset($postarray["parent"]) || ($postarray["parent"] == 0))
|
||||||
$postarray["parent"] = $item;
|
$postarray["parent"] = $item;
|
||||||
}
|
|
||||||
|
|
||||||
logger('twitter_fetchhometimeline: User ' . $self["nick"] . ' posted mention timeline item ' . $item);
|
logger('twitter_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item);
|
||||||
|
|
||||||
if ($item == 0) {
|
if ($item == 0) {
|
||||||
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
|
$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
|
||||||
|
|
@ -1861,7 +1803,7 @@ function twitter_fetchhometimeline(App $a, $uid)
|
||||||
$parent_id = $postarray['parent'];
|
$parent_id = $postarray['parent'];
|
||||||
|
|
||||||
if (($item != 0) && !function_exists("check_item_notification")) {
|
if (($item != 0) && !function_exists("check_item_notification")) {
|
||||||
require_once 'include/enotify.php';
|
require_once('include/enotify.php');
|
||||||
notification(array(
|
notification(array(
|
||||||
'type' => NOTIFY_TAGSELF,
|
'type' => NOTIFY_TAGSELF,
|
||||||
'notify_flags' => $u[0]['notify-flags'],
|
'notify_flags' => $u[0]['notify-flags'],
|
||||||
|
|
@ -1870,7 +1812,7 @@ function twitter_fetchhometimeline(App $a, $uid)
|
||||||
'to_email' => $u[0]['email'],
|
'to_email' => $u[0]['email'],
|
||||||
'uid' => $u[0]['uid'],
|
'uid' => $u[0]['uid'],
|
||||||
'item' => $postarray,
|
'item' => $postarray,
|
||||||
'link' => $a->get_baseurl() . '/display/' . urlencode(get_item_guid($item)),
|
'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
|
||||||
'source_name' => $postarray['author-name'],
|
'source_name' => $postarray['author-name'],
|
||||||
'source_link' => $postarray['author-link'],
|
'source_link' => $postarray['author-link'],
|
||||||
'source_photo' => $postarray['author-avatar'],
|
'source_photo' => $postarray['author-avatar'],
|
||||||
|
|
@ -1885,8 +1827,7 @@ function twitter_fetchhometimeline(App $a, $uid)
|
||||||
PConfig::set($uid, 'twitter', 'lastmentionid', $lastid);
|
PConfig::set($uid, 'twitter', 'lastmentionid', $lastid);
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_fetch_own_contact(App $a, $uid)
|
function twitter_fetch_own_contact($a, $uid) {
|
||||||
{
|
|
||||||
$ckey = Config::get('twitter', 'consumerkey');
|
$ckey = Config::get('twitter', 'consumerkey');
|
||||||
$csecret = Config::get('twitter', 'consumersecret');
|
$csecret = Config::get('twitter', 'consumersecret');
|
||||||
$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
|
$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
|
||||||
|
|
@ -1897,9 +1838,9 @@ function twitter_fetch_own_contact(App $a, $uid)
|
||||||
$contact_id = 0;
|
$contact_id = 0;
|
||||||
|
|
||||||
if ($own_id == "") {
|
if ($own_id == "") {
|
||||||
require_once 'library/twitteroauth.php';
|
require_once('library/twitteroauth.php');
|
||||||
|
|
||||||
$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
|
$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
|
||||||
|
|
||||||
// Fetching user data
|
// Fetching user data
|
||||||
$user = $connection->get('account/verify_credentials');
|
$user = $connection->get('account/verify_credentials');
|
||||||
|
|
@ -1907,70 +1848,64 @@ function twitter_fetch_own_contact(App $a, $uid)
|
||||||
PConfig::set($uid, 'twitter', 'own_id', $user->id_str);
|
PConfig::set($uid, 'twitter', 'own_id', $user->id_str);
|
||||||
|
|
||||||
$contact_id = twitter_fetch_contact($uid, $user, true);
|
$contact_id = twitter_fetch_contact($uid, $user, true);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
|
||||||
intval($uid),
|
intval($uid), dbesc("twitter::".$own_id));
|
||||||
dbesc("twitter::" . $own_id));
|
if(count($r))
|
||||||
if (count($r)) {
|
|
||||||
$contact_id = $r[0]["id"];
|
$contact_id = $r[0]["id"];
|
||||||
} else {
|
else
|
||||||
PConfig::delete($uid, 'twitter', 'own_id');
|
PConfig::delete($uid, 'twitter', 'own_id');
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $contact_id;
|
return($contact_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
function twitter_is_retweet(App $a, $uid, $body)
|
function twitter_is_retweet($a, $uid, $body) {
|
||||||
{
|
|
||||||
$body = trim($body);
|
$body = trim($body);
|
||||||
|
|
||||||
// Skip if it isn't a pure repeated messages
|
// Skip if it isn't a pure repeated messages
|
||||||
// Does it start with a share?
|
// Does it start with a share?
|
||||||
if (strpos($body, "[share") > 0) {
|
if (strpos($body, "[share") > 0)
|
||||||
return false;
|
return(false);
|
||||||
}
|
|
||||||
|
|
||||||
// Does it end with a share?
|
// Does it end with a share?
|
||||||
if (strlen($body) > (strrpos($body, "[/share]") + 8)) {
|
if (strlen($body) > (strrpos($body, "[/share]") + 8))
|
||||||
return false;
|
return(false);
|
||||||
}
|
|
||||||
|
|
||||||
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
|
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
|
||||||
// Skip if there is no shared message in there
|
// Skip if there is no shared message in there
|
||||||
if ($body == $attributes) {
|
if ($body == $attributes)
|
||||||
return false;
|
return(false);
|
||||||
}
|
|
||||||
|
|
||||||
$link = "";
|
$link = "";
|
||||||
preg_match("/link='(.*?)'/ism", $attributes, $matches);
|
preg_match("/link='(.*?)'/ism", $attributes, $matches);
|
||||||
if ($matches[1] != "") {
|
if ($matches[1] != "")
|
||||||
$link = $matches[1];
|
$link = $matches[1];
|
||||||
}
|
|
||||||
|
|
||||||
preg_match('/link="(.*?)"/ism', $attributes, $matches);
|
preg_match('/link="(.*?)"/ism', $attributes, $matches);
|
||||||
if ($matches[1] != "") {
|
if ($matches[1] != "")
|
||||||
$link = $matches[1];
|
$link = $matches[1];
|
||||||
}
|
|
||||||
|
|
||||||
$id = preg_replace("=https?://twitter.com/(.*)/status/(.*)=ism", "$2", $link);
|
$id = preg_replace("=https?://twitter.com/(.*)/status/(.*)=ism", "$2", $link);
|
||||||
if ($id == $link) {
|
if ($id == $link)
|
||||||
return false;
|
return(false);
|
||||||
}
|
|
||||||
|
|
||||||
logger('twitter_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, LOGGER_DEBUG);
|
logger('twitter_is_retweet: Retweeting id '.$id.' for user '.$uid, LOGGER_DEBUG);
|
||||||
|
|
||||||
$ckey = Config::get('twitter', 'consumerkey');
|
$ckey = Config::get('twitter', 'consumerkey');
|
||||||
$csecret = Config::get('twitter', 'consumersecret');
|
$csecret = Config::get('twitter', 'consumersecret');
|
||||||
$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
|
$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
|
||||||
$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
|
$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
|
||||||
|
|
||||||
require_once 'library/twitteroauth.php';
|
require_once('library/twitteroauth.php');
|
||||||
$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
|
$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
|
||||||
|
|
||||||
$result = $connection->post('statuses/retweet/' . $id);
|
$result = $connection->post('statuses/retweet/'.$id);
|
||||||
|
|
||||||
logger('twitter_is_retweet: result ' . print_r($result, true), LOGGER_DEBUG);
|
logger('twitter_is_retweet: result '.print_r($result, true), LOGGER_DEBUG);
|
||||||
|
|
||||||
return !isset($result->errors);
|
return(!isset($result->errors));
|
||||||
}
|
}
|
||||||
|
?>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue