Merge pull request #51 from ICEPrey/discussion-command

MohammedADev · web-flow · commit 674c4b420022 · 2024-09-02T18:56:01.000-07:00
feat: discussion cmd
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,11 +1,18 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
 version: 2
 updates:
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  - package-ecosystem: "npm"
+    directory: "/"
     schedule:
       interval: "weekly"
+    open-pull-requests-limit: 10
+    versioning-strategy: auto
+    allow:
+      - dependency-type: "direct"
+    commit-message:
+      prefix: "chore"
+      include: "scope"
+    labels:
+      - "dependencies"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-patch"]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,3 +31,33 @@ jobs:
 
       - name: Build
         run: bunx tsc
+
+  commitlint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Use Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: Install commitlint
+        run: |
+          bun add -d @commitlint/cli @commitlint/config-conventional
+
+      - name: Print versions
+        run: |
+          git --version
+          bun --version
+          bunx commitlint --version
+
+      - name: Validate current commit (last commit) with commitlint
+        if: github.event_name == 'push'
+        run: bunx commitlint --from HEAD~1 --to HEAD --verbose
+
+      - name: Validate PR commits with commitlint
+        if: github.event_name == 'pull_request'
+        run: bunx commitlint --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }} --verbose
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -0,0 +1,2 @@
+bun run lint
+bunx commitlint --edit $1
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1,2 @@
+bun run format
+bunx tsc --noEmit
diff --git a/commitlint.config.mjs b/commitlint.config.mjs
@@ -0,0 +1 @@
+export default { extends: ["@commitlint/config-conventional"] };
diff --git a/package.json b/package.json
@@ -9,7 +9,8 @@
     "start": "bun ./dist/index.js",
     "watch": "bunx tsc -w",
     "format": "bunx prettier --write .",
-    "lint": "eslint . --fix "
+    "lint": "eslint . --fix --ignore-pattern 'dist/*'",
+    "prepare": "husky"
   },
   "keywords": [
     "canvas",
@@ -33,6 +34,8 @@
     "url": "^0.11.4"
   },
   "devDependencies": {
+    "@commitlint/cli": "^19.4.1",
+    "@commitlint/config-conventional": "^19.4.1",
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.9.1",
     "@types/eslint__js": "^8.42.3",
@@ -41,6 +44,7 @@
     "@typescript-eslint/parser": "^8.3.0",
     "eslint": "^9.9.1",
     "globals": "^15.9.0",
+    "husky": "^9.1.5",
     "supabase": "^1.191.3",
     "typescript-eslint": "^8.3.0"
   }
diff --git a/src/commands/canvas/assignments.ts b/src/commands/canvas/assignments.ts
@@ -8,7 +8,7 @@ import {
   ChatInputCommandInteraction,
 } from "discord.js";
 import { randomColor } from "../../helpers/colors";
-import { fetchAssignments, fetchCourses } from "../../helpers/api";
+import { fetchAssignments, getCourses } from "../../helpers/api";
 import { Course } from "../../types";
 
 export const data = new SlashCommandBuilder()
