Merge branch 'staging' of https://github.com/Antares-Network/CSSC-Bot into feature/nathen418/detect-containerization

Author: nathen418

commands/owner/createRoles.ts

@@ -1,5 +1,5 @@
 import { ICommand } from "wokcommands";
-import { createRoles } from "../../rolesOps";
+import { createRoles } from "../../utils/roleUtils";
 import chalk from "chalk";
 import { classModel } from "../../models/classModel";
 import { staffModel } from "../../models/staffModel";

commands/owner/csClassPoll.ts

@@ -7,8 +7,8 @@ import {
 import chalk from "chalk";
 import { ICommand } from "wokcommands";
 import { classModel, IClass } from "../../models/classModel";
-import { checkForRoles } from "../../rolesOps";
-import { sleep } from "../../util";
+import { checkForRoles } from "../../utils/roleUtils";
+import { sleep } from "../../utils/util";
 
 // Splits any size list into lists of at most `max_list_len`
 function split_list<T>(list: T[], max_list_len: number): T[][] {

commands/owner/staffPoll.ts

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import { MessageEmbed, MessageActionRow, MessageSelectMenu } from "discord.js";
 import { ICommand } from "wokcommands";
-import { checkForRoles } from "../../rolesOps";
+import { checkForRoles } from "../../utils/roleUtils";
 
 export default {
   name: "staffPoll",

commands/owner/yearPoll.ts

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import { MessageEmbed, MessageActionRow, MessageSelectMenu } from "discord.js";
 import { ICommand } from "wokcommands";
-import { checkForRoles } from "../../rolesOps";
+import { checkForRoles } from "../../utils/roleUtils";
 
 export default {
   name: "yearPoll",

commands/user/clear.ts

@@ -4,7 +4,7 @@ import { ICommand } from "wokcommands";
 import { classModel } from "../../models/classModel";
 import { staffModel } from "../../models/staffModel";
 import { yearModel } from "../../models/yearModel";
-import { removeRole } from "../../rolesOps";
+import { removeRole } from "../../utils/roleUtils";
 
 export default {
   name: "clear",

commands/user/view.ts

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import { GuildMember } from "discord.js";
 import { ICommand } from "wokcommands";
-import { getUsersRoles } from "../../rolesOps";
+import { getUsersRoles } from "../../utils/roleUtils";
 
 export default {
   name: "view",

features/interactionCreate.ts

@@ -1,6 +1,6 @@
 import { Client, MessageEmbed, GuildMember } from "discord.js";
 import { yearModel } from "../models/yearModel";
-import { removeRole, addNewRole } from "../rolesOps";
+import { removeRole, addNewRole } from "../utils/roleUtils";
 import { staffModel } from "../models/staffModel";
 import { classModel } from "../models/classModel";
 

models/classModel.ts

@@ -1,5 +1,5 @@
 import mongoose, { Schema } from "mongoose";
-import { IRole } from "../rolesOps";
+import { IRole } from "../utils/roleUtils";
 
 export interface IClass extends IRole {
   id: string;

models/staffModel.ts

@@ -1,5 +1,5 @@
 import mongoose, { Schema } from "mongoose";
-import { IRole } from "../rolesOps";
+import { IRole } from "../utils/roleUtils";
 
 export interface IStaff extends IRole {
   id: string;

models/yearModel.ts

@@ -1,5 +1,5 @@
 import mongoose, { Schema } from "mongoose";
-import { IRole } from "../rolesOps";
+import { IRole } from "../utils/roleUtils";
 
 export interface IYear extends IRole {
   id: string;