X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=twitter%2Ftwitter.php;h=d55c9febca8c8119ba98a63ea606bb54753a15c4;hb=34396fedfe60adf61cdd73483d9911a5f1a600b2;hp=31d3f4dbd43be2f329081fb62a92ac22fa97a966;hpb=54525724bf5cd189f13510d9fa6b1d103d94793b;p=friendica-addons.git

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 31d3f4db..d55c9feb 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -60,11 +60,15 @@
  *     Requirements: PHP5, curl [Slinky library]
  */
 
-require_once('include/enotify.php');
-require_once("include/socgraph.php");
-
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Core\Worker;
+use Friendica\Model\GContact;
+use Friendica\Model\Photo;
+use Friendica\Object\Image;
+
+require_once 'include/enotify.php';
+
 
 define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
@@ -169,7 +173,7 @@ function twitter_jot_nets(&$a,&$b) {
 	}
 }
 
-function twitter_settings_post ($a,$post) {
+function twitter_settings_post($a,$post) {
 	if(! local_user())
 		return;
 	// don't check twitter settings if twitter submit button is not clicked
@@ -410,7 +414,7 @@ function twitter_post_hook(&$a,&$b) {
 			return;
 	}
 
-	if($b['parent'] != $b['id']) {
+	if ($b['parent'] != $b['id']) {
 		logger("twitter_post_hook: parameter ".print_r($b, true), LOGGER_DATA);
 
 		// Looking if its a reply to a twitter post
@@ -444,8 +448,16 @@ function twitter_post_hook(&$a,&$b) {
 	} else {
 		$iscomment = false;
 
-		if($b['private'] || !strstr($b['postopts'],'twitter'))
+		if ($b['private'] || !strstr($b['postopts'],'twitter')) {
+			return;
+		}
+
+		// Dont't post if the post doesn't belong to us.
+		// This is a check for forum postings
+		$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+		if ($b['contact-id'] != $self['id']) {
 			return;
+		}
 	}
 
 	if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])
@@ -646,7 +658,7 @@ function twitter_cron($a,$b) {
 	if(count($r)) {
 		foreach($r as $rr) {
 			logger('twitter: fetching for user '.$rr['uid']);
-			proc_run(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int)$rr['uid']);
+			Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int)$rr['uid']);
 		}
 	}
 
@@ -668,7 +680,7 @@ function twitter_cron($a,$b) {
 			}
 
 			logger('twitter: importing timeline from user '.$rr['uid']);
-			proc_run(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
 			// check for new contacts once a day
@@ -936,11 +948,9 @@ function twitter_queue_hook(&$a,&$b) {
 }
 
 function twitter_fix_avatar($avatar) {
-	require_once("include/Photo.php");
-
 	$new_avatar = str_replace("_normal.", ".", $avatar);
 
-	$info = get_photo_info($new_avatar);
+	$info = Image::getInfoFromURL($new_avatar);
 	if (!$info)
 		$new_avatar = $avatar;
 
@@ -954,7 +964,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
 	$avatar = twitter_fix_avatar($contact->profile_image_url_https);
 
-	update_gcontact(array("url" => "https://twitter.com/".$contact->screen_name,
+	GContact::update(array("url" => "https://twitter.com/".$contact->screen_name,
 			"network" => NETWORK_TWITTER, "photo" => $avatar,  "hide" => true,
 			"name" => $contact->name, "nick" => $contact->screen_name,
 			"location" => $contact->location, "about" => $contact->description,
@@ -1015,9 +1025,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 			group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
 		}
 
-		require_once("Photo.php");
-
-		$photos = import_profile_photo($avatar, $uid, $contact_id, true);
+		$photos = Photo::importProfilePhoto($avatar, $uid, $contact_id, true);
 
 		if ($photos) {
 			q("UPDATE `contact` SET `photo` = '%s',
@@ -1048,9 +1056,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
 			logger("twitter_fetch_contact: Updating contact ".$contact->screen_name, LOGGER_DEBUG);
 
-			require_once("Photo.php");
-
-			$photos = import_profile_photo($avatar, $uid, $r[0]['id'], true);
+			$photos = Photo::importProfilePhoto($avatar, $uid, $r[0]['id'], true);
 
 			if ($photos) {
 				q("UPDATE `contact` SET `photo` = '%s',