"kepi" module, which implements ActivityPub, renamed to "bowler_pub".
This is to prepare for the rename of the entire project to "kepi".remote_update_not_partial
|
@ -6,14 +6,14 @@
|
|||
|
||||
"""
|
||||
These classes are used by the admin system to interact
|
||||
with kepi's models.
|
||||
with bowler_pub's models.
|
||||
"""
|
||||
|
||||
from django.contrib import admin
|
||||
from polymorphic.admin import *
|
||||
from chapeau.kepi.models import *
|
||||
from chapeau.kepi.validation import IncomingMessage
|
||||
import chapeau.kepi.forms as kepi_forms
|
||||
from chapeau.bowler_pub.models import *
|
||||
from chapeau.bowler_pub.validation import IncomingMessage
|
||||
import chapeau.bowler_pub.forms as bowler_pub_forms
|
||||
|
||||
###################################
|
||||
|
||||
|
@ -28,7 +28,7 @@ class ActivityAdmin(admin.ModelAdmin):
|
|||
|
||||
@admin.register(AcNote)
|
||||
class NoteAdmin(admin.ModelAdmin):
|
||||
form = kepi_forms.NoteAdminForm
|
||||
form = bowler_pub_forms.NoteAdminForm
|
||||
base_model = AcNote
|
||||
|
||||
###################################
|
|
@ -1,4 +1,4 @@
|
|||
import chapeau.kepi.settings
|
||||
import chapeau.bowler_pub.settings
|
||||
from django.core.management import get_commands, call_command
|
||||
from django.core.management.base import CommandError
|
||||
from django.conf import settings
|
||||
|
@ -7,9 +7,9 @@ import django
|
|||
import os
|
||||
import sys
|
||||
|
||||
KEPI_PREFIX = 'kepi-'
|
||||
KEPI_PREFIX = 'bowler_pub-'
|
||||
|
||||
def kepi_commands():
|
||||
def bowler_pub_commands():
|
||||
result = []
|
||||
for command in sorted(get_commands().keys()):
|
||||
if command.startswith(KEPI_PREFIX):
|
||||
|
@ -20,7 +20,7 @@ def kepi_commands():
|
|||
def setup():
|
||||
os.environ.setdefault(
|
||||
"DJANGO_SETTINGS_MODULE",
|
||||
"kepi.settings"
|
||||
"bowler_pub.settings"
|
||||
)
|
||||
django.setup()
|
||||
|
||||
|
@ -35,7 +35,7 @@ def show_help():
|
|||
|
||||
column = 0
|
||||
width = 70
|
||||
for command in kepi_commands():
|
||||
for command in bowler_pub_commands():
|
||||
|
||||
if column+len(command)+1>width:
|
||||
print('')
|
|
@ -8,7 +8,7 @@
|
|||
This module contains create(), which creates objects.
|
||||
"""
|
||||
|
||||
from chapeau.kepi.models import *
|
||||
from chapeau.bowler_pub.models import *
|
||||
import django.db.utils
|
||||
import logging
|
||||
import json
|
||||
|
@ -36,7 +36,7 @@ def create(
|
|||
**kwargs):
|
||||
|
||||
"""
|
||||
Creates a kepi object.
|
||||
Creates a bowler_pub object.
|
||||
|
||||
Keyword arguments:
|
||||
value -- the fields of the new object, as a dict.
|
||||
|
@ -59,8 +59,8 @@ def create(
|
|||
Don't confuse create() with objects of type Create!
|
||||
"""
|
||||
|
||||
from chapeau.kepi.delivery import deliver
|
||||
from chapeau.kepi.models.activity import AcActivity
|
||||
from chapeau.bowler_pub.delivery import deliver
|
||||
from chapeau.bowler_pub.models.activity import AcActivity
|
||||
|
||||
if value is None:
|
||||
value = {}
|
||||
|
@ -96,8 +96,8 @@ def create(
|
|||
|
||||
class_name = 'Ac'+value['type']
|
||||
try:
|
||||
import chapeau.kepi.models as kepi_models
|
||||
cls = getattr(locals()['kepi_models'], class_name)
|
||||
import chapeau.bowler_pub.models as bowler_pub_models
|
||||
cls = getattr(locals()['bowler_pub_models'], class_name)
|
||||
except AttributeError:
|
||||
logger.warn("There's no type called %s",
|
||||
class_name)
|
|
@ -11,8 +11,8 @@ to their audiences.
|
|||
|
||||
from __future__ import absolute_import, unicode_literals
|
||||
from celery import shared_task
|
||||
from chapeau.kepi.find import find, find_local, is_local
|
||||
import chapeau.kepi.models
|
||||
from chapeau.bowler_pub.find import find, find_local, is_local
|
||||
import chapeau.bowler_pub.models
|
||||
from httpsig.verify import HeaderVerifier
|
||||
from urllib.parse import urlparse
|
||||
from django.http.request import HttpRequest
|
||||
|
@ -55,7 +55,7 @@ def _find_local_actor(activity_form):
|
|||
the "attributedTo" field.
|
||||
"""
|
||||
|
||||
from chapeau.kepi.models.acobject import AcObject
|
||||
from chapeau.bowler_pub.models.acobject import AcObject
|
||||
|
||||
parts = None
|
||||
for fieldname in ['actor', 'attributedTo']:
|
||||
|
@ -216,8 +216,8 @@ def _activity_form_to_outgoing_string(activity_form):
|
|||
an HTTP response.
|
||||
"""
|
||||
|
||||
from chapeau.kepi import ATSIGN_CONTEXT
|
||||
from chapeau.kepi.utils import as_json
|
||||
from chapeau.bowler_pub import ATSIGN_CONTEXT
|
||||
from chapeau.bowler_pub.utils import as_json
|
||||
|
||||
format_for_delivery = activity_form.copy()
|
||||
for blind_field in ['bto', 'bcc']:
|
||||
|
@ -414,8 +414,8 @@ def deliver(
|
|||
"""
|
||||
|
||||
try:
|
||||
activity = chapeau.kepi.models.AcActivity.objects.get(id=activity_id)
|
||||
except chapeau.kepi.models.AcActivity.DoesNotExist:
|
||||
activity = chapeau.bowler_pub.models.AcActivity.objects.get(id=activity_id)
|
||||
except chapeau.bowler_pub.models.AcActivity.DoesNotExist:
|
||||
logger.warn("Can't deliver activity %s because it doesn't exist",
|
||||
activity_id)
|
||||
return None
|
|
@ -15,9 +15,9 @@ from django.conf import settings
|
|||
import django.urls
|
||||
from urllib.parse import urlparse
|
||||
from django.http.request import HttpRequest
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.bowler_pub.create import create
|
||||
from django.utils import timezone
|
||||
from chapeau.kepi.utils import is_short_id
|
||||
from chapeau.bowler_pub.utils import is_short_id
|
||||
import json
|
||||
import mimeparse
|
||||
|
||||
|
@ -145,7 +145,7 @@ def find_remote(url,
|
|||
its stated audiences. This is usually not what you want.
|
||||
"""
|
||||
|
||||
from chapeau.kepi.models.acobject import AcObject
|
||||
from chapeau.bowler_pub.models.acobject import AcObject
|
||||
|
||||
logger.debug('%s: find remote', url)
|
||||
|
||||
|
@ -279,7 +279,7 @@ def _short_id_lookup(number):
|
|||
|
||||
"""
|
||||
|
||||
from chapeau.kepi.models import AcObject
|
||||
from chapeau.bowler_pub.models import AcObject
|
||||
|
||||
try:
|
||||
result = AcObject.objects.get(
|
|
@ -1,6 +1,6 @@
|
|||
[
|
||||
{
|
||||
"model": "kepi.ActivityObject",
|
||||
"model": "bowler_pub.ActivityObject",
|
||||
"pk": 1,
|
||||
"fields": {
|
||||
"a_type": "Object",
|
||||
|
@ -8,7 +8,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"model": "kepi.ActivityObject",
|
||||
"model": "bowler_pub.ActivityObject",
|
||||
"pk": 2,
|
||||
"fields": {
|
||||
"a_type": "Object",
|
||||
|
@ -16,7 +16,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"model": "kepi.ActivityObject",
|
||||
"model": "bowler_pub.ActivityObject",
|
||||
"pk": 3,
|
||||
"fields": {
|
||||
"a_type": "Person",
|
|
@ -10,12 +10,12 @@ the admin interface. It's not very elaborate yet.
|
|||
"""
|
||||
|
||||
from django import forms
|
||||
import chapeau.kepi.models as kepi_models
|
||||
import chapeau.bowler_pub.models as bowler_pub_models
|
||||
|
||||
class NoteAdminForm(forms.ModelForm):
|
||||
|
||||
class Meta:
|
||||
model = kepi_models.AcNote
|
||||
model = bowler_pub_models.AcNote
|
||||
|
||||
fields = [
|
||||
'f_content',
|
|
@ -1,5 +1,5 @@
|
|||
from django.core.management.base import BaseCommand, CommandError
|
||||
from chapeau.kepi.models import *
|
||||
from chapeau.bowler_pub.models import *
|
||||
from django.conf import settings
|
||||
import logging
|
||||
import os
|
|
@ -1,8 +1,8 @@
|
|||
from django.core.management.base import BaseCommand, CommandError
|
||||
from django.conf import settings
|
||||
from chapeau.kepi.models import *
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.management import KepiCommand, objects_by_keywords
|
||||
from chapeau.bowler_pub.models import *
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.management import KepiCommand, objects_by_keywords
|
||||
import os
|
||||
import logging
|
||||
import json
|
|
@ -1,8 +1,8 @@
|
|||
from django.core.management.base import BaseCommand, CommandError
|
||||
from django.conf import settings
|
||||
from chapeau.kepi.models import *
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.management import KepiCommand
|
||||
from chapeau.bowler_pub.models import *
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.management import KepiCommand
|
||||
import os
|
||||
import logging
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
from django.core.management.base import BaseCommand, CommandError
|
||||
from django.conf import settings
|
||||
from chapeau.kepi.models import *
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.management import KepiCommand
|
||||
from chapeau.bowler_pub.models import *
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.management import KepiCommand
|
||||
import os
|
||||
import logging
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.management import KepiCommand
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.management import KepiCommand
|
||||
import logging
|
||||
|
||||
logger = logging.Logger('chapeau')
|
|
@ -1,8 +1,8 @@
|
|||
from django.core.management.base import BaseCommand, CommandError
|
||||
from django.conf import settings
|
||||
from chapeau.kepi.models import *
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.management import KepiCommand
|
||||
from chapeau.bowler_pub.models import *
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.management import KepiCommand
|
||||
import os
|
||||
import logging
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
from django.core.management.base import BaseCommand, CommandError
|
||||
from django.conf import settings
|
||||
from chapeau.kepi.models import *
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.management import KepiCommand, objects_by_keywords
|
||||
from chapeau.bowler_pub.models import *
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.management import KepiCommand, objects_by_keywords
|
||||
from collections import abc
|
||||
import os
|
||||
import logging
|
||||
|
@ -128,7 +128,7 @@ class Command(KepiCommand):
|
|||
|
||||
def _show_json(self, thing, *args, **options):
|
||||
|
||||
from chapeau.kepi.utils import as_json
|
||||
from chapeau.bowler_pub.utils import as_json
|
||||
|
||||
print(as_json(thing.activity_form))
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
from django.core.management.base import BaseCommand, CommandError
|
||||
from django.conf import settings
|
||||
from chapeau.kepi.models import *
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.management import KepiCommand
|
||||
from chapeau.bowler_pub.models import *
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.management import KepiCommand
|
||||
import os
|
||||
import logging
|
||||
|
||||
|
@ -37,7 +37,7 @@ class Command(KepiCommand):
|
|||
self.stdout.write(
|
||||
self.style.ERROR(
|
||||
"No users found. To create a user, use "+\
|
||||
"'kepi users --create fred'."
|
||||
"'bowler_pub users --create fred'."
|
||||
))
|
||||
return
|
||||
|
|
@ -21,7 +21,7 @@ class Migration(migrations.Migration):
|
|||
('id', models.CharField(default=None, editable=False, max_length=255, primary_key=True, serialize=False, unique=True)),
|
||||
('published', models.DateTimeField(default=django.utils.timezone.now)),
|
||||
('updated', models.DateTimeField(auto_now=True)),
|
||||
('polymorphic_ctype', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_kepi.acobject_set+', to='contenttypes.ContentType')),
|
||||
('polymorphic_ctype', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_bowler_pub.acobject_set+', to='contenttypes.ContentType')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
|
@ -69,19 +69,19 @@ class Migration(migrations.Migration):
|
|||
migrations.CreateModel(
|
||||
name='AcActivity',
|
||||
fields=[
|
||||
('acobject_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcObject')),
|
||||
('acobject_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcObject')),
|
||||
('f_actor', models.CharField(blank=True, default=None, max_length=255, null=True)),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'activity',
|
||||
'verbose_name_plural': 'activities',
|
||||
},
|
||||
bases=('kepi.acobject',),
|
||||
bases=('bowler_pub.acobject',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcActor',
|
||||
fields=[
|
||||
('acobject_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcObject')),
|
||||
('acobject_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcObject')),
|
||||
('privateKey', models.TextField(blank=True, null=True)),
|
||||
('f_name', models.TextField(help_text='Your name, in human-friendly form. Something like "Alice Liddell".', verbose_name='name')),
|
||||
('f_publicKey', models.TextField(blank=True, null=True, verbose_name='public key')),
|
||||
|
@ -94,12 +94,12 @@ class Migration(migrations.Migration):
|
|||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acobject',),
|
||||
bases=('bowler_pub.acobject',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcItem',
|
||||
fields=[
|
||||
('acobject_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcObject')),
|
||||
('acobject_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcObject')),
|
||||
('f_content', models.CharField(blank=True, max_length=255)),
|
||||
('f_attributedTo', models.CharField(blank=True, max_length=255)),
|
||||
],
|
||||
|
@ -107,7 +107,7 @@ class Migration(migrations.Migration):
|
|||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acobject',),
|
||||
bases=('bowler_pub.acobject',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='ThingField',
|
||||
|
@ -115,7 +115,7 @@ class Migration(migrations.Migration):
|
|||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('field', models.CharField(max_length=255)),
|
||||
('value', models.CharField(blank=True, default=None, max_length=255, null=True)),
|
||||
('parent', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='kepi.AcObject')),
|
||||
('parent', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bowler_pub.AcObject')),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
|
@ -123,15 +123,15 @@ class Migration(migrations.Migration):
|
|||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('to_actor', models.CharField(max_length=255)),
|
||||
('from_status', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='kepi.AcObject')),
|
||||
('from_status', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='bowler_pub.AcObject')),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='CollectionMember',
|
||||
fields=[
|
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('member', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='kepi.AcObject')),
|
||||
('parent', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='kepi.Collection')),
|
||||
('member', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='bowler_pub.AcObject')),
|
||||
('parent', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bowler_pub.Collection')),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
|
@ -140,304 +140,304 @@ class Migration(migrations.Migration):
|
|||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('field', models.PositiveSmallIntegerField(choices=[(1, 'audience'), (2, 'to'), (4, 'cc'), (114, 'bto'), (116, 'bcc')])),
|
||||
('recipient', models.CharField(max_length=255)),
|
||||
('parent', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='kepi.AcObject')),
|
||||
('parent', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bowler_pub.AcObject')),
|
||||
],
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcAccept',
|
||||
fields=[
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActivity')),
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActivity')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactivity',),
|
||||
bases=('bowler_pub.acactivity',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcAdd',
|
||||
fields=[
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActivity')),
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActivity')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactivity',),
|
||||
bases=('bowler_pub.acactivity',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcAnnounce',
|
||||
fields=[
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActivity')),
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActivity')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactivity',),
|
||||
bases=('bowler_pub.acactivity',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcApplication',
|
||||
fields=[
|
||||
('acactor_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActor')),
|
||||
('acactor_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActor')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactor',),
|
||||
bases=('bowler_pub.acactor',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcArticle',
|
||||
fields=[
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcItem')),
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcItem')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acitem',),
|
||||
bases=('bowler_pub.acitem',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcAudio',
|
||||
fields=[
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcItem')),
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcItem')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acitem',),
|
||||
bases=('bowler_pub.acitem',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcCreate',
|
||||
fields=[
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActivity')),
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActivity')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactivity',),
|
||||
bases=('bowler_pub.acactivity',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcDelete',
|
||||
fields=[
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActivity')),
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActivity')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactivity',),
|
||||
bases=('bowler_pub.acactivity',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcDocument',
|
||||
fields=[
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcItem')),
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcItem')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acitem',),
|
||||
bases=('bowler_pub.acitem',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcEvent',
|
||||
fields=[
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcItem')),
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcItem')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acitem',),
|
||||
bases=('bowler_pub.acitem',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcFollow',
|
||||
fields=[
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActivity')),
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActivity')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactivity',),
|
||||
bases=('bowler_pub.acactivity',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcGroup',
|
||||
fields=[
|
||||
('acactor_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActor')),
|
||||
('acactor_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActor')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactor',),
|
||||
bases=('bowler_pub.acactor',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcImage',
|
||||
fields=[
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcItem')),
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcItem')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acitem',),
|
||||
bases=('bowler_pub.acitem',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcLike',
|
||||
fields=[
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActivity')),
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActivity')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactivity',),
|
||||
bases=('bowler_pub.acactivity',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcNote',
|
||||
fields=[
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcItem')),
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcItem')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'note',
|
||||
},
|
||||
bases=('kepi.acitem',),
|
||||
bases=('bowler_pub.acitem',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcOrganization',
|
||||
fields=[
|
||||
('acactor_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActor')),
|
||||
('acactor_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActor')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactor',),
|
||||
bases=('bowler_pub.acactor',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcPage',
|
||||
fields=[
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcItem')),
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcItem')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acitem',),
|
||||
bases=('bowler_pub.acitem',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcPerson',
|
||||
fields=[
|
||||
('acactor_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActor')),
|
||||
('acactor_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActor')),
|
||||
],
|
||||
options={
|
||||
'verbose_name': 'person',
|
||||
'verbose_name_plural': 'people',
|
||||
},
|
||||
bases=('kepi.acactor',),
|
||||
bases=('bowler_pub.acactor',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcPlace',
|
||||
fields=[
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcItem')),
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcItem')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acitem',),
|
||||
bases=('bowler_pub.acitem',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcProfile',
|
||||
fields=[
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcItem')),
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcItem')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acitem',),
|
||||
bases=('bowler_pub.acitem',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcReject',
|
||||
fields=[
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActivity')),
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActivity')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactivity',),
|
||||
bases=('bowler_pub.acactivity',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcRelationship',
|
||||
fields=[
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcItem')),
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcItem')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acitem',),
|
||||
bases=('bowler_pub.acitem',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcRemove',
|
||||
fields=[
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActivity')),
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActivity')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactivity',),
|
||||
bases=('bowler_pub.acactivity',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcService',
|
||||
fields=[
|
||||
('acactor_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActor')),
|
||||
('acactor_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActor')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactor',),
|
||||
bases=('bowler_pub.acactor',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcUndo',
|
||||
fields=[
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActivity')),
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActivity')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactivity',),
|
||||
bases=('bowler_pub.acactivity',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcUpdate',
|
||||
fields=[
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcActivity')),
|
||||
('acactivity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcActivity')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acactivity',),
|
||||
bases=('bowler_pub.acactivity',),
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='AcVideo',
|
||||
fields=[
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='kepi.AcItem')),
|
||||
('acitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bowler_pub.AcItem')),
|
||||
],
|
||||
options={
|
||||
'abstract': False,
|
||||
'base_manager_name': 'objects',
|
||||
},
|
||||
bases=('kepi.acitem',),
|
||||
bases=('bowler_pub.acitem',),
|
||||
),
|
||||
migrations.AddConstraint(
|
||||
model_name='thingfield',
|
||||
|
@ -446,7 +446,7 @@ class Migration(migrations.Migration):
|
|||
migrations.AddField(
|
||||
model_name='collection',
|
||||
name='owner',
|
||||
field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='kepi.AcActor'),
|
||||
field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='bowler_pub.AcActor'),
|
||||
),
|
||||
migrations.AddConstraint(
|
||||
model_name='collection',
|
|
@ -6,7 +6,7 @@ from django.db import migrations, models
|
|||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('kepi', '0001_initial'),
|
||||
('bowler_pub', '0001_initial'),
|
||||
]
|
||||
|
||||
operations = [
|
|
@ -6,7 +6,7 @@ from django.db import migrations
|
|||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('kepi', '0002_acitem_serial'),
|
||||
('bowler_pub', '0002_acitem_serial'),
|
||||
]
|
||||
|
||||
operations = [
|
|
@ -3,12 +3,12 @@ from django.conf import settings
|
|||
from django.utils import timezone
|
||||
from polymorphic.models import PolymorphicModel
|
||||
from polymorphic.managers import PolymorphicManager
|
||||
from chapeau.kepi.models.audience import Audience, AUDIENCE_FIELD_NAMES
|
||||
from chapeau.kepi.models.thingfield import ThingField
|
||||
from chapeau.kepi.models.mention import Mention
|
||||
from chapeau.kepi.utils import configured_path, uri_to_url
|
||||
from chapeau.bowler_pub.models.audience import Audience, AUDIENCE_FIELD_NAMES
|
||||
from chapeau.bowler_pub.models.thingfield import ThingField
|
||||
from chapeau.bowler_pub.models.mention import Mention
|
||||
from chapeau.bowler_pub.utils import configured_path, uri_to_url
|
||||
from .. import URL_REGEXP, SERIAL_NUMBER_REGEXP
|
||||
import chapeau.kepi.side_effects as side_effects
|
||||
import chapeau.bowler_pub.side_effects as side_effects
|
||||
import logging
|
||||
import random
|
||||
import warnings
|
||||
|
@ -152,7 +152,7 @@ class AcObject(PolymorphicModel):
|
|||
@property
|
||||
def activity_form(self):
|
||||
|
||||
from chapeau.kepi.utils import short_id_to_url
|
||||
from chapeau.bowler_pub.utils import short_id_to_url
|
||||
|
||||
result = {
|
||||
'id': self.url,
|
||||
|
@ -189,7 +189,7 @@ class AcObject(PolymorphicModel):
|
|||
|
||||
def __getitem__(self, name):
|
||||
|
||||
from chapeau.kepi.find import find
|
||||
from chapeau.bowler_pub.find import find
|
||||
|
||||
name_parts = name.split('__')
|
||||
name = name_parts.pop(0)
|
||||
|
@ -265,7 +265,7 @@ class AcObject(PolymorphicModel):
|
|||
)
|
||||
else:
|
||||
|
||||
from chapeau.kepi.utils import as_json
|
||||
from chapeau.bowler_pub.utils import as_json
|
||||
|
||||
if self.pk is None:
|
||||
# See above
|
||||
|
@ -304,8 +304,8 @@ class AcObject(PolymorphicModel):
|
|||
|
||||
def run_side_effects(self):
|
||||
|
||||
from chapeau.kepi.find import find
|
||||
from chapeau.kepi.delivery import deliver
|
||||
from chapeau.bowler_pub.find import find
|
||||
from chapeau.bowler_pub.delivery import deliver
|
||||
|
||||
f_type = self.f_type.lower()
|
||||
|
||||
|
@ -410,7 +410,7 @@ class AcObject(PolymorphicModel):
|
|||
find() would ignore these.
|
||||
"""
|
||||
|
||||
from chapeau.kepi.find import find
|
||||
from chapeau.bowler_pub.find import find
|
||||
|
||||
logger.debug(' -- finding object with url %s', url)
|
||||
result = find(url,
|
|
@ -23,8 +23,8 @@ class AcActivity(acobject.AcObject):
|
|||
|
||||
def go_into_outbox_if_local(self):
|
||||
|
||||
from chapeau.kepi.models.collection import Collection
|
||||
from chapeau.kepi.find import find
|
||||
from chapeau.bowler_pub.models.collection import Collection
|
||||
from chapeau.bowler_pub.find import find
|
||||
|
||||
if not self.is_local:
|
||||
return
|
|
@ -1,8 +1,8 @@
|
|||
from django.db import models
|
||||
from django.conf import settings
|
||||
from . import acobject, following, collection
|
||||
import chapeau.kepi.crypto as crypto
|
||||
from chapeau.kepi.utils import configured_url, uri_to_url
|
||||
import chapeau.bowler_pub.crypto as crypto
|
||||
from chapeau.bowler_pub.utils import configured_url, uri_to_url
|
||||
import logging
|
||||
import re
|
||||
|
||||
|
@ -122,7 +122,7 @@ class AcActor(acobject.AcObject):
|
|||
|
||||
elif name=='publicKey':
|
||||
|
||||
from chapeau.kepi.utils import as_json
|
||||
from chapeau.bowler_pub.utils import as_json
|
||||
|
||||
self.publicKey = as_json(value,
|
||||
indent=None)
|
|
@ -28,7 +28,7 @@ AUDIENCE_FIELD_KEYS = set([v for (f,v) in FIELD_CHOICES])
|
|||
class Audience(models.Model):
|
||||
|
||||
parent = models.ForeignKey(
|
||||
'kepi.AcObject',
|
||||
'bowler_pub.AcObject',
|
||||
on_delete = models.CASCADE,
|
||||
)
|
||||
|
|
@ -8,7 +8,7 @@ logger = logging.getLogger(name='chapeau')
|
|||
class Collection(models.Model):
|
||||
|
||||
owner = models.ForeignKey(
|
||||
'kepi.AcActor',
|
||||
'bowler_pub.AcActor',
|
||||
on_delete = models.DO_NOTHING,
|
||||
)
|
||||
|
||||
|
@ -130,7 +130,7 @@ class CollectionMember(models.Model):
|
|||
)
|
||||
|
||||
member = models.ForeignKey(
|
||||
'kepi.AcObject',
|
||||
'bowler_pub.AcObject',
|
||||
on_delete = models.DO_NOTHING,
|
||||
)
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
from django.db import models
|
||||
from chapeau.kepi.utils import short_id_to_url
|
||||
from chapeau.bowler_pub.utils import short_id_to_url
|
||||
import logging
|
||||
|
||||
logger = logging.getLogger(name='chapeau')
|
|
@ -122,7 +122,7 @@ class AcItem(acobject.AcObject):
|
|||
@property
|
||||
def thread(self):
|
||||
|
||||
from chapeau.kepi.find import find
|
||||
from chapeau.bowler_pub.find import find
|
||||
|
||||
if hasattr(self, '_thread'):
|
||||
return self._thread
|
||||
|
@ -190,7 +190,7 @@ class AcItem(acobject.AcObject):
|
|||
in which case this property will be None.
|
||||
You can still find the name of the actor in f_attributedTo.
|
||||
"""
|
||||
from chapeau.kepi.find import find
|
||||
from chapeau.bowler_pub.find import find
|
||||
|
||||
return find(self.f_attributedTo, local_only=True)
|
||||
|
||||
|
@ -200,7 +200,7 @@ class AcItem(acobject.AcObject):
|
|||
|
||||
@property
|
||||
def mentions(self):
|
||||
from chapeau.kepi.models.mention import Mention
|
||||
from chapeau.bowler_pub.models.mention import Mention
|
||||
|
||||
logger.info('Finding Mentions for %s', self)
|
||||
return [x.to_actor for x in
|
|
@ -8,7 +8,7 @@ logger = logging.getLogger(name='chapeau')
|
|||
class Mention(models.Model):
|
||||
|
||||
from_status = models.ForeignKey(
|
||||
'kepi.AcObject',
|
||||
'bowler_pub.AcObject',
|
||||
on_delete = models.DO_NOTHING,
|
||||
)
|
||||
|
|
@ -26,7 +26,7 @@ class ThingField(models.Model):
|
|||
)
|
||||
|
||||
parent = models.ForeignKey(
|
||||
'kepi.AcObject',
|
||||
'bowler_pub.AcObject',
|
||||
on_delete = models.CASCADE,
|
||||
)
|
||||
|
|
@ -13,14 +13,14 @@ the new activity as a parameter.
|
|||
|
||||
import logging
|
||||
from django.conf import settings
|
||||
from chapeau.kepi.find import find, is_local
|
||||
from chapeau.kepi.delivery import deliver
|
||||
from chapeau.bowler_pub.find import find, is_local
|
||||
from chapeau.bowler_pub.delivery import deliver
|
||||
|
||||
logger = logging.getLogger(name='chapeau')
|
||||
|
||||
def accept(activity):
|
||||
|
||||
from chapeau.kepi.models.following import Following
|
||||
from chapeau.bowler_pub.models.following import Following
|
||||
|
||||
obj = activity['object__obj']
|
||||
|
||||
|
@ -40,8 +40,8 @@ def accept(activity):
|
|||
|
||||
def follow(activity):
|
||||
|
||||
from chapeau.kepi.models.following import Following
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.bowler_pub.models.following import Following
|
||||
from chapeau.bowler_pub.create import create
|
||||
|
||||
if not is_local(activity['object']):
|
||||
logger.info('Following a remote user has no local side-effects.')
|
||||
|
@ -72,7 +72,7 @@ def follow(activity):
|
|||
|
||||
def reject(activity):
|
||||
|
||||
from chapeau.kepi.models.following import Following
|
||||
from chapeau.bowler_pub.models.following import Following
|
||||
|
||||
obj = activity['object__obj']
|
||||
|
||||
|
@ -92,9 +92,9 @@ def reject(activity):
|
|||
|
||||
def create(activity):
|
||||
|
||||
import chapeau.kepi.models as kepi_models
|
||||
from chapeau.kepi.create import create as kepi_create
|
||||
from chapeau.kepi.models.audience import AUDIENCE_FIELD_KEYS
|
||||
import chapeau.bowler_pub.models as bowler_pub_models
|
||||
from chapeau.bowler_pub.create import create as bowler_pub_create
|
||||
from chapeau.bowler_pub.models.audience import AUDIENCE_FIELD_KEYS
|
||||
|
||||
raw_material = activity['object'].copy()
|
||||
|
||||
|
@ -112,9 +112,9 @@ def create(activity):
|
|||
raw_material[field] = value
|
||||
|
||||
try:
|
||||
if not issubclass(getattr(kepi_models,
|
||||
if not issubclass(getattr(bowler_pub_models,
|
||||
'Ac'+f_type),
|
||||
kepi_models.AcItem):
|
||||
bowler_pub_models.AcItem):
|
||||
|
||||
logger.warn('Attempt to use Create to create '+\
|
||||
'an object of type %s. '+\
|
||||
|
@ -147,7 +147,7 @@ def create(activity):
|
|||
|
||||
def it_is_relevant(something, activity):
|
||||
|
||||
from chapeau.kepi.models import Audience
|
||||
from chapeau.bowler_pub.models import Audience
|
||||
|
||||
logger.debug('Checking whether the new object is relevant to us.')
|
||||
|
||||
|
@ -204,7 +204,7 @@ def create(activity):
|
|||
logger.debug(' -- does actor %s have local followers?',
|
||||
activity['actor'])
|
||||
try:
|
||||
if kepi_models.Following.objects.filter(
|
||||
if bowler_pub_models.Following.objects.filter(
|
||||
following = activity['actor'],
|
||||
):
|
||||
logger.debug(' -- yes!')
|
||||
|
@ -222,7 +222,7 @@ def create(activity):
|
|||
'To be honest, that\'s none of our business.')
|
||||
return False
|
||||
|
||||
creation = kepi_create(
|
||||
creation = bowler_pub_create(
|
||||
value = raw_material,
|
||||
is_local_user = activity.is_local,
|
||||
run_side_effects = False,
|
Przed Szerokość: | Wysokość: | Rozmiar: 95 KiB Po Szerokość: | Wysokość: | Rozmiar: 95 KiB |
Przed Szerokość: | Wysokość: | Rozmiar: 8.2 KiB Po Szerokość: | Wysokość: | Rozmiar: 8.2 KiB |
Przed Szerokość: | Wysokość: | Rozmiar: 8.3 KiB Po Szerokość: | Wysokość: | Rozmiar: 8.3 KiB |
Przed Szerokość: | Wysokość: | Rozmiar: 8.7 KiB Po Szerokość: | Wysokość: | Rozmiar: 8.7 KiB |
Przed Szerokość: | Wysokość: | Rozmiar: 9.9 KiB Po Szerokość: | Wysokość: | Rozmiar: 9.9 KiB |
Przed Szerokość: | Wysokość: | Rozmiar: 9.9 KiB Po Szerokość: | Wysokość: | Rozmiar: 9.9 KiB |
Przed Szerokość: | Wysokość: | Rozmiar: 58 KiB Po Szerokość: | Wysokość: | Rozmiar: 58 KiB |
Przed Szerokość: | Wysokość: | Rozmiar: 5.3 KiB Po Szerokość: | Wysokość: | Rozmiar: 5.3 KiB |
Przed Szerokość: | Wysokość: | Rozmiar: 9.1 KiB Po Szerokość: | Wysokość: | Rozmiar: 9.1 KiB |
Przed Szerokość: | Wysokość: | Rozmiar: 58 KiB Po Szerokość: | Wysokość: | Rozmiar: 58 KiB |
Przed Szerokość: | Wysokość: | Rozmiar: 124 KiB Po Szerokość: | Wysokość: | Rozmiar: 124 KiB |
Przed Szerokość: | Wysokość: | Rozmiar: 129 KiB Po Szerokość: | Wysokość: | Rozmiar: 129 KiB |
Przed Szerokość: | Wysokość: | Rozmiar: 18 KiB Po Szerokość: | Wysokość: | Rozmiar: 18 KiB |
Przed Szerokość: | Wysokość: | Rozmiar: 272 KiB Po Szerokość: | Wysokość: | Rozmiar: 272 KiB |
Przed Szerokość: | Wysokość: | Rozmiar: 9.1 KiB Po Szerokość: | Wysokość: | Rozmiar: 9.1 KiB |
|
@ -1,7 +1,7 @@
|
|||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.validation import IncomingMessage, validate
|
||||
from chapeau.kepi.models import AcObject, AcActor
|
||||
from chapeau.kepi.utils import as_json, uri_to_url, configured_url
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.validation import IncomingMessage, validate
|
||||
from chapeau.bowler_pub.models import AcObject, AcActor
|
||||
from chapeau.bowler_pub.utils import as_json, uri_to_url, configured_url
|
||||
from django.conf import settings
|
||||
import django.test
|
||||
import httpretty
|
||||
|
@ -36,7 +36,7 @@ CONTEXT_URL = "https://www.w3.org/ns/activitystreams"
|
|||
logger = logging.getLogger(name='chapeau')
|
||||
|
||||
def create_local_person(name='jemima',
|
||||
load_default_keys_from='chapeau/kepi/tests/keys/keys-0003.json',
|
||||
load_default_keys_from='chapeau/bowler_pub/tests/keys/keys-0003.json',
|
||||
**kwargs):
|
||||
|
||||
if 'publicKey' or 'privateKey' not in kwargs:
|
||||
|
@ -363,7 +363,7 @@ def remote_user(url, name,
|
|||
|
||||
def remote_object_is_recorded(url):
|
||||
|
||||
from chapeau.kepi.models import AcObject
|
||||
from chapeau.bowler_pub.models import AcObject
|
||||
|
||||
try:
|
||||
result = AcObject.objects.get(id=url)
|
|
@ -1,7 +1,7 @@
|
|||
from io import StringIO
|
||||
from django.test import TestCase
|
||||
from django.core.management import call_command
|
||||
from chapeau.kepi.models import *
|
||||
from chapeau.bowler_pub.models import *
|
||||
from .. import create_local_person
|
||||
|
||||
class KepiPostTest(TestCase):
|
|
@ -1,9 +1,9 @@
|
|||
from django.test import TestCase
|
||||
from chapeau.kepi.tests import create_local_note, create_local_person
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.models.audience import Audience, AUDIENCE_FIELD_NAMES
|
||||
from chapeau.kepi.models.mention import Mention
|
||||
from chapeau.kepi.models.item import AcItem
|
||||
from chapeau.bowler_pub.tests import create_local_note, create_local_person
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.models.audience import Audience, AUDIENCE_FIELD_NAMES
|
||||
from chapeau.bowler_pub.models.mention import Mention
|
||||
from chapeau.bowler_pub.models.item import AcItem
|
||||
from .. import create_local_person
|
||||
import logging
|
||||
import json
|
||||
|
@ -306,7 +306,7 @@ class TestCreate(TestCase):
|
|||
|
||||
def test_when_sender_is_followed_by_local_users(self):
|
||||
|
||||
from chapeau.kepi.models.following import Following
|
||||
from chapeau.bowler_pub.models.following import Following
|
||||
|
||||
local_user = create_local_person()
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
from chapeau.kepi.tests import create_local_note, create_local_person
|
||||
from chapeau.bowler_pub.tests import create_local_note, create_local_person
|
||||
from unittest import skip
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.bowler_pub.create import create
|
||||
from django.test import TestCase
|
||||
|
||||
class TestLike(TestCase):
|
|
@ -1,8 +1,8 @@
|
|||
from django.test import TestCase
|
||||
from chapeau.kepi.tests import create_local_note, create_local_person
|
||||
from chapeau.bowler_pub.tests import create_local_note, create_local_person
|
||||
from unittest import skip
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.models import *
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.models import *
|
||||
import logging
|
||||
|
||||
SENDER_ID = 'https://example.com/actor'
|
|
@ -5,8 +5,8 @@
|
|||
# Licensed under the GNU Public License v2.
|
||||
|
||||
from django.test import TestCase
|
||||
from chapeau.kepi.models import AcObject, AcActivity
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.bowler_pub.models import AcObject, AcActivity
|
||||
from chapeau.bowler_pub.create import create
|
||||
from unittest import skip
|
||||
from . import remote_object_is_recorded, create_local_person
|
||||
import logging
|
||||
|
@ -39,7 +39,7 @@ class TestAcObject(TestCase):
|
|||
|
||||
def test_remote_no_id(self):
|
||||
|
||||
from chapeau.kepi.models import AcObject
|
||||
from chapeau.bowler_pub.models import AcObject
|
||||
|
||||
create(
|
||||
f_type = "Create",
|
|
@ -1,6 +1,6 @@
|
|||
from django.test import TestCase
|
||||
from chapeau.kepi.models import Audience
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.bowler_pub.models import Audience
|
||||
from chapeau.bowler_pub.create import create
|
||||
from . import create_local_person, REMOTE_FRED, REMOTE_JIM
|
||||
|
||||
class TestAudience(TestCase):
|
|
@ -1,10 +1,10 @@
|
|||
from django.test import TestCase, Client
|
||||
from unittest import skip
|
||||
from chapeau.kepi.models import *
|
||||
from chapeau.bowler_pub.models import *
|
||||
import datetime
|
||||
import json
|
||||
from chapeau.kepi.find import find
|
||||
from chapeau.kepi.utils import as_json
|
||||
from chapeau.bowler_pub.find import find
|
||||
from chapeau.bowler_pub.utils import as_json
|
||||
from . import *
|
||||
import logging
|
||||
|
|
@ -9,10 +9,10 @@
|
|||
|
||||
from django.test import TestCase, Client
|
||||
from django.conf import settings
|
||||
from chapeau.kepi.delivery import deliver
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.models import AcObject
|
||||
import chapeau.kepi.views as kepi_views
|
||||
from chapeau.bowler_pub.delivery import deliver
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.models import AcObject
|
||||
import chapeau.bowler_pub.views as bowler_pub_views
|
||||
from unittest.mock import Mock, patch
|
||||
from . import *
|
||||
import logging
|
||||
|
@ -38,7 +38,7 @@ class TestDelivery(TestCase):
|
|||
|
||||
def _set_up_remote_user_mocks(self):
|
||||
|
||||
keys = json.load(open('chapeau/kepi/tests/keys/keys-0001.json', 'r'))
|
||||
keys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0001.json', 'r'))
|
||||
|
||||
create_remote_person(
|
||||
url = REMOTE_FRED,
|
||||
|
@ -86,14 +86,14 @@ class TestDelivery(TestCase):
|
|||
|
||||
def _set_up_local_user_mocks(self):
|
||||
|
||||
keys = json.load(open('chapeau/kepi/tests/keys/keys-0002.json', 'r'))
|
||||
keys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0002.json', 'r'))
|
||||
|
||||
# I know these aren't mocks. This is just for consistency.
|
||||
create_local_person(name='alice',
|
||||
privateKey = keys['private'])
|
||||
create_local_person(name='bob')
|
||||
|
||||
@patch.object(kepi_views.activitypub.ActorView, 'activity_store')
|
||||
@patch.object(bowler_pub_views.activitypub.ActorView, 'activity_store')
|
||||
@httpretty.activate
|
||||
def _test_delivery(self,
|
||||
fake_local_request,
|
|
@ -1,12 +1,12 @@
|
|||
from django.test import TestCase
|
||||
from chapeau.kepi.find import find
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.bowler_pub.find import find
|
||||
from chapeau.bowler_pub.create import create
|
||||
from django.conf import settings
|
||||
from . import *
|
||||
import httpretty
|
||||
import json
|
||||
import logging
|
||||
from chapeau.kepi.utils import as_json
|
||||
from chapeau.bowler_pub.utils import as_json
|
||||
|
||||
logger = logging.getLogger(name='chapeau')
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
from django.test import TestCase
|
||||
from unittest import skip
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.models import *
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.models import *
|
||||
import logging
|
||||
|
||||
logger = logging.getLogger(name='chapeau')
|
|
@ -1,6 +1,6 @@
|
|||
from django.conf import settings
|
||||
from django.test import TestCase, Client
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.bowler_pub.create import create
|
||||
from . import create_local_person
|
||||
import httpretty
|
||||
import logging
|
||||
|
@ -126,7 +126,7 @@ class TestOutbox(TestCase):
|
|||
what):
|
||||
|
||||
if not hasattr(self, '_example_user'):
|
||||
keys = json.load(open('chapeau/kepi/tests/keys/keys-0001.json', 'r'))
|
||||
keys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0001.json', 'r'))
|
||||
|
||||
alice = create_local_person(
|
||||
name='alice',
|
|
@ -1,11 +1,11 @@
|
|||
from django.test import TestCase
|
||||
from unittest import skip
|
||||
from chapeau.kepi.tests import *
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.models.audience import Audience, AUDIENCE_FIELD_NAMES
|
||||
from chapeau.kepi.models.mention import Mention
|
||||
from chapeau.kepi.models.item import AcItem
|
||||
from chapeau.kepi.models.following import Following
|
||||
from chapeau.bowler_pub.tests import *
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.models.audience import Audience, AUDIENCE_FIELD_NAMES
|
||||
from chapeau.bowler_pub.models.mention import Mention
|
||||
from chapeau.bowler_pub.models.item import AcItem
|
||||
from chapeau.bowler_pub.models.following import Following
|
||||
from django.test import Client
|
||||
from urllib.parse import urlparse
|
||||
import httpretty
|
||||
|
@ -65,7 +65,7 @@ class TestInbox2(TestCase):
|
|||
]
|
||||
|
||||
if recipientKeys is None:
|
||||
recipientKeys = json.load(open('chapeau/kepi/tests/keys/keys-0001.json', 'r'))
|
||||
recipientKeys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0001.json', 'r'))
|
||||
|
||||
if recipient is None:
|
||||
recipient = create_local_person(
|
||||
|
@ -75,7 +75,7 @@ class TestInbox2(TestCase):
|
|||
)
|
||||
|
||||
if senderKeys is None:
|
||||
senderKeys = json.load(open('chapeau/kepi/tests/keys/keys-0002.json', 'r'))
|
||||
senderKeys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0002.json', 'r'))
|
||||
|
||||
if sender is None:
|
||||
sender = create_remote_person(
|
||||
|
@ -163,7 +163,7 @@ class TestInbox2(TestCase):
|
|||
|
||||
@httpretty.activate
|
||||
def test_sole_inbox(self):
|
||||
recipientKeys = json.load(open('chapeau/kepi/tests/keys/keys-0001.json', 'r'))
|
||||
recipientKeys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0001.json', 'r'))
|
||||
recipient = create_local_person(
|
||||
name = 'alice',
|
||||
publicKey = recipientKeys['public'],
|
||||
|
@ -192,7 +192,7 @@ class TestInbox2(TestCase):
|
|||
|
||||
@httpretty.activate
|
||||
def test_shared_inbox(self):
|
||||
recipientKeys = json.load(open('chapeau/kepi/tests/keys/keys-0001.json', 'r'))
|
||||
recipientKeys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0001.json', 'r'))
|
||||
recipient = create_local_person(
|
||||
name = 'alice',
|
||||
publicKey = recipientKeys['public'],
|
|
@ -1,12 +1,12 @@
|
|||
from django.test import TestCase
|
||||
from unittest import skip
|
||||
from chapeau.kepi.tests import *
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.models.audience import Audience, AUDIENCE_FIELD_NAMES
|
||||
from chapeau.kepi.models.mention import Mention
|
||||
from chapeau.kepi.models.item import AcItem
|
||||
from chapeau.kepi.models.acobject import AcObject
|
||||
from chapeau.kepi.models.activity import AcActivity
|
||||
from chapeau.bowler_pub.tests import *
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.models.audience import Audience, AUDIENCE_FIELD_NAMES
|
||||
from chapeau.bowler_pub.models.mention import Mention
|
||||
from chapeau.bowler_pub.models.item import AcItem
|
||||
from chapeau.bowler_pub.models.acobject import AcObject
|
||||
from chapeau.bowler_pub.models.activity import AcActivity
|
||||
from django.test import Client
|
||||
from urllib.parse import urlparse
|
||||
import httpretty
|
||||
|
@ -63,7 +63,7 @@ class TestOutbox(TestCase):
|
|||
):
|
||||
|
||||
if keys is None:
|
||||
keys = json.load(open('chapeau/kepi/tests/keys/keys-0001.json', 'r'))
|
||||
keys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0001.json', 'r'))
|
||||
|
||||
if sender is None:
|
||||
sender = create_local_person(
|
||||
|
@ -163,7 +163,7 @@ class TestOutbox(TestCase):
|
|||
|
||||
def test_post_by_remote_interloper(self):
|
||||
|
||||
keys = json.load(open('chapeau/kepi/tests/keys/keys-0002.json', 'r'))
|
||||
keys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0002.json', 'r'))
|
||||
|
||||
sender = create_remote_person(
|
||||
url = REMOTE_DAVE_ID,
|
||||
|
@ -190,8 +190,8 @@ class TestOutbox(TestCase):
|
|||
|
||||
def test_post_by_local_interloper(self):
|
||||
|
||||
keys1 = json.load(open('chapeau/kepi/tests/keys/keys-0001.json', 'r'))
|
||||
keys2 = json.load(open('chapeau/kepi/tests/keys/keys-0002.json', 'r'))
|
||||
keys1 = json.load(open('chapeau/bowler_pub/tests/keys/keys-0001.json', 'r'))
|
||||
keys2 = json.load(open('chapeau/bowler_pub/tests/keys/keys-0002.json', 'r'))
|
||||
|
||||
create_local_person(
|
||||
name = 'alice',
|
||||
|
@ -344,7 +344,7 @@ class TestOutbox(TestCase):
|
|||
|
||||
c = Client()
|
||||
|
||||
keys = json.load(open('chapeau/kepi/tests/keys/keys-0001.json', 'r'))
|
||||
keys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0001.json', 'r'))
|
||||
|
||||
alice = create_local_person(
|
||||
name = 'alice',
|
|
@ -1,6 +1,6 @@
|
|||
from django.test import TestCase, Client
|
||||
from chapeau.kepi.validation import IncomingMessage, validate
|
||||
from chapeau.kepi.models import AcObject
|
||||
from chapeau.bowler_pub.validation import IncomingMessage, validate
|
||||
from chapeau.bowler_pub.models import AcObject
|
||||
from unittest import skip
|
||||
import httpretty
|
||||
from . import *
|
||||
|
@ -37,7 +37,7 @@ class TestValidationTasks(TestCase):
|
|||
@httpretty.activate
|
||||
def test_local_lookup(self):
|
||||
|
||||
keys = json.load(open('chapeau/kepi/tests/keys/keys-0001.json', 'r'))
|
||||
keys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0001.json', 'r'))
|
||||
|
||||
alice = create_local_person(
|
||||
name = 'alice',
|
||||
|
@ -67,7 +67,7 @@ class TestValidationTasks(TestCase):
|
|||
@httpretty.activate
|
||||
def test_remote_user_known(self):
|
||||
|
||||
keys = json.load(open('chapeau/kepi/tests/keys/keys-0001.json', 'r'))
|
||||
keys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0001.json', 'r'))
|
||||
fetched = {
|
||||
'fred': False,
|
||||
}
|
||||
|
@ -108,8 +108,8 @@ class TestValidationTasks(TestCase):
|
|||
@httpretty.activate
|
||||
def test_remote_user_spoofed(self):
|
||||
|
||||
keys1 = json.load(open('chapeau/kepi/tests/keys/keys-0001.json', 'r'))
|
||||
keys2 = json.load(open('chapeau/kepi/tests/keys/keys-0002.json', 'r'))
|
||||
keys1 = json.load(open('chapeau/bowler_pub/tests/keys/keys-0001.json', 'r'))
|
||||
keys2 = json.load(open('chapeau/bowler_pub/tests/keys/keys-0002.json', 'r'))
|
||||
|
||||
fetched = {
|
||||
'fred': False,
|
||||
|
@ -153,7 +153,7 @@ class TestValidationTasks(TestCase):
|
|||
@httpretty.activate
|
||||
def test_remote_user_gone(self):
|
||||
|
||||
keys = json.load(open('chapeau/kepi/tests/keys/keys-0001.json', 'r'))
|
||||
keys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0001.json', 'r'))
|
||||
fetched = {
|
||||
'fred': False,
|
||||
}
|
||||
|
@ -190,7 +190,7 @@ class TestValidationTasks(TestCase):
|
|||
@httpretty.activate
|
||||
def test_remote_user_unknown(self):
|
||||
|
||||
keys = json.load(open('chapeau/kepi/tests/keys/keys-0001.json', 'r'))
|
||||
keys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0001.json', 'r'))
|
||||
fetched = {
|
||||
'fred': False,
|
||||
}
|
|
@ -25,7 +25,7 @@ class TestKepiView(TestCase):
|
|||
settings.KEPI['LOCAL_OBJECT_HOSTNAME'] = 'testserver'
|
||||
self.maxDiff = None
|
||||
|
||||
def test_single_kepi_view(self):
|
||||
def test_single_bowler_pub_view(self):
|
||||
|
||||
alice = create_local_person('alice',
|
||||
summary = ALICE_SUMMARY,
|
||||
|
@ -54,7 +54,7 @@ class TestKepiView(TestCase):
|
|||
ALICE_SUMMARY,
|
||||
)
|
||||
|
||||
def test_multiple_kepi_view(self):
|
||||
def test_multiple_bowler_pub_view(self):
|
||||
|
||||
alice = create_local_person('alice')
|
||||
bob = create_local_person('bob')
|
|
@ -13,7 +13,7 @@ logger = logging.getLogger(name='chapeau')
|
|||
class TestWebfinger(TestCase):
|
||||
|
||||
def setUp(self):
|
||||
keys = json.load(open('chapeau/kepi/tests/keys/keys-0001.json', 'r'))
|
||||
keys = json.load(open('chapeau/bowler_pub/tests/keys/keys-0001.json', 'r'))
|
||||
|
||||
create_local_person(
|
||||
name='alice',
|
|
@ -0,0 +1,34 @@
|
|||
# urls.py
|
||||
#
|
||||
# Part of an ActivityPub daemon.
|
||||
# Copyright (c) 2018-2019 Marnanel Thurman.
|
||||
# Licensed under the GNU Public License v2.
|
||||
|
||||
"""
|
||||
These are URL patterns, to include from your app's urls.py.
|
||||
"""
|
||||
|
||||
from django.urls import path, re_path
|
||||
import chapeau.bowler_pub.views as bowler_pub_views
|
||||
|
||||
urlpatterns = [
|
||||
re_path('^(?P<id>[0-9a-z]{8})$', bowler_pub_views.ThingView.as_view()),
|
||||
path('users', bowler_pub_views.AllUsersView.as_view()),
|
||||
path('users/<str:username>', bowler_pub_views.ActorView.as_view()),
|
||||
path('users/<str:username>/inbox', bowler_pub_views.InboxView.as_view(),
|
||||
{ 'listname': 'inbox', } ),
|
||||
path('users/<str:username>/outbox', bowler_pub_views.OutboxView.as_view(),
|
||||
{ 'listname': 'outbox', } ),
|
||||
path('users/<str:username>/followers', bowler_pub_views.FollowersView.as_view()),
|
||||
path('users/<str:username>/following', bowler_pub_views.FollowingView.as_view()),
|
||||
path('sharedInbox', bowler_pub_views.InboxView.as_view()),
|
||||
|
||||
# XXX We might want to split out the patterns that HAVE to be
|
||||
# at the root.
|
||||
|
||||
path('.well-known/host-meta', bowler_pub_views.HostMeta.as_view()),
|
||||
path('.well-known/webfinger', bowler_pub_views.Webfinger.as_view()),
|
||||
path('.well-known/nodeinfo', bowler_pub_views.NodeinfoPart1.as_view()),
|
||||
path('nodeinfo.json', bowler_pub_views.NodeinfoPart2.as_view()),
|
||||
]
|
||||
|
|
@ -29,7 +29,7 @@ class IncomingMessage(models.Model):
|
|||
|
||||
At present, we don't delete them afterwards. This is
|
||||
so we can use them for forensics when stuff goes wrong.
|
||||
But eventually we'll need kepi to clear up after itself.
|
||||
But eventually we'll need bowler_pub to clear up after itself.
|
||||
|
||||
The primary key is a UUID because it helps with logging.
|
||||
You can't use any of the fields from the message to identify it,
|
||||
|
@ -156,9 +156,9 @@ def _run_validation(
|
|||
that was generated by validate().
|
||||
"""
|
||||
|
||||
from chapeau.kepi.delivery import deliver
|
||||
from chapeau.kepi.create import create
|
||||
from chapeau.kepi.find import find
|
||||
from chapeau.bowler_pub.delivery import deliver
|
||||
from chapeau.bowler_pub.create import create
|
||||
from chapeau.bowler_pub.find import find
|
||||
|
||||
logger.info('%s: begin validation',
|
||||
message_id)
|