GContact renamed
Rename and update references for GlobalContact
This commit is contained in:
parent
9c618c80af
commit
b638efe8f9
|
@ -9,7 +9,7 @@
|
||||||
use Friendica\Core\Config;
|
use Friendica\Core\Config;
|
||||||
use Friendica\Core\PConfig;
|
use Friendica\Core\PConfig;
|
||||||
use Friendica\Core\Worker;
|
use Friendica\Core\Worker;
|
||||||
use Friendica\Model\GContact;
|
use Friendica\Model\GlobalContact;
|
||||||
|
|
||||||
require 'addon/pumpio/oauth/http.php';
|
require 'addon/pumpio/oauth/http.php';
|
||||||
require 'addon/pumpio/oauth/oauth_client.php';
|
require 'addon/pumpio/oauth/oauth_client.php';
|
||||||
|
@ -968,7 +968,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
|
||||||
|
|
||||||
function pumpio_get_contact($uid, $contact, $no_insert = false) {
|
function pumpio_get_contact($uid, $contact, $no_insert = false) {
|
||||||
|
|
||||||
GContact::update(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,
|
"photo" => $contact->image->url, "name" => $contact->displayName, "hide" => true,
|
||||||
"nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
|
"nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
|
||||||
"about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));
|
"about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));
|
||||||
|
|
|
@ -48,7 +48,7 @@ require_once 'include/enotify.php';
|
||||||
|
|
||||||
use Friendica\Core\Config;
|
use Friendica\Core\Config;
|
||||||
use Friendica\Core\PConfig;
|
use Friendica\Core\PConfig;
|
||||||
use Friendica\Model\GContact;
|
use Friendica\Model\GlobalContact;
|
||||||
|
|
||||||
class StatusNetOAuth extends TwitterOAuth {
|
class StatusNetOAuth extends TwitterOAuth {
|
||||||
function get_maxlength() {
|
function get_maxlength() {
|
||||||
|
@ -929,7 +929,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
|
||||||
if ($contact->statusnet_profile_url == "")
|
if ($contact->statusnet_profile_url == "")
|
||||||
return(-1);
|
return(-1);
|
||||||
|
|
||||||
GContact::update(array("url" => $contact->statusnet_profile_url,
|
GlobalContact::update(array("url" => $contact->statusnet_profile_url,
|
||||||
"network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url,
|
"network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url,
|
||||||
"name" => $contact->name, "nick" => $contact->screen_name,
|
"name" => $contact->name, "nick" => $contact->screen_name,
|
||||||
"location" => $contact->location, "about" => $contact->description,
|
"location" => $contact->location, "about" => $contact->description,
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
use Friendica\Core\Config;
|
use Friendica\Core\Config;
|
||||||
use Friendica\Core\PConfig;
|
use Friendica\Core\PConfig;
|
||||||
use Friendica\Core\Worker;
|
use Friendica\Core\Worker;
|
||||||
use Friendica\Model\GContact;
|
use Friendica\Model\GlobalContact;
|
||||||
|
|
||||||
require_once 'include/enotify.php';
|
require_once 'include/enotify.php';
|
||||||
|
|
||||||
|
@ -956,7 +956,7 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
|
||||||
|
|
||||||
$avatar = twitter_fix_avatar($contact->profile_image_url_https);
|
$avatar = twitter_fix_avatar($contact->profile_image_url_https);
|
||||||
|
|
||||||
GContact::update(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,
|
"network" => NETWORK_TWITTER, "photo" => $avatar, "hide" => true,
|
||||||
"name" => $contact->name, "nick" => $contact->screen_name,
|
"name" => $contact->name, "nick" => $contact->screen_name,
|
||||||
"location" => $contact->location, "about" => $contact->description,
|
"location" => $contact->location, "about" => $contact->description,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user