yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adds book class view and re-works pagination

Browse Source
This commit is contained in:
Mouse Reeve
2021-01-13 09:42:54 -08:00
parent cf2b9937c6
commit 56e3e98bc1
16 changed files with 197 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bookwyrm/views/__init__.py
View File

@ -9,3 +9,5 @@ from .import_data import Import, ImportStatus
from .user import User, EditUser, Followers, Following
from .status import Status, Replies, CreateStatus, DeleteStatus
from .interaction import Favorite, Unfavorite, Boost, Unboost
from .books import Book, EditBook, Editions
from .books import upload_cover, add_description, switch_edition, resolve_book

12
bookwyrm/views/direct_message.py
View File

@ -18,19 +18,9 @@ class DirectMessage(View):
activities = get_activity_feed(request.user, 'direct')
paginated = Paginator(activities, PAGE_LENGTH)
activity_page = paginated.page(page)
prev_page = next_page = None
if activity_page.has_next():
next_page = '/direct-message/?page=%d#feed' % \
activity_page.next_page_number()
if activity_page.has_previous():
prev_page = '/direct-messages/?page=%d#feed' % \
activity_page.previous_page_number()
data = {
'title': 'Direct Messages',
'user': request.user,
'activities': activity_page.object_list,
'next': next_page,
'prev': prev_page,
'activities': activity_page,
}
return TemplateResponse(request, 'direct_messages.html', data)

10
bookwyrm/views/helpers.py
View File

@ -137,3 +137,13 @@ def handle_remote_webfinger(query):
except KeyError:
return None
return user
def get_edition(book_id):
''' look up a book in the db and return an edition '''
book = models.Book.objects.select_subclasses().get(id=book_id)
if isinstance(book, models.Work):
book = book.get_default_edition()
return book

1
bookwyrm/views/interaction.py
View File

@ -105,7 +105,6 @@ class Boost(View):
return redirect(request.headers.get('Referer', '/'))
@method_decorator(login_required, name='dispatch')
class Unboost(View):
''' boost a status '''

13
bookwyrm/views/landing.py
View File

@ -86,23 +86,12 @@ class Feed(View):
activities = get_activity_feed(
request.user, ['public', 'followers'])
paginated = Paginator(activities, PAGE_LENGTH)
activity_page = paginated.page(page)
prev_page = next_page = None
if activity_page.has_next():
next_page = '/%s/?page=%d#feed' % \
(tab, activity_page.next_page_number())
if activity_page.has_previous():
prev_page = '/%s/?page=%d#feed' % \
(tab, activity_page.previous_page_number())
data = {
'title': 'Updates Feed',
'user': request.user,
'suggested_books': suggested_books,
'activities': activity_page.object_list,
'activities': paginated.page(page),
'tab': tab,
'next': next_page,
'prev': prev_page,
}
return TemplateResponse(request, 'feed.html', data)

13
bookwyrm/views/user.py
View File

@ -70,24 +70,13 @@ class User(View):
queryset=models.Status.objects.filter(user=user)
)
paginated = Paginator(activities, PAGE_LENGTH)
activity_page = paginated.page(page)
prev_page = next_page = None
if activity_page.has_next():
next_page = '/user/%s/?page=%d' % \
(username, activity_page.next_page_number())
if activity_page.has_previous():
prev_page = '/user/%s/?page=%d' % \
(username, activity_page.previous_page_number())
data = {
'title': user.name,
'user': user,
'is_self': is_self,
'shelves': shelf_preview,
'shelf_count': shelves.count(),
'activities': activity_page.object_list,
'next': next_page,
'prev': prev_page,
'activities': paginated.page(page),
}
return TemplateResponse(request, 'user.html', data)