X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FNotificationsManager.php;h=8ac5d93c729d33779573990638b978af602dcf3e;hb=c34204cf50ced68a14d220706c4dc6ef93eb94c9;hp=5a2efe297be17b44b29cb4696f74cb8822b9ec2c;hpb=7efde8e334d6ca52fd1608fb9a78babcea4bdc9f;p=friendica.git diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php index 5a2efe297b..8ac5d93c72 100644 --- a/src/Core/NotificationsManager.php +++ b/src/Core/NotificationsManager.php @@ -9,8 +9,6 @@ namespace Friendica\Core; use Friendica\BaseObject; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\Core\Logger; -use Friendica\Core\Protocol; use Friendica\Database\DBA; use Friendica\Model\Contact; use Friendica\Model\Item; @@ -36,8 +34,9 @@ class NotificationsManager extends BaseObject * - date_rel : relative date string * - msg_html: message as html string * - msg_plain: message as plain text string + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - private function _set_extra($notes) + private function _set_extra(array $notes) { $rets = []; foreach ($notes as $n) { @@ -56,49 +55,28 @@ class NotificationsManager extends BaseObject * @brief Get all notifications for local_user() * * @param array $filter optional Array "column name"=>value: filter query by columns values - * @param string $order optional Space separated list of column to sort by. - * Prepend name with "+" to sort ASC, "-" to sort DESC. Default to "-date" + * @param array $order optional Array to order by * @param string $limit optional Query limits * - * @return array of results or false on errors + * @return array|bool of results or false on errors + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public function getAll($filter = [], $order = "-date", $limit = "") + public function getAll($filter = [], $order = ['date' => 'DESC'], $limit = "") { - $filter_str = []; - $filter_sql = ""; - foreach ($filter as $column => $value) { - $filter_str[] = sprintf("`%s` = '%s'", $column, DBA::escape($value)); - } - if (count($filter_str) > 0) { - $filter_sql = "AND " . implode(" AND ", $filter_str); - } + $params = []; - $aOrder = explode(" ", $order); - $asOrder = []; - foreach ($aOrder as $o) { - $dir = "asc"; - if ($o[0] === "-") { - $dir = "desc"; - $o = substr($o, 1); - } - if ($o[0] === "+") { - $dir = "asc"; - $o = substr($o, 1); - } - $asOrder[] = "$o $dir"; - } - $order_sql = implode(", ", $asOrder); + $params['order'] = $order; - if ($limit != "") { - $limit = " LIMIT " . $limit; + if (!empty($limit)) { + $params['limit'] = $limit; } - $r = q( - "SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit", - intval(local_user()) - ); - if (DBA::isResult($r)) { - return $this->_set_extra($r); + $dbFilter = array_merge($filter, ['uid' => local_user()]); + + $stmtNotifies = DBA::select('notify', [], $dbFilter, $params); + + if (DBA::isResult($stmtNotifies)) { + return $this->_set_extra(DBA::toArray($stmtNotifies)); } return false; @@ -109,16 +87,13 @@ class NotificationsManager extends BaseObject * * @param int $id identity * @return array note values or null if not found + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function getByID($id) { - $r = q( - "SELECT * FROM `notify` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($id), - intval(local_user()) - ); - if (DBA::isResult($r)) { - return $this->_set_extra($r)[0]; + $stmtNotify = DBA::selectFirst('notify', [], ['id' => $id, 'uid' => local_user()]); + if (DBA::isResult($stmtNotify)) { + return $this->_set_extra([$stmtNotify])[0]; } return null; } @@ -129,17 +104,17 @@ class NotificationsManager extends BaseObject * @param array $note note array * @param bool $seen optional true or false, default true * @return bool true on success, false on errors + * @throws \Exception */ public function setSeen($note, $seen = true) { - return q( - "UPDATE `notify` SET `seen` = %d WHERE (`link` = '%s' OR (`parent` != 0 AND `parent` = %d AND `otype` = '%s')) AND `uid` = %d", - intval($seen), - DBA::escape($note['link']), - intval($note['parent']), - DBA::escape($note['otype']), - intval(local_user()) - ); + return DBA::update('notify', ['seen' => $seen], [ + '(`link` = ? OR (`parent` != 0 AND `parent` = ? AND `otype` = ?)) AND `uid` = ?', + $note['link'], + $note['parent'], + $note['otype'], + local_user() + ]); } /** @@ -147,20 +122,18 @@ class NotificationsManager extends BaseObject * * @param bool $seen optional true or false. default true * @return bool true on success, false on error + * @throws \Exception */ public function setAllSeen($seen = true) { - return q( - "UPDATE `notify` SET `seen` = %d WHERE `uid` = %d", - intval($seen), - intval(local_user()) - ); + return DBA::update('notify', ['seen' => $seen], ['uid' => local_user()]); } /** * @brief List of pages for the Notifications TabBar * * @return array with with notifications TabBar data + * @throws \Exception */ public function getTabs() { @@ -213,18 +186,18 @@ class NotificationsManager extends BaseObject * @param array $notifs The array from the db query * @param string $ident The notifications identifier (e.g. network) * @return array - * string 'label' => The type of the notification - * string 'link' => URL to the source - * string 'image' => The avatar image - * string 'url' => The profile url of the contact - * string 'text' => The notification text - * string 'when' => The date of the notification - * string 'ago' => T relative date of the notification - * bool 'seen' => Is the notification marked as "seen" + * string 'label' => The type of the notification + * string 'link' => URL to the source + * string 'image' => The avatar image + * string 'url' => The profile url of the contact + * string 'text' => The notification text + * string 'when' => The date of the notification + * string 'ago' => T relative date of the notification + * bool 'seen' => Is the notification marked as "seen" + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private function formatNotifs(array $notifs, $ident = "") { - $notif = []; $arr = []; if (DBA::isResult($notifs)) { @@ -398,14 +371,15 @@ class NotificationsManager extends BaseObject /** * @brief Get network notifications * - * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" - * @param int $start Start the query at this point - * @param int $limit Maximum number of query results + * @param int|string $seen If 0 only include notifications into the query + * which aren't marked as "seen" + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results * * @return array with - * string 'ident' => Notification identifier - * array 'notifications' => Network notifications + * string 'ident' => Notification identifier + * array 'notifications' => Network notifications + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function networkNotifs($seen = 0, $start = 0, $limit = 80) { @@ -420,7 +394,7 @@ class NotificationsManager extends BaseObject $fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar', 'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid']; - $params = ['order' => ['created' => true], 'limit' => [$start, $limit]]; + $params = ['order' => ['received' => true], 'limit' => [$start, $limit]]; $items = Item::selectForUser(local_user(), $fields, $condition, $params); @@ -439,14 +413,15 @@ class NotificationsManager extends BaseObject /** * @brief Get system notifications * - * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" - * @param int $start Start the query at this point - * @param int $limit Maximum number of query results + * @param int|string $seen If 0 only include notifications into the query + * which aren't marked as "seen" + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results * * @return array with - * string 'ident' => Notification identifier - * array 'notifications' => System notifications + * string 'ident' => Notification identifier + * array 'notifications' => System notifications + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function systemNotifs($seen = 0, $start = 0, $limit = 80) { @@ -454,20 +429,22 @@ class NotificationsManager extends BaseObject $notifs = []; $sql_seen = ""; + $filter = ['uid' => local_user()]; if ($seen === 0) { - $sql_seen = " AND NOT `seen` "; + $filter['seen'] = false; } - $r = q( - "SELECT `id`, `url`, `photo`, `msg`, `date`, `seen`, `verb` FROM `notify` - WHERE `uid` = %d $sql_seen ORDER BY `date` DESC LIMIT %d, %d ", - intval(local_user()), - intval($start), - intval($limit) - ); + $params = []; + $params['order'] = ['date' => 'DESC']; + $params['limit'] = [$start, $limit]; - if (DBA::isResult($r)) { - $notifs = $this->formatNotifs($r, $ident); + $stmtNotifies = DBA::select('notify', + ['id', 'url', 'photo', 'msg', 'date', 'seen', 'verb'], + $filter, + $params); + + if (DBA::isResult($stmtNotifies)) { + $notifs = $this->formatNotifs(DBA::toArray($stmtNotifies), $ident); } $arr = [ @@ -481,14 +458,15 @@ class NotificationsManager extends BaseObject /** * @brief Get personal notifications * - * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" - * @param int $start Start the query at this point - * @param int $limit Maximum number of query results + * @param int|string $seen If 0 only include notifications into the query + * which aren't marked as "seen" + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results * * @return array with - * string 'ident' => Notification identifier - * array 'notifications' => Personal notifications + * string 'ident' => Notification identifier + * array 'notifications' => Personal notifications + * @throws \Exception */ public function personalNotifs($seen = 0, $start = 0, $limit = 80) { @@ -507,7 +485,7 @@ class NotificationsManager extends BaseObject $fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar', 'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid']; - $params = ['order' => ['created' => true], 'limit' => [$start, $limit]]; + $params = ['order' => ['received' => true], 'limit' => [$start, $limit]]; $items = Item::selectForUser(local_user(), $fields, $condition, $params); @@ -526,14 +504,15 @@ class NotificationsManager extends BaseObject /** * @brief Get home notifications * - * @param int|string $seen If 0 only include notifications into the query - * which aren't marked as "seen" - * @param int $start Start the query at this point - * @param int $limit Maximum number of query results + * @param int|string $seen If 0 only include notifications into the query + * which aren't marked as "seen" + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results * * @return array with - * string 'ident' => Notification identifier - * array 'notifications' => Home notifications + * string 'ident' => Notification identifier + * array 'notifications' => Home notifications + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public function homeNotifs($seen = 0, $start = 0, $limit = 80) { @@ -548,7 +527,7 @@ class NotificationsManager extends BaseObject $fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar', 'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid']; - $params = ['order' => ['created' => true], 'limit' => [$start, $limit]]; + $params = ['order' => ['received' => true], 'limit' => [$start, $limit]]; $items = Item::selectForUser(local_user(), $fields, $condition, $params); if (DBA::isResult($items)) { @@ -566,14 +545,16 @@ class NotificationsManager extends BaseObject /** * @brief Get introductions * - * @param bool $all If false only include introductions into the query - * which aren't marked as ignored - * @param int $start Start the query at this point - * @param int $limit Maximum number of query results + * @param bool $all If false only include introductions into the query + * which aren't marked as ignored + * @param int $start Start the query at this point + * @param int $limit Maximum number of query results * * @return array with - * string 'ident' => Notification identifier - * array 'notifications' => Introductions + * string 'ident' => Notification identifier + * array 'notifications' => Introductions + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public function introNotifs($all = false, $start = 0, $limit = 80) { @@ -582,11 +563,11 @@ class NotificationsManager extends BaseObject $sql_extra = ""; if (!$all) { - $sql_extra = " AND `ignore` = 0 "; + $sql_extra = " AND NOT `ignore` "; } /// @todo Fetch contact details by "Contact::getDetailsByUrl" instead of queries to contact, fcontact and gcontact - $r = q( + $stmtNotifies = DBA::p( "SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*, `fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`, `fcontact`.`addr` AS `faddr`, `fcontact`.`photo` AS `fphoto`, `fcontact`.`request` AS `frequest`, @@ -597,14 +578,14 @@ class NotificationsManager extends BaseObject LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id` LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl` LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id` - WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 - LIMIT %d, %d", - intval($_SESSION['uid']), - intval($start), - intval($limit) + WHERE `intro`.`uid` = ? $sql_extra AND `intro`.`blocked` = 0 + LIMIT ?, ?", + $_SESSION['uid'], + $start, + $limit ); - if (DBA::isResult($r)) { - $notifs = $this->formatIntros($r); + if (DBA::isResult($stmtNotifies)) { + $notifs = $this->formatIntros(DBA::toArray($stmtNotifies)); } $arr = [ @@ -620,11 +601,15 @@ class NotificationsManager extends BaseObject * * @param array $intros The array from the db query * @return array with the introductions + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ private function formatIntros($intros) { $knowyou = ''; + $arr = []; + foreach ($intros as $it) { // There are two kind of introduction. Contacts suggested by other contacts and normal connection requests. // We have to distinguish between these two because they use different data. @@ -703,6 +688,7 @@ class NotificationsManager extends BaseObject * @param array $arr The input array with the intro data * * @return array The array with the intro data + * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ private function getMissingIntroData($arr) {