From 1003aa2df5ad632278c05339b5243ee1e2f63d1c Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Sat, 21 Mar 2020 18:34:04 -0700
Subject: [PATCH 1/7] Fix related children count

---
 plexpy/pmsconnect.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py
index d3f521ff..58cbe02a 100644
--- a/plexpy/pmsconnect.py
+++ b/plexpy/pmsconnect.py
@@ -2365,7 +2365,7 @@ class PmsConnect(object):
                                       }
                     children_results_list[media_type].append(children_output)
 
-            output = {'results_count': sum(len(s) for s in children_results_list.items()),
+            output = {'results_count': sum(len(v) for k, v in children_results_list.items()),
                       'results_list': children_results_list,
                       }
 

From d5917f89f03d50c45af83fbac7e7a974fa0e2b33 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Mon, 23 Mar 2020 10:28:01 -0700
Subject: [PATCH 2/7] Fix notification grouping not enabled by default on new
 install

---
 plexpy/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plexpy/config.py b/plexpy/config.py
index 93e93a76..c8675d21 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -340,7 +340,7 @@ _CONFIG_DEFINITIONS = {
     'NOTIFY_CONSECUTIVE': (int, 'Monitoring', 1),
     'NOTIFY_GROUP_RECENTLY_ADDED_GRANDPARENT': (int, 'Monitoring', 0),
     'NOTIFY_GROUP_RECENTLY_ADDED_PARENT': (int, 'Monitoring', 1),
-    'NOTIFY_GROUP_RECENTLY_ADDED': (int, 'Monitoring', 0),
+    'NOTIFY_GROUP_RECENTLY_ADDED': (int, 'Monitoring', 1),
     'NOTIFY_UPLOAD_POSTERS': (int, 'Monitoring', 0),
     'NOTIFY_RECENTLY_ADDED': (int, 'Monitoring', 0),
     'NOTIFY_RECENTLY_ADDED_DELAY': (int, 'Monitoring', 60),

From d54794e85f5dc3b47468bc31a7e47ae7583b7f8d Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Mon, 23 Mar 2020 15:21:05 -0700
Subject: [PATCH 3/7] Add favicon to newsletter template

---
 data/interfaces/default/newsletter_preview.html          | 3 +++
 data/interfaces/newsletters/recently_added.html          | 1 +
 data/interfaces/newsletters/recently_added.internal.html | 1 +
 3 files changed, 5 insertions(+)

diff --git a/data/interfaces/default/newsletter_preview.html b/data/interfaces/default/newsletter_preview.html
index 22b2e13a..3d20987c 100644
--- a/data/interfaces/default/newsletter_preview.html
+++ b/data/interfaces/default/newsletter_preview.html
@@ -8,6 +8,9 @@
     <meta charset="utf-8">
     <title>Tautulli - ${title} | ${server_name}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.0.5">
+    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.0.5">
+    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.0.5">
     <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
     <style>
         * {
diff --git a/data/interfaces/newsletters/recently_added.html b/data/interfaces/newsletters/recently_added.html
index f16e2c15..7065ec20 100644
--- a/data/interfaces/newsletters/recently_added.html
+++ b/data/interfaces/newsletters/recently_added.html
@@ -26,6 +26,7 @@
     <meta name="viewport" content="width=device-width">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Tautulli Newsletter - ${subject}</title>
+    <link rel="shortcut icon" href="${base_url_image + 'images/favicon/favicon.ico' if base_url_image else 'https://tautulli.com/images/favicon.ico'}">
     <style>
         /* -------------------------------------
             GLOBAL RESETS
diff --git a/data/interfaces/newsletters/recently_added.internal.html b/data/interfaces/newsletters/recently_added.internal.html
index 96e3e82e..b16f5851 100644
--- a/data/interfaces/newsletters/recently_added.internal.html
+++ b/data/interfaces/newsletters/recently_added.internal.html
@@ -26,6 +26,7 @@
     <meta name="viewport" content="width=device-width"/>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <title>Tautulli Newsletter - ${subject}</title>
+    <link rel="shortcut icon" href="${base_url_image + 'images/favicon/favicon.ico' if base_url_image else 'https://tautulli.com/images/favicon.ico'}">
     <style>
         /* -------------------------------------
             GLOBAL RESETS

From 395fc49087b88b2f962567607d67c86f6d1371fd Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Mon, 23 Mar 2020 17:49:51 -0700
Subject: [PATCH 4/7] Add ability to flush recently_added database table

---
 API.md                                |  4 +++
 data/interfaces/default/settings.html | 22 +++++++++++++++-
 plexpy/database.py                    | 37 ++++++++++++---------------
 plexpy/webserve.py                    | 14 ++++++++++
 4 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/API.md b/API.md
index 799f4dee..8164bd97 100644
--- a/API.md
+++ b/API.md
@@ -278,6 +278,10 @@ Returns:
 ```
 
 
+### delete_recently_added
+Flush out all of the recently added items in the database.
+
+
 ### delete_temp_sessions
 Flush out all of the temporary sessions in the database.
 
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 7e761534..31628c26 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -998,6 +998,20 @@
                             </div>
                             <p class="help-block">Set the delay (in seconds) to wait for consecutive recently added items to group together and to allow metadata to be processed before sending the notification. Minimum 60 seconds.</p>
                         </div>
+                        <div class="form-group advanced-setting">
+                            <label>Flush Recently Added</label>
+                            <p class="help-block">
+                                Attempt to fix recently added notifications by flushing out all of the recently added items in the database.<br />
+                                Warning: This will reset all recently added notifications. For emergency use only when recently added notifications are stuck!
+                            </p>
+                            <div class="row">
+                                <div class="col-md-4">
+                                    <div class="btn-group">
+                                        <button class="btn btn-form" type="button" id="delete_recently_added">Flush</button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                         <!--<div class="checkbox">
                             <label>
                                 <input type="checkbox" name="notify_recently_added_upgrade" id="notify_recently_added_upgrade" value="1" ${config['notify_recently_added_upgrade']}> Send a Notification for New Versions <span class="settings-warning">[Not working]</span>
@@ -2156,11 +2170,17 @@ $(document).ready(function() {
     });
 
     $("#delete_temp_sessions").click(function () {
-        var msg = 'Are you sure you want to flush the temporary sessions?<br /><strong>This will reset all currently active sessions.</strong>';
+        var msg = 'Are you sure you want to flush the temporary sessions?<br /><br /><strong>This will reset all currently active sessions.</strong>';
         var url = 'delete_temp_sessions';
         confirmAjaxCall(url, msg);
     });
 
+    $("#delete_recently_added").click(function () {
+        var msg = 'Are you sure you want to flush the recently added items?<br /><br /><strong>This will reset all recently added notifications.</strong>';
+        var url = 'delete_recently_added';
+        confirmAjaxCall(url, msg);
+    });
+
     $("#switch_git_branch").click(function () {
         var current_remote = "${config['git_remote']}";
         var current_branch = "${config['git_branch']}";
diff --git a/plexpy/database.py b/plexpy/database.py
index 05830288..e164b62c 100644
--- a/plexpy/database.py
+++ b/plexpy/database.py
@@ -33,31 +33,28 @@ def integrity_check():
     return result
 
 
-def drop_session_db():
-    monitor_db = MonitorDatabase()
-    monitor_db.action('DROP TABLE sessions')
+def clear_table(table=None):
+    if table:
+        monitor_db = MonitorDatabase()
 
-
-def clear_history_tables():
-    logger.debug(u"Tautulli Database :: Deleting all session_history records... No turning back now bub.")
-    monitor_db = MonitorDatabase()
-    monitor_db.action('DELETE FROM session_history')
-    monitor_db.action('DELETE FROM session_history_media_info')
-    monitor_db.action('DELETE FROM session_history_metadata')
-    monitor_db.action('VACUUM')
+        logger.debug(u"Tautulli Database :: Clearing database table '%s'." % table)
+        try:
+            monitor_db.action('DELETE FROM %s' % table)
+            monitor_db.action('VACUUM')
+            return True
+        except Exception as e:
+            logger.error(u"Tautulli Database :: Failed to clear database table '%s': %s." % (table, e))
+            return False
 
 
 def delete_sessions():
-    logger.debug(u"Tautulli Database :: Clearing temporary sessions from database.")
-    monitor_db = MonitorDatabase()
+    logger.info(u"Tautulli Database :: Clearing temporary sessions from database.")
+    return clear_table('sessions')
 
-    try:
-        monitor_db.action('DELETE FROM sessions')
-        monitor_db.action('VACUUM')
-        return True
-    except Exception as e:
-        logger.warn(u"Tautulli Database :: Unable to clear temporary sessions from database: %s." % e)
-        return False
+
+def delete_recently_added():
+    logger.info(u"Tautulli Database :: Clearing recently added items from database.")
+    return clear_table('recently_added')
 
 
 def db_filename(filename=FILENAME):
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index f41c1839..e38c509e 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -341,6 +341,20 @@ class WebInterface(object):
         else:
             return {'result': 'error', 'message': 'Flush sessions failed.'}
 
+    @cherrypy.expose
+    @cherrypy.tools.json_out()
+    @requireAuth(member_of("admin"))
+    @addtoapi()
+    def delete_recently_added(self, **kwargs):
+        """ Flush out all of the recently added items in the database."""
+
+        result = database.delete_recently_added()
+
+        if result:
+            return {'result': 'success', 'message': 'Recently added flushed.'}
+        else:
+            return {'result': 'error', 'message': 'Flush recently added failed.'}
+
 
     ##### Libraries #####
 

From 763e5f583a466df9300181d73feca3887a6c2df4 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Tue, 24 Mar 2020 21:24:31 -0700
Subject: [PATCH 5/7] Fix Windows system tray icon not enabled by default

---
 data/interfaces/default/welcome.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/interfaces/default/welcome.html b/data/interfaces/default/welcome.html
index 10af25ae..0c1c101a 100644
--- a/data/interfaces/default/welcome.html
+++ b/data/interfaces/default/welcome.html
@@ -216,6 +216,7 @@
                         <input type="checkbox" name="first_run" id="first_run" value="1" checked>
                         <input type="checkbox" name="group_history_tables" id="group_history_tables" value="1" checked>
                         <input type="checkbox" name="history_table_activity" id="history_table_activity" value="1" checked>
+                        <input type="checkbox" name="win_sys_tray" id="win_sys_tray" value="1" checked>
                         <input type="checkbox" name="launch_browser" id="launch_browser" value="1" checked>
                         <input type="checkbox" name="api_enabled" id="api_enabled" value="1" checked>
                         <input type="checkbox" name="refresh_users_on_startup" id="refresh_users_on_startup" value="1" checked>

From fa61302954dfa411fcc1d0e631cc41f5adc6c608 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Thu, 26 Mar 2020 10:11:33 -0700
Subject: [PATCH 6/7] Fix saving mobile device with blank friendly name

---
 plexpy/mobile_app.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/plexpy/mobile_app.py b/plexpy/mobile_app.py
index 45ef1a4d..af565cac 100644
--- a/plexpy/mobile_app.py
+++ b/plexpy/mobile_app.py
@@ -97,10 +97,7 @@ def set_mobile_device_config(mobile_device_id=None, **kwargs):
         return False
 
     keys = {'id': mobile_device_id}
-    values = {}
-
-    if kwargs.get('friendly_name'):
-        values['friendly_name'] = kwargs['friendly_name']
+    values = {'friendly_name': kwargs.get('friendly_name', '')}
 
     db = database.MonitorDatabase()
     try:

From 16ffbd9940d1566e9b2d69cd1e9990f89dbaa867 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Sat, 28 Mar 2020 15:11:02 -0700
Subject: [PATCH 7/7] v2.2.1

---
 CHANGELOG.md      | 21 +++++++++++++++++++++
 plexpy/version.py |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67090ca9..49b37825 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # Changelog
 
+## v2.2.1 (2020-03-28)
+
+* Notifications:
+  * Fix: File size notification parameter incorrectly truncated to an integer.
+  * Fix: Notification grouping by season/album not enabled by default.
+  * New: Added transcode decision counts to notification parameters.
+  * Change: Tags (<>) are no longer stripped from from Webhook notification text.
+* Newsletter:
+  * New: Added favicon to newsletter template when viewing as a web page.
+* UI:
+  * Fix: Username missing from the Synced Items table.
+  * Fix: Windows system tray icon not enabled by default.
+  * Fix: Saving a mobile device with a blank friendly name caused an error.
+  * New: Added IMDb and Rotten Tomato Ratings to info pages.
+  * New: Added button in settings to delete all 3rd party metadata lookup info in the database.
+  * New: Added button in settings to flush recently added items in the database.
+* API:
+  * New: Added delete_recenly_added API command to flush recently added items.
+  * Change: Updated delete_lookup_info API command parameters to allow deleteing all 3rd party metadata lookup info.
+
+
 ## v2.2.0 (2020-03-08)
 
 * Important Note!
diff --git a/plexpy/version.py b/plexpy/version.py
index 19cf1b3f..01a5ad0b 100644
--- a/plexpy/version.py
+++ b/plexpy/version.py
@@ -1,2 +1,2 @@
 PLEXPY_BRANCH = "master"
-PLEXPY_RELEASE_VERSION = "v2.2.0"
+PLEXPY_RELEASE_VERSION = "v2.2.1"