From a60913f6df6288309a626a9aee4ac883e06694c1 Mon Sep 17 00:00:00 2001
From: srqc <98553181+2srqc@users.noreply.github.com>
Date: Fri, 13 Jan 2023 01:41:25 -0500
Subject: [PATCH] Update templateSafeObjects.ts

---
 backend/src/utils/templateSafeObjects.ts | 52 +++---------------------
 1 file changed, 6 insertions(+), 46 deletions(-)

diff --git a/backend/src/utils/templateSafeObjects.ts b/backend/src/utils/templateSafeObjects.ts
index bde8bcab..d57e1fca 100644
--- a/backend/src/utils/templateSafeObjects.ts
+++ b/backend/src/utils/templateSafeObjects.ts
@@ -5,7 +5,6 @@ import {
   GuildMember,
   Message,
   PartialGuildMember,
-  PartialUser,
   Role,
   Snowflake,
   StageInstance,
@@ -24,8 +23,6 @@ import {
   SavedMessage,
 } from "../data/entities/SavedMessage";
 import { Case } from "../data/entities/Case";
-import { CounterValue } from "../data/entities/CounterValue";
-import { number } from "io-ts";
 
 type InputProps<T> = Omit<
   {
@@ -203,23 +200,6 @@ export class TemplateSafeCase extends TemplateSafeValueContainer {
   }
 }
 
-export class RankedCounterValue extends CounterValue {
-  rank?: number;
-}
-
-export class TemplateSafeCounterValue extends TemplateSafeValueContainer {
-  id: number;
-  counter_id: string;
-  user_id: string;
-  channel_id: string;
-  value: number;
-  rank?: number;
-
-  constructor(data: InputProps<TemplateSafeCounterValue>) {
-    super(data);
-  }
-}
-
 export class TemplateSafeMessage extends TemplateSafeValueContainer {
   id: string;
   content: string;
@@ -275,25 +255,16 @@ export function roleToTemplateSafeRole(role: Role): TemplateSafeRole {
   });
 }
 
-export function memberToTemplateSafeMember(
-  member?: GuildMember | PartialGuildMember | null,
-  user?: User | UnknownUser | null,
-): TemplateSafeMember {
-  if (!member && !user) {
-    throw new Error(`No usable information received; cannot create template`);
-  }
-
-  user = user ?? member?.user;
-
-  const templateSafeUser = userToTemplateSafeUser(user!);
+export function memberToTemplateSafeMember(member: GuildMember | PartialGuildMember): TemplateSafeMember {
+  const templateSafeUser = userToTemplateSafeUser(member.user!);
 
   return new TemplateSafeMember({
     ...templateSafeUser,
     user: templateSafeUser,
-    nick: member?.nickname ?? "*None*",
-    roles: member ? [...member.roles.cache.mapValues((r) => roleToTemplateSafeRole(r)).values()] : [],
-    joinedAt: member?.joinedTimestamp ?? undefined,
-    guildName: member?.guild.name,
+    nick: member.nickname ?? "*None*",
+    roles: [...member.roles.cache.mapValues((r) => roleToTemplateSafeRole(r)).values()],
+    joinedAt: member.joinedTimestamp ?? undefined,
+    guildName: member.guild.name,
   });
 }
 
@@ -472,17 +443,6 @@ export function caseToTemplateSafeCase(theCase: Case): TemplateSafeCase {
   });
 }
 
-export function counterValueToTemplateSafeCounterValue(theCounterValue: RankedCounterValue): TemplateSafeCounterValue {
-  return new TemplateSafeCounterValue({
-    id: theCounterValue.id,
-    counter_id: theCounterValue.counter_id,
-    channel_id: theCounterValue.channel_id,
-    user_id: theCounterValue.user_id,
-    value: theCounterValue.value,
-    rank: theCounterValue.rank,
-  });
-}
-
 export function messageToTemplateSafeMessage(message: Message): TemplateSafeMessage {
   return new TemplateSafeMessage({
     id: message.id,