From: Roland Häder <roland@mxchange.org>
Date: Tue, 6 Jun 2023 10:16:56 +0000 (+0200)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fb0c7a423c23161376f2917dbd2be962128c3637;p=fba.git

Continued:
- renamed result <-> blocks
- added config entry 'hostname' which you should change to where you have
  installed it, e.g. mine is 'fba.mxchange.org' (password-protected)
---

diff --git a/api.py b/api.py
index 94fdc38..ec2e193 100644
--- a/api.py
+++ b/api.py
@@ -227,17 +227,17 @@ def rss(request: Request, domain: str = None):
     else:
         fba.cursor.execute("SELECT blocker, blocked, block_level, reason, first_seen, last_seen FROM blocks ORDER BY first_seen DESC LIMIT 50")
 
-    blocks = fba.cursor.fetchall()
+    result = fba.cursor.fetchall()
 
-    result = []
-    for blocker, blocked, block_level, reason, first_seen, last_seen in blocks:
+    blocks = []
+    for blocker, blocked, block_level, reason, first_seen, last_seen in result:
         first_seen = utils.format_datetime(datetime.fromtimestamp(first_seen))
         if reason == None or reason == '':
             reason = "No reason provided."
         else:
             reason = "Provided reason: '" + reason + "'"
 
-        result.append({
+        blocks.append({
             "blocker"    : blocker,
             "blocked"    : blocked,
             "block_level": block_level,
@@ -245,13 +245,12 @@ def rss(request: Request, domain: str = None):
             "first_seen" : first_seen
         })
 
-    timestamp = utils.format_datetime(datetime.now())
-
     return templates.TemplateResponse("rss.xml", {
         "request"  : request,
-        "timestamp": timestamp,
+        "timestamp": utils.format_datetime(datetime.now()),
         "domain"   : domain,
-        "blocks"   : result
+        "hostname" : config.get("hostname"),
+        "blocks"   : blocks
     }, headers={
         "Content-Type": "routerlication/rss+xml"
     })
diff --git a/config.defaults.json b/config.defaults.json
index 9fba2c1..02a7c74 100644
--- a/config.defaults.json
+++ b/config.defaults.json
@@ -6,6 +6,7 @@
     "useragent"         : "Mozilla/5.0 (Windows NT 10.0; rv:102.0) Gecko/20100101 Firefox/113.0",
     "connection_timeout": 30,
     "read_timeout"      : 5,
+    "hostname"          : "fba.ryona.agency",
     "nodeinfo_connection_timeout": 3,
     "nodeinfo_read_timeout"      : 2,
     "bot_enabled"       : false,
diff --git a/templates/rss.xml b/templates/rss.xml
index 5d63df9..9fe3962 100644
--- a/templates/rss.xml
+++ b/templates/rss.xml
@@ -9,7 +9,7 @@
  <item>
   <title>{{block['blocker']}} has applied '{{block['block_level']}}' restriction to {{block['blocked']}}</title>
   <description>{{block['reason']}}</description>
-  <link>https://fba.ryona.agency/?reverse={{block['blocker']}}</link>
+  <link>https://{{hostname}}/?reverse={{block['blocker']}}</link>
   <pubDate>{{block['first_seen']}}</pubDate>
  </item>
  {% endfor %}