diff --git a/books/models.py b/books/models.py index 47d40db2..6c827f0e 100644 --- a/books/models.py +++ b/books/models.py @@ -1,6 +1,6 @@ import uuid import django.contrib.postgres.fields as postgres -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.db import models from django.core.serializers.json import DjangoJSONEncoder from django.shortcuts import reverse diff --git a/common/forms.py b/common/forms.py index 2b97cf79..b255f2ee 100644 --- a/common/forms.py +++ b/common/forms.py @@ -46,7 +46,7 @@ class HstoreInput(forms.Widget): js = ('js/key_value_input.js',) -class JSONField(postgres.JSONField): +class JSONField(forms.fields.JSONField): widget = KeyValueInput def to_python(self, value): if not value: diff --git a/common/models.py b/common/models.py index a7fefc0a..b69a9868 100644 --- a/common/models.py +++ b/common/models.py @@ -1,7 +1,7 @@ import re from decimal import * from markdown import markdown -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.db import models, IntegrityError from django.core.serializers.json import DjangoJSONEncoder from django.db.models import Q @@ -161,6 +161,8 @@ class UserOwnedEntity(models.Model): abstract = True def is_visible_to(self, viewer): + if not viewer.is_authenticated: + return self.visibility == 0 owner = self.owner if owner == viewer: return True diff --git a/games/models.py b/games/models.py index 74a6dcf0..177255cb 100644 --- a/games/models.py +++ b/games/models.py @@ -1,6 +1,6 @@ import uuid import django.contrib.postgres.fields as postgres -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.db import models from django.core.serializers.json import DjangoJSONEncoder from django.shortcuts import reverse diff --git a/management/models.py b/management/models.py index 9816781e..c5bf2f64 100644 --- a/management/models.py +++ b/management/models.py @@ -1,7 +1,7 @@ import re from django.db import models from django.shortcuts import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from markdownx.models import MarkdownxField from markdown import markdown diff --git a/mastodon/api.py b/mastodon/api.py index c950b1be..024bb7c1 100644 --- a/mastodon/api.py +++ b/mastodon/api.py @@ -104,11 +104,8 @@ def create_app(domain_name): 'website': settings.APP_WEBSITE } - if settings.DEBUG: - payload['redirect_uris'] = 'http://localhost/users/OAuth2_login/\nurn:ietf:wg:oauth:2.0:oob' - payload['client_name'] = 'test_do_not_authorise' - response = post(url, data=payload, headers={'User-Agent': 'NeoDB/1.0'}) + print(payload) return response diff --git a/mastodon/models.py b/mastodon/models.py index 220dd217..138b5f43 100644 --- a/mastodon/models.py +++ b/mastodon/models.py @@ -1,6 +1,6 @@ from django.db import models from django.utils import timezone -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class MastodonApplication(models.Model): diff --git a/movies/models.py b/movies/models.py index 84fc9270..599b030f 100644 --- a/movies/models.py +++ b/movies/models.py @@ -1,6 +1,6 @@ import uuid import django.contrib.postgres.fields as postgres -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.db import models from django.core.serializers.json import DjangoJSONEncoder from django.shortcuts import reverse diff --git a/music/models.py b/music/models.py index 5d785a5a..31493387 100644 --- a/music/models.py +++ b/music/models.py @@ -1,6 +1,6 @@ import uuid import django.contrib.postgres.fields as postgres -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.db import models from django.core.serializers.json import DjangoJSONEncoder from django.shortcuts import reverse diff --git a/requirements.txt b/requirements.txt index 9e83c89a..01017454 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ dateparser -django +django~=3.2.10 django-hstore django-markdownx django-sass diff --git a/sync/models.py b/sync/models.py index a3d10d7c..ae3993e7 100644 --- a/sync/models.py +++ b/sync/models.py @@ -1,5 +1,5 @@ from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ import django.contrib.postgres.fields as postgres from users.models import User from common.utils import GenerateDateUUIDMediaFilePath diff --git a/users/models.py b/users/models.py index d128c259..23842abd 100644 --- a/users/models.py +++ b/users/models.py @@ -4,7 +4,7 @@ from django.db import models from django.contrib.auth.models import AbstractUser from django.utils import timezone from django.core.serializers.json import DjangoJSONEncoder -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from common.utils import GenerateDateUUIDMediaFilePath from django.conf import settings from mastodon.api import *