Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ran black on branc

Browse source
This commit is contained in:
Griatch 2019-12-16 20:31:42 +01:00
parent 6effb6f456
commit 4ea6209123
230 changed files with 7108 additions and 2395 deletions
Download patch file Download diff file Expand all files Collapse all files

9
evennia/web/urls.py
View file

@ -14,9 +14,14 @@ from django.views.generic import RedirectView
urlpatterns = [
# Front page (note that we shouldn't specify namespace here since we will
# not be able to load django-auth/admin stuff (will probably work in Django>1.9)
url(r"^", include("evennia.web.website.urls")), # , namespace='website', app_name='website')),
url(
r"^", include("evennia.web.website.urls")
), # , namespace='website', app_name='website')),
# webclient
url(r"^webclient/", include("evennia.web.webclient.urls", namespace="webclient")),
# favicon
url(r"^favicon\.ico$", RedirectView.as_view(url="/media/images/favicon.ico", permanent=False)),
url(
r"^favicon\.ico$",
RedirectView.as_view(url="/media/images/favicon.ico", permanent=False),
),
]

15
evennia/web/utils/tests.py
View file

@ -13,9 +13,18 @@ class TestGeneralContext(TestCase):
"evennia.web.utils.general_context.WEBSOCKET_CLIENT_ENABLED",
"websocket_client_enabled_testvalue",
)
@patch("evennia.web.utils.general_context.WEBCLIENT_ENABLED", "webclient_enabled_testvalue")
@patch("evennia.web.utils.general_context.WEBSOCKET_PORT", "websocket_client_port_testvalue")
@patch("evennia.web.utils.general_context.WEBSOCKET_URL", "websocket_client_url_testvalue")
@patch(
"evennia.web.utils.general_context.WEBCLIENT_ENABLED",
"webclient_enabled_testvalue",
)
@patch(
"evennia.web.utils.general_context.WEBSOCKET_PORT",
"websocket_client_port_testvalue",
)
@patch(
"evennia.web.utils.general_context.WEBSOCKET_URL",
"websocket_client_url_testvalue",
)
def test_general_context(self):
request = RequestFactory().get("/")
request.user = AnonymousUser()

3
evennia/web/website/forms.py
View file

@ -63,7 +63,8 @@ class AccountForm(UserCreationForm):
# Username is collected as part of the core UserCreationForm, so we just need
# to add a field to (optionally) capture email.
email = forms.EmailField(
help_text="A valid email address. Optional; used for password resets.", required=False
help_text="A valid email address. Optional; used for password resets.",
required=False,
)

12
evennia/web/website/tests.py
View file

@ -65,7 +65,9 @@ class EvenniaWebTest(EvenniaTest):
self.assertTrue(logged_in, "Account failed to log in!")
# Try accessing page while logged in
response = self.client.get(reverse(self.url_name, kwargs=self.get_kwargs()), follow=True)
response = self.client.get(
reverse(self.url_name, kwargs=self.get_kwargs()), follow=True
)
self.assertEqual(response.status_code, self.authenticated_response)
@ -225,7 +227,9 @@ class CharacterUpdateView(EvenniaWebTest):
self.login()
# Try to access update page for char1
response = self.client.get(reverse(self.url_name, kwargs=self.get_kwargs()), follow=True)
response = self.client.get(
reverse(self.url_name, kwargs=self.get_kwargs()), follow=True
)
self.assertEqual(response.status_code, 200)
# Try to update char1 desc
@ -262,7 +266,9 @@ class CharacterDeleteView(EvenniaWebTest):
self.login()
# Try to access delete page for char1
response = self.client.get(reverse(self.url_name, kwargs=self.get_kwargs()), follow=True)
response = self.client.get(
reverse(self.url_name, kwargs=self.get_kwargs()), follow=True
)
self.assertEqual(response.status_code, 200)
# Proceed with deleting it

53
evennia/web/website/views.py
View file

