From 8b8af40c640e02955fe0c42f0939da6210a488e6 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 25 Mar 2021 17:15:01 +0000
Subject: [PATCH 1/2] Simplify

---
 desktop_client.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/desktop_client.py b/desktop_client.py
index 192d23033..8c324c06c 100644
--- a/desktop_client.py
+++ b/desktop_client.py
@@ -1075,12 +1075,6 @@ def _desktopShowBox(indent: str,
     # say the post number range
     sayStr = indent + boxNameStr + ' page ' + str(pageNumber) + \
         ' containing ' + str(ctr - 1) + ' posts. '
-    if newDMs and boxName != 'dm':
-        sayStr += \
-            'Use \33[3mshow dm\33[0m to view direct messages.'
-    elif newReplies and boxName != 'tlreplies':
-        sayStr += \
-            'Use \33[3mshow replies\33[0m to view reply posts.'
     sayStr2 = sayStr.replace('\33[3m', '').replace('\33[0m', '')
     sayStr2 = sayStr2.replace('show dm', 'show DM')
     sayStr2 = sayStr2.replace('dm post', 'Direct message post')

From abf822abace76b3fe3e49fb34ed291e33cec35b1 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 25 Mar 2021 22:02:31 +0000
Subject: [PATCH 2/2] Check that cache entry exists before deleting

---
 utils.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/utils.py b/utils.py
index dc6ba6378..d1addc920 100644
--- a/utils.py
+++ b/utils.py
@@ -1546,8 +1546,10 @@ def updateRecentPostsCache(recentPostsCache: {}, maxRecentPosts: int,
         while len(recentPostsCache['html'].items()) > maxRecentPosts:
             postId = recentPostsCache['index'][0]
             recentPostsCache['index'].pop(0)
-            del recentPostsCache['json'][postId]
-            del recentPostsCache['html'][postId]
+            if recentPostsCache['json'].get(postId):
+                del recentPostsCache['json'][postId]
+            if recentPostsCache['html'].get(postId):
+                del recentPostsCache['html'][postId]
     else:
         recentPostsCache['index'] = [postId]
         recentPostsCache['json'] = {}