vbatts/maubot_karma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use new ReactionEvent instead of GenericEvent

Browse source
This commit is contained in:
Tulir Asokan 2019-06-21 14:19:41 +03:00
parent 4a135ba1bc
commit 071377c930
1 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
karma/bot.py
View file

@ -19,8 +19,8 @@ import json
import html import html
from mautrix.client import Client from mautrix.client import Client
from mautrix.types import (Event, StateEvent, EventID, UserID, FileInfo, MessageType, from mautrix.types import (Event, StateEvent, EventID, UserID, FileInfo, MessageType, RelationType,
MediaMessageEventContent, EventType, GenericEvent, RedactionEvent) MediaMessageEventContent, EventType, ReactionEvent, RedactionEvent)
from mautrix.client.api.types.event.message import media_reply_fallback_body_map from mautrix.client.api.types.event.message import media_reply_fallback_body_map
from mautrix.util.config import BaseProxyConfig, ConfigUpdateHelper from mautrix.util.config import BaseProxyConfig, ConfigUpdateHelper
from maubot import Plugin, MessageEvent from maubot import Plugin, MessageEvent
@ -56,11 +56,6 @@ def sha1(val: str) -> str:
return hashlib.sha1(val.encode("utf-8")).hexdigest() return hashlib.sha1(val.encode("utf-8")).hexdigest()
def reaction_key(evt: GenericEvent) -> None:
relates_to = evt.content.get("m.relates_to", None) or {}
return relates_to.get("key") if relates_to.get("rel_type", None) == "m.annotation" else None
class KarmaBot(Plugin): class KarmaBot(Plugin):
karma_t: Type[Karma] karma_t: Type[Karma]
version: Type[Version] version: Type[Version]
@ -90,19 +85,19 @@ class KarmaBot(Plugin):
def downvote(self, evt: MessageEvent, _: Tuple[str]) -> Awaitable[None]: def downvote(self, evt: MessageEvent, _: Tuple[str]) -> Awaitable[None]:
return self._vote(evt, evt.content.get_reply_to(), -1) return self._vote(evt, evt.content.get_reply_to(), -1)
@command.passive(regex=UPVOTE_EMOJI, field=reaction_key, @command.passive(regex=UPVOTE_EMOJI, field=lambda evt: evt.content.relates_to.key,
event_type=EventType.find("m.reaction"), msgtypes=None) event_type=EventType.REACTION, msgtypes=None)
def upvote_react(self, evt: GenericEvent, key: Tuple[str]) -> Awaitable[None]: def upvote_react(self, evt: ReactionEvent, key: Tuple[str]) -> Awaitable[None]:
try: try:
return self._vote(evt, evt.content["m.relates_to"]["event_id"], 1) return self._vote(evt, evt.content.relates_to.event_id, 1)
except KeyError: except KeyError:
pass pass
@command.passive(regex=DOWNVOTE_EMOJI, field=reaction_key, @command.passive(regex=DOWNVOTE_EMOJI, field=lambda evt: evt.content.relates_to.key,
event_type=EventType.find("m.reaction"), msgtypes=None) event_type=EventType.REACTION, msgtypes=None)
def downvote_react(self, evt: GenericEvent, key: Tuple[str]) -> Awaitable[None]: def downvote_react(self, evt: ReactionEvent, key: Tuple[str]) -> Awaitable[None]:
try: try:
return self._vote(evt, evt.content["m.relates_to"]["event_id"], -1) return self._vote(evt, evt.content.relates_to.event_id, -1)
except KeyError: except KeyError:
pass pass