mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2025-01-25 16:38:09 +00:00
Code Issues Projects Releases Wiki Activity

Rename Image to Document

Browse source
This commit is contained in:
Mouse Reeve 2021-04-15 16:35:04 -07:00
parent 2f493336ad
commit 220fb926c9
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/activitypub/__init__.py
View file

@ -5,7 +5,7 @@ import sys
from .base_activity import ActivityEncoder, Signature, naive_parse from .base_activity import ActivityEncoder, Signature, naive_parse
from .base_activity import Link, Mention from .base_activity import Link, Mention
from .base_activity import ActivitySerializerError, resolve_remote_id from .base_activity import ActivitySerializerError, resolve_remote_id
from .image import Image from .image import Document
from .note import Note, GeneratedNote, Article, Comment, Quotation from .note import Note, GeneratedNote, Article, Comment, Quotation
from .note import Review, Rating from .note import Review, Rating
from .note import Tombstone from .note import Tombstone

4
bookwyrm/activitypub/book.py
View file

@ -3,7 +3,7 @@ from dataclasses import dataclass, field
from typing import List from typing import List
from .base_activity import ActivityObject from .base_activity import ActivityObject
from .image import Image from .image import Document
@dataclass(init=False) @dataclass(init=False)
@ -28,7 +28,7 @@ class Book(ActivityObject):
librarythingKey: str = "" librarythingKey: str = ""
goodreadsKey: str = "" goodreadsKey: str = ""
cover: Image = None cover: Document = None
type: str = "Book" type: str = "Book"

2
bookwyrm/activitypub/image.py
View file

@ -4,7 +4,7 @@ from .base_activity import ActivityObject
@dataclass(init=False) @dataclass(init=False)
class Image(ActivityObject): class Document(ActivityObject):
""" image block """ """ image block """
url: str url: str

4
bookwyrm/activitypub/note.py
View file

@ -4,7 +4,7 @@ from typing import Dict, List
from django.apps import apps from django.apps import apps
from .base_activity import ActivityObject, Link from .base_activity import ActivityObject, Link
from .image import Image from .image import Document
@dataclass(init=False) @dataclass(init=False)
@ -32,7 +32,7 @@ class Note(ActivityObject):
inReplyTo: str = "" inReplyTo: str = ""
summary: str = "" summary: str = ""
tag: List[Link] = field(default_factory=lambda: []) tag: List[Link] = field(default_factory=lambda: [])
attachment: List[Image] = field(default_factory=lambda: []) attachment: List[Document] = field(default_factory=lambda: [])
sensitive: bool = False sensitive: bool = False
type: str = "Note" type: str = "Note"

4
bookwyrm/activitypub/person.py
View file

@ -3,7 +3,7 @@ from dataclasses import dataclass, field
from typing import Dict from typing import Dict
from .base_activity import ActivityObject from .base_activity import ActivityObject
from .image import Image from .image import Document
@dataclass(init=False) @dataclass(init=False)
@ -28,7 +28,7 @@ class Person(ActivityObject):
endpoints: Dict = None endpoints: Dict = None
name: str = None name: str = None
summary: str = None summary: str = None
icon: Image = field(default_factory=lambda: {}) icon: Document = field(default_factory=lambda: {})
bookwyrmUser: bool = False bookwyrmUser: bool = False
manuallyApprovesFollowers: str = False manuallyApprovesFollowers: str = False
discoverable: str = False discoverable: str = False

2
bookwyrm/models/attachment.py
View file

@ -33,4 +33,4 @@ class Image(Attachment):
) )
caption = fields.TextField(null=True, blank=True, activitypub_field="name") caption = fields.TextField(null=True, blank=True, activitypub_field="name")
activity_serializer = activitypub.Image activity_serializer = activitypub.Document

2
bookwyrm/models/fields.py
View file

@ -336,7 +336,7 @@ def image_serializer(value, alt):
else: else:
return None return None
url = "https://%s%s" % (DOMAIN, url) url = "https://%s%s" % (DOMAIN, url)
return activitypub.Image(url=url, name=alt) return activitypub.Document(url=url, name=alt)
class ImageField(ActivitypubFieldMixin, models.ImageField): class ImageField(ActivitypubFieldMixin, models.ImageField):