zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Merge branch 'main' into followers-following-views

Browse source
This commit is contained in:
Mouse Reeve 2022-07-29 13:09:30 -07:00 • committed by GitHub
commit 23188dfc5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
102 changed files with 16985 additions and 1412 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/views/__init__.py
View file

@ -127,7 +127,7 @@ from .setup import InstanceConfig, CreateAdmin
from .status import CreateStatus, EditStatus, DeleteStatus, update_progress
from .status import edit_readthrough
from .updates import get_notification_count, get_unread_status_string
from .user import User, hide_suggestions, user_redirect
from .user import User, hide_suggestions, user_redirect, toggle_guided_tour
from .relationships import Relationships
from .wellknown import *
from .annual_summary import (

1
bookwyrm/views/feed.py
View file

@ -65,6 +65,7 @@ class Feed(View):
"filters_applied": filters_applied,
"path": f"/{tab['key']}",
"annual_summary_year": get_annual_summary_year(),
"has_tour": True,
},
}
return TemplateResponse(request, "feed/feed.html", data)

4
bookwyrm/views/goal.py
View file

@ -70,7 +70,7 @@ class Goal(View):
privacy=goal.privacy,
)
return redirect(request.headers.get("Referer", "/"))
return redirect("user-goal", request.user.localname, year)
@require_POST
@ -79,4 +79,4 @@ def hide_goal(request):
"""don't keep bugging people to set a goal"""
request.user.show_goal = False
request.user.save(broadcast=False, update_fields=["show_goal"])
return redirect(request.headers.get("Referer", "/"))
return redirect("/")

10
bookwyrm/views/interaction.py
View file

@ -28,7 +28,7 @@ class Favorite(View):
if is_api_request(request):
return HttpResponse()
return redirect(request.headers.get("Referer", "/"))
return redirect("/")
@method_decorator(login_required, name="dispatch")
@ -48,7 +48,7 @@ class Unfavorite(View):
favorite.delete()
if is_api_request(request):
return HttpResponse()
return redirect(request.headers.get("Referer", "/"))
return redirect("/")
@method_decorator(login_required, name="dispatch")
@ -67,7 +67,7 @@ class Boost(View):
boosted_status=status, user=request.user
).exists():
# you already boosted that.
return redirect(request.headers.get("Referer", "/"))
return redirect("/")
models.Boost.objects.create(
boosted_status=status,
@ -76,7 +76,7 @@ class Boost(View):
)
if is_api_request(request):
return HttpResponse()
return redirect(request.headers.get("Referer", "/"))
return redirect("/")
@method_decorator(login_required, name="dispatch")
@ -94,4 +94,4 @@ class Unboost(View):
boost.delete()
if is_api_request(request):
return HttpResponse()
return redirect(request.headers.get("Referer", "/"))
return redirect("/")

2
bookwyrm/views/landing/login.py
View file

