From 6537a1c64952e8a511f6e5276dd6e82e44a252e2 Mon Sep 17 00:00:00 2001
From: Faruk AYDIN <omerfaruk26@gmail.com>
Date: Wed, 31 Aug 2022 16:33:51 +0300
Subject: [PATCH] refactor: Use plural wording for user tweets trigger

---
 packages/backend/src/apps/twitter/info.json                 | 4 ++--
 packages/backend/src/apps/twitter/triggers.ts               | 6 +++---
 .../apps/twitter/triggers/{user-tweet.ts => user-tweets.ts} | 2 +-
 packages/backend/src/models/flow.ts                         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename packages/backend/src/apps/twitter/triggers/{user-tweet.ts => user-tweets.ts} (94%)

diff --git a/packages/backend/src/apps/twitter/info.json b/packages/backend/src/apps/twitter/info.json
index 973ceba8..216ce9b5 100644
--- a/packages/backend/src/apps/twitter/info.json
+++ b/packages/backend/src/apps/twitter/info.json
@@ -233,8 +233,8 @@
       ]
     },
     {
-      "name": "User Tweet",
-      "key": "userTweet",
+      "name": "User Tweets",
+      "key": "userTweets",
       "description": "Will be triggered when a specific user tweet something new.",
       "substeps": [
         {
diff --git a/packages/backend/src/apps/twitter/triggers.ts b/packages/backend/src/apps/twitter/triggers.ts
index b8ddf879..0162f6af 100644
--- a/packages/backend/src/apps/twitter/triggers.ts
+++ b/packages/backend/src/apps/twitter/triggers.ts
@@ -1,15 +1,15 @@
 import TwitterClient from './client';
-import UserTweet from './triggers/user-tweet';
+import UserTweets from './triggers/user-tweets';
 import SearchTweets from './triggers/search-tweets';
 
 export default class Triggers {
   client: TwitterClient;
-  userTweet: UserTweet;
+  userTweets: UserTweets;
   searchTweets: SearchTweets;
 
   constructor(client: TwitterClient) {
     this.client = client;
-    this.userTweet = new UserTweet(client);
+    this.userTweets = new UserTweets(client);
     this.searchTweets = new SearchTweets(client);
   }
 }
diff --git a/packages/backend/src/apps/twitter/triggers/user-tweet.ts b/packages/backend/src/apps/twitter/triggers/user-tweets.ts
similarity index 94%
rename from packages/backend/src/apps/twitter/triggers/user-tweet.ts
rename to packages/backend/src/apps/twitter/triggers/user-tweets.ts
index 40bce65b..bd4919b0 100644
--- a/packages/backend/src/apps/twitter/triggers/user-tweet.ts
+++ b/packages/backend/src/apps/twitter/triggers/user-tweets.ts
@@ -1,6 +1,6 @@
 import TwitterClient from '../client';
 
-export default class UserTweet {
+export default class UserTweets {
   client: TwitterClient;
 
   constructor(client: TwitterClient) {
diff --git a/packages/backend/src/models/flow.ts b/packages/backend/src/models/flow.ts
index ca44c208..e88ec678 100644
--- a/packages/backend/src/models/flow.ts
+++ b/packages/backend/src/models/flow.ts
@@ -55,7 +55,7 @@ class Flow extends Base {
       .orderBy('created_at', 'desc')
       .first();
 
-    return (lastExecution as Execution).internalId;
+    return lastExecution ? (lastExecution as Execution).internalId : null;
   }
 
   async $beforeUpdate(