keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some cleaning up

Browse source
This commit is contained in:
Michael 2019-05-06 18:46:30 +00:00
parent 37f9af2f24
commit 626709159f
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Model/Contact.php
View file

@ -125,13 +125,14 @@ class Contact extends BaseObject
} }
/** /**
* @param integer $id * @param integer $id Contact ID
* @param array $fields Array of selected fields, empty for all
* @return array|boolean Contact record if it exists, false otherwise * @return array|boolean Contact record if it exists, false otherwise
* @throws \Exception * @throws \Exception
*/ */
public static function getById($id) public static function getById($id, $fields = [])
{ {
return DBA::selectFirst('contact', [], ['id' => $id]); return DBA::selectFirst('contact', $fields, ['id' => $id]);
} }
/** /**

14
src/Module/FollowConfirm.php
View file

@ -8,10 +8,14 @@ use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\User;
use Friendica\Protocol\Diaspora; use Friendica\Protocol\Diaspora;
use Friendica\Protocol\ActivityPub; use Friendica\Protocol\ActivityPub;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
/**
* Process follow request confirmations
*/
class FollowConfirm extends BaseModule class FollowConfirm extends BaseModule
{ {
public static function post() public static function post()
@ -34,11 +38,11 @@ class FollowConfirm extends BaseModule
return; return;
} }
Logger::log('Confirming follower with contact_id: ' . $cid); Logger::info('Confirming follower', ['cid' => $cid]);
$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'uid' => $uid]); $contact = DBA::selectFirst('contact', [], ['id' => $cid, 'uid' => $uid]);
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
Logger::log('Contact not found in DB.'); Logger::warning('Contact not found in DB.', ['cid' => $cid]);
notice(L10n::t('Contact not found.') . EOL); notice(L10n::t('Contact not found.') . EOL);
return; return;
} }
@ -77,10 +81,10 @@ class FollowConfirm extends BaseModule
if ($new_relation == Contact::FRIEND) { if ($new_relation == Contact::FRIEND) {
if ($protocol == Protocol::DIASPORA) { if ($protocol == Protocol::DIASPORA) {
$user = DBA::selectFirst('user', [], ['uid' => $uid]); $user = User::getById($uid);
$contact = DBA::select('contact', [], ['id' => $cid]); $contact = Contact::getById($cid);
$ret = Diaspora::sendShare($user, $contact); $ret = Diaspora::sendShare($user, $contact);
Logger::log('share returns: ' . $ret); Logger::info('share returns', ['return' => $ret]);
} elseif ($protocol == Protocol::ACTIVITYPUB) { } elseif ($protocol == Protocol::ACTIVITYPUB) {
ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid); ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid);
} }