Merge branch 'main' of gitlab.com:bashrc2/epicyon

daemon.py

@@ -11973,7 +11973,8 @@ class PubServer(BaseHTTPRequestHandler):
         recentCrawlers = 60 * 60 * 24 * 30
         for uaStr, item in knownCrawlers.items():
             if item['lastseen'] - currTime < recentCrawlers:
-                crawlersList.append(str(item['hits']) + ' ' + uaStr)
+                hitsStr = str(item['hits']).zfill(8)
+                crawlersList.append(hitsStr + ' ' + uaStr)
         crawlersList.sort(reverse=True)
         msg = ''
         for lineStr in crawlersList:

fitnessFunctions.py

@@ -58,12 +58,7 @@ def sortedWatchPoints(fitness: {}, fitnessId: str) -> []:
         if not item.get('total'):
             continue
         averageTime = item['total'] * 1000 / item['ctr']
-        averageTimeStr = str(averageTime)
-        threshold = 10
-        while threshold < 100000:
-            if averageTime < threshold:
-                averageTimeStr = '0' + averageTimeStr
-            threshold *= 10
+        averageTimeStr = str(averageTime).zfill(8)
         result.append(averageTimeStr + ' ' + watchPoint)
     result.sort(reverse=True)
     return result

utils.py

@@ -1615,6 +1615,8 @@ def _deleteHashtagsOnPost(baseDir: str, postJsonObject: {}) -> None:
     # get the id of the post
     postId = removeIdEnding(postJsonObject['object']['id'])
     for tag in postJsonObject['object']['tag']:
+        if not tag.get('type'):
+            continue
         if tag['type'] != 'Hashtag':
             continue
         if not tag.get('name'):