Skip to content

Handle FCM events without ding IDs #540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danielcolquitt wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −3
Open

Handle FCM events without ding IDs #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ring_doorbell/listen/eventlistener.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,16 @@ def _get_ring_event(self, msg_data: dict) -> RingEvent | None:
event_kind = PUSH_NOTIFICATION_KINDS.get(event_category, "Unknown")
device = data["device"]
event = data["event"]
event_id = int(event["ding"]["id"])
created_at = event["ding"]["created_at"]
ding = event["ding"]
created_at = ding["created_at"]
create_seconds = parse_datetime(created_at).timestamp()
# Some FCM payloads omit ding.id; created_at remains stable across updates.
event_id_value = ding.get("id")
event_id = (
int(event_id_value)
if event_id_value is not None
else int(create_seconds * 1000)
)
return RingEvent(
event_id,
device["id"],
Expand All @@ -331,7 +338,7 @@ def _get_ring_event(self, msg_data: dict) -> RingEvent | None:
kind=event_kind,
now=create_seconds,
expires_in=DEFAULT_LISTEN_EVENT_EXPIRES_IN,
state=event["ding"]["subtype"],
state=ding["subtype"],
)

def _get_legacy_ring_event(self, gcm_data: dict) -> RingEvent | None:
Expand Down
21 changes: 21 additions & 0 deletions tests/test_listen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,27 @@ async def test_active_dings(auth, mocker):
await listener.stop()


def test_notification_without_ding_id(auth):
"""Test notifications without a Ring event ID are still processed."""
ring = Ring(auth)
listener = RingEventListener(ring)
received_events = []
listener.add_notification_callback(received_events.append)

msg = load_alert_v2("camera_motion", 123456782)
data = json.loads(msg["data"]["data"])
del data["event"]["ding"]["id"]
msg["data"]["data"] = json.dumps(data)

listener._on_notification(msg, "1234567")
listener._on_notification(msg, "1234568")

assert received_events[0].id > 0
assert received_events[1].id == received_events[0].id
assert received_events[0].is_update is False
assert received_events[1].is_update is True


async def test_ding_expirey(auth, mocker, freezer: FrozenDateTimeFactory):
ring = Ring(auth)
listener = RingEventListener(ring)
Expand Down