Change channelID field in GraphQL to channel.

components/dashboard.tsx

@@ -39,7 +39,7 @@ query getServerSettings($server: String!, $token: String!) {
     addRoleForAll
     joinAutorole
     joinLeaveMessages {
-      channelID
+      channel
       joinMessage
       leaveMessage
       banMessage

components/settings.tsx

@@ -10,7 +10,7 @@ import { gql } from 'apollo-boost'
 interface Props {
   data: {
     addRoleForAll: string, joinAutorole: string, ocrOnSend: boolean, joinLeaveMessages: {
-      channelID: string,
+      channel: string,
       joinMessage: string,
       leaveMessage: string,
       banMessage: string
@@ -27,7 +27,7 @@ interface State {
   joinAutorole: string,
   ocrOnSend: boolean,
   joinLeaveMessages: {
-    channelID: string,
+    channel: string,
     joinMessage: string,
     leaveMessage: string,
     banMessage: string
@@ -40,7 +40,7 @@ export default class Settings extends React.Component<Props, State> {
       joinAutorole: this.props.data.joinAutorole,
       ocrOnSend: this.props.data.ocrOnSend,
       joinLeaveMessages: {
-        channelID: this.props.data.joinLeaveMessages.channelID,
+        channel: this.props.data.joinLeaveMessages.channel,
         joinMessage: this.props.data.joinLeaveMessages.joinMessage,
         leaveMessage: this.props.data.joinLeaveMessages.leaveMessage,
         banMessage: this.props.data.joinLeaveMessages.banMessage
@@ -62,7 +62,7 @@ mutation variables(
     joinAutorole
     ocrOnSend
     joinLeaveMessages {
-      channelID
+      channel
       joinMessage
       leaveMessage
       banMessage
@@ -127,10 +127,10 @@ mutation variables(
             <Typography gutterBottom>Ensure the channel name is correct.</Typography>
             <FormControl fullWidth>
               <InputLabel>Channel Name</InputLabel>
-              <Select value={this.state.joinLeaveMessages.channelID} fullWidth margin='dense'
+              <Select value={this.state.joinLeaveMessages.channel} fullWidth margin='dense'
                 onChange={e => this.setState({
                   joinLeaveMessages: {
-                    ...this.state.joinLeaveMessages, channelID: e.target.value
+                    ...this.state.joinLeaveMessages, channel: e.target.value
                   }
                 })}
               >

server/bot/index.ts

@@ -35,16 +35,15 @@ export const guildMemberAdd = (client: Client, db: Db, tempDB: DB) => async (
   }
   // If join/leave messages is not configured/improperly configured..
   if (!serverSettings.joinLeaveMessages) return
-  const { joinMessage, channelName } = serverSettings.joinLeaveMessages
-  if (!channelName || !joinMessage) return
+  const { joinMessage, channel } = serverSettings.joinLeaveMessages
+  if (!channel || !joinMessage) return
   // We send a message.
   try {
-    const channelID = guild.channels.find(i => i.name === channelName).id
     const toSend = joinMessage
       .split('{un}').join(member.user.username) // Replace the username.
       .split('{m}').join(member.user.mention) // Replace the mention.
       .split('{d}').join(member.user.discriminator) // Replace the discriminator.
-    client.createMessage(channelID, toSend)
+    await client.createMessage(channel, toSend)
   } catch (e) {}
 }
 
@@ -56,18 +55,17 @@ export const guildMemberRemove = (client: Client, db: Db) => async (
   const serverSettings = await getServerSettings(db, guild.id)
   // If join/leave messages is not configured/improperly configured..
   if (!serverSettings.joinLeaveMessages) return
-  const { leaveMessage, channelName, banMessage } = serverSettings.joinLeaveMessages
-  if (!channelName || !leaveMessage) return
+  const { leaveMessage, channel, banMessage } = serverSettings.joinLeaveMessages
+  if (!channel || !leaveMessage) return
   // If there is a ban message and the user is banned.
   if (banMessage && (await guild.getBans()).find(i => i.id === member.user.id)) return
   // We send a message.
   try {
-    const channelID = guild.channels.find(i => i.name === channelName).id
     const toSend = leaveMessage
       .split('{un}').join(member.user.username) // Replace the username.
       .split('{m}').join(member.user.mention) // Replace the mention.
       .split('{d}').join(member.user.discriminator) // Replace the discriminator.
-    client.createMessage(channelID, toSend)
+    await client.createMessage(channel, toSend)
   } catch (e) {}
 }
 

server/resolvers.ts

@@ -31,11 +31,11 @@ export default (ctx: { tempDB: DB, client: Client }) => ({
       } = await getServerSettings(db, serverId)
       // Insert default values for all properties.
       joinLeaveMessages = joinLeaveMessages ? {
-        channelID: joinLeaveMessages.channelID || '',
+        channel: joinLeaveMessages.channel || '',
         joinMessage: joinLeaveMessages.joinMessage || '',
         leaveMessage: joinLeaveMessages.leaveMessage || '',
         banMessage: joinLeaveMessages.banMessage || ''
-      } : { channelID: '', joinMessage: '', leaveMessage: '', banMessage: '' }
+      } : { channel: '', joinMessage: '', leaveMessage: '', banMessage: '' }
       addRoleForAll = addRoleForAll || ''
       ocrOnSend = ocrOnSend || false
       joinAutorole = joinAutorole || ''
@@ -79,7 +79,7 @@ export default (ctx: { tempDB: DB, client: Client }) => ({
       _: string, { input }: { input: { // eslint-disable-next-line indent
         serverId: string, linkToken: string, addRoleForAll: string, joinAutorole: string,
       // eslint-disable-next-line indent
-        joinLeaveMessages: { channelID: string, joinMessage: string, leaveMessage: string },
+        joinLeaveMessages: { channel: string, joinMessage: string, leaveMessage: string },
       // eslint-disable-next-line indent
         ocrOnSend: boolean
       } }
@@ -96,7 +96,7 @@ export default (ctx: { tempDB: DB, client: Client }) => ({
           joinAutorole: joinAutorole || undefined,
           ocrOnSend,
           joinLeaveMessages: joinLeaveMessages ? {
-            channelID: '',
+            channel: '',
             joinMessage: '',
             leaveMessage: '',
             banMessage: '',

server/schema.graphql

@@ -1,7 +1,7 @@
 # Joining and leaving servers.
 type JoinLeaveMessages {
-  # Name of channel.
-  channelID: String
+  # ID of channel.
+  channel: String
   # What to post when joining.
   joinMessage: String
   # What to post when leaving.
@@ -58,8 +58,8 @@ type Query {
 
 # Input for modifying join/leave messages.
 input JoinLeaveMessagesInput {
-  # Name of channel.
-  channelID: String!
+  # ID of channel.
+  channel: String!
   # What to post when joining.
   joinMessage: String
   # What to post when leaving.