Merge pull request #448 from zeroadam/GContact-#3878
GContact moved to src
This commit is contained in:
commit
95884b601a
|
@ -6,17 +6,16 @@
|
|||
* Author: Michael Vogel <http://pirati.ca/profile/heluecht>
|
||||
*/
|
||||
|
||||
use Friendica\Core\Worker;
|
||||
|
||||
require('addon/pumpio/oauth/http.php');
|
||||
require('addon/pumpio/oauth/oauth_client.php');
|
||||
require_once('include/enotify.php');
|
||||
require_once('include/socgraph.php');
|
||||
require_once("include/Photo.php");
|
||||
require_once("mod/share.php");
|
||||
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Model\GlobalContact;
|
||||
|
||||
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
|
||||
|
||||
|
@ -969,7 +968,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
|
|||
|
||||
function pumpio_get_contact($uid, $contact, $no_insert = false) {
|
||||
|
||||
update_gcontact(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
|
||||
GlobalContact::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)));
|
||||
|
|
|
@ -43,12 +43,12 @@
|
|||
|
||||
define('STATUSNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
|
||||
|
||||
require_once('library/twitteroauth.php');
|
||||
require_once('include/enotify.php');
|
||||
require_once("include/socgraph.php");
|
||||
require_once 'library/twitteroauth.php';
|
||||
require_once 'include/enotify.php';
|
||||
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Model\GlobalContact;
|
||||
|
||||
class StatusNetOAuth extends TwitterOAuth {
|
||||
function get_maxlength() {
|
||||
|
@ -929,7 +929,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
|
|||
if ($contact->statusnet_profile_url == "")
|
||||
return(-1);
|
||||
|
||||
update_gcontact(array("url" => $contact->statusnet_profile_url,
|
||||
GlobalContact::update(array("url" => $contact->statusnet_profile_url,
|
||||
"network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url,
|
||||
"name" => $contact->name, "nick" => $contact->screen_name,
|
||||
"location" => $contact->location, "about" => $contact->description,
|
||||
|
|
|
@ -60,13 +60,13 @@
|
|||
* Requirements: PHP5, curl [Slinky library]
|
||||
*/
|
||||
|
||||
use Friendica\Core\Worker;
|
||||
|
||||
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;
|
||||
|
||||
require_once 'include/enotify.php';
|
||||
|
||||
|
||||
define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
|
||||
|
||||
|
@ -956,7 +956,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,
|
||||
|
|
Loading…
Reference in New Issue
Block a user