From 77e7eff43747c2a584f4e600bc7a17acc5a3de5d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 11 Feb 2021 12:27:12 +0000
Subject: [PATCH 01/27] Comments

---
 webapp_post.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/webapp_post.py b/webapp_post.py
index c9505c819..b5646c416 100644
--- a/webapp_post.py
+++ b/webapp_post.py
@@ -327,6 +327,10 @@ def _getEditIconHtml(baseDir: str, nickname: str, domainFull: str,
     """
     editStr = ''
     actor = postJsonObject['actor']
+    # This should either be a post which you created,
+    # or it could be generated from the newswire (see
+    # _addBlogsToNewswire) in which case anyone with
+    # editor status should be able to alter it
     if (actor.endswith('/' + domainFull + '/users/' + nickname) or
         (isEditor(baseDir, nickname) and
          actor.endswith('/' + domainFull + '/users/news'))):

From eeb095fe8af7def3161c5845f0fff9c5c6600719 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 11 Feb 2021 12:40:56 +0000
Subject: [PATCH 02/27] Only include non-system users blog posts

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

diff --git a/newswire.py b/newswire.py
index ccaf983bf..35f35b2d9 100644
--- a/newswire.py
+++ b/newswire.py
@@ -794,7 +794,7 @@ def _addAccountBlogsToNewswire(baseDir: str, nickname: str, domain: str,
                     locatePost(baseDir, nickname,
                                domain, postUrl, False)
                 if not fullPostFilename:
-                    print('Unable to locate post ' + postUrl)
+                    print('Unable to locate post for newswire ' + postUrl)
                     ctr += 1
                     if ctr >= maxBlogsPerAccount:
                         break
@@ -840,7 +840,7 @@ def _addBlogsToNewswire(baseDir: str, domain: str, newswire: {},
         for handle in dirs:
             if '@' not in handle:
                 continue
-            if 'inbox@' in handle:
+            if 'inbox@' in handle or 'news@' in handle:
                 continue
 
             nickname = handle.split('@')[0]

From e104b9c5b0f029240b07964720519fb70ec9bae2 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 10:33:10 +0000
Subject: [PATCH 03/27] Title on calendat events

---
 webapp_calendar.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webapp_calendar.py b/webapp_calendar.py
index 0135cc08e..48910ada1 100644
--- a/webapp_calendar.py
+++ b/webapp_calendar.py
@@ -358,7 +358,9 @@ def htmlCalendar(cssCache: {}, translate: {},
                     url = calActor + '/calendar?year=' + \
                         str(year) + '?month=' + \
                         str(monthNumber) + '?day=' + str(dayOfMonth)
-                    dayLink = '<a href="' + url + '">' + \
+                    dayDescription = monthName + ' ' + str(dayOfMonth)
+                    dayLink = '<a href="' + url + '" ' + \
+                        'title="' + dayDescription + '">' + \
                         str(dayOfMonth) + '</a>'
                     # there are events for this day
                     if not isToday:

From 4308317b3d8d07c08a7499accb809b1ab8ac00b7 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 11:28:00 +0000
Subject: [PATCH 04/27] Support for json feeds on newswire

---
 newswire.py | 121 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 115 insertions(+), 6 deletions(-)

diff --git a/newswire.py b/newswire.py
index 35f35b2d9..da9372e0b 100644
--- a/newswire.py
+++ b/newswire.py
@@ -7,6 +7,7 @@ __email__ = "bob@freedombone.net"
 __status__ = "Production"
 
 import os
+import json
 import requests
 from socket import error as SocketError
 import errno
@@ -332,12 +333,14 @@ def _xml2StrToDict(baseDir: str, domain: str, xmlStr: str,
                                       result, pubDateStr,
                                       title, link,
                                       votesStatus, postFilename,
-                                      description, moderated, mirrored)
+                                      description, moderated,
+                                      mirrored)
                 postCtr += 1
                 if postCtr >= maxPostsPerSource:
                     break
     if postCtr > 0:
-        print('Added ' + str(postCtr) + ' rss 2.0 feed items to newswire')
+        print('Added ' + str(postCtr) +
+              ' rss 2.0 feed items to newswire')
     return result
 
 
@@ -416,12 +419,14 @@ def _xml1StrToDict(baseDir: str, domain: str, xmlStr: str,
                                       result, pubDateStr,
                                       title, link,
                                       votesStatus, postFilename,
-                                      description, moderated, mirrored)
+                                      description, moderated,
+                                      mirrored)
                 postCtr += 1
                 if postCtr >= maxPostsPerSource:
                     break
     if postCtr > 0:
-        print('Added ' + str(postCtr) + ' rss 1.0 feed items to newswire')
+        print('Added ' + str(postCtr) +
+              ' rss 1.0 feed items to newswire')
     return result
 
 
@@ -488,12 +493,112 @@ def _atomFeedToDict(baseDir: str, domain: str, xmlStr: str,
                                       result, pubDateStr,
                                       title, link,
                                       votesStatus, postFilename,
-                                      description, moderated, mirrored)
+                                      description, moderated,
+                                      mirrored)
                 postCtr += 1
                 if postCtr >= maxPostsPerSource:
                     break
     if postCtr > 0:
-        print('Added ' + str(postCtr) + ' atom feed items to newswire')
+        print('Added ' + str(postCtr) +
+              ' atom feed items to newswire')
+    return result
+
+
+def _jsonFeedToDict(baseDir: str, domain: str, xmlStr: str,
+                    moderated: bool, mirrored: bool,
+                    maxPostsPerSource: int,
+                    maxFeedItemSizeKb: int) -> {}:
+    """Converts a json feed string to a dictionary
+    See https://jsonfeed.org/version/1
+    """
+    if '<entry>' not in xmlStr:
+        return {}
+    result = {}
+    try:
+        feedJson = json.loads(xmlStr)
+    except BaseException:
+        return {}
+    postCtr = 0
+    maxBytes = maxFeedItemSizeKb * 1024
+    if not feedJson.get('version'):
+        return {}
+    if feedJson['version'] != 'https://jsonfeed.org/version/1':
+        return {}
+    if not feedJson.get('items'):
+        return {}
+    if not isinstance(feedJson['items'], list):
+        return {}
+    for jsonFeedItem in feedJson['items']:
+        if not jsonFeedItem:
+            continue
+        if not isinstance(jsonFeedItem, dict):
+            continue
+        if not jsonFeedItem.get('url'):
+            continue
+        if not isinstance(jsonFeedItem['url'], str):
+            continue
+        if not jsonFeedItem.get('date_published'):
+            if not jsonFeedItem.get('date_modified'):
+                continue
+        if not jsonFeedItem.get('content_text'):
+            if not jsonFeedItem.get('content_html'):
+                continue
+        if jsonFeedItem.get('content_html'):
+            if not isinstance(jsonFeedItem['content_html'], str):
+                continue
+            title = removeHtml(jsonFeedItem['content_html'])
+        else:
+            if not isinstance(jsonFeedItem['content_text'], str):
+                continue
+            title = jsonFeedItem['content_text']
+        if len(title) > maxBytes:
+            print('WARN: json feed title is too long')
+            continue
+        description = ''
+        if jsonFeedItem.get('description'):
+            if not isinstance(jsonFeedItem['description'], str):
+                continue
+            description = jsonFeedItem['description']
+            if len(description) > maxBytes:
+                print('WARN: json feed description is too long')
+                continue
+        link = jsonFeedItem['url']
+        if '://' not in link:
+            continue
+        if len(link) > maxBytes:
+            print('WARN: json feed link is too long')
+            continue
+        itemDomain = link.split('://')[1]
+        if '/' in itemDomain:
+            itemDomain = itemDomain.split('/')[0]
+        if isBlockedDomain(baseDir, itemDomain):
+            continue
+        if jsonFeedItem.get('date_published'):
+            if not isinstance(jsonFeedItem['date_published'], str):
+                continue
+            pubDate = jsonFeedItem['date_published']
+        else:
+            if not isinstance(jsonFeedItem['date_modified'], str):
+                continue
+            pubDate = jsonFeedItem['date_modified']
+
+        pubDateStr = parseFeedDate(pubDate)
+        if pubDateStr:
+            if _validFeedDate(pubDateStr):
+                postFilename = ''
+                votesStatus = []
+                _addNewswireDictEntry(baseDir, domain,
+                                      result, pubDateStr,
+                                      title, link,
+                                      votesStatus, postFilename,
+                                      description, moderated,
+                                      mirrored)
+                postCtr += 1
+                if postCtr >= maxPostsPerSource:
+                    break
+    if postCtr > 0:
+        print('Added ' + str(postCtr) +
+              ' json feed items to newswire')
     return result
 
 
@@ -593,6 +698,10 @@ def _xmlStrToDict(baseDir: str, domain: str, xmlStr: str,
         return _atomFeedToDict(baseDir, domain,
                                xmlStr, moderated, mirrored,
                                maxPostsPerSource, maxFeedItemSizeKb)
+    elif 'https://jsonfeed.org/version/1' in xmlStr:
+        return _jsonFeedToDict(baseDir, domain,
+                               xmlStr, moderated, mirrored,
+                               maxPostsPerSource, maxFeedItemSizeKb)
     return {}
 
 

From 000162d85c2ab84f7061389998ccfa619d5904b7 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 11:30:23 +0000
Subject: [PATCH 05/27] Json feed version

---
 newswire.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/newswire.py b/newswire.py
index da9372e0b..6b229fbd0 100644
--- a/newswire.py
+++ b/newswire.py
@@ -504,10 +504,10 @@ def _atomFeedToDict(baseDir: str, domain: str, xmlStr: str,
     return result
 
 
-def _jsonFeedToDict(baseDir: str, domain: str, xmlStr: str,
-                    moderated: bool, mirrored: bool,
-                    maxPostsPerSource: int,
-                    maxFeedItemSizeKb: int) -> {}:
+def _jsonFeedV1ToDict(baseDir: str, domain: str, xmlStr: str,
+                      moderated: bool, mirrored: bool,
+                      maxPostsPerSource: int,
+                      maxFeedItemSizeKb: int) -> {}:
     """Converts a json feed string to a dictionary
     See https://jsonfeed.org/version/1
     """
@@ -699,9 +699,9 @@ def _xmlStrToDict(baseDir: str, domain: str, xmlStr: str,
                                xmlStr, moderated, mirrored,
                                maxPostsPerSource, maxFeedItemSizeKb)
     elif 'https://jsonfeed.org/version/1' in xmlStr:
-        return _jsonFeedToDict(baseDir, domain,
-                               xmlStr, moderated, mirrored,
-                               maxPostsPerSource, maxFeedItemSizeKb)
+        return _jsonFeedV1ToDict(baseDir, domain,
+                                 xmlStr, moderated, mirrored,
+                                 maxPostsPerSource, maxFeedItemSizeKb)
     return {}
 
 

From 43ffcd73022c08af7e8fffa82c2b03252d630eef Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 11:46:26 +0000
Subject: [PATCH 06/27] Support json feed 1.1

---
 newswire.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/newswire.py b/newswire.py
index 6b229fbd0..d7fa66df3 100644
--- a/newswire.py
+++ b/newswire.py
@@ -509,9 +509,9 @@ def _jsonFeedV1ToDict(baseDir: str, domain: str, xmlStr: str,
                       maxPostsPerSource: int,
                       maxFeedItemSizeKb: int) -> {}:
     """Converts a json feed string to a dictionary
-    See https://jsonfeed.org/version/1
+    See https://jsonfeed.org/version/1.1
     """
-    if '<entry>' not in xmlStr:
+    if '"items"' not in xmlStr:
         return {}
     result = {}
     try:
@@ -522,7 +522,7 @@ def _jsonFeedV1ToDict(baseDir: str, domain: str, xmlStr: str,
     maxBytes = maxFeedItemSizeKb * 1024
     if not feedJson.get('version'):
         return {}
-    if feedJson['version'] != 'https://jsonfeed.org/version/1':
+    if not feedJson['version'].startswith('https://jsonfeed.org/version/1'):
         return {}
     if not feedJson.get('items'):
         return {}

From c0c44e9d1a60094283c249c7be24ed115bacabe9 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 11:47:49 +0000
Subject: [PATCH 07/27] Result later

---
 newswire.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newswire.py b/newswire.py
index d7fa66df3..7b0465dbb 100644
--- a/newswire.py
+++ b/newswire.py
@@ -513,7 +513,6 @@ def _jsonFeedV1ToDict(baseDir: str, domain: str, xmlStr: str,
     """
     if '"items"' not in xmlStr:
         return {}
-    result = {}
     try:
         feedJson = json.loads(xmlStr)
     except BaseException:
@@ -528,6 +527,7 @@ def _jsonFeedV1ToDict(baseDir: str, domain: str, xmlStr: str,
         return {}
     if not isinstance(feedJson['items'], list):
         return {}
+    result = {}
     for jsonFeedItem in feedJson['items']:
         if not jsonFeedItem:
             continue

From c74b208b53b3b1f16ba3d2d83a43665e9ba250ee Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 11:50:05 +0000
Subject: [PATCH 08/27] Counter later

---
 newswire.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newswire.py b/newswire.py
index 7b0465dbb..a9d2b58b1 100644
--- a/newswire.py
+++ b/newswire.py
@@ -517,7 +517,6 @@ def _jsonFeedV1ToDict(baseDir: str, domain: str, xmlStr: str,
         feedJson = json.loads(xmlStr)
     except BaseException:
         return {}
-    postCtr = 0
     maxBytes = maxFeedItemSizeKb * 1024
     if not feedJson.get('version'):
         return {}
@@ -527,6 +526,7 @@ def _jsonFeedV1ToDict(baseDir: str, domain: str, xmlStr: str,
         return {}
     if not isinstance(feedJson['items'], list):
         return {}
+    postCtr = 0
     result = {}
     for jsonFeedItem in feedJson['items']:
         if not jsonFeedItem:

From 39a0c7ba9ee72816b3480d84ca136f4d7840f2e7 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 12:02:09 +0000
Subject: [PATCH 09/27] Remove html from json feeds

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

diff --git a/newswire.py b/newswire.py
index a9d2b58b1..777f31c22 100644
--- a/newswire.py
+++ b/newswire.py
@@ -550,7 +550,7 @@ def _jsonFeedV1ToDict(baseDir: str, domain: str, xmlStr: str,
         else:
             if not isinstance(jsonFeedItem['content_text'], str):
                 continue
-            title = jsonFeedItem['content_text']
+            title = removeHtml(jsonFeedItem['content_text'])
         if len(title) > maxBytes:
             print('WARN: json feed title is too long')
             continue
@@ -558,7 +558,7 @@ def _jsonFeedV1ToDict(baseDir: str, domain: str, xmlStr: str,
         if jsonFeedItem.get('description'):
             if not isinstance(jsonFeedItem['description'], str):
                 continue
-            description = jsonFeedItem['description']
+            description = removeHtml(jsonFeedItem['description'])
             if len(description) > maxBytes:
                 print('WARN: json feed description is too long')
                 continue

From b1c301dcb5289704e1f241da5ec1f3191c0f0fee Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 12:09:16 +0000
Subject: [PATCH 10/27] Support hashtags in json feeds

---
 newswire.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/newswire.py b/newswire.py
index 777f31c22..2ae1eb71e 100644
--- a/newswire.py
+++ b/newswire.py
@@ -562,6 +562,18 @@ def _jsonFeedV1ToDict(baseDir: str, domain: str, xmlStr: str,
             if len(description) > maxBytes:
                 print('WARN: json feed description is too long')
                 continue
+            if jsonFeedItem.get('tags'):
+                if not isinstance(jsonFeedItem['tags'], list):
+                    for tagName in jsonFeedItem['tags']:
+                        if not isinstance(tagName, str):
+                            continue
+                        if ' ' in tagName:
+                            continue
+                        if not tagName.startswith('#'):
+                            tagName = '#' + tagName
+                        if tagName not in description:
+                            description += ' ' + tagName
+
         link = jsonFeedItem['url']
         if '://' not in link:
             continue

From 67172c31653fe5a8800fd1455d570157c36bce04 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 12:09:48 +0000
Subject: [PATCH 11/27] Invert logic

---
 newswire.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newswire.py b/newswire.py
index 2ae1eb71e..29abb2428 100644
--- a/newswire.py
+++ b/newswire.py
@@ -563,7 +563,7 @@ def _jsonFeedV1ToDict(baseDir: str, domain: str, xmlStr: str,
                 print('WARN: json feed description is too long')
                 continue
             if jsonFeedItem.get('tags'):
-                if not isinstance(jsonFeedItem['tags'], list):
+                if isinstance(jsonFeedItem['tags'], list):
                     for tagName in jsonFeedItem['tags']:
                         if not isinstance(tagName, str):
                             continue

From 49e5eda8234ba3366736b9d2cf99e55dbaa7ef0f Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 14:28:28 +0000
Subject: [PATCH 12/27] Indicate calendar columns

---
 webapp_calendar.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/webapp_calendar.py b/webapp_calendar.py
index 48910ada1..72342a468 100644
--- a/webapp_calendar.py
+++ b/webapp_calendar.py
@@ -320,19 +320,19 @@ def htmlCalendar(cssCache: {}, translate: {},
     calendarStr += '</caption>\n'
     calendarStr += '<thead>\n'
     calendarStr += '<tr>\n'
-    calendarStr += '  <th class="calendar__day__header">' + \
+    calendarStr += '  <th scope="col" class="calendar__day__header">' + \
         translate['Sun'] + '</th>\n'
-    calendarStr += '  <th class="calendar__day__header">' + \
+    calendarStr += '  <th scope="col" class="calendar__day__header">' + \
         translate['Mon'] + '</th>\n'
-    calendarStr += '  <th class="calendar__day__header">' + \
+    calendarStr += '  <th scope="col" class="calendar__day__header">' + \
         translate['Tue'] + '</th>\n'
-    calendarStr += '  <th class="calendar__day__header">' + \
+    calendarStr += '  <th scope="col" class="calendar__day__header">' + \
         translate['Wed'] + '</th>\n'
-    calendarStr += '  <th class="calendar__day__header">' + \
+    calendarStr += '  <th scope="col" class="calendar__day__header">' + \
         translate['Thu'] + '</th>\n'
-    calendarStr += '  <th class="calendar__day__header">' + \
+    calendarStr += '  <th scope="col" class="calendar__day__header">' + \
         translate['Fri'] + '</th>\n'
-    calendarStr += '  <th class="calendar__day__header">' + \
+    calendarStr += '  <th scope="col" class="calendar__day__header">' + \
         translate['Sat'] + '</th>\n'
     calendarStr += '</tr>\n'
     calendarStr += '</thead>\n'

From f24f26a31f9785963669a744255a0ffdeb9fd1b3 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 15:13:07 +0000
Subject: [PATCH 13/27] Keyboard navigation menu for calendar

---
 daemon.py          |  3 ++-
 webapp_calendar.py | 37 ++++++++++++++++++++++++++++++++-----
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/daemon.py b/daemon.py
index 3e091bebc..4d3041ad9 100644
--- a/daemon.py
+++ b/daemon.py
@@ -11085,7 +11085,8 @@ class PubServer(BaseHTTPRequestHandler):
                                    self.server.translate,
                                    self.server.baseDir, self.path,
                                    self.server.httpPrefix,
-                                   self.server.domainFull).encode('utf-8')
+                                   self.server.domainFull,
+                                   self.server.textModeBanner).encode('utf-8')
                 msglen = len(msg)
                 self._set_headers('text/html', msglen, cookie, callingDomain)
                 self._write(msg)
diff --git a/webapp_calendar.py b/webapp_calendar.py
index 72342a468..0b54cc36a 100644
--- a/webapp_calendar.py
+++ b/webapp_calendar.py
@@ -21,6 +21,8 @@ from happening import getCalendarEvents
 from webapp_utils import htmlHeaderWithExternalStyle
 from webapp_utils import htmlFooter
 from webapp_utils import getAltPath
+from webapp_utils import htmlHideFromScreenReader
+from webapp_utils import htmlKeyboardNavigation
 
 
 def htmlCalendarDeleteConfirm(cssCache: {}, translate: {}, baseDir: str,
@@ -200,7 +202,8 @@ def _htmlCalendarDay(cssCache: {}, translate: {},
 
 def htmlCalendar(cssCache: {}, translate: {},
                  baseDir: str, path: str,
-                 httpPrefix: str, domainFull: str) -> str:
+                 httpPrefix: str, domainFull: str,
+                 textModeBanner: str) -> str:
     """Show the calendar for a person
     """
     domain = domainFull
@@ -297,8 +300,10 @@ def htmlCalendar(cssCache: {}, translate: {},
 
     instanceTitle = \
         getConfigParam(baseDir, 'instanceTitle')
-    calendarStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle)
-    calendarStr += '<main><table class="calendar">\n'
+    headerStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle)
+
+    # the main graphical calendar as a table
+    calendarStr = '<main><table class="calendar">\n'
     calendarStr += '<caption class="calendar__banner--month">\n'
     calendarStr += \
         '  <a href="' + calActor + '/calendar?year=' + str(prevYear) + \
@@ -338,6 +343,12 @@ def htmlCalendar(cssCache: {}, translate: {},
     calendarStr += '</thead>\n'
     calendarStr += '<tbody>\n'
 
+    # beginning of the links used for accessibility
+    navLinks = {}
+    timelineLinkStr = htmlHideFromScreenReader('🏠') + ' ' + \
+        translate['Switch to timeline view']
+    navLinks[timelineLinkStr] = calActor + '/inbox'
+
     dayOfMonth = 0
     dow = weekDayOfMonthStart(monthNumber, year)
     for weekOfMonth in range(1, 7):
@@ -362,6 +373,11 @@ def htmlCalendar(cssCache: {}, translate: {},
                     dayLink = '<a href="' + url + '" ' + \
                         'title="' + dayDescription + '">' + \
                         str(dayOfMonth) + '</a>'
+                    # accessibility menu links
+                    menuOptionStr = \
+                        htmlHideFromScreenReader('📅') + ' ' + \
+                        dayDescription
+                    navLinks[menuOptionStr] = url
                     # there are events for this day
                     if not isToday:
                         calendarStr += \
@@ -389,5 +405,16 @@ def htmlCalendar(cssCache: {}, translate: {},
 
     calendarStr += '</tbody>\n'
     calendarStr += '</table></main>\n'
-    calendarStr += htmlFooter()
-    return calendarStr
+
+    # end of the links used for accessibility
+    nextMonthStr = \
+        htmlHideFromScreenReader('→') + ' ' + translate['Next month']
+    navLinks[nextMonthStr] = calActor + '/calendar?year=' + str(nextYear) + \
+        '?month=' + str(nextMonthNumber)
+    prevMonthStr = \
+        htmlHideFromScreenReader('←') + ' ' + translate['Previous month']
+    navLinks[prevMonthStr] = calActor + '/calendar?year=' + str(prevYear) + \
+        '?month=' + str(prevMonthNumber)
+    screenReaderCal = htmlKeyboardNavigation(textModeBanner, navLinks)
+
+    return headerStr + screenReaderCal + calendarStr + htmlFooter()

From d77bd49c89b3383912f066cde952ba4a99afe8d4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 15:15:26 +0000
Subject: [PATCH 14/27] Transparent style

---
 epicyon-calendar.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/epicyon-calendar.css b/epicyon-calendar.css
index 223f3836a..f9d48b826 100644
--- a/epicyon-calendar.css
+++ b/epicyon-calendar.css
@@ -84,6 +84,14 @@ a:focus {
     border: 2px solid var(--focus-color);
 }
 
+.transparent {
+    color: transparent;
+    background: transparent;
+    font-size: 0px;
+    line-height: 0px;
+    height: 0px;
+}
+
 .calendar__day__header,
 .calendar__day__cell {
     border: 2px solid var(--lines-color);

From a18697d0fa343c40e8b8a89d2f6b9305b9fc315b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 15:28:11 +0000
Subject: [PATCH 15/27] Show month name in keyboard navigation

---
 webapp_calendar.py | 3 ++-
 webapp_timeline.py | 2 +-
 webapp_utils.py    | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/webapp_calendar.py b/webapp_calendar.py
index 0b54cc36a..025614e79 100644
--- a/webapp_calendar.py
+++ b/webapp_calendar.py
@@ -415,6 +415,7 @@ def htmlCalendar(cssCache: {}, translate: {},
         htmlHideFromScreenReader('←') + ' ' + translate['Previous month']
     navLinks[prevMonthStr] = calActor + '/calendar?year=' + str(prevYear) + \
         '?month=' + str(prevMonthNumber)
-    screenReaderCal = htmlKeyboardNavigation(textModeBanner, navLinks)
+    screenReaderCal = \
+        htmlKeyboardNavigation(textModeBanner, navLinks, monthName)
 
     return headerStr + screenReaderCal + calendarStr + htmlFooter()
diff --git a/webapp_timeline.py b/webapp_timeline.py
index f3707b826..0c0407520 100644
--- a/webapp_timeline.py
+++ b/webapp_timeline.py
@@ -432,7 +432,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
     }
     if moderator:
         navLinks[menuModeration] = usersPath + '/moderation#modtimeline'
-    tlStr += htmlKeyboardNavigation(textModeBanner, navLinks,
+    tlStr += htmlKeyboardNavigation(textModeBanner, navLinks, None,
                                     usersPath, translate, followApprovals)
 
     # banner and row of buttons
diff --git a/webapp_utils.py b/webapp_utils.py
index 1511b1408..9d3e97244 100644
--- a/webapp_utils.py
+++ b/webapp_utils.py
@@ -887,6 +887,7 @@ def htmlHideFromScreenReader(htmlStr: str) -> str:
 
 
 def htmlKeyboardNavigation(banner: str, links: {},
+                           subHeading=None,
                            usersPath=None, translate=None,
                            followApprovals=False) -> str:
     """Given a set of links return the html for keyboard navigation
@@ -896,6 +897,10 @@ def htmlKeyboardNavigation(banner: str, links: {},
     if banner:
         htmlStr += '<pre aria-label="">' + banner + '<br><br></pre>'
 
+    if subHeading:
+        htmlStr += '<label class="transparent">' + \
+            subHeading + '</label><br>'
+
     # show new follower approvals
     if usersPath and translate and followApprovals:
         htmlStr += '<strong><label class="transparent">' + \

From 5fe12e343a3b6d7974cc39f0e0c0913bce8ed7a4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 15:31:47 +0000
Subject: [PATCH 16/27] Strong month name

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

diff --git a/webapp_utils.py b/webapp_utils.py
index 9d3e97244..014b42a19 100644
--- a/webapp_utils.py
+++ b/webapp_utils.py
@@ -898,8 +898,8 @@ def htmlKeyboardNavigation(banner: str, links: {},
         htmlStr += '<pre aria-label="">' + banner + '<br><br></pre>'
 
     if subHeading:
-        htmlStr += '<label class="transparent">' + \
-            subHeading + '</label><br>'
+        htmlStr += '<strong><label class="transparent">' + \
+            subHeading + '</label></strong><br>'
 
     # show new follower approvals
     if usersPath and translate and followApprovals:

From 493534341ffd1d050c9d72927ca80386b5f4c6a3 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 17:08:48 +0000
Subject: [PATCH 17/27] Include emoji within display names

---
 webapp_profile.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/webapp_profile.py b/webapp_profile.py
index b4859a6d9..8c7704390 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -1745,6 +1745,10 @@ def _individualFollowAsHtml(translate: {},
     if avatarUrl2:
         avatarUrl = avatarUrl2
     if displayName:
+        displayName = \
+            addEmojiToDisplayName(baseDir, httpPrefix,
+                                  actorNickname, domain,
+                                  displayName, False)
         titleStr = displayName
 
     if dormant:

From 8a499bb5746ff024d173ddf4d18092cb0510f50f Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 18:50:12 +0000
Subject: [PATCH 18/27] Android emoji

---
 emoji/android.png        | Bin 0 -> 6455 bytes
 emoji/default_emoji.json |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 emoji/android.png

diff --git a/emoji/android.png b/emoji/android.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fb586588a72561c2985ac665a7ae2a92ed7e484
GIT binary patch
literal 6455
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
RS(g9+002ovPDHLkV1gO_EZYD8

literal 0
HcmV?d00001

diff --git a/emoji/default_emoji.json b/emoji/default_emoji.json
index 9f86c0384..f241708d0 100644
--- a/emoji/default_emoji.json
+++ b/emoji/default_emoji.json
@@ -1,4 +1,5 @@
 {
+    "android": "android",
     "popcorn": "1F37F",
     "1stplacemedal": "1F947",
     "abbutton": "1F18E",

From 37c0ea8e832c6930a1c3014e23f80ac6bd530e45 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 19:29:10 +0000
Subject: [PATCH 19/27] Text mode banner for person options

---
 daemon.py                | 3 ++-
 webapp_person_options.py | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/daemon.py b/daemon.py
index 4d3041ad9..12c69af1f 100644
--- a/daemon.py
+++ b/daemon.py
@@ -5469,7 +5469,8 @@ class PubServer(BaseHTTPRequestHandler):
                                     self.server.dormantMonths,
                                     backToPath,
                                     lockedAccount,
-                                    movedTo, alsoKnownAs).encode('utf-8')
+                                    movedTo, alsoKnownAs,
+                                    self.server.textModeBanner).encode('utf-8')
             msglen = len(msg)
             self._set_headers('text/html', msglen,
                               cookie, callingDomain)
diff --git a/webapp_person_options.py b/webapp_person_options.py
index 3dc819f7b..6c9928220 100644
--- a/webapp_person_options.py
+++ b/webapp_person_options.py
@@ -24,6 +24,7 @@ from followingCalendar import receivingCalendarEvents
 from webapp_utils import htmlHeaderWithExternalStyle
 from webapp_utils import htmlFooter
 from webapp_utils import getBrokenLinkSubstitute
+from webapp_utils import htmlKeyboardNavigation
 
 
 def htmlPersonOptions(defaultTimeline: str,
@@ -49,7 +50,8 @@ def htmlPersonOptions(defaultTimeline: str,
                       backToPath: str,
                       lockedAccount: bool,
                       movedTo: str,
-                      alsoKnownAs: []) -> str:
+                      alsoKnownAs: [],
+                      textModeBanner: str) -> str:
     """Show options for a person: view/follow/block/report
     """
     optionsDomain, optionsPort = getDomainFromActor(optionsActor)
@@ -114,6 +116,7 @@ def htmlPersonOptions(defaultTimeline: str,
     instanceTitle = \
         getConfigParam(baseDir, 'instanceTitle')
     optionsStr = htmlHeaderWithExternalStyle(cssFilename, instanceTitle)
+    optionsStr += htmlKeyboardNavigation(textModeBanner, {})
     optionsStr += '<br><br>\n'
     optionsStr += '<div class="options">\n'
     optionsStr += '  <div class="optionsAvatar">\n'

From 15d27d842e1f9ac957e4d9ee634dbc83a6580b75 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 19:30:22 +0000
Subject: [PATCH 20/27] Remove tab on domate button link

---
 webapp_person_options.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp_person_options.py b/webapp_person_options.py
index 6c9928220..dc2be6fea 100644
--- a/webapp_person_options.py
+++ b/webapp_person_options.py
@@ -110,7 +110,7 @@ def htmlPersonOptions(defaultTimeline: str,
     if donateUrl:
         donateStr = \
             '    <a href="' + donateUrl + \
-            '"><button class="button" name="submitDonate">' + \
+            ' tabindex="-1""><button class="button" name="submitDonate">' + \
             translate['Donate'] + '</button></a>\n'
 
     instanceTitle = \

From 8532e71cc1729a87d50e55429752e056b7b18dde Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 12 Feb 2021 19:37:24 +0000
Subject: [PATCH 21/27] Transparent style

---
 epicyon-options.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/epicyon-options.css b/epicyon-options.css
index aaff9989b..f7093c1a7 100644
--- a/epicyon-options.css
+++ b/epicyon-options.css
@@ -98,6 +98,14 @@ a:focus {
     border: 2px solid var(--focus-color);
 }
 
+.transparent {
+    color: transparent;
+    background: transparent;
+    font-size: 0px;
+    line-height: 0px;
+    height: 0px;
+}
+
 .follow {
     height: 100%;
     position: relative;

From 5ef5174feedab3e882a314a90c2634fa6ac0b1a1 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 13 Feb 2021 10:01:04 +0000
Subject: [PATCH 22/27] Refresh newswire after removing or suspending an
 account

---
 daemon.py     |  2 +-
 newsdaemon.py | 12 ------------
 person.py     |  9 +++++++++
 utils.py      | 11 +++++++++++
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/daemon.py b/daemon.py
index 12c69af1f..079c3d7e7 100644
--- a/daemon.py
+++ b/daemon.py
@@ -218,6 +218,7 @@ from utils import loadJson
 from utils import saveJson
 from utils import isSuspended
 from utils import dangerousMarkup
+from utils import refreshNewswire
 from manualapprove import manualDenyFollowRequest
 from manualapprove import manualApproveFollowRequest
 from announce import createAnnounce
@@ -255,7 +256,6 @@ from newswire import rss2Footer
 from newswire import loadHashtagCategories
 from newsdaemon import runNewswireWatchdog
 from newsdaemon import runNewswireDaemon
-from newsdaemon import refreshNewswire
 from filters import isFiltered
 from filters import addGlobalFilter
 from filters import removeGlobalFilter
diff --git a/newsdaemon.py b/newsdaemon.py
index e52932072..a32628428 100644
--- a/newsdaemon.py
+++ b/newsdaemon.py
@@ -750,15 +750,3 @@ def runNewswireWatchdog(projectVersion: str, httpd) -> None:
                 newswireOriginal.clone(runNewswireDaemon)
             httpd.thrNewswireDaemon.start()
             print('Restarting newswire daemon...')
-
-
-def refreshNewswire(baseDir: str) -> None:
-    """Causes the newswire to be updated.
-    This creates a file which is then detected by the daemon
-    """
-    refreshFilename = baseDir + '/accounts/.refresh_newswire'
-    if os.path.isfile(refreshFilename):
-        return
-    refreshFile = open(refreshFilename, 'w+')
-    refreshFile.write('\n')
-    refreshFile.close()
diff --git a/person.py b/person.py
index 71422ac42..b6bf9baf4 100644
--- a/person.py
+++ b/person.py
@@ -40,6 +40,7 @@ from utils import loadJson
 from utils import saveJson
 from utils import setConfigParam
 from utils import getConfigParam
+from utils import refreshNewswire
 
 
 def generateRSAKey() -> (str, str):
@@ -915,6 +916,9 @@ def removeAccount(baseDir: str, nickname: str,
         os.remove(baseDir + '/wfdeactivated/' + handle + '.json')
     if os.path.isdir(baseDir + '/sharefilesdeactivated/' + nickname):
         shutil.rmtree(baseDir + '/sharefilesdeactivated/' + nickname)
+
+    refreshNewswire(baseDir)
+
     return True
 
 
@@ -944,6 +948,9 @@ def deactivateAccount(baseDir: str, nickname: str, domain: str) -> bool:
             os.mkdir(deactivatedSharefilesDir)
         shutil.move(baseDir + '/sharefiles/' + nickname,
                     deactivatedSharefilesDir + '/' + nickname)
+
+    refreshNewswire(baseDir)
+
     return os.path.isdir(deactivatedDir + '/' + nickname + '@' + domain)
 
 
@@ -970,6 +977,8 @@ def activateAccount(baseDir: str, nickname: str, domain: str) -> None:
             shutil.move(deactivatedSharefilesDir + '/' + nickname,
                         baseDir + '/sharefiles/' + nickname)
 
+    refreshNewswire(baseDir)
+
 
 def isPersonSnoozed(baseDir: str, nickname: str, domain: str,
                     snoozeActor: str) -> bool:
diff --git a/utils.py b/utils.py
index 5a58d45ce..d36fb5447 100644
--- a/utils.py
+++ b/utils.py
@@ -26,6 +26,17 @@ invalidCharacters = (
 )
 
 
+def refreshNewswire(baseDir: str):
+    """Causes the newswire to be updates after a change to user accounts
+    """
+    refreshNewswireFilename = baseDir + '/accounts/.refresh_newswire'
+    if os.path.isfile(refreshNewswireFilename):
+        return
+    refreshFile = open(refreshNewswireFilename, 'w+')
+    refreshFile.write('\n')
+    refreshFile.close()
+
+
 def getSHA256(msg: str):
     """Returns a SHA256 hash of the given string
     """

From d3abc360e332b23ffcf0cf28813a64ff1f5fe59e Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 13 Feb 2021 10:05:37 +0000
Subject: [PATCH 23/27] Refresh newswire after changing post to newsire status
 for account

---
 daemon.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/daemon.py b/daemon.py
index 079c3d7e7..62d3fbe7d 100644
--- a/daemon.py
+++ b/daemon.py
@@ -1948,12 +1948,14 @@ class PubServer(BaseHTTPRequestHandler):
                 if postsToNews == 'on':
                     if os.path.isfile(newswireBlockedFilename):
                         os.remove(newswireBlockedFilename)
+                        refreshNewswire(self.server.baseDir)
                 else:
                     if os.path.isdir(accountDir):
                         noNewswireFile = open(newswireBlockedFilename, "w+")
                         if noNewswireFile:
                             noNewswireFile.write('\n')
                             noNewswireFile.close()
+                            refreshNewswire(self.server.baseDir)
             usersPathStr = \
                 usersPath + '/' + self.server.defaultTimeline + \
                 '?page=' + str(pageNumber)

From 03c234eac95b3283b0ec91d94ec3e2f0916be707 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 13 Feb 2021 11:37:02 +0000
Subject: [PATCH 24/27] Featured writers

---
 daemon.py                | 39 ++++++++++++++++++++++++++++++++++++++-
 outbox.py                | 19 +++++++++++--------
 translations/ar.json     |  3 ++-
 translations/ca.json     |  3 ++-
 translations/cy.json     |  3 ++-
 translations/de.json     |  3 ++-
 translations/en.json     |  3 ++-
 translations/es.json     |  3 ++-
 translations/fr.json     |  3 ++-
 translations/ga.json     |  3 ++-
 translations/hi.json     |  3 ++-
 translations/it.json     |  3 ++-
 translations/ja.json     |  3 ++-
 translations/oc.json     |  3 ++-
 translations/pt.json     |  3 ++-
 translations/ru.json     |  3 ++-
 translations/zh.json     |  3 ++-
 utils.py                 | 10 ++++++++++
 webapp_person_options.py | 22 +++++++++++++++++++++-
 19 files changed, 110 insertions(+), 25 deletions(-)

diff --git a/daemon.py b/daemon.py
index 62d3fbe7d..d4e9dd30c 100644
--- a/daemon.py
+++ b/daemon.py
@@ -1964,6 +1964,42 @@ class PubServer(BaseHTTPRequestHandler):
             self.server.POSTbusy = False
             return
 
+        # person options screen, permission to post to featured articles
+        # See htmlPersonOptions
+        if '&submitPostToFeatures=' in optionsConfirmParams:
+            adminNickname = getConfigParam(self.server.baseDir, 'admin')
+            if (chooserNickname != optionsNickname and
+                (chooserNickname == adminNickname or
+                 (isModerator(self.server.baseDir, chooserNickname) and
+                  not isModerator(self.server.baseDir, optionsNickname)))):
+                postsToFeatures = None
+                if 'postsToFeatures=' in optionsConfirmParams:
+                    postsToFeatures = \
+                        optionsConfirmParams.split('postsToFeatures=')[1]
+                    if '&' in postsToFeatures:
+                        postsToFeatures = postsToFeatures.split('&')[0]
+                accountDir = self.server.baseDir + '/accounts/' + \
+                    optionsNickname + '@' + optionsDomain
+                featuresBlockedFilename = accountDir + '/.nofeatures'
+                if postsToFeatures == 'on':
+                    if os.path.isfile(featuresBlockedFilename):
+                        os.remove(featuresBlockedFilename)
+                        refreshNewswire(self.server.baseDir)
+                else:
+                    if os.path.isdir(accountDir):
+                        noFeaturesFile = open(featuresBlockedFilename, "w+")
+                        if noFeaturesFile:
+                            noFeaturesFile.write('\n')
+                            noFeaturesFile.close()
+                            refreshNewswire(self.server.baseDir)
+            usersPathStr = \
+                usersPath + '/' + self.server.defaultTimeline + \
+                '?page=' + str(pageNumber)
+            self._redirect_headers(usersPathStr, cookie,
+                                   callingDomain)
+            self.server.POSTbusy = False
+            return
+
         # person options screen, permission to post to newswire
         # See htmlPersonOptions
         if '&submitModNewsPosts=' in optionsConfirmParams:
@@ -5472,7 +5508,8 @@ class PubServer(BaseHTTPRequestHandler):
                                     backToPath,
                                     lockedAccount,
                                     movedTo, alsoKnownAs,
-                                    self.server.textModeBanner).encode('utf-8')
+                                    self.server.textModeBanner,
+                                    self.server.newsInstance).encode('utf-8')
             msglen = len(msg)
             self._set_headers('text/html', msglen,
                               cookie, callingDomain)
diff --git a/outbox.py b/outbox.py
index e50000386..2c3fda855 100644
--- a/outbox.py
+++ b/outbox.py
@@ -18,6 +18,7 @@ from utils import getFullDomain
 from utils import removeIdEnding
 from utils import getDomainFromActor
 from utils import dangerousMarkup
+from utils import isFeaturedWriter
 from blocking import isBlockedDomain
 from blocking import outboxBlock
 from blocking import outboxUndoBlock
@@ -211,14 +212,16 @@ def postMessageToOutbox(messageJson: {}, postToNickname: str,
         # save all instance blogs to the news actor
         if postToNickname != 'news' and outboxName == 'tlblogs':
             if '/' in savedFilename:
-                savedPostId = savedFilename.split('/')[-1]
-                blogsDir = baseDir + '/accounts/news@' + domain + '/tlblogs'
-                if not os.path.isdir(blogsDir):
-                    os.mkdir(blogsDir)
-                copyfile(savedFilename, blogsDir + '/' + savedPostId)
-                inboxUpdateIndex('tlblogs', baseDir,
-                                 'news@' + domain,
-                                 savedFilename, debug)
+                if isFeaturedWriter(baseDir, postToNickname, domain):
+                    savedPostId = savedFilename.split('/')[-1]
+                    blogsDir = \
+                        baseDir + '/accounts/news@' + domain + '/tlblogs'
+                    if not os.path.isdir(blogsDir):
+                        os.mkdir(blogsDir)
+                    copyfile(savedFilename, blogsDir + '/' + savedPostId)
+                    inboxUpdateIndex('tlblogs', baseDir,
+                                     'news@' + domain,
+                                     savedFilename, debug)
 
                 # clear the citations file if it exists
                 citationsFilename = \
diff --git a/translations/ar.json b/translations/ar.json
index b3a408074..605d5b98b 100644
--- a/translations/ar.json
+++ b/translations/ar.json
@@ -367,5 +367,6 @@
     "Skip to timeline": "تخطي إلى الجدول الزمني",
     "Skip to Newswire": "انتقل إلى Newswire",
     "Skip to Links": "تخطي إلى روابط الويب",
-    "Publish a blog article": "نشر مقال بلوق"
+    "Publish a blog article": "نشر مقال بلوق",
+    "Featured writer": "كاتب متميز"
 }
diff --git a/translations/ca.json b/translations/ca.json
index 232ee4300..3c8846bbf 100644
--- a/translations/ca.json
+++ b/translations/ca.json
@@ -367,5 +367,6 @@
     "Skip to timeline": "Ves a la cronologia",
     "Skip to Newswire": "Vés a Newswire",
     "Skip to Links": "Vés als enllaços web",
-    "Publish a blog article": "Publicar un article del bloc"
+    "Publish a blog article": "Publicar un article del bloc",
+    "Featured writer": "Escriptor destacat"
 }
diff --git a/translations/cy.json b/translations/cy.json
index 55b4b95e1..6e45de39d 100644
--- a/translations/cy.json
+++ b/translations/cy.json
@@ -367,5 +367,6 @@
     "Skip to timeline": "Neidio i'r llinell amser",
     "Skip to Newswire": "Neidio i Newswire",
     "Skip to Links": "Neidio i Dolenni Gwe",
-    "Publish a blog article": "Cyhoeddi erthygl blog"
+    "Publish a blog article": "Cyhoeddi erthygl blog",
+    "Featured writer": "Awdur dan sylw"
 }
diff --git a/translations/de.json b/translations/de.json
index 140712ebd..c15cb492f 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -367,5 +367,6 @@
     "Skip to timeline": "Zur Zeitleiste springen",
     "Skip to Newswire": "Springe zu Newswire",
     "Skip to Links": "Springe zu Weblinks",
-    "Publish a blog article": "Veröffentlichen Sie einen Blog-Artikel"
+    "Publish a blog article": "Veröffentlichen Sie einen Blog-Artikel",
+    "Featured writer": "Ausgewählter Schriftsteller"
 }
diff --git a/translations/en.json b/translations/en.json
index 77da14052..3fbbfdd34 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -367,5 +367,6 @@
     "Skip to timeline": "Skip to timeline",
     "Skip to Newswire": "Skip to Newswire",
     "Skip to Links": "Skip to Links",
-    "Publish a blog article": "Publish a blog article"
+    "Publish a blog article": "Publish a blog article",
+    "Featured writer": "Featured writer"
 }
diff --git a/translations/es.json b/translations/es.json
index cf09d1446..3566d06b0 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -367,5 +367,6 @@
     "Skip to timeline": "Saltar a la línea de tiempo",
     "Skip to Newswire": "Saltar a Newswire",
     "Skip to Links": "Saltar a enlaces web",
-    "Publish a blog article": "Publica un artículo de blog"
+    "Publish a blog article": "Publica un artículo de blog",
+    "Featured writer": "Escritora destacada"
 }
diff --git a/translations/fr.json b/translations/fr.json
index ac51b24fa..78c7ff547 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -367,5 +367,6 @@
     "Skip to timeline": "Passer à la chronologie",
     "Skip to Newswire": "Passer à Newswire",
     "Skip to Links": "Passer aux liens Web",
-    "Publish a blog article": "Publier un article de blog"
+    "Publish a blog article": "Publier un article de blog",
+    "Featured writer": "Écrivain en vedette"
 }
diff --git a/translations/ga.json b/translations/ga.json
index 5cff4c525..75f87780c 100644
--- a/translations/ga.json
+++ b/translations/ga.json
@@ -367,5 +367,6 @@
     "Skip to timeline": "Scipeáil chuig an amlíne",
     "Skip to Newswire": "Scipeáil chuig Newswire",
     "Skip to Links": "Scipeáil chuig Naisc Ghréasáin",
-    "Publish a blog article": "Foilsigh alt blagála"
+    "Publish a blog article": "Foilsigh alt blagála",
+    "Featured writer": "Scríbhneoir mór le rá"
 }
diff --git a/translations/hi.json b/translations/hi.json
index a83d8d5a9..acf417f88 100644
--- a/translations/hi.json
+++ b/translations/hi.json
@@ -367,5 +367,6 @@
     "Skip to timeline": "टाइमलाइन पर जाएं",
     "Skip to Newswire": "Newswire पर जाएं",
     "Skip to Links": "वेब लिंक पर जाएं",
-    "Publish a blog article": "एक ब्लॉग लेख प्रकाशित करें"
+    "Publish a blog article": "एक ब्लॉग लेख प्रकाशित करें",
+    "Featured writer": "फीचर्ड लेखक"
 }
diff --git a/translations/it.json b/translations/it.json
index e7082ff98..f2bc1e1ed 100644
--- a/translations/it.json
+++ b/translations/it.json
@@ -367,5 +367,6 @@
     "Skip to timeline": "Passa alla sequenza temporale",
     "Skip to Newswire": "Passa a Newswire",
     "Skip to Links": "Passa a collegamenti Web",
-    "Publish a blog article": "Pubblica un articolo sul blog"
+    "Publish a blog article": "Pubblica un articolo sul blog",
+    "Featured writer": "Scrittore in primo piano"
 }
diff --git a/translations/ja.json b/translations/ja.json
index 38d6685a4..9f1275544 100644
--- a/translations/ja.json
+++ b/translations/ja.json
@@ -367,5 +367,6 @@
     "Skip to timeline": "タイムラインにスキップ",
     "Skip to Newswire": "Newswireにスキップ",
     "Skip to Links": "Webリンクにスキップ",
-    "Publish a blog article": "ブログ記事を公開する"
+    "Publish a blog article": "ブログ記事を公開する",
+    "Featured writer": "注目の作家"
 }
diff --git a/translations/oc.json b/translations/oc.json
index 7cd70a858..c9e3717a0 100644
--- a/translations/oc.json
+++ b/translations/oc.json
@@ -363,5 +363,6 @@
     "Skip to timeline": "Skip to timeline",
     "Skip to Newswire": "Skip to Newswire",
     "Skip to Links": "Skip to Links",
-    "Publish a blog article": "Publish a blog article"
+    "Publish a blog article": "Publish a blog article",
+    "Featured writer": "Featured writer"
 }
diff --git a/translations/pt.json b/translations/pt.json
index 2abe336bf..b2a29ca2d 100644
--- a/translations/pt.json
+++ b/translations/pt.json
@@ -367,5 +367,6 @@
     "Skip to timeline": "Pular para a linha do tempo",
     "Skip to Newswire": "Pular para Newswire",
     "Skip to Links": "Pular para links da web",
-    "Publish a blog article": "Publique um artigo de blog"
+    "Publish a blog article": "Publique um artigo de blog",
+    "Featured writer": "Escritor em destaque"
 }
diff --git a/translations/ru.json b/translations/ru.json
index b75628208..618c5cbf0 100644
--- a/translations/ru.json
+++ b/translations/ru.json
@@ -367,5 +367,6 @@
     "Skip to timeline": "Перейти к временной шкале",
     "Skip to Newswire": "Перейти к ленте новостей",
     "Skip to Links": "Перейти к веб-ссылкам",
-    "Publish a blog article": "Опубликовать статью в блоге"
+    "Publish a blog article": "Опубликовать статью в блоге",
+    "Featured writer": "Избранный писатель"
 }
diff --git a/translations/zh.json b/translations/zh.json
index ea0dcce39..e7fab5755 100644
--- a/translations/zh.json
+++ b/translations/zh.json
@@ -367,5 +367,6 @@
     "Skip to timeline": "跳到时间线",
     "Skip to Newswire": "跳到新闻专线",
     "Skip to Links": "跳到网页链接",
-    "Publish a blog article": "发布博客文章"
+    "Publish a blog article": "发布博客文章",
+    "Featured writer": "特色作家"
 }
diff --git a/utils.py b/utils.py
index d36fb5447..f1247e898 100644
--- a/utils.py
+++ b/utils.py
@@ -26,6 +26,16 @@ invalidCharacters = (
 )
 
 
+def isFeaturedWriter(baseDir: str, nickname: str, domain: str) -> bool:
+    """Is the given account a featured writer, appearing in the features
+    timeline on news instances?
+    """
+    featuresBlockedFilename = \
+        baseDir + '/accounts/' + \
+        nickname + '@' + domain + '/.nofeatures'
+    return not os.path.isfile(featuresBlockedFilename)
+
+
 def refreshNewswire(baseDir: str):
     """Causes the newswire to be updates after a change to user accounts
     """
diff --git a/webapp_person_options.py b/webapp_person_options.py
index dc2be6fea..75dd21045 100644
--- a/webapp_person_options.py
+++ b/webapp_person_options.py
@@ -17,6 +17,7 @@ from utils import isDormant
 from utils import removeHtml
 from utils import getDomainFromActor
 from utils import getNicknameFromActor
+from utils import isFeaturedWriter
 from blocking import isBlocked
 from follow import isFollowerOfPerson
 from follow import isFollowingActor
@@ -51,7 +52,8 @@ def htmlPersonOptions(defaultTimeline: str,
                       lockedAccount: bool,
                       movedTo: str,
                       alsoKnownAs: [],
-                      textModeBanner: str) -> str:
+                      textModeBanner: str,
+                      newsInstance: bool) -> str:
     """Show options for a person: view/follow/block/report
     """
     optionsDomain, optionsPort = getDomainFromActor(optionsActor)
@@ -287,6 +289,24 @@ def htmlPersonOptions(defaultTimeline: str,
             checkboxStr = checkboxStr.replace(' checked>', '>')
         optionsStr += checkboxStr
 
+    # checkbox for permission to post to featured articles
+    if newsInstance and optionsDomainFull == domainFull:
+        adminNickname = getConfigParam(baseDir, 'admin')
+        if (nickname == adminNickname or
+            (isModerator(baseDir, nickname) and
+             not isModerator(baseDir, optionsNickname))):
+            checkboxStr = \
+                '    <input type="checkbox" ' + \
+                'class="profilecheckbox" name="postsToFeatures" checked> ' + \
+                translate['Featured writer'] + \
+                '\n    <button type="submit" class="buttonsmall" ' + \
+                'name="submitPostToFeatures">' + \
+                translate['Submit'] + '</button><br>\n'
+            if not isFeaturedWriter(baseDir, optionsNickname,
+                                    optionsDomain):
+                checkboxStr = checkboxStr.replace(' checked>', '>')
+            optionsStr += checkboxStr
+
     optionsStr += optionsLinkStr
     backPath = '/'
     if nickname:

From ab6994329a2d442544ba0aef2c16fbd40f1453a7 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 13 Feb 2021 12:12:06 +0000
Subject: [PATCH 25/27] Remove endings from hashtags

---
 content.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/content.py b/content.py
index 1d8334412..13062660d 100644
--- a/content.py
+++ b/content.py
@@ -788,6 +788,12 @@ def addHtmlTags(baseDir: str, httpPrefix: str,
                     prevWordStr = ''
                     continue
             elif firstChar == '#':
+                # remove any endings from the hashtag
+                hashTagEndings = ('.', ':', ';', '-', '\n')
+                for ending in hashTagEndings:
+                    if wordStr.endswith(ending):
+                        wordStr = wordStr.replace(ending, '')
+
                 if _addHashTags(wordStr, httpPrefix, originalDomain,
                                 replaceHashTags, hashtags):
                     prevWordStr = ''

From 58ba1146a41296e28edbe88323e523199e2e9b69 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 13 Feb 2021 12:17:03 +0000
Subject: [PATCH 26/27] Remove only the last character

---
 content.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content.py b/content.py
index 13062660d..0d9fed4de 100644
--- a/content.py
+++ b/content.py
@@ -792,7 +792,7 @@ def addHtmlTags(baseDir: str, httpPrefix: str,
                 hashTagEndings = ('.', ':', ';', '-', '\n')
                 for ending in hashTagEndings:
                     if wordStr.endswith(ending):
-                        wordStr = wordStr.replace(ending, '')
+                        wordStr = wordStr[:len(wordStr) - 1]
 
                 if _addHashTags(wordStr, httpPrefix, originalDomain,
                                 replaceHashTags, hashtags):

From 460b8bd938bdd4823def8624e21f6716f4607703 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 13 Feb 2021 12:26:25 +0000
Subject: [PATCH 27/27] Only one truncation

---
 content.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/content.py b/content.py
index 0d9fed4de..bc3db29e6 100644
--- a/content.py
+++ b/content.py
@@ -793,6 +793,7 @@ def addHtmlTags(baseDir: str, httpPrefix: str,
                 for ending in hashTagEndings:
                     if wordStr.endswith(ending):
                         wordStr = wordStr[:len(wordStr) - 1]
+                        break
 
                 if _addHashTags(wordStr, httpPrefix, originalDomain,
                                 replaceHashTags, hashtags):