Merge pull request #3 from neodb-social/doubaniux/boofilsic/generalization

Generalize instance related code #2 by doubaniux
2022-12-09 19:25:21 -05:00 · 2022-12-09 19:25:21 -05:00 · a333c4b01e
commit a333c4b01e
parent 8558623ad8 5e036650c1
90 changed files with 244 additions and 203 deletions
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@ -13,10 +13,10 @@ name: "CodeQL"

 on:
  push:
-    branches: [ "neo" ]
+    branches: [ "master" ]
  pull_request:
    # The branches below must be a subset of the branches above
-    branches: [ "neo" ]
+    branches: [ "master" ]
  schedule:
    - cron: '35 0 * * 0'

--- a/.github/workflows/pysa.yml
+++ b/.github/workflows/pysa.yml
@ -17,9 +17,9 @@ name: Pysa
 on:
  workflow_dispatch:
  push:
-    branches: [ "neo" ]
+    branches: [ "master" ]
  pull_request:
-    branches: [ "neo" ]
+    branches: [ "master" ]
  schedule:
    - cron: '45 12 * * 4'

--- a/.gitignore
+++ b/.gitignore
@ -31,5 +31,8 @@ log
 # conf folder for neodb
 /neodb

+# typesense folder
+/typesense-data
+
 # test coverage
 .coverage
--- a/2
+++ b/2
@ -11,7 +11,7 @@ RUN pip install --no-cache-dir -r /tmp/requirements.txt \
    && useradd -U app_user \  
    && install -d -m 0755 -o app_user -g app_user /app/static

-ENV DJANGO_SETTINGS_MODULE=neodb.dev
+ENV DJANGO_SETTINGS_MODULE=yoursettings.dev
 WORKDIR /app
 USER app_user:app_user
 COPY --chown=app_user:app_user . .
--- a/boofilsic/settings.py
+++ b/boofilsic/settings.py
@ -13,7 +13,6 @@ https://docs.djangoproject.com/en/3.0/ref/settings/
 import os
 import requests
 import psycopg2.extensions
