From 09787cfd7a68e994f248c0cad0ebe5ae68b7aaf3 Mon Sep 17 00:00:00 2001
From: Seokseong Jeon <songsong@monet.postech.ac.kr>
Date: Wed, 3 May 2017 22:52:31 +0900
Subject: [PATCH 1/4] actualizeFeed return number of new articles as 3rd

---
 app/Controllers/feedController.php | 4 +++-
 cli/actualize-user.php             | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index f71f26a4e..eec3b92bc 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -254,6 +254,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		$pshbMinAge = time() - (3600 * 24);  //TODO: Make a configuration.
 
 		$updated_feeds = 0;
+		$nb_new_articles = 0;
 		$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
 		foreach ($feeds as $feed) {
 			$url = $feed->url();	//For detection of HTTP 301
@@ -372,6 +373,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 							$entryDAO->beginTransaction();
 						}
 						$entryDAO->addEntry($entry->toArray());
+						$nb_new_articles++;
 					}
 				}
 				$entryDAO->updateLastSeen($feed->id(), $oldGuids, $mtime);
@@ -434,7 +436,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				break;
 			}
 		}
-		return array($updated_feeds, reset($feeds));
+		return array($updated_feeds, reset($feeds), $nb_new_articles);
 	}
 
 	/**
diff --git a/cli/actualize-user.php b/cli/actualize-user.php
index 29d51753a..932c6975c 100755
--- a/cli/actualize-user.php
+++ b/cli/actualize-user.php
@@ -14,9 +14,9 @@ $username = cliInitUser($options['user']);
 
 fwrite(STDERR, 'FreshRSS actualizing user “' . $username . "”…\n");
 
-list($nbUpdatedFeeds, $feed) = FreshRSS_feed_Controller::actualizeFeed(0, '', true);
+list($nbUpdatedFeeds, $feed, $nbNewArticles) = FreshRSS_feed_Controller::actualizeFeed(0, '', true);
 
-echo "FreshRSS actualized $nbUpdatedFeeds feeds for $username\n";
+echo "FreshRSS actualized $nbUpdatedFeeds feeds for $username ($nbNewArticles new articles)\n";
 
 invalidateHttpCache($username);
 

From d74fe83899c2179d6b8c1f907528e9ff72e667a4 Mon Sep 17 00:00:00 2001
From: Seokseong Jeon <sjeon87+github@gmail.com>
Date: Fri, 5 May 2017 02:34:46 +0900
Subject: [PATCH 2/4] Update CREDITS.md

---
 CREDITS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CREDITS.md b/CREDITS.md
index c7aa808e3..ebf4b694c 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -17,6 +17,7 @@ People are sorted by name so please keep this order.
 * [dswd](https://github.com/dswd): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:dswd)
 * [ealdraed](https://github.com/ealdraed): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ealdraed)
 * [Frans de Jonge](https://github.com/Frenzie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Frenzie), [Web](http://fransdejonge.com/)
+* [gsongsong](https://github.com/gsongsong): [contribuitions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:gsongsong)
 * [Guillaume Fillon](https://github.com/kokaz): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:kokaz), [Web](http://www.guillaume-fillon.com/)
 * [Guillaume Hayot](https://github.com/postblue): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:postblue), [Web](https://postblue.info/)
 * [hckweb](https://github.com/hckweb): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=hckweb)

From fd5bd80af18925b910c563657418ccba45eb388f Mon Sep 17 00:00:00 2001
From: Seokseong Jeon <sjeon87+github@gmail.com>
Date: Fri, 5 May 2017 03:42:07 +0900
Subject: [PATCH 3/4] Update CREDITS.md

---
 CREDITS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CREDITS.md b/CREDITS.md
index ebf4b694c..c3464848c 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -17,7 +17,7 @@ People are sorted by name so please keep this order.
 * [dswd](https://github.com/dswd): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:dswd)
 * [ealdraed](https://github.com/ealdraed): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ealdraed)
 * [Frans de Jonge](https://github.com/Frenzie): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=Frenzie), [Web](http://fransdejonge.com/)
-* [gsongsong](https://github.com/gsongsong): [contribuitions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:gsongsong)
+* [gsongsong](https://github.com/gsongsong): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:gsongsong)
 * [Guillaume Fillon](https://github.com/kokaz): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:kokaz), [Web](http://www.guillaume-fillon.com/)
 * [Guillaume Hayot](https://github.com/postblue): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:postblue), [Web](https://postblue.info/)
 * [hckweb](https://github.com/hckweb): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=hckweb)

From 0bc59ba140b19d8e0a1762e5ffed66b0c61bd322 Mon Sep 17 00:00:00 2001
From: Seokseong Jeon <songsong@monet.postech.ac.kr>
Date: Fri, 5 May 2017 17:16:39 +0900
Subject: [PATCH 4/4] Make actualizeFeed returns values consistent&safe

---
 app/Controllers/feedController.php | 2 +-
 p/api/pshb.php                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index b8679d86d..8e0e5dd6d 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -482,7 +482,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 			$feedDAO->updateCachedValues();
 			$entryDAO->commit();
 		} else {
-			list($updated_feeds, $feed) = self::actualizeFeed($id, $url, $force, null, false, $noCommit);
+			list($updated_feeds, $feed, $nb_new_articles) = self::actualizeFeed($id, $url, $force, null, false, $noCommit);
 		}
 
 		if (Minz_Request::param('ajax')) {
diff --git a/p/api/pshb.php b/p/api/pshb.php
index 378f43516..a0b64ede1 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -136,7 +136,7 @@ foreach ($users as $userFilename) {
 		                             join_path(USERS_PATH, '_', 'config.default.php'));
 		new Minz_ModelPdo($username);	//TODO: FIXME: Quick-fix while waiting for a better FreshRSS() constructor/init
 		FreshRSS_Context::init();
-		list($updated_feeds, $feed) = FreshRSS_feed_Controller::actualizeFeed(0, $self, false, $simplePie);
+		list($updated_feeds, $feed, $nb_new_articles) = FreshRSS_feed_Controller::actualizeFeed(0, $self, false, $simplePie);
 		if ($updated_feeds > 0 || $feed != false) {
 			$nb++;
 		} else {