Merge pull request Elfayer#41 from sustained/master

Add Vue-green buttons for a more vuetiful pagination experience.

Author: sustained

src/utils/constants/index.js

@@ -60,9 +60,23 @@ const DISCORD_EMBED_FOOTER_LIMIT = 2048
 const DISCORD_EMBED_AUTHOR_LIMIT = 256
 const DISCORD_EMBED_TOTAL_LIMIT = 6000
 
+/*
+  The IDs of emojis that the bot will use in reactions, since bots have the 
+  ability to use cross-server emojis without Discord Nitro.
+*/
+const EMOJIS = {
+  PAGINATION: {
+    PREV: '661289441184317441',
+    NEXT: '661289441674919946',
+    FIRST: '661289441171865660',
+    LAST: '661289441218002984',
+  },
+}
+
 export {
   USERS,
   ROLES,
+  EMOJIS,
   OWNER_IDS,
   PROTECTED_USER_IDS,
   PROTECTED_ROLE_IDS,

src/utils/embed.js

@@ -1,5 +1,5 @@
 import { RichEmbed } from 'discord.js'
-import { EMPTY_MESSAGE, DISCORD_EMBED_FIELD_LIMIT } from './constants'
+import { EMOJIS, EMPTY_MESSAGE, DISCORD_EMBED_FIELD_LIMIT } from './constants'
 import { CommandMessage } from 'discord.js-commando'
 
 export const DEFAULT_EMBED_COLOUR = '#42b883'
@@ -220,10 +220,10 @@ export async function respondWithPaginatedEmbed(
     embed: context.embed,
   })
 
-  await context.response.react('⏪')
-  await context.response.react('⬅')
-  await context.response.react('➡')
-  await context.response.react('⏩')
+  await context.response.react(msg.client.emojis.get(EMOJIS.PAGINATION.FIRST))
+  await context.response.react(msg.client.emojis.get(EMOJIS.PAGINATION.PREV))
+  await context.response.react(msg.client.emojis.get(EMOJIS.PAGINATION.NEXT))
+  await context.response.react(msg.client.emojis.get(EMOJIS.PAGINATION.LAST))
 
   /*
     Collect relevant reactions.
@@ -269,7 +269,7 @@ function _createCollector(
         return false
       }
 
-      return ['⏪', '⬅', '➡', '⏩'].includes(reaction.emoji.name)
+      return Object.values(EMOJIS.PAGINATION).includes(reaction.emoji.id)
     },
     {
       time: observeReactionsFor,
@@ -299,17 +299,17 @@ function _handlePagination(
   { inlineFields, itemsAreEmbeds, showDetailsInFooter }
 ) {
   return async reaction => {
-    switch (reaction.emoji.name) {
-      case '⏪':
+    switch (reaction.emoji.id) {
+      case EMOJIS.PAGINATION.FIRST:
         pageCurrent = 1
         break
-      case '⬅':
+      case EMOJIS.PAGINATION.PREV:
         pageCurrent = Math.max(1, --pageCurrent)
         break
-      case '➡':
+      case EMOJIS.PAGINATION.NEXT:
         pageCurrent = Math.min(pageLast, ++pageCurrent)
         break
-      case '⏩':
+      case EMOJIS.PAGINATION.LAST:
         pageCurrent = pageLast
         break
     }