-from git import Repo

 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@ -68,7 +67,6 @@ INSTALLED_APPS = [
    'timeline.apps.TimelineConfig',
    'easy_thumbnails',
    'user_messages',
-    'django_slack',
 ]

 MIDDLEWARE = [
@ -114,9 +112,9 @@ if DEBUG:
        'default': {
            'ENGINE': 'django.db.backends.postgresql',
            'NAME': os.environ.get('DB_NAME', 'test'),
-            'USER': os.environ.get('DB_USER', 'donotban'),
-            'PASSWORD': os.environ.get('DB_PASSWORD', 'donotbansilvousplait'),
-            'HOST': os.environ.get('DB_HOST', '172.18.116.29'),
+            'USER': os.environ.get('DB_USER', 'postgres'),
+            'PASSWORD': os.environ.get('DB_PASSWORD', 'admin123'),
+            'HOST': os.environ.get('DB_HOST', '127.0.0.1'),
            'OPTIONS': {
                'client_encoding': 'UTF8',
                # 'isolation_level': psycopg2.extensions.ISOLATION_LEVEL_DEFAULT,
@ -281,22 +279,22 @@ LUMINATI_PASSWORD = 'nsb7te9bw0ney'
 SCRAPING_TIMEOUT = 90

 # ScraperAPI api key
-SCRAPERAPI_KEY = 'wnb3794v675b8w475h0e8hr7tyge'
+SCRAPERAPI_KEY = '***REMOVED***'
 PROXYCRAWL_KEY = None
 SCRAPESTACK_KEY = None

 # Spotify credentials
-SPOTIFY_CREDENTIAL = "NzYzNkYTE6MGQ0ODY0NTY2Y2b3n645sdfgAyY2I1ljYjg3Nzc0MjIwODQ0ZWE="
+SPOTIFY_CREDENTIAL = "***REMOVED***"

 # IMDb API service https://imdb-api.com/
-IMDB_API_KEY = "k23fwewff23"
+IMDB_API_KEY = "***REMOVED***"

 # The Movie Database (TMDB) API Keys
-TMDB_API3_KEY = "deadbeef"
-TMDB_API4_KEY = "deadbeef.deadbeef.deadbeef"
+TMDB_API3_KEY = "***REMOVED***"
+# TMDB_API4_KEY = "deadbeef.deadbeef.deadbeef"

 # Google Books API Key
-GOOGLE_API_KEY = 'deadbeef-deadbeef-deadbeef'
+GOOGLE_API_KEY = '***REMOVED***'

 # IGDB
 IGDB_CLIENT_ID = 'deadbeef'
@ -348,19 +346,18 @@ RQ_SHOW_ADMIN_LINK = True

 SEARCH_INDEX_NEW_ONLY = False

-SEARCH_BACKEND = None

 # SEARCH_BACKEND = 'MEILISEARCH'
 # MEILISEARCH_SERVER = 'http://127.0.0.1:7700'
 # MEILISEARCH_KEY = 'deadbeef'

-# SEARCH_BACKEND = 'TYPESENSE'
-# TYPESENSE_CONNECTION = {
-#     'api_key': 'deadbeef',
-#     'nodes': [{
-#         'host': 'localhost',
-#         'port': '8108',
-#         'protocol': 'http'
-#     }],
-#     'connection_timeout_seconds': 2
-# }
+SEARCH_BACKEND = 'TYPESENSE'
+TYPESENSE_CONNECTION = {
+    'api_key': 'xyz',
+    'nodes': [{
+        'host': 'localhost',
+        'port': '8108',
+        'protocol': 'http'
+    }],
+    'connection_timeout_seconds': 2
+}
--- a/books/models.py
+++ b/books/models.py
@ -164,7 +164,7 @@ class BookReview(Review):

    @property
    def url(self):
-        return settings.APP_WEBSITE + reverse("books:retrieve_review", args=[self.id])
+        return reverse("books:retrieve_review", args=[self.id])

    @property
    def item(self):
--- a/books/templates/books/create_update.html
+++ b/books/templates/books/create_update.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
 </head>

--- a/books/templates/books/create_update_review.html
+++ b/books/templates/books/create_update_review.html
@ -13,7 +13,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'js/create_update_review.js' %}"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/books/templates/books/delete.html
+++ b/books/templates/books/delete.html
@ -12,7 +12,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '删除图书' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/books/templates/books/delete_review.html
+++ b/books/templates/books/delete_review.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '删除评论' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>

    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
--- a/books/templates/books/mark_list.html
+++ b/books/templates/books/mark_list.html
@ -13,7 +13,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ book.title }}{% trans '的标记' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
--- a/books/templates/books/review_detail.html
+++ b/books/templates/books/review_detail.html
@ -17,12 +17,12 @@
    <meta property="og:url" content="{{ request.build_absolute_uri }}">
    <meta property="og:image" content="{{ book.cover|thumb:'normal' }}">
    <title>{{ site_name }}{% trans '书评' %} - {{ review.title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
-    <link rel="stylesheet" href="{% static 'lib/css/neo.css' %}">
+    <link rel="stylesheet" href="{% static 'lib/css/collection.css' %}">
 </head>

 <body>
--- a/books/templates/books/review_list.html
+++ b/books/templates/books/review_list.html
@ -13,7 +13,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ book.title }}{% trans '的评论' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/books/templates/books/scrape.html
+++ b/books/templates/books/scrape.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '从豆瓣获取数据' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'js/scrape.js' %}"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
 </head>
--- a/collection/models.py
+++ b/collection/models.py
@ -1,4 +1,5 @@
 from django.db import models
+from markdown import markdown
 from common.models import UserOwnedEntity
 from movies.models import Movie
 from books.models import Book
@ -8,6 +9,7 @@ from markdownx.models import MarkdownxField
 from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 from common.utils import ChoicesDictGenerator, GenerateDateUUIDMediaFilePath
+from common.models import RE_HTML_TAG
 from django.shortcuts import reverse


@ -64,7 +66,7 @@ class Collection(UserOwnedEntity):

    @property
    def url(self):
-        return settings.APP_WEBSITE + reverse("collection:retrieve", args=[self.id])
+        return reverse("collection:retrieve", args=[self.id])

    @property
    def wish_url(self):
--- a/collection/templates/create_update.html
+++ b/collection/templates/create_update.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
    <style type="text/css">
        #id_collaborative li, #id_visibility li {display: inline-block !important;}
--- a/collection/templates/delete.html
+++ b/collection/templates/delete.html
@ -20,12 +20,12 @@
    <meta property="og:url" content="{{ request.build_absolute_uri }}">
    <meta property="og:image" content="{{ collection.cover|thumb:'normal' }}">
    <title>{{ site_name }} {% trans '收藏单' %} - {{ collection.title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/htmx/1.8.0/htmx.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/htmx/1.8.4/htmx.min.js"></script>
 </head>

 <body>
--- a/collection/templates/entity_list.html
+++ b/collection/templates/entity_list.html
@ -12,7 +12,7 @@
    <li>
        <form hx-target=".entity-list" hx-post="{% url 'collection:append_item' form.instance.id %}" method="POST">
            {% csrf_token %}
-            <input type="url" name="url" placeholder="https://neodb.social/movies/1/" style="min-width:24rem" required>
+            <input type="url" name="url" placeholder="{{ request.scheme }}://{{ request.get_host }}/movies/1/" style="min-width:24rem" required>
            <input type="text" name="comment" placeholder="{% trans '备注' %}" style="min-width:24rem">
            <input class="button" type="submit" value="{% trans '添加' %}" >
        </form>
--- a/collection/templates/list.html
+++ b/collection/templates/list.html
@ -15,7 +15,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/common/models.py
+++ b/common/models.py
@ -62,7 +62,12 @@ class Entity(models.Model):

    @property
    def url(self):
-        return settings.APP_WEBSITE + self.get_absolute_url()
+        return self.get_absolute_url()
+
+    @property
+    def absolute_url(self):
+        """URL with host and protocol"""
+        return settings.APP_WEBSITE + self.url

    def get_json(self):
        return {
@ -70,7 +75,7 @@ class Entity(models.Model):
            'brief': self.brief,
            'rating': self.rating,
            'url': self.url,
-            'cover_url': settings.APP_WEBSITE + self.cover.url,
+            'cover_url': self.cover.url,
            'top_tags': self.tags[:5],
            'category_name': self.verbose_category_name,
            'other_info': self.other_info,
--- a/common/search/typesense.py
+++ b/common/search/typesense.py
@ -1,5 +1,7 @@
+import types
 import logging
 import typesense
+from typesense.exceptions import ObjectNotFound
 from django.conf import settings
 from django.db.models.signals import post_save, post_delete

@ -194,14 +196,16 @@ class Indexer:
            # 'facetsDistribution': ['_class'],
            # 'sort_by': None,
        }
-        # print(q)
-        r = self.instance().collections[INDEX_NAME].documents.search(options)
-        # print(r)
-        import types
        results = types.SimpleNamespace()
-        results.items = list([x for x in map(lambda i: self.item_to_obj(i['document']), r['hits']) if x is not None])
-        results.num_pages = (r['found'] + SEARCH_PAGE_SIZE - 1) // SEARCH_PAGE_SIZE
-        # print(results)
+
+        try:
+            r = self.instance().collections[INDEX_NAME].documents.search(options)
+            results.items = list([x for x in map(lambda i: self.item_to_obj(i['document']), r['hits']) if x is not None])
+            results.num_pages = (r['found'] + SEARCH_PAGE_SIZE - 1) // SEARCH_PAGE_SIZE
+        except ObjectNotFound:
+            results.items = []
+            results.num_pages = 1
+
        return results

    @classmethod
--- a/common/static/css/boofilsic.css
+++ b/common/static/css/boofilsic.css
@ -2425,6 +2425,19 @@ select::placeholder {
  list-style: circle inside;
 }

+.markdownx-preview h1 {
+  font-size: 2.5em;
+}
+
+.markdownx-preview h2 {
+  font-size: 2.0em;
+}
+
+.markdownx-preview blockquote {
+  border-left: lightgray solid 0.4em;
+  padding-left: 0.4em;
+}
+
 .rating-star .jq-star {
  cursor: unset !important;
 }
--- a/common/static/css/boofilsic.min.css
+++ b/common/static/css/boofilsic.min.css
--- a/common/static/js/home.js
+++ b/common/static/js/home.js
@ -17,6 +17,24 @@ $(document).ready( function() {
        $(".mast-following-more").hide();
        $(".mast-followers-more").hide();

+        getUserInfo(
+            id, 
+            mast_uri, 
+            token, 
+            function(userData) {
+                let userName;
+                if (userData.display_name) {
+                    userName = translateEmojis(userData.display_name, userData.emojis, true);
+                } else {
+                    userName = userData.username;
+                }
+                $("#userInfoCard .mast-avatar").attr("src", userData.avatar);
+                $("#userInfoCard .mast-displayname").html(userName);
+                $("#userInfoCard .mast-brief").text($(userData.note).text());
+                $(userInfoSpinner).remove();
+            }
+        );
+
        getFollowers(
            id,
            mast_uri,
@ -206,7 +224,6 @@ $(document).ready( function() {
                    if (data.failed_urls.length > 0) {
                        $(".import-panel__fail-urls").show();
                        data.failed_urls.forEach((v, i) => {
-                            console.log(v)
                            $("#failedUrls").append($("<li>" + v + "</li>"));
                        });
                    }
@ -224,4 +241,4 @@ $(document).ready( function() {
        });
    }

-});
+});
--- a/common/static/lib/css/collection.css
+++ b/common/static/lib/css/collection.css
@ -1,20 +1,3 @@
-.markdownx-preview h1 {
-    font-size: 2.5em;
-}
-
-.markdownx-preview h2 {
-    font-size: 2.0em;
-}
-
-.markdownx-preview h3 {
-    font-size: 1.6em;
-}
-
-.markdownx-preview blockquote {
-    border-left: lightgray solid 0.4em;
-    padding-left: 0.4em;
-}
-
 .collection-item-position-edit {
    float: right;
 }
--- a/common/static/lib/js/hyperscript-0.9.5.min.js
+++ b/common/static/lib/js/hyperscript-0.9.5.min.js
--- a/common/static/lib/js/hyperscript-0.9.7.min.js
+++ b/common/static/lib/js/hyperscript-0.9.7.min.js
--- a/common/static/sass/_Vendor.sass
+++ b/common/static/sass/_Vendor.sass
@ -4,6 +4,21 @@
    & ul li
        list-style: circle inside

+    h1
+        font-size: 2.5em
+    
+    h2
+        font-size: 2.0em
+
+    blockquote
+        border-left: lightgray solid 0.4em
+        padding-left: 0.1em
+        margin-left: 0
+
+    code
+        border-left: $color-primary solid 0.3em
+        padding-left: 0.1em
+
 .rating-star .jq-star
    cursor: unset !important

--- a/common/templates/common/error.html
+++ b/common/templates/common/error.html
@ -6,7 +6,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta http-equiv="refresh" content="5;url={% if url %}{{url}}{% else %}{% url 'common:home' %}{% endif %}">
-    <link rel="stylesheet" href="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/milligram/1.4.1/milligram.min.css">
+    <link rel="stylesheet" href="https://cdn.staticfile.org/milligram/1.4.1/milligram.min.css">
    <link rel="stylesheet" href="{% static 'css/boofilsic_edit.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic_box.css' %}">
    <title>{% trans '错误' %}</title>
--- a/common/templates/common/search_result.html
+++ b/common/templates/common/search_result.html
@ -15,13 +15,13 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '搜索结果' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/htmx/1.8.0/htmx.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/htmx/1.8.4/htmx.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
-    <link rel="stylesheet" href="{% static 'lib/css/neo.css' %}">
+    <link rel="stylesheet" href="{% static 'lib/css/collection.css' %}">
 </head>

 <body>
--- a/common/templates/partial/_common_libs.html
+++ b/common/templates/partial/_common_libs.html
@ -1,23 +1,23 @@
 {% load static %}
 {% if sentry_dsn %}
-<script src="https://static.neodb.social/browser.sentry-cdn.com/7.7.0/bundle.min.js"></script>
+<script src="https://browser.sentry-cdn.com/7.7.0/bundle.min.js"></script>
 <script>
    if (window.Sentry) Sentry.init({
      dsn: "{{ sentry_dsn }}",
-      release: "NeoDB@{{ version_hash }}",
+      release: "{{ version_hash }}",
      environment: "{{ settings_module }}",
      tracesSampleRate: 1.0,
    });
 </script>
 {% endif %}
 {% if jquery %}
-<script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+<script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
 {% else %}
-<script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/cash/8.1.1/cash.min.js"></script>
+<script src="https://cdn.staticfile.org/cash/8.1.1/cash.min.js"></script>
 {% endif %}
-<script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/htmx/1.8.0/htmx.min.js"></script>
-<script src="https://static.neodb.social/unpkg.com/hyperscript.org@0.9.7.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/htmx/1.8.4/htmx.min.js"></script>
+<script src="{% static 'lib/js/hyperscript-0.9.7.min.js' %}"></script>
 <link rel="stylesheet" href="{% static 'css/boofilsic.css' %}">
 <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
-<link rel="stylesheet" href="{% static 'lib/css/neo.css' %}">
+<link rel="stylesheet" href="{% static 'lib/css/collection.css' %}">
 <link rel="search"type="application/opensearchdescription+xml" title="{{ site_name }}" href="{% static 'opensearch.xml' %}">
--- a/common/templates/partial/_sidebar.html
+++ b/common/templates/partial/_sidebar.html
@ -5,7 +5,7 @@
 {% load oauth_token %}
 {% load truncate %}
 {% load thumb %}
-{% load neo %}
+{% load user_item %}
 <div class="grid__aside grid__aside--reverse-order grid__aside--tablet-column">
    <div class="aside-section-wrapper aside-section-wrapper--no-margin">
        <div class="user-profile" id="userInfoCard">
--- a/common/templates/partial/list_item_book.html
+++ b/common/templates/partial/list_item_book.html
@ -2,7 +2,7 @@
 {% load highlight %}
 {% load i18n %}
 {% load l10n %}
-{% load neo %}
+{% load user_item %}
 {% current_user_marked_item book as marked %}
 <li class="entity-list__entity">
    <div class="entity-list__entity-img-wrapper">
--- a/common/templates/partial/list_item_game.html
+++ b/common/templates/partial/list_item_game.html
@ -2,7 +2,7 @@
 {% load highlight %}
 {% load i18n %}
 {% load l10n %}
-{% load neo %}
+{% load user_item %}
 {% current_user_marked_item game as marked %}
 <li class="entity-list__entity">
    <div class="entity-list__entity-img-wrapper">
--- a/common/templates/partial/list_item_movie.html
+++ b/common/templates/partial/list_item_movie.html
@ -3,7 +3,7 @@
 {% load i18n %}
 {% load l10n %}
 {% load humanize %}
-{% load neo %}
+{% load user_item %}
 {% current_user_marked_item movie as marked %}
 <li class="entity-list__entity">
    <div class="entity-list__entity-img-wrapper">
--- a/common/templates/partial/list_item_music.html
+++ b/common/templates/partial/list_item_music.html
@ -2,7 +2,7 @@
 {% load highlight %}
 {% load i18n %}
 {% load l10n %}
-{% load neo %}
+{% load user_item %}
 {% current_user_marked_item music as marked %}
 <li class="entity-list__entity">
    <div class="entity-list__entity-img-wrapper">
--- a/common/templatetags/mastodon.py
+++ b/common/templatetags/mastodon.py
@ -10,3 +10,17 @@ register = template.Library()
 def mastodon(domain):
    url = 'https://' + domain
    return url 
+
+
+@register.simple_tag(takes_context=True)
+def current_user_relationship(context, user):
+    current_user = context['request'].user
+    if current_user and current_user.is_authenticated:
+        if current_user.is_following(user):
+            if current_user.is_followed_by(user):
+                return '互相关注'
+            else:
+                return '已关注'
+        elif current_user.is_followed_by(user):
+            return '被ta关注'
+    return None
--- a/common/templatetags/neo.py
+++ b/common/templatetags/neo.py
@ -1,48 +0,0 @@
-from django import template
-import datetime
-from django.utils import timezone
-from collection.models import Collection
-
-
-register = template.Library()
-
-
-@register.simple_tag(takes_context=True)
-def current_user_marked_item(context, item):
-    user = context['request'].user
-    if user and user.is_authenticated:
-        if isinstance(item, Collection) and item.owner == user:
-            return item
-        else:
-            return context['request'].user.get_mark_for_item(item)
-    return None
-
-
-@register.simple_tag(takes_context=True)
-def current_user_relationship(context, user):
-    current_user = context['request'].user
-    if current_user and current_user.is_authenticated:
-        if current_user.is_following(user):
-            if current_user.is_followed_by(user):
-                return '互相关注'
-            else:
-                return '已关注'
-        elif current_user.is_followed_by(user):
-            return '被ta关注'
-    return None
-
-
-@register.filter
-def prettydate(d):
-    diff = timezone.now() - d
-    s = diff.seconds
-    if diff.days > 14 or diff.days < 0:
-        return d.strftime('%Y年%m月%d日')
-    elif diff.days >= 1:
-        return '{} 天前'.format(diff.days)
-    elif s < 120:
-        return '刚刚'
-    elif s < 3600:
-        return '{} 分钟前'.format(s // 60)
-    else:
-        return '{} 小时前'.format(s // 3600)
--- a/common/templatetags/prettydate.py
+++ b/common/templatetags/prettydate.py
@ -0,0 +1,22 @@
+from django import template
+from django.utils import timezone
+
+
+register = template.Library()
+
+
+@register.filter
+def prettydate(d):
+    # TODO use date and naturaltime instead https://docs.djangoproject.com/en/3.2/ref/contrib/humanize/
+    diff = timezone.now() - d
+    s = diff.seconds
+    if diff.days > 14 or diff.days < 0:
+        return d.strftime('%Y年%m月%d日')
+    elif diff.days >= 1:
+        return '{} 天前'.format(diff.days)
+    elif s < 120:
+        return '刚刚'
+    elif s < 3600:
+        return '{} 分钟前'.format(s // 60)
+    else:
+        return '{} 小时前'.format(s // 3600)
--- a/common/templatetags/user_item.py
+++ b/common/templatetags/user_item.py
@ -0,0 +1,19 @@
+from django import template
+from collection.models import Collection
+
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=True)
+def current_user_marked_item(context, item):
+    # NOTE weird to put business logic in tags
+    user = context['request'].user
+    if user and user.is_authenticated:
+        if isinstance(item, Collection) and item.owner == user:
+            return item
+        else:
+            return context['request'].user.get_mark_for_item(item)
+    return None
+
+
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -26,7 +26,7 @@ services:
      - DB_USER=postgres
      - DB_PASSWORD=postgres
      - REDIS_HOST=redis
-      - DJANGO_SETTINGS_MODULE=neodb.dev
+      - DJANGO_SETTINGS_MODULE=yoursettings.dev
    depends_on:
      - db
      - redis
--- a/games/models.py
+++ b/games/models.py
@ -149,7 +149,7 @@ class GameReview(Review):

    @property
    def url(self):
-        return settings.APP_WEBSITE + reverse("games:retrieve_review", args=[self.id])
+        return reverse("games:retrieve_review", args=[self.id])

    @property
    def item(self):
--- a/games/templates/games/create_update.html
+++ b/games/templates/games/create_update.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
 </head>

--- a/games/templates/games/create_update_review.html
+++ b/games/templates/games/create_update_review.html
@ -14,7 +14,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'js/create_update_review.js' %}"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/games/templates/games/delete.html
+++ b/games/templates/games/delete.html
@ -14,7 +14,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '删除电影/剧集' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/games/templates/games/delete_review.html
+++ b/games/templates/games/delete_review.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '删除评论' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
    
--- a/games/templates/games/mark_list.html
+++ b/games/templates/games/mark_list.html
@ -15,7 +15,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ game.title }}{% trans '的标记' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
--- a/games/templates/games/review_detail.html
+++ b/games/templates/games/review_detail.html
@ -19,12 +19,12 @@
    <meta property="og:url" content="{{ request.build_absolute_uri }}">
    <meta property="og:image" content="{{ game.cover|thumb:'normal' }}">
    <title>{{ site_name }}游戏评论 - {{ review.title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
-    <link rel="stylesheet" href="{% static 'lib/css/neo.css' %}">
+    <link rel="stylesheet" href="{% static 'lib/css/collection.css' %}">
 </head>

 <body>
--- a/games/templates/games/review_list.html
+++ b/games/templates/games/review_list.html
@ -15,7 +15,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ game.title }}{% trans '的评论' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/games/templates/games/scrape.html
+++ b/games/templates/games/scrape.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '从豆瓣获取数据' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'js/scrape.js' %}"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
 </head>
--- a/management/templates/management/detail.html
+++ b/management/templates/management/detail.html
@ -6,7 +6,7 @@
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
    <title>{{ site_name }} - {{ object.title }}</title>
 </head>
--- a/management/templates/management/list.html
+++ b/management/templates/management/list.html
@ -7,7 +7,7 @@
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">

    <title>{{ site_name }} - {% trans '公告栏' %}</title>
@ -111,10 +111,9 @@
        });
        // strip html tags
        document.querySelectorAll(".markdownx-preview").forEach(e => {
-            console.log($(e).text())
            $(e).html($(e).text());
        });
    </script>
 </body>

-</html>
+</html>
--- a/mastodon/api.py
+++ b/mastodon/api.py
@ -410,7 +410,7 @@ def share_mark(mark):
        visibility = TootVisibilityEnum.UNLISTED
    tags = '\n' + user.get_preference().mastodon_append_tag.replace('[category]', str(mark.item.verbose_category_name)) if user.get_preference().mastodon_append_tag else ''
    stars = rating_to_emoji(mark.rating, MastodonApplication.objects.get(domain_name=user.mastodon_site).star_mode)
-    content = f"{mark.translated_status}《{mark.item.title}》{stars}\n{mark.item.url}\n{mark.text}{tags}"
+    content = f"{mark.translated_status}《{mark.item.title}》{stars}\n{mark.item.absolute_url}\n{mark.text}{tags}"
    update_id = None
    if mark.shared_link:  # "https://mastodon.social/@username/1234567890"
        r = re.match(r'.+/(\w+)$', mark.shared_link)  # might be re.match(r'.+/([^/]+)$', u) if Pleroma supports edit
@ -469,7 +469,7 @@ def share_collection(collection, comment, user, visibility_no):
    else:
        visibility = TootVisibilityEnum.UNLISTED
    tags = '\n' + user.get_preference().mastodon_append_tag.replace('[category]', '收藏单') if user.get_preference().mastodon_append_tag else ''
-    content = f"分享收藏单《{collection.title}》\n{collection.url}\n{comment}{tags}"
+    content = f"分享收藏单《{collection.title}》\n{collection.absolute_url}\n{comment}{tags}"
    response = post_toot(user.mastodon_site, content, visibility, user.mastodon_token)
    if response and response.status_code in [200, 201]:
        j = response.json()
--- a/movies/models.py
+++ b/movies/models.py
@ -272,7 +272,7 @@ class MovieReview(Review):

    @property
    def url(self):
-        return settings.APP_WEBSITE + reverse("movies:retrieve_review", args=[self.id])
+        return reverse("movies:retrieve_review", args=[self.id])

    @property
    def item(self):
--- a/movies/templates/movies/create_update.html
+++ b/movies/templates/movies/create_update.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
 </head>

--- a/movies/templates/movies/create_update_review.html
+++ b/movies/templates/movies/create_update_review.html
@ -14,7 +14,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'js/create_update_review.js' %}"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/movies/templates/movies/delete.html
+++ b/movies/templates/movies/delete.html
@ -14,7 +14,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '删除电影/剧集' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/movies/templates/movies/delete_review.html
+++ b/movies/templates/movies/delete_review.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '删除评论' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
    
--- a/movies/templates/movies/mark_list.html
+++ b/movies/templates/movies/mark_list.html
@ -15,7 +15,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ movie.title }}{% trans '的标记' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
--- a/movies/templates/movies/review_detail.html
+++ b/movies/templates/movies/review_detail.html
@ -19,12 +19,12 @@
    <meta property="og:url" content="{{ request.build_absolute_uri }}">
    <meta property="og:image" content="{{ movie.cover|thumb:'normal' }}">
    <title>{{ site_name }}影评 - {{ review.title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
-    <link rel="stylesheet" href="{% static 'lib/css/neo.css' %}">
+    <link rel="stylesheet" href="{% static 'lib/css/collection.css' %}">
 </head>

 <body>
--- a/movies/templates/movies/review_list.html
+++ b/movies/templates/movies/review_list.html
@ -15,7 +15,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ movie.title }}{% trans '的评论' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/movies/templates/movies/scrape.html
+++ b/movies/templates/movies/scrape.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '从豆瓣获取数据' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'js/scrape.js' %}"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
 </head>
--- a/music/models.py
+++ b/music/models.py
@ -195,7 +195,7 @@ class SongReview(Review):

    @property
    def url(self):
-        return settings.APP_WEBSITE + reverse("music:retrieve_song_review", args=[self.id])
+        return reverse("music:retrieve_song_review", args=[self.id])

    @property
    def item(self):
@ -246,7 +246,7 @@ class AlbumReview(Review):

    @property
    def url(self):
-        return settings.APP_WEBSITE + reverse("music:retrieve_album_review", args=[self.id])
+        return reverse("music:retrieve_album_review", args=[self.id])

    @property
    def item(self):
--- a/music/templates/music/album_mark_list.html
+++ b/music/templates/music/album_mark_list.html
@ -15,7 +15,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ album.title }}{% trans '的标记' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
--- a/music/templates/music/album_review_detail.html
+++ b/music/templates/music/album_review_detail.html
@ -19,12 +19,12 @@
    <meta property="og:url" content="{{ request.build_absolute_uri }}">
    <meta property="og:image" content="{{ album.cover|thumb:'normal' }}">
    <title>{{ site_name }}乐评 - {{ review.title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
-    <link rel="stylesheet" href="{% static 'lib/css/neo.css' %}">
+    <link rel="stylesheet" href="{% static 'lib/css/collection.css' %}">
 </head>

 <body>
--- a/music/templates/music/album_review_list.html
+++ b/music/templates/music/album_review_list.html
@ -14,7 +14,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ album.title }}{% trans '的评论' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/music/templates/music/create_update_album.html
+++ b/music/templates/music/create_update_album.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
 </head>

--- a/music/templates/music/create_update_album_review.html
+++ b/music/templates/music/create_update_album_review.html
@ -14,7 +14,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'js/create_update_review.js' %}"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/music/templates/music/create_update_song.html
+++ b/music/templates/music/create_update_song.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
 </head>

--- a/music/templates/music/create_update_song_review.html
+++ b/music/templates/music/create_update_song_review.html
@ -14,7 +14,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'js/create_update_review.js' %}"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/music/templates/music/delete_album.html
+++ b/music/templates/music/delete_album.html
@ -14,7 +14,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '删除音乐' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/music/templates/music/delete_album_review.html
+++ b/music/templates/music/delete_album_review.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '删除评论' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
    
