Allow passing event ID in batch sends

Author: tulir

mautrix/types/event/batch.py

@@ -3,26 +3,28 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-from typing import Any
+from typing import Any, Optional
 
 from attr import dataclass
 import attr
 
-from ..primitive import UserID
+from ..primitive import UserID, EventID
 from ..util import SerializableAttrs
 from .base import BaseEvent
 
 
-@dataclass
+@dataclass(kw_only=True)
 class BatchSendEvent(BaseEvent, SerializableAttrs):
     """Base event class for events sent via a batch send request."""
 
     sender: UserID
     timestamp: int = attr.ib(metadata={"json": "origin_server_ts"})
     content: Any
+    # N.B. Overriding event IDs is not allowed in standard room versions
+    event_id: Optional[EventID] = None
 
 
-@dataclass
+@dataclass(kw_only=True)
 class BatchSendStateEvent(BatchSendEvent, SerializableAttrs):
     """
     State events to be used as initial state events on batch send events. These never need to be