From 65c94f98546cfd308e6cb9a60c794e0f69ef7f79 Mon Sep 17 00:00:00 2001 From: Dashie Date: Sat, 23 Mar 2019 07:40:46 +0100 Subject: [PATCH 1/4] Start to add Audio type --- little_boxes/activitypub.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/little_boxes/activitypub.py b/little_boxes/activitypub.py index 4e564be..cd9b845 100644 --- a/little_boxes/activitypub.py +++ b/little_boxes/activitypub.py @@ -85,6 +85,7 @@ class ActivityType(Enum): NOTE = "Note" ARTICLE = "Article" VIDEO = "Video" + AUDIO = "Audio" ACCEPT = "Accept" REJECT = "Reject" @@ -122,6 +123,7 @@ CREATE_TYPES = [ ActivityType.NOTE, ActivityType.ARTICLE, ActivityType.VIDEO, + ActivityType.AUDIO, ActivityType.QUESTION, ] @@ -906,6 +908,12 @@ class Video(Note): OBJECT_REQURIED = False +class Audio(Note): + ACTIVITY_TYPE = ActivityType.AUDIO + ACTOR_REQUIRED = True + OBJECT_REQUIRED = False + + def fetch_remote_activity( iri: str, expected: Optional[ActivityType] = None ) -> BaseActivity: From 2bd3f736cac674ed3fc4bab453b5e477424c3d27 Mon Sep 17 00:00:00 2001 From: Dashie Date: Sat, 23 Mar 2019 14:15:07 +0100 Subject: [PATCH 2/4] Add Document type; Audio extends Document --- little_boxes/activitypub.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/little_boxes/activitypub.py b/little_boxes/activitypub.py index cd9b845..293b78a 100644 --- a/little_boxes/activitypub.py +++ b/little_boxes/activitypub.py @@ -86,6 +86,7 @@ class ActivityType(Enum): ARTICLE = "Article" VIDEO = "Video" AUDIO = "Audio" + DOCUMENT = "Document" ACCEPT = "Accept" REJECT = "Reject" @@ -908,7 +909,13 @@ class Video(Note): OBJECT_REQURIED = False -class Audio(Note): +class Document(BaseActivity): + ACTIVITY_TYPE = ActivityType.DOCUMENT + ACTOR_REQUIRED = True + OBJECT_REQUIRED = False + + +class Audio(Document): ACTIVITY_TYPE = ActivityType.AUDIO ACTOR_REQUIRED = True OBJECT_REQUIRED = False From 666aea5ce00f6d3ddb15cde2f63ace1f018f5550 Mon Sep 17 00:00:00 2001 From: Dashie Date: Sat, 23 Mar 2019 14:16:15 +0100 Subject: [PATCH 3/4] Add Documents to CREATE_TYPES --- little_boxes/activitypub.py | 1 + 1 file changed, 1 insertion(+) diff --git a/little_boxes/activitypub.py b/little_boxes/activitypub.py index 293b78a..e778610 100644 --- a/little_boxes/activitypub.py +++ b/little_boxes/activitypub.py @@ -126,6 +126,7 @@ CREATE_TYPES = [ ActivityType.VIDEO, ActivityType.AUDIO, ActivityType.QUESTION, + ActivityType.DOCUMENT ] COLLECTION_TYPES = [ActivityType.COLLECTION, ActivityType.ORDERED_COLLECTION] From ad4587f8a893a074cbd303541f48930f7dbaecaa Mon Sep 17 00:00:00 2001 From: Dashie Date: Sat, 23 Mar 2019 14:28:37 +0100 Subject: [PATCH 4/4] Seems better to depends on Note... --- little_boxes/activitypub.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/little_boxes/activitypub.py b/little_boxes/activitypub.py index e778610..47d7bd1 100644 --- a/little_boxes/activitypub.py +++ b/little_boxes/activitypub.py @@ -910,13 +910,13 @@ class Video(Note): OBJECT_REQURIED = False -class Document(BaseActivity): +class Document(Note): ACTIVITY_TYPE = ActivityType.DOCUMENT ACTOR_REQUIRED = True OBJECT_REQUIRED = False -class Audio(Document): +class Audio(Note): ACTIVITY_TYPE = ActivityType.AUDIO ACTOR_REQUIRED = True OBJECT_REQUIRED = False