Skip to content

Commit 98de42a

Browse files
committed
feat(actor): add extension field
1 parent ea8611a commit 98de42a

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/apmodel/core/object.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
from ..vocab.actor import Actor
1414
from ..vocab.document import Image
1515
from ..extra.schema import PropertyValue
16+
from ..extra.emoji import Emoji
17+
from ..extra.hashtag import Hashtag
1618

1719
T = TypeVar("T", bound="Object")
1820

@@ -41,7 +43,7 @@ class Object(ActivityPubModel):
4143
preview: Union["Object", Undefined] = field(default_factory=Undefined)
4244
replies: Union["Collection", Undefined] = field(default_factory=Undefined)
4345
scope: Union["Object", Undefined] = field(default_factory=Undefined)
44-
tag: List["Object"] = field(default_factory=list)
46+
tag: List[Union["Object", "Hashtag", "Emoji"]] = field(default_factory=list)
4547
attachment: List[Union["Object", "PropertyValue"]] = field(default_factory=list)
4648
_extra: dict = field(default_factory=dict)
4749

src/apmodel/vocab/actor.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
from ..types import Undefined
66
from ..core.collection import Collection, OrderedCollection
77
from ..core.object import Object
8-
from ..extra.schema.propertyvalue import PropertyValue
9-
from ..extra.emoji import Emoji
10-
from ..extra.hashtag import Hashtag
8+
from ..extra.cid import Multikey
9+
from ..extra.security import CryptographicKey
1110

1211
@dataclass
1312
class ActorEndpoints(Object):
@@ -37,6 +36,8 @@ class Actor(Object):
3736
indexable: Union[bool, Undefined] = field(default_factory=Undefined)
3837
suspended: Union[bool, Undefined] = field(default_factory=Undefined)
3938
memorial: Union[bool, Undefined] = field(default_factory=Undefined)
39+
publicKey: Union[CryptographicKey, Undefined] = field(default_factory=Undefined)
40+
assertionMethod: Union[List[Multikey], Undefined] = field(default_factory=Undefined)
4041

4142
def to_json(self):
4243
result = super().to_json()

0 commit comments

Comments
 (0)