From 0f1240ca1fb9c8e8b40fa32c297dd9bda66e5bce Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 Feb 2020 22:10:05 -0800
Subject: [PATCH] Resolve miscellaneous TODOS

Fixes #2
---
 fedireads/api.py                     | 4 +++-
 fedireads/migrations/0001_initial.py | 5 +++--
 fedireads/settings.py                | 9 +++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/fedireads/api.py b/fedireads/api.py
index 3a70137d..0374190a 100644
--- a/fedireads/api.py
+++ b/fedireads/api.py
@@ -6,6 +6,7 @@ from Crypto.Hash import SHA256
 from datetime import datetime
 import json
 import requests
+from urllib.parse import urlparse
 
 from fedireads import models
 from fedireads import incoming
@@ -32,7 +33,8 @@ def get_or_create_remote_user(actor):
 
     # the webfinger format for the username.
     # TODO: get the user's domain in a better way
-    username = '%s@%s' % (actor.split('/')[-1], actor.split('/')[2])
+    actor_parts = urlparse(actor)
+    username = '%s@%s' % (actor_parts.path.split('/')[-1], actor_parts.netloc)
     shared_inbox = data.get('endpoints').get('sharedInbox') if \
         data.get('endpoints') else None
 
diff --git a/fedireads/migrations/0001_initial.py b/fedireads/migrations/0001_initial.py
index d8f05baf..22e8d020 100644
--- a/fedireads/migrations/0001_initial.py
+++ b/fedireads/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.0.2 on 2020-02-01 00:22
+# Generated by Django 3.0.2 on 2020-02-11 05:57
 
 from django.conf import settings
 import django.contrib.auth.models
@@ -7,6 +7,7 @@ import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
+import fedireads.models
 
 
 class Migration(migrations.Migration):
@@ -189,7 +190,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('activity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='fedireads.Activity')),
                 ('name', models.CharField(max_length=255)),
-                ('rating', models.IntegerField(default=0)),
+                ('rating', models.IntegerField(default=0, validators=[fedireads.models.validate_rating])),
                 ('review_content', models.TextField()),
                 ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='fedireads.Book')),
             ],
diff --git a/fedireads/settings.py b/fedireads/settings.py
index a88a7d94..1af5933c 100644
--- a/fedireads/settings.py
+++ b/fedireads/settings.py
@@ -4,7 +4,6 @@ import os
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
 
@@ -14,8 +13,8 @@ SECRET_KEY = '7(2w1sedok=aznpq)ta1mc4i%4h=xx@hxwx*o57ctsuml0x%fr'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-# TODO: this hsould be populated at runtime at least for debug mode
-DOMAIN = 'a4522b16.ngrok.io'
+# TODO: this should be populated at runtime at least for debug mode
+DOMAIN = 'af064ab4.ngrok.io'
 ALLOWED_HOSTS = ['*']
 OL_URL = 'https://openlibrary.org'
 
@@ -44,7 +43,6 @@ MIDDLEWARE = [
 
 ROOT_URLCONF = 'fedireads.urls'
 
-# TODO: how tf do I switch to jinja2
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -120,5 +118,4 @@ USE_TZ = True
 
 STATIC_URL = '/static/'
 MEDIA_URL = '/images/'
-# TODO: this super doesn't work when I do a join on BASE_DIR
-MEDIA_ROOT = '/Users/mouse/Personal/fedireads/images/'
+MEDIA_ROOT = os.path.join(BASE_DIR, 'images/')