diff --git a/config.json b/config.json index cbf9518..ad3bb99 100644 --- a/config.json +++ b/config.json @@ -49,6 +49,11 @@ "move_sent": false, "use_interval": false, "interval": "1h30m", + "submitted_caption": { + "enabled": true, + "ignore_admins": true, + "text": "#submitted" + }, "extensions": { "photo": [ "jpg", diff --git a/modules/sender.py b/modules/sender.py index 7e6adfb..2d90f30 100644 --- a/modules/sender.py +++ b/modules/sender.py @@ -77,11 +77,16 @@ async def send_content(app: PosterClient) -> None: else: caption = "" + if configGet("enabled", "posting", "submitted_caption") and ((submitted["user"] not in app.admins) or (configGet("ignore_admins", "posting", "submitted_caption") is True)): + caption = f"{caption}\n\n{configGet('text', 'posting', 'submitted_caption')}\n" + else: + caption = f"{caption}\n\n" + if configGet("enabled", "caption"): if configGet("link", "caption") != None: - caption = f"{caption}\n\n[{configGet('text', 'caption')}]({configGet('link', 'caption')})" + caption = f"{caption}[{configGet('text', 'caption')}]({configGet('link', 'caption')})" else: - caption = f"{caption}\n\n{configGet('text', 'caption')}" + caption = f"{caption}{configGet('text', 'caption')}" else: caption = caption