From 3465bd9f1102203b12e5d3439ecbe080b54d81bd Mon Sep 17 00:00:00 2001
From: Philipp Holzer <admin+github@philipp.info>
Date: Sat, 26 Oct 2019 05:02:14 +0200
Subject: [PATCH] rename methods

---
 mod/notifications.php | 10 +++++-----
 src/Model/Notify.php  | 24 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/mod/notifications.php b/mod/notifications.php
index 2c8e39bfb4..da508a33c2 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -112,27 +112,27 @@ function notifications_content(App $a)
 
 		$all = (($a->argc > 2) && ($a->argv[2] == 'all'));
 
-		$notifs = $nm->getIntroNotifies($all, $startrec, $perpage, $id);
+		$notifs = $nm->getIntroList($all, $startrec, $perpage, $id);
 
 	// Get the network notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'network')) {
 		$notif_header = L10n::t('Network Notifications');
-		$notifs = $nm->getNetworkNotifies($show, $startrec, $perpage);
+		$notifs = $nm->getNetworkList($show, $startrec, $perpage);
 
 	// Get the system notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'system')) {
 		$notif_header = L10n::t('System Notifications');
-		$notifs = $nm->getSystemNotifies($show, $startrec, $perpage);
+		$notifs = $nm->getSystemList($show, $startrec, $perpage);
 
 	// Get the personal notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'personal')) {
 		$notif_header = L10n::t('Personal Notifications');
-		$notifs = $nm->getPersonalNotifies($show, $startrec, $perpage);
+		$notifs = $nm->getPersonalList($show, $startrec, $perpage);
 
 	// Get the home notifications
 	} elseif (($a->argc > 1) && ($a->argv[1] == 'home')) {
 		$notif_header = L10n::t('Home Notifications');
-		$notifs = $nm->getHomeNotifies($show, $startrec, $perpage);
+		$notifs = $nm->getHomeList($show, $startrec, $perpage);
 	// fallback - redirect to main page
 	} else {
 		$a->internalRedirect('notifications');
diff --git a/src/Model/Notify.php b/src/Model/Notify.php
index 2ee1a03a48..8a60ee6c04 100644
--- a/src/Model/Notify.php
+++ b/src/Model/Notify.php
@@ -238,7 +238,7 @@ final class Notify extends BaseObject
 	 *                       bool 'seen' => Is the notification marked as "seen"
 	 * @throws Exception
 	 */
-	private function formatNotifies(array $notifies, string $ident = "")
+	private function formatList(array $notifies, string $ident = "")
 	{
 		$formattedNotifies = [];
 
@@ -422,7 +422,7 @@ final class Notify extends BaseObject
 	 *
 	 * @throws Exception
 	 */
-	public function getNetworkNotifies(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
+	public function getNetworkList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
 	{
 		$ident    = self::NETWORK;
 		$notifies = [];
@@ -440,7 +440,7 @@ final class Notify extends BaseObject
 		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
 
 		if ($this->dba->isResult($items)) {
-			$notifies = $this->formatNotifies(Item::inArray($items), $ident);
+			$notifies = $this->formatList(Item::inArray($items), $ident);
 		}
 
 		$arr = [
@@ -465,7 +465,7 @@ final class Notify extends BaseObject
 	 *
 	 * @throws Exception
 	 */
-	public function getSystemNotifies(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
+	public function getSystemList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
 	{
 		$ident    = self::SYSTEM;
 		$notifies = [];
@@ -485,7 +485,7 @@ final class Notify extends BaseObject
 			$params);
 
 		if ($this->dba->isResult($stmtNotifies)) {
-			$notifies = $this->formatNotifies($this->dba->toArray($stmtNotifies), $ident);
+			$notifies = $this->formatList($this->dba->toArray($stmtNotifies), $ident);
 		}
 
 		$arr = [
@@ -510,7 +510,7 @@ final class Notify extends BaseObject
 	 *
 	 * @throws Exception
 	 */
-	public function getPersonalNotifies(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
+	public function getPersonalList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
 	{
 		$ident    = self::PERSONAL;
 		$notifies = [];
@@ -532,7 +532,7 @@ final class Notify extends BaseObject
 		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
 
 		if ($this->dba->isResult($items)) {
-			$notifies = $this->formatNotifies(Item::inArray($items), $ident);
+			$notifies = $this->formatList(Item::inArray($items), $ident);
 		}
 
 		$arr = [
@@ -557,7 +557,7 @@ final class Notify extends BaseObject
 	 *
 	 * @throws Exception
 	 */
-	public function getHomeNotifies(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
+	public function getHomeList(bool $seen = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT)
 	{
 		$ident    = self::HOME;
 		$notifies = [];
@@ -575,7 +575,7 @@ final class Notify extends BaseObject
 		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
 
 		if ($this->dba->isResult($items)) {
-			$notifies = $this->formatNotifies(Item::inArray($items), $ident);
+			$notifies = $this->formatList(Item::inArray($items), $ident);
 		}
 
 		$arr = [
@@ -602,7 +602,7 @@ final class Notify extends BaseObject
 	 * @throws ImagickException
 	 * @throws Exception
 	 */
-	public function getIntroNotifies(bool $all = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT, int $id = 0)
+	public function getIntroList(bool $all = false, int $start = 0, int $limit = self::DEFAULT_PAGE_LIMIT, int $id = 0)
 	{
 		/// @todo sanitize wording according to SELF::INTRO
 		$ident     = 'introductions';
@@ -638,7 +638,7 @@ final class Notify extends BaseObject
 			$limit
 		);
 		if ($this->dba->isResult($stmtNotifies)) {
-			$notifies = $this->formatIntros($this->dba->toArray($stmtNotifies));
+			$notifies = $this->formatIntroList($this->dba->toArray($stmtNotifies));
 		}
 
 		$arr = [
@@ -658,7 +658,7 @@ final class Notify extends BaseObject
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws ImagickException
 	 */
-	private function formatIntros(array $intros)
+	private function formatIntroList(array $intros)
 	{
 		$knowyou = '';