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

blocking.py

@@ -706,9 +706,9 @@ def brochModeLapses(baseDir: str, lapseDays=7) -> bool:
         modifiedDate = \
             datetime.strptime(lastModified, "%Y-%m-%dT%H:%M:%SZ")
     except BaseException:
-        return brochMode
+        return False
     if not modifiedDate:
-        return brochMode
+        return False
     currTime = datetime.datetime.utcnow()
     daysSinceBroch = (currTime - modifiedDate).days
     if daysSinceBroch >= lapseDays:
@@ -717,6 +717,7 @@ def brochModeLapses(baseDir: str, lapseDays=7) -> bool:
             brochMode = False
             setConfigParam(baseDir, "brochMode", brochMode)
             print('Broch mode has elapsed')
+            return True
         except BaseException:
             pass
-    return brochMode
+    return False

inbox.py

@@ -10,6 +10,7 @@ import json
 import os
 import datetime
 import time
+import random
 from linked_data_sig import verifyJsonSignature
 from utils import dmAllowedFromDomain
 from utils import isRecentPost
@@ -2730,6 +2731,9 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int,
     # within _bounceDM
     lastBounceMessage = [int(time.time())]
 
+    # how long it takes for broch mode to lapse
+    brochLapseDays = random.randrange(7, 14)
+
     while True:
         time.sleep(1)
 
@@ -2737,7 +2741,8 @@ def runInboxQueue(recentPostsCache: {}, maxRecentPosts: int,
         heartBeatCtr += 1
         if heartBeatCtr >= 10:
             # turn off broch mode after it has timed out
-            brochModeLapses(baseDir)
+            if brochModeLapses(baseDir, brochLapseDays):
+                brochLapseDays = random.randrange(7, 14)
             print('>>> Heartbeat Q:' + str(len(queue)) + ' ' +
                   '{:%F %T}'.format(datetime.datetime.now()))
             heartBeatCtr = 0