--- a/music/templates/music/delete_song.html
+++ b/music/templates/music/delete_song.html
@ -14,7 +14,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '删除音乐' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/music/templates/music/delete_song_review.html
+++ b/music/templates/music/delete_song_review.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '删除评论' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
    
--- a/music/templates/music/scrape_album.html
+++ b/music/templates/music/scrape_album.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '从豆瓣获取数据' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'js/scrape.js' %}"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
 </head>
--- a/music/templates/music/scrape_song.html
+++ b/music/templates/music/scrape_song.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '从豆瓣获取数据' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'js/scrape.js' %}"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
 </head>
--- a/music/templates/music/song_mark_list.html
+++ b/music/templates/music/song_mark_list.html
@ -15,7 +15,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ song.title }}{% trans '的标记' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
--- a/music/templates/music/song_review_detail.html
+++ b/music/templates/music/song_review_detail.html
@ -19,12 +19,12 @@
    <meta property="og:url" content="{{ request.build_absolute_uri }}">
    <meta property="og:image" content="{{ song.cover|thumb:'normal' }}">
    <title>{{ site_name }}乐评 - {{ review.title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
-    <link rel="stylesheet" href="{% static 'lib/css/neo.css' %}">
+    <link rel="stylesheet" href="{% static 'lib/css/collection.css' %}">
 </head>

 <body>
--- a/music/templates/music/song_review_list.html
+++ b/music/templates/music/song_review_list.html
@ -14,7 +14,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ song.title }}{% trans '的评论' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
--- a/requirements.txt
+++ b/requirements.txt
@ -24,6 +24,4 @@ opencc
 dnspython
 typesense
 markdownify
-sentry-sdk
-gitpython
 igdb-api-v4
--- a/timeline/templates/timeline_data.html
+++ b/timeline/templates/timeline_data.html
@ -6,7 +6,7 @@
 {% load oauth_token %}
 {% load truncate %}
 {% load thumb %}
-{% load neo %}
+{% load prettydate %}

 {% for activity in activities %}
 {% current_user_marked_item activity.target.item as marked %}
--- a/users/feeds.py
+++ b/users/feeds.py
@ -41,7 +41,7 @@ class ReviewFeed(Feed):
        return f"{item.title} - 评论《{item.item.title}》"

    def item_description(self, item):
-        target_html = f'<p><a href="{item.item.url}">{item.item.title}</a></p>\n' 
+        target_html = f'<p><a href="{item.item.absolute_url}">{item.item.title}</a></p>\n' 
        html = markdown(item.content)
        return target_html + html

--- a/users/tasks.py
+++ b/users/tasks.py
@ -135,7 +135,7 @@ def export_marks_task(user):
            my_rating = None  # (mark.rating / 2) if mark.rating else None
            content = review.content
            target_source_url = review.item.source_url
-            target_url = review.item.url
+            target_url = review.item.absolute_url
            line = [title, target, url, timestamp, my_rating, label, content, target_source_url, target_url]
            ws.append(line)

--- a/users/templates/users/home.html
+++ b/users/templates/users/home.html
@ -20,8 +20,8 @@

    {% include "partial/_common_libs.html" with jquery=1 %}

-    <script src="{% static 'js/mastodon.js' %}"></script>
-    <script src="{% static 'js/home.js' %}"></script>
+    <script src="{% static 'js/mastodon.js' %}" defer></script>
+    <script src="{% static 'js/home.js' %}" defer></script>
 </head>

 <body>
@ -635,7 +635,7 @@
                            {% csrf_token %}
                            <input type="hidden" name="layout">
                        </form>
-                        <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/html5sortable/0.13.3/html5sortable.min.js" crossorigin="anonymous"></script>
+                        <script src="https://cdn.staticfile.org/html5sortable/0.13.3/html5sortable.min.js" crossorigin="anonymous"></script>
                        <script src="{% static 'js/sort_layout.js' %}"></script>
                        {% endif %}
                        <script>
--- a/users/templates/users/item_list.html
+++ b/users/templates/users/item_list.html
@ -13,15 +13,15 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {{ user.mastodon_username }} {{ list_title }}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/htmx/1.8.0/htmx.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/htmx/1.8.4/htmx.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <script src="{% static 'js/mastodon.js' %}"></script>
    <script src="{% static 'js/home.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
-    <link rel="stylesheet" href="{% static 'lib/css/neo.css' %}">
+    <link rel="stylesheet" href="{% static 'lib/css/collection.css' %}">
 </head>

 <body>
--- a/users/templates/users/login.html
+++ b/users/templates/users/login.html
@ -12,10 +12,10 @@
    <meta property="og:image" content="{{ request.scheme }}://{{ request.get_host }}{% static 'img/logo_square.jpg' %}">
    <title>{{ site_name }} - {% trans '登录' %}</title>
    {% include "partial/_common_libs.html" %}
-    <link rel="stylesheet" href="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/milligram/1.4.1/milligram.min.css">
+    <link rel="stylesheet" href="https://cdn.staticfile.org/milligram/1.4.1/milligram.min.css">
    <link rel="stylesheet" href="{% static 'css/boofilsic_edit.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic_box.css' %}">
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/js-cookie/3.0.1/js.cookie.min.js"></script>
+    <script src="https://cdn.staticfile.org/js-cookie/3.0.1/js.cookie.min.js"></script>
    <script> $(document).ready( function() { $('.delayed').remove(); $('#loginButton').prop("disabled", false); } ); </script>
    <style type="text/css">
        .delayed {
@ -67,7 +67,6 @@
                placeholder="实例域名(不含@和@之前的部分)，如mastodon.social"
                autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" />
            <input type='submit' value="{% trans '授权登录' %}" id="loginButton" disabled />
-            <br><a target="_blank" href="https://about.neodb.social/doc/howto/">{% trans '了解更多' %}</a>
            <script type="text/javascript">if (Cookies.get('mastodon_domain')) $('#domain').val(Cookies.get('mastodon_domain'));</script>
            {% else %}            
            <select name="domain" placeholder="test">
--- a/users/templates/users/manage_report.html
+++ b/users/templates/users/manage_report.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '管理举报' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'js/create_update.js' %}"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
 </head>
--- a/users/templates/users/register.html
+++ b/users/templates/users/register.html
@ -6,7 +6,7 @@
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="stylesheet" href="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/milligram/1.4.1/milligram.min.css">
+    <link rel="stylesheet" href="https://cdn.staticfile.org/milligram/1.4.1/milligram.min.css">
    <link rel="stylesheet" href="{% static 'css/boofilsic_edit.css' %}">
    <link rel="stylesheet" href="{% static 'css/boofilsic_box.css' %}">
    <title>{{ site_name }} - {% trans '注册' %}</title>
--- a/users/templates/users/report.html
+++ b/users/templates/users/report.html
@ -11,7 +11,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - {% trans '举报用户' %}</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'js/create_update.js' %}"></script>
    <link rel="stylesheet" href="{% static 'css/boofilsic.min.css' %}">
 </head>
--- a/users/templates/users/tags.html
+++ b/users/templates/users/tags.html
@ -15,7 +15,7 @@
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>{{ site_name }} - 我的标签</title>
-    <script src="https://static.neodb.social/cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+    <script src="https://cdn.staticfile.org/jquery/3.6.1/jquery.min.js"></script>
    <script src="{% static 'lib/js/rating-star.js' %}"></script>
    <script src="{% static 'js/rating-star-readonly.js' %}"></script>
    <link rel="stylesheet" href="{% static 'lib/css/rating-star.css' %}">