@@ -17,7 +17,7 @@ export const data = new SlashCommandBuilder()
 
 export async function execute(interaction: ChatInputCommandInteraction) {
   const userId = interaction.user.id;
-  const courses = await fetchCourses(userId);
+  const courses = await getCourses(userId);
   if (courses.length === 0) {
     await interaction.reply({
       content: "You have no courses.",
diff --git a/src/commands/canvas/discussion.ts b/src/commands/canvas/discussion.ts
@@ -0,0 +1,60 @@
+import {
+  ChatInputCommandInteraction,
+  EmbedBuilder,
+  SlashCommandBuilder,
+} from "discord.js";
+import { randomColor } from "../../helpers/colors";
+import { getDiscussions } from "../../helpers/api";
+import { convert } from "html-to-text";
+import { CourseSelector } from "../../components/dropdown/CourseSelector";
+
+export const data = new SlashCommandBuilder()
+  .setName("discussion")
+  .setDescription("Fetches the latest discussion from Canvas")
+  .setDMPermission(false);
+
+export async function execute(interaction: ChatInputCommandInteraction) {
+  try {
+    const userId: string = interaction.user.id;
+    await interaction.deferReply({ ephemeral: true });
+    const courseId = await CourseSelector(interaction, userId);
+
+    if (!courseId) {
+      await interaction.editReply("No course was selected. Command cancelled.");
+      return;
+    }
+
+    // Fetch discussions for the selected course
+    const discussions = await getDiscussions(userId, parseInt(courseId));
+
+    if (!discussions || discussions.length === 0) {
+      await interaction.editReply(
+        "No discussions found for the selected course.",
+      );
+      return;
+    }
+
+    const discussion = discussions[0];
+    const embed = new EmbedBuilder()
+      .setColor(randomColor())
+      .setTitle(discussion.title)
+      .setURL(discussion.html_url)
+      .setDescription(convert(discussion.message))
+      .setTimestamp(new Date(discussion.posted_at))
+      .setFooter({ text: "Next Canvas check in 24 hours." });
+
+    await interaction.editReply({
+      content: "Here's the latest discussion:",
+      embeds: [embed],
+    });
+  } catch (error) {
+    console.error(
+      `Unexpected error in discussion command for user ${interaction.user.id}:`,
+      error,
+    );
+    await interaction.editReply({
+      content:
+        "An unexpected error occurred. Please try again later or contact support if the issue persists.",
+    });
+  }
+}
diff --git a/src/commands/canvas/missing.ts b/src/commands/canvas/missing.ts
@@ -20,9 +20,8 @@ export async function execute(interaction: ChatInputCommandInteraction) {
       aliases: [],
     };
     const userId: string = interaction.user.id;
-    const userAssignments: MissingAssignmentResponse = await getAllAssignments(
-      userId,
-    );
+    const userAssignments: MissingAssignmentResponse =
+      await getAllAssignments(userId);
 
     if (userAssignments.courses.length === 0) {
       await interaction.reply({
diff --git a/src/components/dropdown/CourseSelector.ts b/src/components/dropdown/CourseSelector.ts
@@ -0,0 +1,85 @@
+import {
+  ActionRowBuilder,
+  ChatInputCommandInteraction,
+  Collection,
+  ComponentType,
+  StringSelectMenuBuilder,
+  StringSelectMenuInteraction,
+} from "discord.js";
+import { getCourses } from "../../helpers/api";
+import { Course } from "../../types";
+const SELECTION_TIMEOUT = 60000;
+
+export async function CourseSelector(
+  interaction: ChatInputCommandInteraction,
+  userId: string,
+): Promise<string | null> {
+  try {
+    const courses = await getCourses(userId);
+    if (courses.length === 0) {
+      await interaction.followUp({
+        content: "You have no active courses.",
+        ephemeral: true,
+      });
+      return null;
+    }
+
+    const selectMenu = new StringSelectMenuBuilder()
+      .setCustomId("course_select")
+      .setPlaceholder("Select a course")
+      .addOptions(
+        courses.map((course: Course) => ({
+          label: course.name,
+          value: course.id.toString(),
+        })),
+      );
+
+    const row = new ActionRowBuilder<StringSelectMenuBuilder>().addComponents(
+      selectMenu,
+    );
+    const followUpMessage = await interaction.followUp({
+      content: "Please select a course:",
+      components: [row],
+      ephemeral: true,
+      fetchReply: true,
+    });
+
+    return new Promise<string | null>((resolve) => {
+      const collector = followUpMessage.createMessageComponentCollector({
+        componentType: ComponentType.StringSelect,
+        time: SELECTION_TIMEOUT,
+      });
+
+      collector.on("collect", async (i: StringSelectMenuInteraction) => {
+        const courseId = i.values[0];
+        await i.update({
+          content: `You selected course ID: ${courseId}`,
+          components: [],
+        });
+        collector.stop();
+        resolve(courseId);
+      });
+
+      collector.on(
+        "end",
+        async (collected: Collection<string, StringSelectMenuInteraction>) => {
+          if (collected.size === 0) {
+            await interaction.followUp({
+              content: "Course selection timed out. Please try again.",
+              ephemeral: true,
+            });
+            resolve(null);
+          }
+        },
+      );
+    });
+  } catch (error) {
+    console.error(`Error in CourseSelector for user ${userId}:`, error);
+    await interaction.followUp({
+      content:
+        "An error occurred while fetching courses. Please try again later.",
+      ephemeral: true,
+    });
+    return null;
+  }
+}
diff --git a/src/events/ready.ts b/src/events/ready.ts
@@ -9,7 +9,7 @@ import { postAssignment } from "./assignmentChecker";
 const clientReadyEvent: BotEvent = {
   name: Events.ClientReady,
   once: true,
-  async execute(client: Client) {
+  execute: async (client: Client) => {
     console.log(`Up! Logged In As ${client?.user?.tag}`);
     client?.user?.setActivity("Your Assignments", {
       type: ActivityType.Watching,
diff --git a/src/helpers/api.ts b/src/helpers/api.ts
@@ -1,6 +1,11 @@
 import axios, { AxiosRequestConfig } from "axios";
-import { getCanvasID, getCanvasToken } from "./supabase";
-import { AnnouncementPost, Course, Assignment } from "../types";
+import { getCanvasToken } from "./supabase";
+import {
+  AnnouncementPost,
+  Course,
+  Assignment,
+  DiscussionTopic,
+} from "../types";
 import { CONFIG } from "../config";
 
 export async function fetchData<T>(
@@ -14,7 +19,9 @@ export async function fetchData<T>(
     if (!canvasToken) {
       throw new Error("Canvas token is not found.");
     }
-    const response = await axios.get<T>(`${CONFIG.CANVAS_DOMAIN}${endpoint}`, {
+
+    const url = `${CONFIG.CANVAS_DOMAIN}${endpoint}`;
+    const response = await axios.get<T>(url, {
       timeout: 10000,
       headers: {
         Authorization: `Bearer ${canvasToken}`,
@@ -29,6 +36,8 @@ export async function fetchData<T>(
       console.error(
         `Axios error fetching data from ${endpoint}:`,
         error.message,
+        error.response?.status,
+        error.response?.data,
       );
     } else {
       console.error(`Unexpected error fetching data from ${endpoint}:`, error);
@@ -37,24 +46,6 @@ export async function fetchData<T>(
   }
 }
 
-export async function fetchCourses(userId: string) {
-  try {
-    const canvasID = await getCanvasID(userId);
-    const courses = await fetchData<Course[]>(
-      userId,
-      `users/${canvasID}/courses`,
-      {
-        enrollment_type: "student",
-        enrollment_state: "active",
-      },
-    );
-    return courses;
-  } catch (error) {
-    console.error("Failed to fetch courses:", error);
-    throw new Error("Error fetching courses.");
-  }
-}
-
 export async function fetchAssignments(
   courseId: number,
   userId: string,
@@ -104,8 +95,10 @@ export async function getAllAssignments(
 
 export async function getCourses(userId: string): Promise<Course[]> {
   try {
-    const canvasID = await getCanvasID(userId);
-    return await fetchData<Course[]>(userId, `users/${canvasID}/courses`);
+    return await fetchData<Course[]>(userId, "courses", {
+      enrollment_type: "student",
+      enrollment_state: "active",
+    });
   } catch (error) {
     console.error("Failed to fetch courses:", error);
     throw new Error("Error fetching courses.");
@@ -185,3 +178,19 @@ export async function fetchAssignmentChecker(
     return [];
   }
 }
+
+export async function getDiscussions(
+  userId: string,
+  courseId: number,
+): Promise<DiscussionTopic[]> {
+  try {
+    const discussions = await fetchData<DiscussionTopic[]>(
+      userId,
+      `courses/${courseId}/discussion_topics`,
+    );
+    return discussions;
+  } catch (error) {
+    console.error(`Failed to fetch discussions for course ${courseId}:`, error);
+    throw new Error("Error fetching discussions.");
+  }
+}
diff --git a/src/types.d.ts b/src/types.d.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+bun run lint`
	`2`	`+bunx commitlint --edit $1`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+bun run format`
	`2`	`+bunx tsc --noEmit`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export default { extends: ["@commitlint/config-conventional"] };`