Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-29 11:44:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Review and Use statements

Browse source 
use statements and review changes.
This commit is contained in:
Adam Magness 2017-11-29 17:29:11 -05:00
parent eb148cad55
commit 0373056448
15 changed files with 83 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Protocol/DFRN.php
View file

@ -1660,7 +1660,7 @@ class DFRN
);
}
Photo::updateContactAvatar(
Contact::updateAvatar(
$author["avatar"],
$importer["uid"],
$contact["id"],
@ -2035,7 +2035,7 @@ class DFRN
dbesc(normalise_link($old["url"]))
);
Photo::updateContactAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
Contact::updateAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
if ($x === false) {
return false;

7
src/Protocol/Diaspora.php
View file

@ -19,7 +19,6 @@ use Friendica\Database\DBM;
use Friendica\Model\GlobalContact;
use Friendica\Network\Probe;
use Friendica\Object\Contact;
use Friendica\Object\Photo;
use Friendica\Object\Profile;
use Friendica\Util\XML;
@ -2211,7 +2210,7 @@ class Diaspora
$image_url = "http://".$handle_parts[1].$image_url;
}
Photo::updateContactAvatar($image_url, $importer["uid"], $contact["id"]);
Contact::updateAvatar($image_url, $importer["uid"], $contact["id"]);
// Generic birthday. We don't know the timezone. The year is irrelevant.
@ -2471,7 +2470,7 @@ class Diaspora
group_add_member($importer["uid"], "", $contact_record["id"], $def_gid);
}
Photo::updateContactAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
Contact::updateAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
if ($importer["page-flags"] == PAGE_NORMAL) {
logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
@ -2494,7 +2493,7 @@ class Diaspora
logger("Does an automatic friend approval for author ".$author.".", LOGGER_DEBUG);
Photo::updateContactAvatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
Contact::updateAvatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
// technically they are sharing with us (CONTACT_IS_SHARING),
// but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX

8
src/Protocol/OStatus.php
View file

@ -203,7 +203,7 @@ class OStatus
if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) {
logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG);
Photo::updateContactAvatar($author["author-avatar"], $importer["uid"], $contact["id"]);
Contact::updateAvatar($author["author-avatar"], $importer["uid"], $contact["id"]);
}
// Ensure that we are having this contact (with uid=0)
@ -223,7 +223,7 @@ class OStatus
dba::update('contact', $fields, array('id' => $cid), $old_contact);
// Update the avatar
Photo::updateContactAvatar($author["author-avatar"], 0, $cid);
Contact::updateAvatar($author["author-avatar"], 0, $cid);
}
$contact["generation"] = 2;
@ -1326,7 +1326,7 @@ class OStatus
switch ($siteinfo["type"]) {
case 'photo':
$imgdata = Photo::getPhotoInfo($siteinfo["image"]);
$imgdata = Photo::getInfoFromURL($siteinfo["image"]);
$attributes = array("rel" => "enclosure",
"href" => $siteinfo["image"],
"type" => $imgdata["mime"],
@ -1346,7 +1346,7 @@ class OStatus
}
if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) {
$imgdata = Photo::getPhotoInfo($siteinfo["image"]);
$imgdata = Photo::getInfoFromURL($siteinfo["image"]);
$attributes = array("rel" => "enclosure",
"href" => $siteinfo["image"],
"type" => $imgdata["mime"],