updated github webhooks and unfollower logic

Author: KevinTrinh1227

src/discordWebhook.js

@@ -132,25 +132,78 @@ async function sendUnfollowedUserDiscordEmbed(user) {
       embeds: [
         {
           title: `Successfully unfollowed ${user.login} (${user.id})`,
+          url: user.html_url,
+          description: `Reason: ${user.unfollow_reason}`,
           thumbnail: {
             url: user.avatar_url, // Set the user's avatar as the embed thumbnail
           },
           fields: [
             {
-              name: "Profile URL",
-              value: `[${user.login}](${user.html_url})`, // Embed the link to the user's profile
-              inline: true, // Single line for link
+              name: "Followed On",
+              value: new Date(user.followed_on).toLocaleString(), // Format the followed_on date
+              inline: true, // Single line for followed date
             },
+            {
+              name: "Unfollowed On",
+              value: new Date().toLocaleString(), // Display current time and date
+              inline: true, // Single line for unfollowed date
+            },
+            {
+              name: "Reason",
+              value: user.unfollow_reason, // Display current time and date
+              inline: true, // Single line for unfollowed date
+            },
+          ],
+          color: colorDecimal, // Use the custom color
+          footer: {
+            text: "Built by www.kevintrinh.dev", // Add footer text
+          },
+          timestamp: new Date().toISOString(),
+        },
+      ],
+    });
+    //console.log(`Embed notification sent to Discord for unfollowed user ${user.login}!`);
+  } catch (error) {
+    console.error("Error sending Discord embed notification:", error);
+  }
+}
+
+// Function to send an embed for an unfollowed user object
+async function sendMovedUserToUnfollowQueueDiscordEmbed(user) {
+  if (!isDiscordEnabled) {
+    console.log(
+      "Discord integration is disabled. Skipping unfollowed user embed notification."
+    );
+    return;
+  }
+
+  const colorDecimal = hexToDecimal("#FFFF55"); // Custom color in decimal
+
+  try {
+    await axios.post(webhookURL, {
+      embeds: [
+        {
+          title: `Added user to unfollow queue: ${user.login} (${user.id})`,
+          url: user.html_url,
+          thumbnail: {
+            url: user.avatar_url, // Set the user's avatar as the embed thumbnail
+          },
+          fields: [
             {
               name: "Followed On",
               value: new Date(user.followed_on).toLocaleString(), // Format the followed_on date
               inline: true, // Single line for followed date
             },
             {
-              name: "Unfollowed On",
+              name: "Queue Timestamp",
               value: new Date().toLocaleString(), // Display current time and date
               inline: true, // Single line for unfollowed date
             },
+            {
+              name: "Reason",
+              value: user.unfollow_reason, // Display current time and date
+              inline: true, // Single line for unfollowed date
+            },
           ],
           color: colorDecimal, // Use the custom color
           footer: {
@@ -171,4 +224,5 @@ module.exports = {
   sendDiscordEmbed,
   sendFollowedUserDiscordEmbed,
   sendUnfollowedUserDiscordEmbed,
+  sendMovedUserToUnfollowQueueDiscordEmbed,
 };

src/index.js

@@ -116,6 +116,8 @@ async function processQueue() {
 
       // Move expired users to the unfollow queue if none to unfollow
       await moveExpiredUsersToUnfollowQueue();
+      // check to see who has followed us back then put them in unfollow queue
+      await moveFollowBacksToUnfollowQueue();
 
       console.log("Waiting before the next cycle...\n\n\n");
       await waitRandomInterval(); // Wait for a random interval...

src/queues.js

@@ -112,9 +112,13 @@ async function moveExpiredUsersToUnfollowQueue() {
           // Add the user to the unfollow queue with a timestamp
           unfollowQueue[user.id] = {
             ...user,
-            added_to_queue_on: new Date().toISOString(), // Add a timestamp for when the user was added
+            moved_to_unfollow_queue_on: new Date().toISOString(), // Add a timestamp for when the user was added
+            unfollow_reason: "Given time for user to follow back has expired",
           };
 
+          // log it in disc if webhook feature enabled
+          await sendMovedUserToUnfollowQueueDiscordEmbed(user);
+
           // Remove the user from pending_follow_back.json
           delete pendingFollowBack[userId];
         }

src/unfollowUser.js

@@ -13,7 +13,10 @@ const currentFollowersPath = path.join(
 );
 const unfollowQueuePath = path.join(__dirname, "../data/unfollow_queue.json");
 
-const { sendUnfollowedUserDiscordEmbed } = require("./discordWebhook");
+const {
+  sendUnfollowedUserDiscordEmbed,
+  sendMovedUserToUnfollowQueueDiscordEmbed,
+} = require("./discordWebhook");
 
 // Path to the JSON file storing past followed and unfollowed users
 const pastFollowsUnfollowsPath = path.join(
@@ -122,7 +125,6 @@ async function removeFromUnfollowQueue(userId) {
   }
 }
 
-// Function to move users from pending follow-back to unfollow queue if they followed back
 async function moveFollowBacksToUnfollowQueue() {
   try {
     // Load pending follow-back list
@@ -157,11 +159,20 @@ async function moveFollowBacksToUnfollowQueue() {
     for (const userID in pendingFollowBack) {
       if (currentFollowerIds.has(parseInt(userID))) {
         // If the user is following back, move them to the unfollow queue
-        unfollowQueue[userID] = {
+        const userObject = {
           ...pendingFollowBack[userID],
-          movedToUnfollowAt: new Date().toISOString(),
+          moved_to_unfollow_queue_on: new Date().toISOString(),
+          unfollow_reason: "User followed back",
         };
 
+        // Call the logThisUser function with userObject
+        // logThisUser(userObject);
+        await sendMovedUserToUnfollowQueueDiscordEmbed(userObject);
+        //console.log("test");
+
+        // Add the user to the unfollow queue
+        unfollowQueue[userID] = userObject;
+
         // Remove the user from the pending follow-back list
         delete pendingFollowBack[userID];
       }