From 031d96d93315ae77435239fa2033cf3149fe310d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Wed, 17 May 2017 15:28:01 +0200 Subject: [PATCH] improved some comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- include/diaspora.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 724160774..03d45b9df 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -880,11 +880,14 @@ class Diaspora { if (dbm::is_result($r)) { return $r[0]; } else { - // We haven't found it? - // We use another function for it that will possibly create a contact entry + /* + * Not found yet? Then use another function for it that will + * possibly create a contact entry. + */ $cid = get_contact($handle, $uid); if ($cid > 0) { + /// @TODO Contact-retrival should be encapsulated into an "entity" class like `Contact` $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid)); if (dbm::is_result($r)) { @@ -919,9 +922,11 @@ class Diaspora { */ private static function post_allow($importer, $contact, $is_comment = false) { - // perhaps we were already sharing with this person. Now they're sharing with us. - // That makes us friends. - // Normally this should have handled by getting a request - but this could get lost + /* + * perhaps we were already sharing with this person. Now they're sharing with us. + * That makes us friends. + * Normally this should have handled by getting a request - but this could get lost + */ if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) { q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d", intval(CONTACT_IS_FRIEND), @@ -944,6 +949,7 @@ class Diaspora { } elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && ($importer["page-flags"] == PAGE_COMMUNITY)) { // That's good return true; + // Is the message a comment for global users? } elseif (($importer["uid"] == 0) || $is_comment) { // Messages for the global users and comments are always accepted return true;