@ -58,7 +58,7 @@ class Login(View):
user.update_active_date()
if request.POST.get("first_login"):
return set_language(user, redirect("get-started-profile"))
return set_language(user, redirect(request.GET.get("next", "/")))
return set_language(user, redirect("/"))
# maybe the user is pending email confirmation
if models.User.objects.filter(

15
bookwyrm/views/landing/password.py
View file

@ -5,7 +5,7 @@ from django.shortcuts import redirect
from django.template.response import TemplateResponse
from django.views import View
from bookwyrm import models
from bookwyrm import forms, models
from bookwyrm.emailing import password_reset_email
@ -57,7 +57,8 @@ class PasswordReset(View):
except models.PasswordReset.DoesNotExist:
raise PermissionDenied()
return TemplateResponse(request, "landing/password_reset.html", {"code": code})
data = {"code": code, "form": forms.PasswordResetForm()}
return TemplateResponse(request, "landing/password_reset.html", data)
def post(self, request, code):
"""allow a user to change their password through an emailed token"""
@ -68,14 +69,12 @@ class PasswordReset(View):
return TemplateResponse(request, "landing/password_reset.html", data)
user = reset_code.user
new_password = request.POST.get("password")
confirm_password = request.POST.get("confirm-password")
if new_password != confirm_password:
data = {"errors": ["Passwords do not match"]}
form = forms.PasswordResetForm(request.POST, instance=user)
if not form.is_valid():
data = {"code": code, "form": form}
return TemplateResponse(request, "landing/password_reset.html", data)
new_password = form.cleaned_data["password"]
user.set_password(new_password)
user.save(broadcast=False, update_fields=["password"])
login(request, user)

8
bookwyrm/views/landing/register.py
View file

@ -134,19 +134,19 @@ class ConfirmEmail(View):
class ResendConfirmEmail(View):
"""you probably didn't get the email because celery is slow but you can try this"""
def get(self, request, error=False):
def get(self, request):
"""resend link landing page"""
return TemplateResponse(request, "confirm_email/resend.html", {"error": error})
return TemplateResponse(request, "confirm_email/resend.html")
def post(self, request):
"""resend confirmation link"""
email = request.POST.get("email")
try:
user = models.User.objects.get(email=email)
emailing.email_confirmation_email(user)
except models.User.DoesNotExist:
return self.get(request, error=True)
pass
emailing.email_confirmation_email(user)
return TemplateResponse(
request, "confirm_email/confirm_email.html", {"valid": True}
)

11
bookwyrm/views/list/lists.py
View file

@ -17,7 +17,10 @@ class Lists(View):
def get(self, request):
"""display a book list"""
lists = ListsStream().get_list_stream(request.user)
if request.user.is_authenticated:
lists = ListsStream().get_list_stream(request.user)
else:
lists = models.List.objects.filter(privacy="public")
paginated = Paginator(lists, 12)
data = {
"lists": paginated.get_page(request.GET.get("page")),
@ -33,11 +36,13 @@ class Lists(View):
form = forms.ListForm(request.POST)
if not form.is_valid():
return redirect("lists")
book_list = form.save()
book_list = form.save(commit=False)
book_list.raise_not_editable(request.user)
# list should not have a group if it is not group curated
if not book_list.curation == "group":
book_list.group = None
book_list.save(broadcast=False)
book_list.save()
return redirect(book_list.local_path)

30
bookwyrm/views/preferences/change_password.py
View file

@ -3,11 +3,10 @@ from django.contrib.auth import login
from django.contrib.auth.decorators import login_required
from django.template.response import TemplateResponse
from django.utils.decorators import method_decorator
from django.utils.translation import gettext_lazy as _
from django.views import View
from django.views.decorators.debug import sensitive_variables, sensitive_post_parameters
from bookwyrm import models
from bookwyrm import forms
# pylint: disable= no-self-use
@ -17,33 +16,24 @@ class ChangePassword(View):
def get(self, request):
"""change password page"""
data = {"user": request.user}
data = {"form": forms.ChangePasswordForm()}
return TemplateResponse(request, "preferences/change_password.html", data)
@sensitive_variables("new_password")
@sensitive_variables("confirm_password")
@method_decorator(sensitive_variables("new_password"))
@method_decorator(sensitive_post_parameters("current_password"))
@method_decorator(sensitive_post_parameters("password"))
@method_decorator(sensitive_post_parameters("confirm__password"))
@method_decorator(sensitive_post_parameters("confirm_password"))
def post(self, request):
"""allow a user to change their password"""
data = {"user": request.user}
# check current password
user = models.User.objects.get(id=request.user.id)
if not user.check_password(request.POST.get("current_password")):
data["errors"] = {"current_password": [_("Incorrect password")]}
return TemplateResponse(request, "preferences/change_password.html", data)
new_password = request.POST.get("password")
confirm_password = request.POST.get("confirm-password")
if new_password != confirm_password:
data["errors"] = {"confirm_password": [_("Password does not match")]}
form = forms.ChangePasswordForm(request.POST, instance=request.user)
if not form.is_valid():
data = {"form": form}
return TemplateResponse(request, "preferences/change_password.html", data)
new_password = form.cleaned_data["password"]
request.user.set_password(new_password)
request.user.save(broadcast=False, update_fields=["password"])
login(request, request.user)
data["success"] = True
data = {"success": True, "form": forms.ChangePasswordForm()}
return TemplateResponse(request, "preferences/change_password.html", data)

10
bookwyrm/views/reading.py
View file

@ -79,13 +79,11 @@ class ReadingStatus(View):
current_status_shelfbook = shelves[0] if shelves else None
# checking the referer prevents redirecting back to the modal page
referer = request.headers.get("Referer", "/")
referer = "/" if "reading-status" in referer else referer
if current_status_shelfbook is not None:
if current_status_shelfbook.shelf.identifier != desired_shelf.identifier:
current_status_shelfbook.delete()
else: # It already was on the shelf
return redirect(referer)
return redirect("/")
models.ShelfBook.objects.create(
book=book, shelf=desired_shelf, user=request.user
@ -123,7 +121,7 @@ class ReadingStatus(View):
if is_api_request(request):
return HttpResponse()
return redirect(referer)
return redirect("/")
@method_decorator(login_required, name="dispatch")
@ -205,7 +203,7 @@ def delete_readthrough(request):
readthrough.raise_not_deletable(request.user)
readthrough.delete()
return redirect(request.headers.get("Referer", "/"))
return redirect("/")
@login_required
@ -216,4 +214,4 @@ def delete_progressupdate(request):
update.raise_not_deletable(request.user)
update.delete()
return redirect(request.headers.get("Referer", "/"))
return redirect("/")

12
bookwyrm/views/shelf/shelf_actions.py
View file

@ -13,9 +13,11 @@ def create_shelf(request):
"""user generated shelves"""
form = forms.ShelfForm(request.POST)
if not form.is_valid():
return redirect(request.headers.get("Referer", "/"))
return redirect("user-shelves", request.user.localname)
shelf = form.save()
shelf = form.save(commit=False)
shelf.raise_not_editable(request.user)
shelf.save()
return redirect(shelf.local_path)
@ -70,7 +72,7 @@ def shelve(request):
):
current_read_status_shelfbook.delete()
else: # It is already on the shelf
return redirect(request.headers.get("Referer", "/"))
return redirect("/")
# create the new shelf-book entry
models.ShelfBook.objects.create(
@ -86,7 +88,7 @@ def shelve(request):
# Might be good to alert, or reject the action?
except IntegrityError:
pass
return redirect(request.headers.get("Referer", "/"))
return redirect("/")
@login_required
@ -100,4 +102,4 @@ def unshelve(request, book_id=False):
)
shelf_book.raise_not_deletable(request.user)
shelf_book.delete()
return redirect(request.headers.get("Referer", "/"))
return redirect("/")

7
bookwyrm/views/status.py
View file

@ -82,9 +82,10 @@ class CreateStatus(View):
if is_api_request(request):
logger.exception(form.errors)
return HttpResponseBadRequest()
return redirect(request.headers.get("Referer", "/"))
return redirect("/")
status = form.save(commit=False)
status.raise_not_editable(request.user)
# save the plain, unformatted version of the status for future editing
status.raw_content = status.content
if hasattr(status, "quote"):
@ -146,7 +147,7 @@ class DeleteStatus(View):
# perform deletion
status.delete()
return redirect(request.headers.get("Referer", "/"))
return redirect("/")
@login_required
@ -195,7 +196,7 @@ def edit_readthrough(request):
if is_api_request(request):
return HttpResponse()
return redirect(request.headers.get("Referer", "/"))
return redirect("/")
def find_mentions(content):

11
bookwyrm/views/user.py
View file

@ -106,10 +106,19 @@ def hide_suggestions(request):
"""not everyone wants user suggestions"""
request.user.show_suggested_users = False
request.user.save(broadcast=False, update_fields=["show_suggested_users"])
return redirect(request.headers.get("Referer", "/"))
return redirect("/")
# pylint: disable=unused-argument
def user_redirect(request, username):
"""redirect to a user's feed"""
return redirect("user-feed", username=username)
@login_required
def toggle_guided_tour(request, tour):
"""most people don't want a tour every time they load a page"""
request.user.show_guided_tour = tour
request.user.save(broadcast=False, update_fields=["show_guided_tour"])
return redirect("/")