Improvements to project file organization, imports

This commit improves the organization of source code files and imports. It does not make any changes to the front-end user experience.

discordBot/commands/ChatInput/logic/buildinginfo.js

@@ -1,6 +1,6 @@
-import { buildingInfo } from '../../common/buildings/embedBuilders.js'
-import { buildingQuery } from '../../common/buildings/retrievers.js'
-import { BadGatewayError } from '../../../lib/errors.js'
+import { buildingQuery } from '../../../../lib/publicAPIs/whereis.js'
+import { BadGatewayError } from '../../../../lib/genericErrors.js'
+import { buildingInfo } from '../../../embedBuilders.js'
 
 export default async function (interaction) {
   const query = interaction.options.get('query').value

discordBot/commands/ChatInput/logic/courseinfo.js

@@ -1,26 +1,26 @@
-import { courseInformation as courseInformationEmbed, departmentInformation as departmentInformationEmbed } from '../../common/courses/embedBuilders.js'
-import { courseInformation as getCourseInformation, departmentInformation, CourseNotFoundError } from '../../common/courses/retrievers.js'
+import * as courses from '../../../../lib/publicAPIs/courses.js'
+import { courseInfo, departmentInfo } from '../../../embedBuilders.js'
 
 export default async function (interaction) {
   const idQuery = interaction.options.get('id').value
   if (idQuery.includes('.')) {
     try {
-      const courseInformation = await getCourseInformation(idQuery)
+      const courseInformation = await courses.courseInformation(idQuery)
       interaction.reply({
-        embeds: [courseInformationEmbed(courseInformation)]
+        embeds: [courseInfo(courseInformation)]
       })
     } catch (e) {
-      if (e instanceof CourseNotFoundError) {
+      if (e instanceof courses.CourseNotFoundError) {
         interaction.reply({
           content: `**Error:** The specified course ID, \`${idQuery}\`, was not found in the course catalog.`,
           ephemeral: true
         })
       }
     }
   } else {
-    if (idQuery in departmentInformation) {
+    if (idQuery in courses.departmentInformation) {
       interaction.reply({
-        embeds: [departmentInformationEmbed(idQuery, departmentInformation[idQuery])]
+        embeds: [departmentInfo(idQuery, courses.departmentInformation[idQuery])]
       })
     } else {
       interaction.reply({

discordBot/commands/ChatInput/logic/dining.js

@@ -63,7 +63,7 @@ export default async function (interaction) {
         })
       }
     }
-  } else {
-    return 0
-  }
+  } /* else {
+    // Area for subcommand groups (unimplemented)
+  } */
 }

discordBot/commands/ChatInput/logic/emergency.js

@@ -1,4 +1,3 @@
-import _ from 'lodash'
 import { EmbedBuilder } from 'discord.js'
 import * as emergency from '../../../../lib/publicAPIs/emergency.js'
 
@@ -52,7 +51,7 @@ export default async function (interaction) {
         })
       }
     }
-  } else {
-    return 0
-  }
+  } /* else {
+    // Area for subcommand groups (unimplemented)
+  } */
 }

discordBot/commands/ChatInput/logic/idcard.js

@@ -1,5 +1,5 @@
-import { getUserInfo, UnlinkedUserError } from '../../common/whois/retrievers.js'
 import { AttachmentBuilder, EmbedBuilder } from 'discord.js'
