Preparation to make the automatic authentication work (hopefully) reliable

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

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 9cf2461fe7dc4cd4c62569dec370a7ff3e849b0f..f5bf6496a01321992741988dccb2da64fdf8ac7f 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -8,13 +8,14 @@
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
-use Friendica\Model\GlobalContact;
-use Friendica\Object\Contact;
+use Friendica\Model\Contact;
+use Friendica\Model\GContact;
+use Friendica\Model\Group;
+use Friendica\Model\User;
 
 require 'addon/pumpio/oauth/http.php';
 require 'addon/pumpio/oauth/oauth_client.php';
 require_once 'include/enotify.php';
-require_once "include/Photo.php";
 require_once "mod/share.php";
 
 define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes
@@ -975,7 +976,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
 
 function pumpio_get_contact($uid, $contact, $no_insert = false) {
 
-       GlobalContact::update(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
+       GContact::update(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
                        "photo" => $contact->image->url, "name" => $contact->displayName,  "hide" => true,
                        "nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
                        "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));
@@ -1023,14 +1024,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) {
 
                $contact_id = $r[0]['id'];
 
-               $g = q("select def_gid from user where uid = %d limit 1",
-                       intval($uid)
-               );
-
-               if($g && intval($g[0]['def_gid'])) {
-                       require_once('include/group.php');
-                       group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
-               }
+               Group::addMember(User::getDefaultGroup($uid), $contact_id);
        } else {
                $contact_id = $r[0]["id"];
 
@@ -1550,10 +1544,9 @@ function pumpio_getreceiver(&$a, $b) {
                        $gid = trim($gid, " <>");
 
                        $r = q("SELECT `contact`.`name`, `contact`.`nick`, `contact`.`url`, `contact`.`network` ".
-                               "FROM `group_member`, `contact` WHERE `group_member`.`gid` = %d AND `group_member`.`uid` = %d ".
+                               "FROM `group_member`, `contact` WHERE `group_member`.`gid` = %d ".
                                "AND `contact`.`id` = `group_member`.`contact-id` AND `contact`.`network` = '%s'",
                                        intval($gid),
-                                       intval($b["uid"]),
                                        dbesc(NETWORK_PUMPIO)
                                );