Use attachment database table

This commit is contained in:
Mouse Reeve 2020-11-23 20:42:05 -08:00
parent 17fca8181b
commit 88e4705717
3 changed files with 38 additions and 24 deletions

View file

@ -0,0 +1,28 @@
# Generated by Django 3.0.7 on 2020-11-24 00:41
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('bookwyrm', '0011_auto_20201113_1727'),
]
operations = [
migrations.CreateModel(
name='Attachment',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created_date', models.DateTimeField(auto_now_add=True)),
('updated_date', models.DateTimeField(auto_now=True)),
('remote_id', models.CharField(max_length=255, null=True)),
('image', models.ImageField(blank=True, null=True, upload_to='status/')),
('status', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='bookwyrm.Status')),
],
options={
'abstract': False,
},
),
]

View file

@ -1,19 +0,0 @@
# Generated by Django 3.0.7 on 2020-11-23 20:44
import bookwyrm.utils.fields
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('bookwyrm', '0011_auto_20201113_1727'),
]
operations = [
migrations.AddField(
model_name='status',
name='images',
field=bookwyrm.utils.fields.ArrayField(base_field=models.ImageField(upload_to='status/'), default=list, size=None),
),
]

View file

@ -5,7 +5,6 @@ from django.db import models
from model_utils.managers import InheritanceManager from model_utils.managers import InheritanceManager
from bookwyrm import activitypub from bookwyrm import activitypub
from bookwyrm.utils.fields import ArrayField
from .base_model import ActivitypubMixin, OrderedCollectionPageMixin from .base_model import ActivitypubMixin, OrderedCollectionPageMixin
from .base_model import ActivityMapping, BookWyrmModel, PrivacyLevels from .base_model import ActivityMapping, BookWyrmModel, PrivacyLevels
from .base_model import tag_formatter from .base_model import tag_formatter
@ -18,10 +17,6 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
mention_users = models.ManyToManyField('User', related_name='mention_user') mention_users = models.ManyToManyField('User', related_name='mention_user')
mention_books = models.ManyToManyField( mention_books = models.ManyToManyField(
'Edition', related_name='mention_book') 'Edition', related_name='mention_book')
images = ArrayField(
models.ImageField(upload_to='status/'),
default=list
)
local = models.BooleanField(default=True) local = models.BooleanField(default=True)
privacy = models.CharField( privacy = models.CharField(
max_length=255, max_length=255,
@ -150,6 +145,16 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
super().save(*args, **kwargs) super().save(*args, **kwargs)
class Attachment(BookWyrmModel):
''' an image (or, in the future, video etc) associated with a status '''
status = models.ForeignKey(
'Status',
on_delete=models.CASCADE,
related_name='items'
)
image = models.ImageField(upload_to='status/', null=True, blank=True)
class GeneratedNote(Status): class GeneratedNote(Status):
''' these are app-generated messages about user activity ''' ''' these are app-generated messages about user activity '''
@property @property