+
Edit "{{ author.name }}"
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index b7ff6e25..76afea7e 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -19,7 +19,7 @@
{# announcements and system messages #}
-{% if request.user.show_goal and not goal and tab == 'home' %}
+{% if request.user.show_goal and not goal and tab == 'home' and not activities.number > 1 %}
{% now 'Y' as year %}
{% include 'snippets/goal_card.html' with year=year %}
@@ -31,9 +31,10 @@
{% if not activities %}
{% trans "There aren't any activities right now! Try following a user to get started" %}
{% endif %}
+
{% for activity in activities %}
-{% include 'snippets/status/status.html' with status=activity %}
+ {% include 'snippets/status/status.html' with status=activity %}
{% endfor %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index c7d10b57..e57f6152 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -83,18 +83,18 @@
-
-
+
{% trans "Direct Messages" %}
-
-
+
{% trans 'Profile' %}
-
-
- {% trans 'Settings' %}
+
+ {% trans 'Directory' %}
-
@@ -102,12 +102,17 @@
{% trans 'Import Books' %}
+ -
+
+ {% trans 'Settings' %}
+
+
{% if perms.bookwyrm.create_invites or perms.bookwyrm.edit_instance_settings%}
{% endif %}
{% if perms.bookwyrm.create_invites %}
-
-
+
{% trans 'Invites' %}
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index ca0f81c2..327d745b 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -53,6 +53,14 @@
{{ form.manually_approves_followers }}
+
+
+ {% url 'directory' as path %}
+ {% blocktrans %}Your account will show up in the directory, and may be recommended to other BookWyrm users.{% endblocktrans %}
+
{% endblock %}
diff --git a/bookwyrm/templates/snippets/avatar.html b/bookwyrm/templates/snippets/avatar.html
index 6d27cd85..d53acf2b 100644
--- a/bookwyrm/templates/snippets/avatar.html
+++ b/bookwyrm/templates/snippets/avatar.html
@@ -1,3 +1,3 @@
{% load bookwyrm_tags %}
-
+
diff --git a/bookwyrm/tests/data/ap_user.json b/bookwyrm/tests/data/ap_user.json
index b159ae65..bc4488e3 100644
--- a/bookwyrm/tests/data/ap_user.json
+++ b/bookwyrm/tests/data/ap_user.json
@@ -28,6 +28,9 @@
},
"bookwyrmUser": true,
"manuallyApprovesFollowers": false,
+ "discoverable": true,
+ "devices": "https://friend.camp/users/tripofmice/collections/devices",
+ "tag": [],
"icon": {
"type": "Image",
"mediaType": "image/png",
diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index 618e4f78..bd5255ce 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -77,7 +77,7 @@ class User(TestCase):
self.assertEqual(activity["inbox"], self.user.inbox)
self.assertEqual(activity["outbox"], self.user.outbox)
self.assertEqual(activity["bookwyrmUser"], False)
- self.assertEqual(activity["discoverable"], True)
+ self.assertEqual(activity["discoverable"], False)
self.assertEqual(activity["type"], "Person")
def test_activitypub_outbox(self):
diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py
new file mode 100644
index 00000000..80d9eaf7
--- /dev/null
+++ b/bookwyrm/tests/views/test_directory.py
@@ -0,0 +1,43 @@
+""" test for app action functionality """
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+
+# pylint: disable=unused-argument
+class DirectoryViews(TestCase):
+ """ tag views"""
+
+ def setUp(self):
+ """ we need basic test data and mocks """
+ self.factory = RequestFactory()
+ self.local_user = models.User.objects.create_user(
+ "mouse@local.com",
+ "mouse@mouse.com",
+ "mouseword",
+ local=True,
+ localname="mouse",
+ remote_id="https://example.com/users/mouse",
+ )
+ self.rat = models.User.objects.create_user(
+ "rat@local.com",
+ "rat@rat.com",
+ "ratword",
+ local=True,
+ localname="rat",
+ remote_id="https://example.com/users/rat",
+ discoverable=True,
+ )
+ models.SiteSettings.objects.create()
+
+ def test_directory_page(self):
+ """ there are so many views, this just makes sure it LOADS """
+ view = views.Directory.as_view()
+ request = self.factory.get("")
+ request.user = self.local_user
+
+ result = view(request)
+ self.assertIsInstance(result, TemplateResponse)
+ result.render()
+ self.assertEqual(result.status_code, 200)
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index b681b961..10f55f89 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -789,6 +789,7 @@ class Inbox(TestCase):
self.assertEqual(user.name, "MOUSE?? MOUSE!!")
self.assertEqual(user.username, "mouse@example.com")
self.assertEqual(user.localname, "mouse")
+ self.assertTrue(user.discoverable)
def test_handle_update_edition(self):
""" update an existing edition """
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 4aced6fe..76622799 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -96,6 +96,7 @@ urlpatterns = [
path("", views.Home.as_view(), name="landing"),
re_path(r"^discover/?$", views.Discover.as_view()),
re_path(r"^notifications/?$", views.Notifications.as_view()),
+ re_path(r"^directory/?", views.Directory.as_view(), name="directory"),
# feeds
re_path(r"^(?Phome|local|federated)/?$", views.Feed.as_view()),
re_path(
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 3402e65f..f1ebfc4c 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -4,6 +4,7 @@ from .author import Author, EditAuthor
from .block import Block, unblock
from .books import Book, EditBook, ConfirmEditBook, Editions
from .books import upload_cover, add_description, switch_edition, resolve_book
+from .directory import Directory
from .error import not_found_page, server_error_page
from .federation import Federation
from .feed import DirectMessage, Feed, Replies, Status
diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py
new file mode 100644
index 00000000..cc21baf2
--- /dev/null
+++ b/bookwyrm/views/directory.py
@@ -0,0 +1,32 @@
+""" who all's here? """
+from django.contrib.auth.decorators import login_required
+from django.core.paginator import Paginator
+from django.template.response import TemplateResponse
+from django.views import View
+from django.utils.decorators import method_decorator
+
+from bookwyrm import models
+
+# pylint: disable=no-self-use
+@method_decorator(login_required, name="dispatch")
+class Directory(View):
+ """ display of known bookwyrm users """
+
+ def get(self, request):
+ """ lets see your cute faces """
+ try:
+ page = int(request.GET.get("page", 1))
+ except ValueError:
+ page = 1
+
+ users = models.User.objects.filter(
+ discoverable=True,
+ bookwyrm_user=True,
+ is_active=True,
+ ).order_by("-last_active_date")
+ paginated = Paginator(users, 12)
+
+ data = {
+ "users": paginated.page(page),
+ }
+ return TemplateResponse(request, "directory.html", data)
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py
index 86f7d3e9..407451fb 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing.py
@@ -2,7 +2,7 @@
from django.template.response import TemplateResponse
from django.views import View
-from bookwyrm import forms, models
+from bookwyrm import forms
from .feed import Feed
from . import helpers
diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index 40fbee8d..61a659d8 100644
Binary files a/locale/de_DE/LC_MESSAGES/django.mo and b/locale/de_DE/LC_MESSAGES/django.mo differ
{% trans "There aren't any activities right now! Try following a user to get started" %}
{% endif %} + {% for activity in activities %}
-{% include 'snippets/status/status.html' with status=activity %}
+ {% include 'snippets/status/status.html' with status=activity %}
{% endfor %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index c7d10b57..e57f6152 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -83,18 +83,18 @@
- - + {% trans "Direct Messages" %}
- - + {% trans 'Profile' %}
- - - {% trans 'Settings' %} + + {% trans 'Directory' %}
- @@ -102,12 +102,17 @@ {% trans 'Import Books' %} +
- + + {% trans 'Settings' %} + + {% if perms.bookwyrm.create_invites or perms.bookwyrm.edit_instance_settings%} {% endif %} {% if perms.bookwyrm.create_invites %}
- - + {% trans 'Invites' %} diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html index ca0f81c2..327d745b 100644 --- a/bookwyrm/templates/preferences/edit_user.html +++ b/bookwyrm/templates/preferences/edit_user.html @@ -53,6 +53,14 @@ {{ form.manually_approves_followers }} +
+
+ {% url 'directory' as path %}
+
{% endblock %}
diff --git a/bookwyrm/templates/snippets/avatar.html b/bookwyrm/templates/snippets/avatar.html
index 6d27cd85..d53acf2b 100644
--- a/bookwyrm/templates/snippets/avatar.html
+++ b/bookwyrm/templates/snippets/avatar.html
@@ -1,3 +1,3 @@
{% load bookwyrm_tags %}
-{% blocktrans %}Your account will show up in the directory, and may be recommended to other BookWyrm users.{% endblocktrans %}
+
+
diff --git a/bookwyrm/tests/data/ap_user.json b/bookwyrm/tests/data/ap_user.json
index b159ae65..bc4488e3 100644
--- a/bookwyrm/tests/data/ap_user.json
+++ b/bookwyrm/tests/data/ap_user.json
@@ -28,6 +28,9 @@
},
"bookwyrmUser": true,
"manuallyApprovesFollowers": false,
+ "discoverable": true,
+ "devices": "https://friend.camp/users/tripofmice/collections/devices",
+ "tag": [],
"icon": {
"type": "Image",
"mediaType": "image/png",
diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index 618e4f78..bd5255ce 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -77,7 +77,7 @@ class User(TestCase):
self.assertEqual(activity["inbox"], self.user.inbox)
self.assertEqual(activity["outbox"], self.user.outbox)
self.assertEqual(activity["bookwyrmUser"], False)
- self.assertEqual(activity["discoverable"], True)
+ self.assertEqual(activity["discoverable"], False)
self.assertEqual(activity["type"], "Person")
def test_activitypub_outbox(self):
diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py
new file mode 100644
index 00000000..80d9eaf7
--- /dev/null
+++ b/bookwyrm/tests/views/test_directory.py
@@ -0,0 +1,43 @@
+""" test for app action functionality """
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+
+# pylint: disable=unused-argument
+class DirectoryViews(TestCase):
+ """ tag views"""
+
+ def setUp(self):
+ """ we need basic test data and mocks """
+ self.factory = RequestFactory()
+ self.local_user = models.User.objects.create_user(
+ "mouse@local.com",
+ "mouse@mouse.com",
+ "mouseword",
+ local=True,
+ localname="mouse",
+ remote_id="https://example.com/users/mouse",
+ )
+ self.rat = models.User.objects.create_user(
+ "rat@local.com",
+ "rat@rat.com",
+ "ratword",
+ local=True,
+ localname="rat",
+ remote_id="https://example.com/users/rat",
+ discoverable=True,
+ )
+ models.SiteSettings.objects.create()
+
+ def test_directory_page(self):
+ """ there are so many views, this just makes sure it LOADS """
+ view = views.Directory.as_view()
+ request = self.factory.get("")
+ request.user = self.local_user
+
+ result = view(request)
+ self.assertIsInstance(result, TemplateResponse)
+ result.render()
+ self.assertEqual(result.status_code, 200)
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index b681b961..10f55f89 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -789,6 +789,7 @@ class Inbox(TestCase):
self.assertEqual(user.name, "MOUSE?? MOUSE!!")
self.assertEqual(user.username, "mouse@example.com")
self.assertEqual(user.localname, "mouse")
+ self.assertTrue(user.discoverable)
def test_handle_update_edition(self):
""" update an existing edition """
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 4aced6fe..76622799 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -96,6 +96,7 @@ urlpatterns = [
path("", views.Home.as_view(), name="landing"),
re_path(r"^discover/?$", views.Discover.as_view()),
re_path(r"^notifications/?$", views.Notifications.as_view()),
+ re_path(r"^directory/?", views.Directory.as_view(), name="directory"),
# feeds
re_path(r"^(?P