@ -39,7 +39,9 @@ def _gamestats():
fpage_account_limit = 4
# A QuerySet of the most recently connected accounts.
recent_users = AccountDB.objects.get_recently_connected_accounts()[:fpage_account_limit]
recent_users = AccountDB.objects.get_recently_connected_accounts()[
:fpage_account_limit
]
nplyrs_conn_recent = len(recent_users) or "none"
nplyrs = AccountDB.objects.num_total_accounts() or "none"
nplyrs_reg_recent = len(AccountDB.objects.get_recently_created_accounts()) or "none"
@ -353,7 +355,9 @@ class ObjectDetailView(EvenniaDetailView):
# Check if the requestor account has permissions to access object
account = self.request.user
if not obj.access(account, self.access_type):
raise PermissionDenied("You are not authorized to %s this object." % self.access_type)
raise PermissionDenied(
"You are not authorized to %s this object." % self.access_type
)
# Get the object, if it is in the specified queryset
obj = super(ObjectDetailView, self).get_object(queryset)
@ -486,12 +490,18 @@ class ObjectUpdateView(LoginRequiredMixin, ObjectDetailView, EvenniaUpdateView):
"""
# Get the attributes after they've been cleaned and validated
data = {k: v for k, v in form.cleaned_data.items() if k not in self.form_class.Meta.fields}
data = {
k: v
for k, v in form.cleaned_data.items()
if k not in self.form_class.Meta.fields
}
# Update the object attributes
for key, value in data.items():
self.object.attributes.add(key, value)
messages.success(self.request, "Successfully updated '%s' for %s." % (key, self.object))
messages.success(
self.request, "Successfully updated '%s' for %s." % (key, self.object)
)
# Do not return super().form_valid; we don't want to update the model
# instance, just its attributes.
@ -543,7 +553,9 @@ class AccountCreateView(AccountMixin, EvenniaCreateView):
email = form.cleaned_data.get("email", "")
# Create account
account, errs = self.typeclass.create(username=username, password=password, email=email)
account, errs = self.typeclass.create(
username=username, password=password, email=email
)
# If unsuccessful, display error messages to user
if not account:
@ -633,13 +645,17 @@ class CharacterListView(LoginRequiredMixin, CharacterMixin, ListView):
# Return a queryset consisting of characters the user is allowed to
# see.
ids = [
obj.id for obj in self.typeclass.objects.all() if obj.access(account, self.access_type)
obj.id
for obj in self.typeclass.objects.all()
if obj.access(account, self.access_type)
]
return self.typeclass.objects.filter(id__in=ids).order_by(Lower("db_key"))
class CharacterPuppetView(LoginRequiredMixin, CharacterMixin, RedirectView, ObjectDetailView):
class CharacterPuppetView(
LoginRequiredMixin, CharacterMixin, RedirectView, ObjectDetailView
):
"""
This view provides a mechanism by which a logged-in player can "puppet" one
of their characters within the context of the website.
@ -736,7 +752,9 @@ class CharacterDetailView(CharacterMixin, ObjectDetailView):
# Return a queryset consisting of characters the user is allowed to
# see.
ids = [
obj.id for obj in self.typeclass.objects.all() if obj.access(account, self.access_type)
obj.id
for obj in self.typeclass.objects.all()
if obj.access(account, self.access_type)
]
return self.typeclass.objects.filter(id__in=ids).order_by(Lower("db_key"))
@ -781,7 +799,9 @@ class CharacterCreateView(CharacterMixin, ObjectCreateView):
charname = self.attributes.pop("db_key")
description = self.attributes.pop("desc")
# Create a character
character, errors = self.typeclass.create(charname, account, description=description)
character, errors = self.typeclass.create(
charname, account, description=description
)
if errors:
# Echo error messages to the user
@ -793,7 +813,9 @@ class CharacterCreateView(CharacterMixin, ObjectCreateView):
setattr(character.db, key, value)
# Return the user to the character management page, unless overridden
messages.success(self.request, "Your character '%s' was created!" % character.name)
messages.success(
self.request, "Your character '%s' was created!" % character.name
)
return HttpResponseRedirect(self.success_url)
else:
@ -841,10 +863,14 @@ class ChannelMixin(TypeclassMixin):
channels = self.typeclass.objects.all().iterator()
# Now figure out which ones the current user is allowed to see
bucket = [channel.id for channel in channels if channel.access(account, "listen")]
bucket = [
channel.id for channel in channels if channel.access(account, "listen")
]
# Re-query and set a sorted list
filtered = self.typeclass.objects.filter(id__in=bucket).order_by(Lower("db_key"))
filtered = self.typeclass.objects.filter(id__in=bucket).order_by(
Lower("db_key")
)
return filtered
@ -1106,7 +1132,8 @@ class HelpDetailView(HelpMixin, EvenniaDetailView):
(
x
for x in queryset
if slugify(x.db_help_category) == category and slugify(x.db_key) == topic
if slugify(x.db_help_category) == category
and slugify(x.db_key) == topic
),
None,
)