diff --git a/discorss.py b/discorss.py index bf39fed..9dc64b1 100755 --- a/discorss.py +++ b/discorss.py @@ -1,5 +1,4 @@ #!/usr/bin/env python -# -*- coding: UTF-8 -*- # SPDX-License-Identifier: MPL-2.0 # SPDX-FileCopyrightText: © 2025 A.M. Rowsell @@ -45,12 +44,10 @@ def main(): now = time.mktime(time.localtime()) last_check = app_config["lastupdate"] for hook in app_config["feeds"]: - # Get the feed feed = feedparser.parse(hook["url"]) published_time = time.mktime(feed.entries[0]["published_parsed"]) published_time = published_time + hook["offset"] print(feed.entries[0]["published"], published_time, now) - # Generate the webhook webhook = { "embeds": [ { @@ -59,19 +56,15 @@ def main(): "description": getDescription(feed), "provider": "DiscoRSS", } - ] + ], } customHeader = { - "user-agent": "DiscoRSS (https://git.frzn.dev/amr/discorss, 0.1)", - "content-type": "application/json", + "User-Agent": "DiscoRSS (https://git.frzn.dev/amr/discorss.git, 0.1)" } if published_time > last_check and published_time < now: - print(json.dumps(webhook)) - r = requests.post( - hook["webhook"], data=json.dumps(webhook), headers=customHeader - ) + r = requests.post(hook["webhook"], json=webhook, headers=customHeader) print(webhook["embeds"][0]["title"]) - print(r.text, r.status_code, r.json()) + print(r.text, r.status_code, r.headers) app_config["lastupdate"] = now with open(config_file_path, "w") as config_file: json.dump(app_config, config_file, indent=4)