Merge pull request #13561 from annando/log-callstack

[friendica.git] / src / Model / Contact / User.php

diff --git a/src/Model/Contact/User.php b/src/Model/Contact/User.php
index da53aba7b74051795670773c09e56d7a9eb8c9c9..c86b1c6bea8d1aba1037a96ed35528a04cfbe4c8 100644 (file)
--- a/src/Model/Contact/User.php
+++ b/src/Model/Contact/User.php
@@ -24,7 +24,6 @@ namespace Friendica\Model\Contact;
 use Exception;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -55,7 +54,7 @@ class User
                }
 
                if (empty($contact['uri-id']) && empty($contact['url'])) {
-                       Logger::info('Missing contact details', ['contact' => $contact, 'callstack' => System::callstack(20)]);
+                       Logger::info('Missing contact details', ['contact' => $contact]);
                        return false;
                }
 
@@ -319,30 +318,30 @@ class User
        }
 
        /**
-        * Set the channel visibility for contact id and user id
+        * Set the channel post frequency for contact id and user id
         *
-        * @param int $cid        Either public contact id or user's contact id
-        * @param int $uid        User ID
-        * @param int $visibility Set type of visibility
+        * @param int $cid       Either public contact id or user's contact id
+        * @param int $uid       User ID
+        * @param int $frequency Type of post frequency in channels
         * @return void
         * @throws \Exception
         */
-       public static function setChannelFrequency(int $cid, int $uid, int $visibility)
+       public static function setChannelFrequency(int $cid, int $uid, int $frequency)
        {
                $cdata = Contact::getPublicAndUserContactID($cid, $uid);
                if (empty($cdata)) {
                        return;
                }
 
-               DBA::update('user-contact', ['channel-frequency' => $visibility], ['cid' => $cdata['public'], 'uid' => $uid], true);
+               DBA::update('user-contact', ['channel-frequency' => $frequency], ['cid' => $cdata['public'], 'uid' => $uid], true);
        }
 
        /**
-        * Returns the channel visibility state for contact id and user id
+        * Returns the channel frequency state for contact id and user id
         *
         * @param int $cid Either public contact id or user's contact id
         * @param int $uid User ID
-        * @return int the type of visibility in channels
+        * @return int Type of post frequency in channels
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
@@ -353,16 +352,16 @@ class User
                        return false;
                }
 
-               $visibility = self::FREQUENCY_DEFAULT;
+               $frequency = self::FREQUENCY_DEFAULT;
 
                if (!empty($cdata['public'])) {
                        $public_contact = DBA::selectFirst('user-contact', ['channel-frequency'], ['cid' => $cdata['public'], 'uid' => $uid]);
                        if (DBA::isResult($public_contact)) {
-                               $visibility = $public_contact['channel-frequency'] ?? self::FREQUENCY_DEFAULT;
+                               $frequency = $public_contact['channel-frequency'] ?? self::FREQUENCY_DEFAULT;
                        }
                }
 
-               return $visibility;
+               return $frequency;
        }
 
        /**