Fix Merge Conflict Errors

Peekaey · Aug 20, 2024 · fa4e338 · fa4e338
1 parent efd6e6e
commit fa4e338
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 30 deletions.
diff --git a/src/Commands/CheckCharacterFreeCompany.ts b/src/Commands/CheckCharacterFreeCompany.ts
@@ -1,6 +1,6 @@
 import {Command} from "../Handler/CommandList.ts";
 import {ApplicationCommandOptionType, Client, CommandInteraction} from "discord.js";
-import {GetLodestoneFreeCompany, RobustlyCheckLodestoneFreeCompany} from "../Helpers/LodestoneHelpers.ts";
+import {RobustlyCheckLodestoneFreeCompany} from "../Helpers/LodestoneHelpers.ts";
 
 export const CheckCharacterFreeCompany: Command = {
     name: "checkcharacterfreecompany",
@@ -17,7 +17,7 @@ export const CheckCharacterFreeCompany: Command = {
     run: async (client: Client, interaction: CommandInteraction) => {
         let messageContent = interaction.options.get("message")!.value as string;
 
-        let content = "";
+        let content;
         try {
             let [firstName, lastName] = messageContent.split(" ");
 

diff --git a/src/Commands/GetCharacterFreeCompany.ts b/src/Commands/GetCharacterFreeCompany.ts
@@ -1,7 +1,6 @@
 import {CommandInteraction, Client, ApplicationCommandOptionType} from "discord.js";
 import {Command} from "../Handler/CommandList.ts";
-import axios from "axios";
-import {GetLodestoneCharacterId, GetLodestoneFreeCompany} from "../Helpers/LodestoneHelpers.ts";
+import {GetLodestoneFreeCompany} from "../Helpers/LodestoneHelpers.ts";
 
 export const GetCharacterFreeCompany: Command = {
     name: "getcharacterfreecompany",
@@ -18,7 +17,7 @@ export const GetCharacterFreeCompany: Command = {
     run: async (client: Client, interaction: CommandInteraction) => {
         let messageContent = interaction.options.get("message")!.value as string;
 
-        let content = "";
+        let content;
         try {
             let [firstName, lastName] = messageContent.split(" ");
 

diff --git a/src/Commands/GetCharacterId.ts b/src/Commands/GetCharacterId.ts
@@ -1,7 +1,6 @@
 import {CommandInteraction, Client, ApplicationCommandOptionType} from "discord.js";
 import {Command} from "../Handler/CommandList.ts";
-import axios from "axios";
-import {GetLodestoneCharacterId, GetLodestoneFreeCompany} from "../Helpers/LodestoneHelpers.ts";
+import {GetLodestoneCharacterId} from "../Helpers/LodestoneHelpers.ts";
 
 export const GetCharacterId: Command = {
     name: "getcharacterid",
@@ -20,7 +19,7 @@ export const GetCharacterId: Command = {
 
         // Default to Carbuncle Server as we only need to query the FCs server location
         let server = "Carbuncle";
-        let content = "";
+        let content;
         try {
             let [firstName, lastName] = messageContent.split(" ");
 

diff --git a/src/Helpers/LodestoneHelpers.ts b/src/Helpers/LodestoneHelpers.ts
@@ -1,7 +1,6 @@
 import axios from "axios";
 import * as cheerio from "cheerio";
 
-
 // Example Query In Browser
 // https://na.finalfantasyxiv.com/lodestone/character/?q=Art+Bayard&worldname=Carbuncle&classjob=&race_tribe=&blog_lang=ja&blog_lang=en&blog_lang=de&blog_lang=fr&order=
 const baseURL = "https://na.finalfantasyxiv.com/lodestone/character/?q=";
@@ -24,31 +23,32 @@ export const RobustlyCheckLodestoneFreeCompany = async (firstName: string, lastN
             if (!content) {
                 return "Error Getting Initial Web Content";
             } else {
-            let webContent = cheerio.load(content);
-            if (!webContent) {
-                return "Error Getting Initial Web Content";
-            } else {
-                let href = webContent('a.entry__link').first().attr('href');
-                if (!href) {
-                    return "Error Getting Character ID - No Characters were found";
+                let webContent = cheerio.load(content);
+                if (!webContent) {
+                    return "Error Getting Initial Web Content";
                 } else {
-                    let url = href.match(/\/lodestone\/character\/(\d+)\//);
-                    if (!url) {
-                        return "Error Getting Character URL - CSS Selectors For Character URL May Have Changed";
+                    let href = webContent('a.entry__link').first().attr('href');
+                    if (!href) {
+                        return "Error Getting Character ID - No Characters were found";
                     } else {
-                        let characterId = url[1];
-                        if (!characterId) {
-                            return "Error Parsing Character ID - Character URL May Have Changed";
+                        let url = href.match(/\/lodestone\/character\/(\d+)\//);
+                        if (!url) {
+                            return "Error Getting Character URL - CSS Selectors For Character URL May Have Changed";
                         } else {
-                            // Found Character ID - Meaning Player Name is Valid and Found
-                            // Now Get Free Company Name
-                            let freeCompany = webContent('a.entry__freecompany__link').first().find('span').text();
-                            if (!freeCompany) {
-                                // Character not in a Free Company or CSS Selector may have updated
-                                return "Character not in a free company or CSS Selector may have updated";
+                            let characterId = url[1];
+                            if (!characterId) {
+                                return "Error Parsing Character ID - Character URL May Have Changed";
                             } else {
-                                // Free Company Found
-                                return freeCompany;
+                                // Found Character ID - Meaning Player Name is Valid and Found
+                                // Now Get Free Company Name
+                                let freeCompany = webContent('a.entry__freecompany__link').first().find('span').text();
+                                if (!freeCompany) {
+                                    // Character not in a Free Company or CSS Selector may have updated
+                                    return "Character not in a free company or CSS Selector may have updated";
+                                } else {
+                                    // Free Company Found
+                                    return freeCompany;
+                                }
                             }
                         }
                     }