+import { getUserInfo, UnlinkedUserError } from '../../../../lib/userLinks.js'
 
 export default async function (interaction) {
   const showIdPhoto = interaction.options.getBoolean('withpicture') !== false

discordBot/commands/ChatInput/logic/resetnick.js

@@ -1,10 +1,10 @@
-import { getNewNickname } from '../../common/resetnick.js'
 import { authorizeServerAndReply } from '../../authorization.js'
+import { getAutoNickname } from '../../../../lib/userLinks.js'
 
 export default async function (interaction) {
   if (!await authorizeServerAndReply(interaction)) return
   const targetUser = interaction.options.get('user').user
-  const newNickname = await getNewNickname(targetUser)
+  const newNickname = await getAutoNickname(targetUser)
   if (newNickname === false) {
     interaction.reply({
       content: `**Error:** User <@${targetUser.id}> has not linked a Kerberos account. Their nickname cannot be reset.`,

discordBot/commands/ChatInput/logic/searchdir.js

@@ -1,24 +1,20 @@
-import {
-  detailSearch,
-  MultipleDirectoryResultsError,
-  NoDirectoryResultsError
-} from '../../common/directory/retrievers.js'
-import { directoryResult, directoryResultList } from '../../common/directory/embedBuilders.js'
+import * as webDirectory from '../../../../lib/publicAPIs/webDirectory.js'
+import { directoryResult, directoryResultList } from '../../../embedBuilders.js'
 
 export default async function (interaction) {
   try {
-    const result = (await detailSearch(interaction.options.get('query').value))[0]
+    const result = (await webDirectory.detailSearch(interaction.options.get('query').value))[0]
     interaction.reply({
       embeds: [await directoryResult(result)]
     })
   } catch (e) {
-    if (e instanceof NoDirectoryResultsError) {
+    if (e instanceof webDirectory.NoDirectoryResultsError) {
       interaction.reply({
         content: `**Error:** The specified query, \`${interaction.options.get('query').value}\`, returned no directory results.`,
         ephemeral: true
       })
     }
-    if (e instanceof MultipleDirectoryResultsError) {
+    if (e instanceof webDirectory.MultipleDirectoryResultsError) {
       interaction.reply({
         embeds: [await directoryResultList(e.results, interaction.options.get('query').value)],
         ephemeral: true

discordBot/commands/ChatInput/logic/seeidphoto.js

@@ -1,7 +1,7 @@
 import { AttachmentBuilder, EmbedBuilder } from 'discord.js'
 import * as authorization from '../../authorization.js'
 import { readUserConfig } from '../../../../lib/configurationReaders.js'
-import { getKerberos, UnlinkedUserError } from '../../common/whois/retrievers.js'
+import { getKerberos, UnlinkedUserError } from '../../../../lib/userLinks.js'
 import { get as getPhoto } from '../../../../lib/mitDeveloperConnection/peoplePictures.js'
 
 export default async function (interaction) {

discordBot/commands/ChatInput/logic/sipbdoor.js

@@ -1,5 +1,5 @@
-import { EmbedBuilder } from 'discord.js'
 import { DateTime } from 'luxon'
+import { EmbedBuilder } from 'discord.js'
 
 export default async function (interaction) {
   const sipbDoorResponseText = await fetch('https://sipb-door.mit.edu/text').then(res => res.text())

discordBot/commands/ChatInput/logic/usersettings.js

@@ -164,7 +164,7 @@ export default async function (interaction) {
         })
       }
     }
-  } else {
-    return 0
-  }
+  } /* else {
+    // Area for subcommand groups (unimplemented)
+  } */
 }

discordBot/commands/ChatInput/logic/whois.js

@@ -1,5 +1,5 @@
 import { authorizeServerAndReply, checkUserVerificationAndReply } from '../../authorization.js'
-import respond from '../../common/whois/respond.js'
+import { respond } from '../../common/whois.js'
 
 export default async function (interaction) {
   if (!(await authorizeServerAndReply(interaction) && await checkUserVerificationAndReply(interaction))) return

discordBot/commands/User/logic/Get Profile from Linked Kerberos.js

@@ -1,5 +1,5 @@
 import { authorizeServerAndReply, checkUserVerificationAndReply } from '../../authorization.js'
-import respond from '../../common/whois/respond.js'
+import { respond } from '../../common/whois.js'
 
 export default async function (interaction) {
   if (!(await authorizeServerAndReply(interaction) && await checkUserVerificationAndReply(interaction))) return