feat: ツイート取得処理の改善 (#614)

tomacheese · May 23, 2023 · 27a7358 · 27a7358
1 parent 0da5395
commit 27a7358
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/api/src/routes/websocket/twitter.ts b/api/src/routes/websocket/twitter.ts
@@ -69,12 +69,14 @@ export class SearchTweet extends BaseWSRouter<
     // スクリーンネームは判明したので返す
     if (screenNames.length === 0) {
       this.send({
+        illustId: this.data.illust_id,
         responseType: 'error',
         message: 'screen name not found',
       })
       return
     }
     this.send({
+      illustId: this.data.illust_id,
       responseType: 'screen_names',
       screen_names: screenNames,
     })
@@ -85,6 +87,7 @@ export class SearchTweet extends BaseWSRouter<
     for (const screenName of screenNames) {
       this.getTweets(screenName, postedAt, path).catch((error) => {
         this.send({
+          illustId: this.data.illust_id,
           responseType: 'error',
           message: error.message,
         })
@@ -121,12 +124,14 @@ export class SearchTweet extends BaseWSRouter<
 
     if (tweetsBySearch.length > 0 || tweetsByUserTimeline.length > 0) {
       this.send({
+        illustId: this.data.illust_id,
         responseType: 'finish',
       })
       return
     }
 
     this.send({
+      illustId: this.data.illust_id,
       responseType: 'error',
       message: `@${screenName} tweet not found`,
     })
@@ -202,6 +207,7 @@ export class SearchTweet extends BaseWSRouter<
 
     const similarity = await this.calculateSimilarity(imagePath, tweetImagePath)
     this.send({
+      illustId: this.data.illust_id,
       responseType: 'tweet',
       tweet: {
         tweet,

diff --git a/types/src/api/ws/twitter.ts b/types/src/api/ws/twitter.ts
@@ -81,6 +81,11 @@ export interface SearchTweetResult {
 }
 
 interface SearchTweetResponseScreenNameData {
+  /**
+   * イラスト ID
+   */
+  illustId: number
+
   /**
    * レスポンスタイプ
    */
@@ -93,6 +98,11 @@ interface SearchTweetResponseScreenNameData {
 }
 
 interface SearchTweetResponseTweetData {
+  /**
+   * イラスト ID
+   */
+  illustId: number
+
   /**
    * レスポンスタイプ
    */
@@ -105,6 +115,11 @@ interface SearchTweetResponseTweetData {
 }
 
 interface SearchTweetResponseError {
+  /**
+   * イラスト ID
+   */
+  illustId: number
+
   /**
    * レスポンスタイプ
    */
@@ -117,6 +132,11 @@ interface SearchTweetResponseError {
 }
 
 interface SearchTweetResponseFinish {
+  /**
+   * イラスト ID
+   */
+  illustId: number
+
   /**
    * レスポンスタイプ
    */

diff --git a/view/src/components/items/illusts/IllustPopup.vue b/view/src/components/items/illusts/IllustPopup.vue
@@ -142,9 +142,7 @@ export default Vue.extend({
 
         this.tweetStatus = 'LOADING'
         this.isLoadingImage = true
-        setTimeout(() => {
-          this.fetchTweets()
-        }, 1000)
+        this.fetchTweets()
 
         // イラストポップアップアクセス中は #illust-popup をつける
         if (window.location.hash !== '#illust-popup') {
@@ -223,6 +221,7 @@ export default Vue.extend({
       if (!this.item) {
         return
       }
+      const illustId = this.item.id
       this.isLoadingTweet = true
       this.tweetStatus = 'LOADING'
       this.tweets = undefined
@@ -233,7 +232,7 @@ export default Vue.extend({
       this.tweets = []
       this.error = undefined
       this.$api.twitter.searchByIllust(
-        this.item.id,
+        illustId,
         this.searchCallback.bind(this),
         (error) => {
           this.tweetStatus = 'FAILED'
@@ -246,6 +245,9 @@ export default Vue.extend({
     },
     searchCallback(response: SearchTweetResponse) {
       const data = response.data
+      if (!this.item || data.illustId !== this.item.id) {
+        return
+      }
 
       switch (data.responseType) {
         case 'screen_names': {