v3.1.0
===================================================================== --- Changes ------------------------------ - improved capability of py/discord/post-message to include username flag, and defaults for each value in env config
This commit is contained in:
@ -1,9 +1,9 @@
|
||||
from py.lib.scwrypts import getenv
|
||||
from py.lib.http.discord import request
|
||||
|
||||
def send_message(content, channel_id=None, webhook=None, avatar_url=None, **kwargs):
|
||||
if channel_id is None:
|
||||
channel_id = getenv('DISCORD__DEFAULT_CHANNEL_ID', required=False)
|
||||
def send_message(content, channel_id=None, webhook=None, username=None, avatar_url=None, **kwargs):
|
||||
if username is None:
|
||||
username = getenv('DISCORD__DEFAULT_USERNAME', required=False)
|
||||
|
||||
if avatar_url is None:
|
||||
avatar_url = getenv('DISCORD__DEFAULT_AVATAR_URL', required=False)
|
||||
@ -12,11 +12,25 @@ def send_message(content, channel_id=None, webhook=None, avatar_url=None, **kwar
|
||||
|
||||
if webhook is not None:
|
||||
endpoint = f'webhooks/{webhook}'
|
||||
|
||||
elif channel_id is not None:
|
||||
endpoint = f'channels/{channel_id}/messages'
|
||||
|
||||
elif (webhook := getenv('DISCORD__DEFAULT_WEBHOOK', required=False)) is not None:
|
||||
endpoint = f'webhooks/{webhook}'
|
||||
|
||||
elif (channel_id := getenv('DISCORD__DEFAULT_CHANNEL_ID', required=False)) is not None:
|
||||
endpoint = f'channels/{channel_id}/messages'
|
||||
|
||||
else:
|
||||
raise ValueError('must provide target channel_id or webhook')
|
||||
|
||||
if (header := getenv('DISCORD__CONTENT_HEADER', required=False)) is not None:
|
||||
content = f'{header}{content}'
|
||||
|
||||
if (footer := getenv('DISCORD__CONTENT_FOOTER', required=False)) is not None:
|
||||
content = f'{content}{footer}'
|
||||
|
||||
|
||||
return request(
|
||||
method = 'POST',
|
||||
@ -25,7 +39,7 @@ def send_message(content, channel_id=None, webhook=None, avatar_url=None, **kwar
|
||||
key: value
|
||||
for key, value in {
|
||||
'content': content,
|
||||
'username': 'wrobot',
|
||||
'username': username,
|
||||
'avatar_url': avatar_url,
|
||||
**kwargs,
|
||||
}.items()
|
||||
|
Reference in New Issue
Block a user