Photo to namespace

[friendica-addons.git] / twitter / twitter.php

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 31d3f4dbd43be2f329081fb62a92ac22fa97a966..8b42e1872bd4539e24a7a9d78698849d39a5d137 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -60,11 +60,14 @@
  *     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\GlobalContact;
+use Friendica\Object\Photo;
+
+require_once 'include/enotify.php';
+
 
 define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
@@ -169,7 +172,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 +413,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 +447,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 +657,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 +679,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
@@ -940,7 +951,7 @@ function twitter_fix_avatar($avatar) {
 
        $new_avatar = str_replace("_normal.", ".", $avatar);
 
-       $info = get_photo_info($new_avatar);
+       $info = Photo::getPhotoInfo($new_avatar);
        if (!$info)
                $new_avatar = $avatar;
 
@@ -954,7 +965,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,
+       GlobalContact::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,
@@ -1017,7 +1028,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
                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',
@@ -1050,7 +1061,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 
                        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',