Publiv forum posts aren't transmitted via the connectors anymore

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

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 21b6122ecfc4bc64bffea1e259b3524d28ade800..f0c71cf41b78eaca2efa7562818fe67d4a0569c5 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -60,13 +60,13 @@
  *     Requirements: PHP5, curl [Slinky library]
  */
 
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
+use Friendica\Model\GlobalContact;
 
-require_once('include/enotify.php');
-require_once("include/socgraph.php");
+require_once 'include/enotify.php';
 
-use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 
 define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
@@ -171,7 +171,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
@@ -412,7 +412,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
@@ -446,8 +446,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'])
@@ -956,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,
+       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,