Merge pull request #13 from wzyboy/feat/spoiler-text

feat: show CW/title in toots
wzyboy · Jul 30, 2023 · 0067857 · 0067857
2 parents e2a2e06 + 4407267
commit 0067857
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 5 deletions.
diff --git a/ash.py b/ash.py
@@ -150,7 +150,7 @@ def search(self, *, keyword=None, user_screen_name=None, index=None, limit=100)
         keyword_query = {
             'simple_query_string': {
                 'query': keyword,
-                'fields': ['text', 'full_text', 'content_text', 'media_attachments.description'],
+                'fields': ['text', 'full_text', 'content_text', 'spoiler_text', 'media_attachments.description'],
                 'default_operator': 'AND',
             }
         }

diff --git a/static/main.css b/static/main.css
diff --git a/static/main.css.map b/static/main.css.map
diff --git a/static/scss/card.scss b/static/scss/card.scss
@@ -73,6 +73,13 @@
                 }
             }
         }
+        .title {
+            font-size: 20px;
+            font-style: italic;
+            padding-top: 0.2em;
+            padding-bottom: 0.5em;
+            border-bottom: 1px solid rgb(207, 217, 222);
+        }
         .full-text {
             color: rgb(15, 20, 25);
             line-height: 24px;

diff --git a/static/scss/list.scss b/static/scss/list.scss
@@ -87,6 +87,13 @@
                 }
             }
 
+            .title {
+                font-style: italic;
+                padding-top: 0.2em;
+                padding-bottom: 0.5em;
+                border-bottom: 1px solid rgb(207, 217, 222);
+            }
+
             .full-text {
                 overflow-wrap: break-word;
                 white-space: pre-wrap;

diff --git a/templates/_tweet_list.html b/templates/_tweet_list.html
@@ -37,6 +37,9 @@
             {%- endif %}
         </div>
 
+        {%- if tweet.spoiler_text %}
+        <div class="title">{{ tweet.spoiler_text }}</div>
+        {%- endif %}
         <div class="full-text">{{ tweet | format_tweet_text | safe }}</div>
 
     </div>

diff --git a/templates/tweet.html b/templates/tweet.html
@@ -31,11 +31,15 @@
     </div>
 
     <div class="text">
+        {%- if tweet.in_reply_to_status_id %}
         <div class="in-reply-to">
-            {%- if tweet.in_reply_to_status_id %}
             <a href="{{ tweet | in_reply_to_link }}">Replying to @{{ tweet['in_reply_to_screen_name'] }}</a>
-            {%- endif %}
         </div>
+        {%- endif %}
+
+        {%- if tweet.spoiler_text %}
+        <div class="title">{{ tweet.spoiler_text }}</div>
+        {%- endif %}
 
         <div class="full-text">{{ tweet | format_tweet_text | safe }}</div>
     </div>