fmartingr/butterrobot
1
0
Fork 0
Code Issues Pull requests Projects Releases 8 Packages 1 Wiki Activity Actions

Added author information to message

Browse source
This commit is contained in:
Felipe M 2020-08-11 13:29:24 +02:00
parent e1c158bd6c
commit 562d7138c0
Signed by: fmartingr
GPG key ID: 716BC147715E716F
4 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
butterrobot/app.py
View file

@ -17,7 +17,9 @@ logger = structlog.get_logger(__name__)
app = Quart(__name__) app = Quart(__name__)
available_platforms = {} available_platforms = {}
plugins = get_available_plugins() plugins = get_available_plugins()
enabled_plugins = [plugin for plugin_name, plugin in plugins.items() if plugin_name in ENABLED_PLUGINS] enabled_plugins = [
plugin for plugin_name, plugin in plugins.items() if plugin_name in ENABLED_PLUGINS
]
@app.before_serving @app.before_serving
@ -39,11 +41,18 @@ async def incoming_platform_message_view(platform, path=None):
return {"error": "Unknown platform"}, 400 return {"error": "Unknown platform"}, 400
try: try:
message = await available_platforms[platform].parse_incoming_message(request=request) message = await available_platforms[platform].parse_incoming_message(
request=request
)
except Platform.PlatformAuthResponse as response: except Platform.PlatformAuthResponse as response:
return response.data, response.status_code return response.data, response.status_code
except Exception as error: except Exception as error:
logger.error(f"Error parsing message", platform=platform, error=error, traceback=traceback.format_exc()) logger.error(
f"Error parsing message",
platform=platform,
error=error,
traceback=traceback.format_exc(),
)
return {"error": str(error)}, 400 return {"error": str(error)}, 400
if not message: if not message:
@ -53,7 +62,7 @@ async def incoming_platform_message_view(platform, path=None):
if result := await plugin.on_message(message): if result := await plugin.on_message(message):
if isinstance(result, Message): if isinstance(result, Message):
result = [result] result = [result]
for out_message in result: for out_message in result:
await available_platforms[platform].methods.send_message(out_message) await available_platforms[platform].methods.send_message(out_message)

2
butterrobot/objects.py
View file

@ -7,6 +7,8 @@ from typing import Text, Optional
class Message: class Message:
text: Text text: Text
chat: Text chat: Text
author: Text
is_bot: bool = False
date: Optional[datetime] = None date: Optional[datetime] = None
id: Optional[Text] = None id: Optional[Text] = None
reply_to: Optional[Text] = None reply_to: Optional[Text] = None

2
butterrobot/platforms/slack.py
View file

@ -63,6 +63,8 @@ class SlackPlatform(Platform):
return Message( return Message(
id=data["event"].get("thread_ts", data["event"]["ts"]), id=data["event"].get("thread_ts", data["event"]["ts"]),
author=data["event"]["user"],
is_bot="bot_id" in data["event"],
date=datetime.fromtimestamp(int(float(data["event"]["event_ts"]))), date=datetime.fromtimestamp(int(float(data["event"]["event_ts"]))),
text=data["event"]["text"], text=data["event"]["text"],
chat=data["event"]["channel"], chat=data["event"]["channel"],

2
butterrobot/platforms/telegram.py
View file

@ -61,6 +61,8 @@ class TelegramPlatform(Platform):
id=request_data["message"]["message_id"], id=request_data["message"]["message_id"],
date=datetime.fromtimestamp(request_data["message"]["date"]), date=datetime.fromtimestamp(request_data["message"]["date"]),
text=str(request_data["message"]["text"]), text=str(request_data["message"]["text"]),
is_bot=request_data["message"]["from"]["is_bot"],
author=request_data["message"]["from"]["id"],
chat=str(request_data["message"]["chat"]["id"]), chat=str(request_data["message"]["chat"]["id"]),
raw=request_data, raw=request_data,
) )