Merge branch 'main' of ssh://code.freedombone.net:2222/bashrc/epicyon

feeds.py

@@ -9,16 +9,14 @@ __module_group__ = "RSS Feeds"
 
 
 def rss2TagHeader(hashtag: str, httpPrefix: str, domainFull: str) -> str:
-    rssStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"
+    return \
-    rssStr += "<rss version=\"2.0\">"
+        "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" + \
-    rssStr += '<channel>'
+        "<rss version=\"2.0\">" + \
-    rssStr += '    <title>#' + hashtag + '</title>'
+        '<channel>' + \
-    rssStr += '    <link>' + httpPrefix + '://' + domainFull + \
+        '    <title>#' + hashtag + '</title>' + \
+        '    <link>' + httpPrefix + '://' + domainFull + \
         '/tags/rss2/' + hashtag + '</link>'
-    return rssStr
 
 
 def rss2TagFooter() -> str:
-    rssStr = '</channel>'
+    return '</channel></rss>'
-    rssStr += '</rss>'
-    return rssStr

follow.py

@@ -220,18 +220,13 @@ def isFollowerOfPerson(baseDir: str, nickname: str, domain: str,
 
     if handle in followersStr:
         alreadyFollowing = True
-    elif '://' + followerDomain + \
+    else:
-         '/profile/' + followerNickname in followersStr:
+        paths = ('/profile/', '/channel/', '/accounts/', '/u/')
-        alreadyFollowing = True
+        for userPath in paths:
-    elif '://' + followerDomain + \
+            url = '://' + followerDomain + userPath + followerNickname
-         '/channel/' + followerNickname in followersStr:
+            if url in followersStr:
-        alreadyFollowing = True
+                alreadyFollowing = True
-    elif '://' + followerDomain + \
+                break
-         '/accounts/' + followerNickname in followersStr:
-        alreadyFollowing = True
-    elif '://' + followerDomain + \
-         '/u/' + followerNickname in followersStr:
-        alreadyFollowing = True
 
     return alreadyFollowing
 

happening.py

@@ -132,12 +132,10 @@ def saveEventPost(baseDir: str, handle: str, postId: str,
     calendarNotificationFilename = \
         baseDir + '/accounts/' + handle + '/.newCalendar'
     with open(calendarNotificationFilename, 'w+') as calendarNotificationFile:
-        calendarNotificationFile.write('/calendar?year=' +
+        notifyStr = \
-                                       str(eventYear) +
+            '/calendar?year=' + str(eventYear) + '?month=' + \
-                                       '?month=' +
+            str(eventMonthNumber) + '?day=' + str(eventDayOfMonth)
-                                       str(eventMonthNumber) +
+        calendarNotificationFile.write(notifyStr)
-                                       '?day=' +
-                                       str(eventDayOfMonth))
     return True
 
 

manualapprove.py

@@ -111,18 +111,12 @@ def manualApproveFollowRequest(session, baseDir: str,
         reqNick = approveHandle.split('@')[0]
         reqDomain = approveHandle.split('@')[1].strip()
         reqPrefix = httpPrefix + '://' + reqDomain
-        if reqPrefix + '/profile/' + reqNick in approveFollowsStr:
+        paths = ('/profile/', '/channel/', '/accounts/', '/u/')
-            exists = True
+        for userPath in paths:
-            approveHandleFull = reqPrefix + '/profile/' + reqNick
+            if reqPrefix + userPath + reqNick in approveFollowsStr:
-        elif reqPrefix + '/channel/' + reqNick in approveFollowsStr:
+                exists = True
-            exists = True
+                approveHandleFull = reqPrefix + userPath + reqNick
-            approveHandleFull = reqPrefix + '/channel/' + reqNick
+                break
-        elif reqPrefix + '/accounts/' + reqNick in approveFollowsStr:
-            exists = True
-            approveHandleFull = reqPrefix + '/accounts/' + reqNick
-        elif reqPrefix + '/u/' + reqNick in approveFollowsStr:
-            exists = True
-            approveHandleFull = reqPrefix + '/u/' + reqNick
     if not exists:
         print('Manual follow accept: ' + approveHandleFull +
               ' not in requests file "' +

markdown.py

@@ -140,29 +140,22 @@ def markdownToHtml(markdown: str) -> str:
     linesList = markdown.split('\n')
     htmlStr = ''
     ctr = 0
+    titles = {
+        "h5": '#####',
+        "h4": '####',
+        "h3": '###',
+        "h2": '##',
+        "h1": '#'
+    }
     for line in linesList:
         if ctr > 0:
             htmlStr += '<br>'
-        if line.startswith('#####'):
+        for h, hashes in titles.items():
-            line = line.replace('#####', '').strip()
+            if line.startswith(hashes):
-            line = '<h5>' + line + '</h5>'
+                line = line.replace(hashes, '').strip()
-            ctr = -1
+                line = '<' + h + '>' + line + '</' + h + '>'
-        elif line.startswith('####'):
+                ctr = -1
-            line = line.replace('####', '').strip()
+                break
-            line = '<h4>' + line + '</h4>'
-            ctr = -1
-        elif line.startswith('###'):
-            line = line.replace('###', '').strip()
-            line = '<h3>' + line + '</h3>'
-            ctr = -1
-        elif line.startswith('##'):
-            line = line.replace('##', '').strip()
-            line = '<h2>' + line + '</h2>'
-            ctr = -1
-        elif line.startswith('#'):
-            line = line.replace('#', '').strip()
-            line = '<h1>' + line + '</h1>'
-            ctr = -1
         htmlStr += line
         ctr += 1
     return htmlStr

migrate.py

@@ -13,9 +13,9 @@ from utils import getNicknameFromActor
 from utils import getDomainFromActor
 from webfinger import webfingerHandle
 from blocking import isBlocked
-from session import getJson
 from posts import getUserUrl
 from follow import unfollowAccount
+from person import getActorJson
 
 
 def _moveFollowingHandlesForAccount(baseDir: str, nickname: str, domain: str,
@@ -73,22 +73,16 @@ def _updateMovedHandle(baseDir: str, nickname: str, domain: str,
         print('wfRequest error: ' + str(wfRequest['errors']))
         return ctr
 
-    profileStr = 'https://www.w3.org/ns/activitystreams'
-    asHeader = {
-        'Accept': 'application/activity+json; profile="' + profileStr + '"'
-    }
     if not personUrl:
         personUrl = getUserUrl(wfRequest, 0, debug)
         if not personUrl:
             return ctr
 
-    profileStr = 'https://www.w3.org/ns/activitystreams'
+    gnunet = False
-    asHeader = {
+    if httpPrefix == 'gnunet':
-        'Accept': 'application/ld+json; profile="' + profileStr + '"'
+        gnunet = True
-    }
     personJson = \
-        getJson(session, personUrl, asHeader, None,
+        getActorJson(domain, personUrl, httpPrefix, gnunet, debug)
-                debug, __version__, httpPrefix, None)
     if not personJson:
         return ctr
     if not personJson.get('movedTo'):

tests.py

@@ -3951,9 +3951,8 @@ def _testSpoofGeolocation() -> None:
         hourStr = str(hour)
         if hour < 10:
             hourStr = '0' + hourStr
-        currTime = datetime.datetime.strptime("2021-05-" + str(dayNumber) +
+        dateTimeStr = "2021-05-" + str(dayNumber) + " " + hourStr + ":14"
-                                              " " + hourStr + ":14",
+        currTime = datetime.datetime.strptime(dateTimeStr, "%Y-%m-%d %H:%M")
-                                              "%Y-%m-%d %H:%M")
         coords = spoofGeolocation('', 'new york, usa', currTime,
                                   decoySeed, citiesList, nogoList)
         longitude = coords[1]
@@ -3989,9 +3988,8 @@ def _testSpoofGeolocation() -> None:
         hourStr = str(hour)
         if hour < 10:
             hourStr = '0' + hourStr
-        currTime = datetime.datetime.strptime("2021-05-" + str(dayNumber) +
+        dateTimeStr = "2021-05-" + str(dayNumber) + " " + hourStr + ":14"
-                                              " " + hourStr + ":14",
+        currTime = datetime.datetime.strptime(dateTimeStr, "%Y-%m-%d %H:%M")
-                                              "%Y-%m-%d %H:%M")
         coords = spoofGeolocation('', 'london, england', currTime,
                                   decoySeed, citiesList, nogoList)
         longitude = coords[1]
@@ -4040,9 +4038,8 @@ def _testSpoofGeolocation() -> None:
         hourStr = str(hour)
         if hour < 10:
             hourStr = '0' + hourStr
-        currTime = datetime.datetime.strptime("2021-05-" + str(dayNumber) +
+        dateTimeStr = "2021-05-" + str(dayNumber) + " " + hourStr + ":14"
-                                              " " + hourStr + ":14",
+        currTime = datetime.datetime.strptime(dateTimeStr, "%Y-%m-%d %H:%M")
-                                              "%Y-%m-%d %H:%M")
         coords = spoofGeolocation('', 'SAN FRANCISCO, USA', currTime,
                                   decoySeed, citiesList, nogoList)
         longitude = coords[1]
@@ -4095,9 +4092,8 @@ def _testSpoofGeolocation() -> None:
         hourStr = str(hour)
         if hour < 10:
             hourStr = '0' + hourStr
-        currTime = datetime.datetime.strptime("2021-05-" + str(dayNumber) +
+        dateTimeStr = "2021-05-" + str(dayNumber) + " " + hourStr + ":14"
-                                              " " + hourStr + ":14",
+        currTime = datetime.datetime.strptime(dateTimeStr, "%Y-%m-%d %H:%M")
-                                              "%Y-%m-%d %H:%M")
         coords = spoofGeolocation('', 'SEATTLE, USA', currTime,
                                   decoySeed, citiesList, nogoList)
         longitude = coords[1]