From 2dc299ff1748c3ec4195d318598cb2c935973e72 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 9 Dec 2017 13:50:29 -0500
Subject: [PATCH 1/2] Use new Model methods for group

---
 pumpio/pumpio.php       | 10 +++-------
 statusnet/statusnet.php | 10 +++-------
 twitter/twitter.php     | 10 +++-------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index c3201f42..e60c6317 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -10,6 +10,8 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 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';
@@ -1022,14 +1024,8 @@ 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"];
 
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index a9e309cf..94f00f28 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -49,7 +49,9 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Model\GContact;
+use Friendica\Model\Group;
 use Friendica\Model\Photo;
+use Friendica\Model\User;
 
 class StatusNetOAuth extends TwitterOAuth
 {
@@ -1054,14 +1056,8 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 
 		$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);
 
 		$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $contact_id);
 
diff --git a/twitter/twitter.php b/twitter/twitter.php
index f88d4542..9973ad92 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -65,7 +65,9 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Model\GContact;
+use Friendica\Model\Group;
 use Friendica\Model\Photo;
+use Friendica\Model\User;
 use Friendica\Object\Image;
 
 require_once 'include/enotify.php';
@@ -1055,14 +1057,8 @@ function twitter_fetch_contact($uid, $contact, $create_user)
 
 		$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);
 
 		$photos = Photo::importProfilePhoto($avatar, $uid, $contact_id, true);
 

From 6e6f64a5374772aca891464ebb08e70aac53c12c Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Sat, 9 Dec 2017 13:50:44 -0500
Subject: [PATCH 2/2] Remove references to include/group.php

---
 pumpio/pumpio.php       | 1 -
 statusnet/statusnet.php | 1 -
 twitter/twitter.php     | 1 -
 3 files changed, 3 deletions(-)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index e60c6317..4ec456a1 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -1024,7 +1024,6 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) {
 
 		$contact_id = $r[0]['id'];
 
-			require_once('include/group.php');
 		Group::addMember(User::getDefaultGroup($uid), $contact_id);
 	} else {
 		$contact_id = $r[0]["id"];
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 94f00f28..4b36859c 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -1056,7 +1056,6 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 
 		$contact_id = $r[0]['id'];
 
-			require_once 'include/group.php';
 		Group::addMember(User::getDefaultGroup($uid), $contact_id);
 
 		$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $contact_id);
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 9973ad92..01fa7471 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1057,7 +1057,6 @@ function twitter_fetch_contact($uid, $contact, $create_user)
 
 		$contact_id = $r[0]['id'];
 
-			require_once 'include/group.php';
 		Group::addMember(User::getDefaultGroup($uid), $contact_id);
 
 		$photos = Photo::importProfilePhoto($avatar, $uid, $contact_id, true);