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 @@
- + +
@@ -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([]); 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 @@
- + +
@@ -42,11 +37,11 @@ -