From 6e8fde47c134575e70fc006e04390fa1fcd87fcd Mon Sep 17 00:00:00 2001
From: tsukumi <tsukumijima@users.noreply.github.com>
Date: Tue, 28 Jan 2025 04:36:04 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20[Client][Panel/Twitter]=20=E3=80=8C?=
 =?UTF-8?q?=E3=83=AA=E3=83=84=E3=82=A4=E3=83=BC=E3=83=88=E3=82=92=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=80=8D=E3=81=AE=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4=E3=81=97=E3=80=81=E6=A4=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=A7=E3=80=8C=E3=83=AA=E3=83=84=E3=82=A4?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=82=92=E8=A1=A8=E7=A4=BA=E3=80=8D=E3=81=8C?=
 =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Watch/Panel/Twitter/Search.vue | 24 ++++++++++---------
 .../Watch/Panel/Twitter/Timeline.vue          | 20 ++++++++--------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/client/src/components/Watch/Panel/Twitter/Search.vue b/client/src/components/Watch/Panel/Twitter/Search.vue
index 80c40917..120f3609 100644
--- a/client/src/components/Watch/Panel/Twitter/Search.vue
+++ b/client/src/components/Watch/Panel/Twitter/Search.vue
@@ -24,13 +24,8 @@
             </div>
         </div>
         <div v-if="showSettings" class="search-settings">
-            <v-switch
-                v-model="showRetweets"
-                color="primary"
-                hide-details
-                density="comfortable"
-                label="リツイートを表示する"
-            />
+            <v-switch id="show_retweets" color="primary" density="compact" hide-details v-model="showRetweets" />
+            <label class="ml-4 cursor-pointer" for="show_retweets">リツイートを表示する</label>
         </div>
         <VirtuaList ref="scroller" class="search-tweets" :data="flattenedItems" #default="{ item }"
             v-show="flattenedItems.length > 0">
@@ -56,7 +51,7 @@
 
 import { storeToRefs } from 'pinia';
 import { VList as VirtuaList } from 'virtua/vue';
-import { ref, watch, onMounted, nextTick, computed, useTemplateRef } from 'vue';
+import { computed, nextTick, onMounted, ref, useTemplateRef, watch } from 'vue';
 
 import Tweet from '@/components/Watch/Panel/Twitter/Tweet.vue';
 import Message from '@/message';
@@ -87,7 +82,7 @@ type TimelineItem = ITweetBlock | ILoadMoreItem;
 
 const timelineItems = ref<TimelineItem[]>([]);
 const showSettings = ref(false);
-const showRetweets = ref(true);
+const showRetweets = ref(false);
 const isFetching = ref(false);
 const isSearchFormFocused = ref(false);
 const searchQuery = ref('');
@@ -167,7 +162,8 @@ const performSearchTweets = async () => {
 
     // 検索結果のツイートを「投稿時刻が新しい順」に取得
     // タイムラインと異なり、検索結果は一度に 20 件しか返ってこない
-    const result = await Twitter.searchTweets(selected_twitter_account.value.screen_name, searchQuery.value);
+    const query = `${searchQuery.value}${showRetweets.value ? 'include:nativeretweets' : ''}`;
+    const result = await Twitter.searchTweets(selected_twitter_account.value.screen_name, query);
     if (result && result.tweets) {
         // 「リツイートを表示する」がオフの場合はリツイートのツイートを除外
         if (showRetweets.value === false) {
@@ -233,7 +229,8 @@ const handleLoadMore = async (item: ILoadMoreItem) => {
 
     // 検索結果のツイートを「投稿時刻が新しい順」に取得
     // タイムラインと異なり、検索結果は一度に 20 件しか返ってこない
-    const result = await Twitter.searchTweets(selected_twitter_account.value.screen_name, searchQuery.value, item.cursor_id);
+    const query = `${searchQuery.value}${showRetweets.value ? 'include:nativeretweets' : ''}`;
+    const result = await Twitter.searchTweets(selected_twitter_account.value.screen_name, query, item.cursor_id);
     if (result && result.tweets) {
         // 「リツイートを表示する」がオフの場合はリツイートのツイートを除外
         if (showRetweets.value === false) {
@@ -397,7 +394,12 @@ onMounted(() => {
 }
 
 .search-settings {
+    display: flex;
+    align-items: center;
+    height: 45px;
     padding: 0px 12px;
+    font-size: 14px;
+    color: rgb(var(--v-theme-text-darken-1));
     border-bottom: 1px solid rgba(var(--v-theme-on-surface), 0.12);
 }
 
diff --git a/client/src/components/Watch/Panel/Twitter/Timeline.vue b/client/src/components/Watch/Panel/Twitter/Timeline.vue
index fe6aed3c..7309ba0a 100644
--- a/client/src/components/Watch/Panel/Twitter/Timeline.vue
+++ b/client/src/components/Watch/Panel/Twitter/Timeline.vue
@@ -14,13 +14,8 @@
             </div>
         </div>
         <div v-if="showSettings" class="timeline-settings">
-            <v-switch
-                v-model="showRetweets"
-                color="primary"
-                hide-details
-                density="comfortable"
-                label="リツイートを表示する"
-            />
+            <v-switch id="show_retweets" color="primary" density="compact" hide-details v-model="showRetweets" />
+            <label class="ml-4 cursor-pointer" for="show_retweets">リツイートを表示する</label>
         </div>
         <VirtuaList ref="scroller" class="timeline-tweets" :data="flattenedItems" #default="{ item }"
             v-show="flattenedItems.length > 0">
@@ -42,11 +37,11 @@
         </div>
     </div>
 </template>
-
 <script lang="ts" setup>
+
 import { storeToRefs } from 'pinia';
 import { VList as VirtuaList } from 'virtua/vue';
-import { ref, onMounted, watch, nextTick, computed, useTemplateRef } from 'vue';
+import { computed, nextTick, onMounted, ref, useTemplateRef, watch } from 'vue';
 
 import Tweet from '@/components/Watch/Panel/Twitter/Tweet.vue';
 import Message from '@/message';
@@ -289,7 +284,7 @@ watch(selected_twitter_account, () => {
     fetchTimelineTweets();
 });
 
-// 「リツイートを表示する」のスイッチが変更されたらタイムラインの内容をまっさらにした上で再取得
+// 「リツイートを表示する」のスイッチが変更されたらタイムラインの内容をまっさらにして再取得
 watch(showRetweets, () => {
     timelineItems.value = [];
     fetchTimelineTweets();
@@ -377,7 +372,12 @@ onMounted(() => {
 }
 
 .timeline-settings {
+    display: flex;
+    align-items: center;
+    height: 45px;
     padding: 0px 12px;
+    font-size: 14px;
+    color: rgb(var(--v-theme-text-darken-1));
     border-bottom: 1px solid rgba(var(--v-theme-on-surface), 0.12);
 }