Merge pull request #469 from friendica/revert-468-task/3878-move-objects-to-src

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

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 5f3e83ca1c90667298d06ae779a13f9f0e67a3e8..8433580f2a49e8c6be600a93e51edac28e6118db 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -49,6 +49,7 @@ require_once 'include/enotify.php';
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Model\GlobalContact;
+use Friendica\Object\Photo;
 
 class StatusNetOAuth extends TwitterOAuth {
     function get_maxlength() {
@@ -541,6 +542,13 @@ function statusnet_post_hook(&$a,&$b) {
 
                if($b['private'] || !strstr($b['postopts'],'statusnet'))
                        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'])
@@ -990,9 +998,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
                        group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
                }
 
-               require_once("Photo.php");
-
-               $photos = import_profile_photo($contact->profile_image_url,$uid,$contact_id);
+               $photos = Photo::importProfilePhoto($contact->profile_image_url,$uid,$contact_id);
 
                q("UPDATE `contact` SET `photo` = '%s',
                                        `thumb` = '%s',
@@ -1017,9 +1023,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 
                        logger("statusnet_fetch_contact: Updating contact ".$contact->screen_name, LOGGER_DEBUG);
 
-                       require_once("Photo.php");
-
-                       $photos = import_profile_photo($contact->profile_image_url, $uid, $r[0]['id']);
+                       $photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $r[0]['id']);
 
                        q("UPDATE `contact` SET `photo` = '%s',
                                                `thumb` = '%s',