[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

openlibrary/core/helpers.py

@@ -143,7 +143,7 @@ def datestr(
     now: datetime | None = None,
     lang: str | None = None,
     relative: bool = True,
-    format: Literal['compact', 'long'] = 'long'
+    format: Literal['compact', 'long'] = 'long',
 ) -> str:
     """Internationalized version of web.datestr."""
     if format == 'compact' and relative:
@@ -161,7 +161,9 @@ def datestr(
     return format_date(then, lang=lang)
 
 
-TimeDeltaUnit = namedtuple('TimeDeltaUnit', ['long_name', 'short_name', 'seconds_per_unit'])
+TimeDeltaUnit = namedtuple(
+    'TimeDeltaUnit', ['long_name', 'short_name', 'seconds_per_unit']
+)
 
 TIME_DELTA_UNITS = (
     TimeDeltaUnit('year', 'y', 3600 * 24 * 365),

openlibrary/i18n/messages.pot

@@ -82,7 +82,7 @@ msgid "Pending Imports"
 msgstr ""
 
 #: BookByline.html FulltextSearchSuggestionItem.html SearchResultsWork.html
-#: account/notes.html account/observations.html
+#: account/activity_feed.html account/notes.html account/observations.html
 msgid "Unknown author"
 msgstr ""
 
@@ -576,7 +576,7 @@ msgstr ""
 msgid "Failed to fetch carousel."
 msgstr ""
 
-#: RawQueryCarousel.html
+#: RawQueryCarousel.html account/mybooks.html
 msgid "Retry?"
 msgstr ""
 
@@ -1503,12 +1503,13 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
-#: account/sidebar.html books/mybooks_breadcrumb_select.html
-#: openlibrary/plugins/upstream/mybooks.py
+#: account/mybooks.html account/sidebar.html
+#: books/mybooks_breadcrumb_select.html openlibrary/plugins/upstream/mybooks.py
 msgid "My Feed"
 msgstr ""
 
-#: account/mybooks.html account/readinglog_shelf_name.html account/sidebar.html
+#: account/activity_feed.html account/mybooks.html
+#: account/readinglog_shelf_name.html account/sidebar.html
 #: my_books/dropdown_content.html my_books/primary_action.html
 #: openlibrary/plugins/upstream/mybooks.py search/sort_options.html
 msgid "Already Read"
@@ -2300,12 +2301,14 @@ msgstr ""
 msgid "Earliest trending data is from October 2017"
 msgstr ""
 
-#: account/mybooks.html account/sidebar.html my_books/dropdown_content.html
-#: my_books/primary_action.html search/sort_options.html trending.html
+#: account/activity_feed.html account/mybooks.html account/sidebar.html
+#: my_books/dropdown_content.html my_books/primary_action.html
+#: search/sort_options.html trending.html
 msgid "Want to Read"
 msgstr ""
 
-#: account/mybooks.html account/readinglog_shelf_name.html account/sidebar.html
+#: account/activity_feed.html account/mybooks.html
+#: account/readinglog_shelf_name.html account/sidebar.html
 #: my_books/dropdown_content.html my_books/primary_action.html
 #: search/sort_options.html trending.html
 msgid "Currently Reading"
@@ -2478,6 +2481,22 @@ msgid ""
 "information form</a>."
 msgstr ""
 
+#: account/activity_feed.html lists/list_follow.html
+msgid "Avatar of the owner of the list"
+msgstr ""
+
+#: account/activity_feed.html
+msgid ""
+"Here's the latest activity around the library. Follow other readers to "
+"personalize your feed."
+msgstr ""
+
+#: account/activity_feed.html
+msgid ""
+"None of the people that you follow have logged books.  When they do, "
+"you'll see it here."
+msgstr ""
+
 #: account/create.html
 msgid "Username may only contain numbers, letters, - or _"
 msgstr ""
@@ -2754,6 +2773,14 @@ msgstr ""
 msgid "My Loans"
 msgstr ""
 
+#: account/mybooks.html
+msgid "Loading activity feed"
+msgstr ""
+
+#: account/mybooks.html
+msgid "Failed to fetch activity feed."
+msgstr ""
+
 #: account/mybooks.html type/user/view.html
 msgid "This reader has chosen to make their Reading Log private."
 msgstr ""
@@ -2763,6 +2790,10 @@ msgstr ""
 msgid "%(year_span)s reading goal"
 msgstr ""
 
+#: account/mybooks.html
+msgid "Activity Feed"
+msgstr ""
+
 #: account/mybooks.html
 msgid "View All Lists"
 msgstr ""
@@ -6334,10 +6365,6 @@ msgstr ""
 msgid "Cover of book"
 msgstr ""
 
-#: lists/list_follow.html
-msgid "Avatar of the owner of the list"
-msgstr ""
-
 #: lists/list_follow.html lists/widget.html my_books/dropdown_content.html
 msgid "You"
 msgstr ""

openlibrary/plugins/openlibrary/partials.py

@@ -355,16 +355,18 @@ def generate(self) -> dict:
         return {"partials": str(macro)}
 
 
-
 class ActivityFeedPartial(PartialDataHandler):
     """Handler for "My Books" page activity feeds"""
+
     def __init__(self):
         self.i = web.input(username=None)
 
     def generate(self) -> dict:
         feed, follows_others = ActivityFeed.get_activity_feed(self.i.username)
         feed_url = f'/people/{self.i.username}/books/feed'
-        template_result = render_template('account/activity_feed', feed, feed_url, follows_others)
+        template_result = render_template(
+            'account/activity_feed', feed, feed_url, follows_others
+        )
         return {"partials": str(template_result)}
 
 

openlibrary/plugins/upstream/mybooks.py

@@ -11,7 +11,7 @@
 from infogami.utils.view import public, render, safeint
 from openlibrary import accounts
 from openlibrary.accounts.model import (
-    OpenLibraryAccount,  # noqa: F401 side effects may be needed
+    OpenLibraryAccount,
 )
 from openlibrary.core.booknotes import Booknotes
 from openlibrary.core.bookshelves import Bookshelves
@@ -26,7 +26,7 @@
 from openlibrary.core.observations import Observations, convert_observation_ids
 from openlibrary.i18n import gettext as _
 from openlibrary.plugins.openlibrary.home import caching_prethread
-from openlibrary.utils import extract_numeric_id_from_olid, dateutil
+from openlibrary.utils import dateutil, extract_numeric_id_from_olid
 from openlibrary.utils.dateutil import current_year
 
 if TYPE_CHECKING:
@@ -677,20 +677,26 @@ def get_pub_sub_feed(cls, username):
     @classmethod
     def get_cached_pub_sub_feed(cls, username):
         five_minutes = 5 * dateutil.MINUTE_SECS
-        mc = memcache_memoize(cls.get_pub_sub_feed, key_prefix="mybooks.pubsub.feed", timeout=five_minutes, prethread=caching_prethread())
+        mc = memcache_memoize(
+            cls.get_pub_sub_feed,
+            key_prefix="mybooks.pubsub.feed",
+            timeout=five_minutes,
+            prethread=caching_prethread(),
+        )
         results = mc(username)
 
         for r in results:
-            if isinstance(r['created'], str):  # `datetime` objects are stored in cache as strings
+            if isinstance(
+                r['created'], str
+            ):  # `datetime` objects are stored in cache as strings
                 # Update `created` to datetime, which is the type expected by `datestr` (called in card template)
                 r['created'] = datetime.fromisoformat(r['created'])
         return results
 
     @classmethod
     def get_trending_feed(cls, username):
         def has_public_reading_log(_username):
-            acct = OpenLibraryAccount.get_by_username(_username)
-            if acct:
+            if acct := OpenLibraryAccount.get_by_username(_username):
                 user = acct.get_user()
                 return user and user.preferences().get('public_readlog', 'no') == 'yes'
             return False
@@ -700,7 +706,11 @@ def has_public_reading_log(_username):
 
         feed = []
         for idx, item in enumerate(logged_books):
-            if item['work'] and item['username'] != username and has_public_reading_log(item['username']):
+            if (
+                item['work']
+                and item['username'] != username
+                and has_public_reading_log(item['username'])
+            ):
                 feed.append(item)
             if len(feed) > 2:
                 break
@@ -710,16 +720,22 @@ def has_public_reading_log(_username):
     @classmethod
     def get_cached_trending_feed(cls, username):
         five_minutes = 5 * dateutil.MINUTE_SECS
-        mc = memcache_memoize(cls.get_trending_feed, key_prefix="mybooks.trending.feed", timeout=five_minutes, prethread=caching_prethread())
+        mc = memcache_memoize(
+            cls.get_trending_feed,
+            key_prefix="mybooks.trending.feed",
+            timeout=five_minutes,
+            prethread=caching_prethread(),
+        )
         results = mc(username)
 
         for r in results:
-            if isinstance(r['created'], str):  # `datetime` objects are stored in cache as strings
+            if isinstance(
+                r['created'], str
+            ):  # `datetime` objects are stored in cache as strings
                 r['created'] = datetime.fromisoformat(r['created'])
         return results
 
 
 @public
 def get_activity_feed(username):
     return ActivityFeed.get_activity_feed(username)
-

static/css/components/activity-feed.less

@@ -1,71 +1,71 @@
 .activity-feed {
-    display: flex;
-    padding: 8px 0;
+  display: flex;
+  padding: 8px 0;
 }
 
 .activity-feed-card {
-    width: 215px;
-    height: 150px;
-    border: 1px solid fade(@black, 25%);
-    margin-right: 24px;
-    border-radius: 4px;
-    box-shadow: 2px 2px 4px fade(@black, 15%);
+  width: 215px;
+  height: 150px;
+  border: 1px solid fade(@black, 25%);
+  margin-right: 24px;
+  border-radius: 4px;
+  box-shadow: 2px 2px 4px fade(@black, 15%);
 }
 
 .activity-feed-card__body {
-    background-color: @beige;
+  background-color: @beige;
+  display: flex;
+  height: 105px;
+  padding: 10px;
+  .activity-feed-card__cover-image img {
+    width: 55px;
+    height: 85px;
+    box-shadow: 4px 4px 4px 0 fade(@black, 25%);
+    margin-right: 10px;
+  }
+  .activity-feed-card__book-details {
     display: flex;
-    height: 105px;
-    padding: 10px;
-    .activity-feed-card__cover-image img {
-        width: 55px;
-        height: 85px;
-        box-shadow: 4px 4px 4px 0 fade(@black, 25%);
-        margin-right: 10px;
+    flex-direction: column;
+    .activity-feed-card__book-title {
+      font-size: 14px;
+      font-weight: 700;
+    }
+    .activity-feed-card__author-name,
+    .activity-feed-card__book-subtitle {
+      font-size: 12px;
+      margin-top: 5px;
     }
-    .activity-feed-card__book-details {
-        display: flex;
-        flex-direction: column;
-        .activity-feed-card__book-title {
-            font-size: 14px;
-            font-weight: 700;
-        }
-        .activity-feed-card__author-name,
-        .activity-feed-card__book-subtitle {
-            font-size: 12px;
-            margin-top: 5px;
-        }
-        .activity-feed-card__book-subtitle {
-            font-style: italic;
-        }
+    .activity-feed-card__book-subtitle {
+      font-style: italic;
     }
+  }
 }
 
 .activity-feed-card__footer {
-    background: #f4f4f4;
-    border-radius: 0 0 4px 4px;
-    box-shadow: 0 0 4px fade(@black, 25%);
-    display: flex;
-    padding: 8px;
-    height: 45px;
-    font-size: 12px;
+  background: #f4f4f4;
+  border-radius: 0 0 4px 4px;
+  box-shadow: 0 0 4px fade(@black, 25%);
+  display: flex;
+  padding: 8px;
+  height: 45px;
+  font-size: 12px;
 
-    .activity-feed-card__footer-copy {
-      margin-right: 9px;
-    }
-    .cta-btn {
-        font-size: 12px;
-        width: unset;
-        height: 24px;
-        padding: 3px 10px;
-    }
-    .shelf-link {
-        text-decoration: none;
-    }
-    .activity-feed-card__avatar img {
-        border-radius: 8px;
-        width: 30px;
-        height: 30px;
-        border: 2px solid @white;
-    }
+  .activity-feed-card__footer-copy {
+    margin-right: 9px;
+  }
+  .cta-btn {
+    font-size: 12px;
+    width: unset;
+    height: 24px;
+    padding: 3px 10px;
+  }
+  .shelf-link {
+    text-decoration: none;
+  }
+  .activity-feed-card__avatar img {
+    border-radius: 8px;
+    width: 30px;
+    height: 30px;
+    border: 2px solid @white;
+  }
 }