From d5b009b186a53439d6320c5c24079169c3d2345a Mon Sep 17 00:00:00 2001 From: Hiroyuki Date: Wed, 24 Mar 2021 00:15:53 -0400 Subject: [PATCH] Proclamation and Motion Quorum fixes --- .eslintrc.json | 3 +- src/api/board.ins/routes/root.ts | 7 +++ src/events/messageReactionAdd.ts | 101 ++++++++++++++++++++----------- src/models/Proclamation.ts | 4 +- 4 files changed, 77 insertions(+), 38 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 70d1a95..8c7630b 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -41,7 +41,8 @@ "keyword-spacing": "off", "no-multiple-empty-lines": "off", "consistent-return": "off", - "no-continue": "off" + "no-continue": "off", + "no-plusplus": "off" }, "ignorePatterns": "**/*.js" } diff --git a/src/api/board.ins/routes/root.ts b/src/api/board.ins/routes/root.ts index 54098c3..0274264 100644 --- a/src/api/board.ins/routes/root.ts +++ b/src/api/board.ins/routes/root.ts @@ -349,6 +349,13 @@ export default class Root extends Route { oID: id, processed: false, msg: msg.id, + results: { + yea: 0, + nay: 0, + present: 0, + absent: 0, + }, + votedDirectors: [], }); res.status(200).json({ diff --git a/src/events/messageReactionAdd.ts b/src/events/messageReactionAdd.ts index a346e60..ad4daee 100644 --- a/src/events/messageReactionAdd.ts +++ b/src/events/messageReactionAdd.ts @@ -1,5 +1,5 @@ import { Emoji, GuildTextableChannel, Member, Message } from 'eris'; -import { Client, Event } from '../class'; +import { Client, Event, RichEmbed } from '../class'; export default class MessageReactionAdd extends Event { public client: Client; @@ -17,8 +17,11 @@ export default class MessageReactionAdd extends Event { private directorRole: string; - public async run(message: Message, _emoji: Emoji, reactor: Member) { + public async run(message: Message, emoji: Emoji, reactor: Member) { if (message.channel.id !== this.directorLogs) return; + if (!(message instanceof Message)) { + message = >(await (message as Message).channel.getMessage((message as Message).id)); + } if (message.author.id !== this.client.user.id) return; if (!reactor.roles[0]) { @@ -28,46 +31,76 @@ export default class MessageReactionAdd extends Event { if (!reactor.roles.includes(this.directorRole)) return; const proc = await this.client.db.Proclamation.findOne({ msg: message.id, processed: false }); - if (proc) { - if (proc.votedDirectors?.includes(message.author.id)) return; - let yea = await message.getReaction('modSuccess:578750988907970567'); - yea = yea.filter((val) => !val.bot); - let nay = await message.getReaction('modError:578750737920688128'); - nay = nay.filter((val) => !val.bot); - let present = await message.getReaction('🙋'); - present = present.filter((val) => !val.bot); + if (!proc?.votedDirectors.includes(reactor.id)) { + let type: 'yea' | 'nay' | 'present'; - const totalDirectors = message.channel.guild.members.filter((member) => member.roles.includes(this.directorRole)).length; + if (emoji.id === '578750988907970567') type = 'yea'; + else if (emoji.id === '578750737920688128') type = 'nay'; + else if (emoji.name === '🙋') type = 'present'; - const processed = totalDirectors === (yea.length + nay.length + present.length) || Date.now() - proc.at > 604800000; - const absent = totalDirectors - (yea.length + nay.length + present.length); + const votes = proc.results; - await proc.updateOne({ - results: { - yea: yea.length, - nay: nay.length, - present: present.length, - absent, - }, - processed, - votedDirectors: [...(proc.votedDirectors || []), message.author.id], - }); - const inTheMajority = yea.length > nay.length + present.length; + switch (type) { + case 'yea': + votes.yea++; + await proc.updateOne({ + results: { + ...proc.results, + yea: votes.yea, + }, + }); + break; - if (processed) { - const author = this.client.users.get(proc.issuer) || await this.client.getRESTUser(proc.issuer); + case 'nay': + votes.nay++; + await proc.updateOne({ + results: { + ...proc.results, + nay: votes.nay, + }, + }); + break; - if (inTheMajority) { - await author.createMessage(`__**Proclamation Majority Vote Received**__\nThe Proclamation you created at Library of Code sp-us, titled **${proc.subject}** (\`${proc.oID}\`) received the majority vote.`); - await message.channel.createMessage(`__**Proclamation Results**__\nProclamation issued by ${author.mention} **received** the majority vote. Proclamation ID: ${proc.oID}\n\n__Results:__\n**Yea:** ${yea.length}\n**Nay:** ${nay.length}\n**Present:** ${present.length}\n**Absent:** ${absent}`); - } else { - await author.createMessage(`__**Proclamation Majority Vote Lost**__\nThe Proclamation you created at Library of Code sp-us, titled **${proc.subject}** (\`${proc.oID}\`) lost the majority vote.`); - await message.channel.createMessage(`__**Proclamation Results**__\nProclamation issued by ${author.mention} **lost** the majority vote. Proclamation ID: ${proc.oID}\n\n__Results:__\n**Yea:** ${yea.length}\n**Nay:** ${nay.length}\n**Present:** ${present.length}\n**Absent:** ${absent}`); - } + case 'present': + votes.present++; + await proc.updateOne({ + results: { + ...proc.results, + present: votes.present, + }, + }); + break; + + default: return; } - reactor.user.createMessage(`__**Vote Recorded**__\nYour vote on the proclamation with ID \`${proc.id}\` at Library of Code sp-us was successfully recorded.`); + const totalDirectors = message.channel.guild.members.filter((member) => member.roles.includes('662163685439045632')); + + if (votes.yea / totalDirectors.length >= 0.6) { + await proc.updateOne({ + processed: true, + results: { + ...votes, + absent: totalDirectors.length - (votes.present + votes.nay + votes.present), + }, + }); + + await message.delete(`Proclamation with ID ${proc.oID} processed.`); + + const embed = new RichEmbed(); + embed.setAuthor(message.embeds[0].author.name, message.embeds[0].author.icon_url); + embed.setTitle('Proclamation'); + embed.setDescription(`${proc.oID}\n\n_This action is available on the Board Register System Directory. You can make changes or edit it [here](https://board.ins/repository)._\n\n__This proclamation was confirmed at ${new Date().toLocaleString()}.__`); + embed.addField('Subject', proc.subject); + embed.addField('Body', proc.body); + embed.setColor(0x29b350); + embed.setFooter('Library of Code sp-us | Board Register System', 'https://static.libraryofcode.org/library_of_code.png'); + embed.setTimestamp(); + + await message.channel.createMessage({ embed }); + } } } } + diff --git a/src/models/Proclamation.ts b/src/models/Proclamation.ts index fbc0fdf..ab1f87d 100644 --- a/src/models/Proclamation.ts +++ b/src/models/Proclamation.ts @@ -12,7 +12,6 @@ export interface ProclamationInterface extends Document { present: number; absent: number; }; - acceptedAt: number; msg: string; processed?: boolean; votedDirectors: string[]; @@ -30,10 +29,9 @@ const Proclamation = new Schema({ present: Number, absent: Number, }, - acceptedAt: Number, msg: { type: String, required: true, unique: true }, processed: Boolean, - votedDirectors: Array, + votedDirectors: { type: Array, required: true }, }); export default model('Proclamations', Proclamation);