Merge branch 'dev'

pull/29/head
Matthew 2020-08-14 00:11:04 -04:00
commit 6019ae01f7
No known key found for this signature in database
GPG Key ID: 210AF32ADE3B5C4B
2 changed files with 13 additions and 30 deletions

View File

@ -86,25 +86,25 @@ export default class Page extends Command {
});
break;
case '#1':
await this.page('00', senderNumber, code, message, txt, { emergencyNumber: '0' });
await this.page('01', senderNumber, code, message, txt, { emergencyNumber: '0' });
await this.page('10', senderNumber, code, message, txt, { emergencyNumber: '0' });
await this.page('20', senderNumber, code, message, txt, { emergencyNumber: '0' });
await this.page('00', senderNumber, code, message, txt, { emergencyNumber: '1' });
await this.page('01', senderNumber, code, message, txt, { emergencyNumber: '1' });
await this.page('10', senderNumber, code, message, txt, { emergencyNumber: '1' });
await this.page('20', senderNumber, code, message, txt, { emergencyNumber: '1' });
break;
case '#2':
const matthew = await this.client.db.PagerNumber.findOne({ individualAssignID: '278620217221971968' });
const bsian = await this.client.db.PagerNumber.findOne({ individualAssignID: '253600545972027394' });
const nightraven = await this.client.db.PagerNumber.findOne({ individualAssignID: '239261547959025665' });
await this.page(matthew?.num, senderNumber, code, message, txt, { emergencyNumber: '0' });
await this.page(bsian?.num, senderNumber, code, message, txt, { emergencyNumber: '0' });
await this.page(nightraven?.num, senderNumber, code, message, txt, { emergencyNumber: '0' });
await this.page('10', senderNumber, code, message, txt, { emergencyNumber: '0' });
await this.page(matthew?.num, senderNumber, code, message, txt, { emergencyNumber: '2' });
await this.page(bsian?.num, senderNumber, code, message, txt, { emergencyNumber: '2' });
await this.page(nightraven?.num, senderNumber, code, message, txt, { emergencyNumber: '2' });
await this.page('10', senderNumber, code, message, txt, { emergencyNumber: '2' });
break;
case '#3':
await this.page('00', senderNumber, code, message, txt, { emergencyNumber: '0' });
await this.page('01', senderNumber, code, message, txt, { emergencyNumber: '0' });
await this.page('20', senderNumber, code, message, txt, { emergencyNumber: '0' });
await this.page('21', senderNumber, code, message, txt, { emergencyNumber: '0' });
await this.page('00', senderNumber, code, message, txt, { emergencyNumber: '3' });
await this.page('01', senderNumber, code, message, txt, { emergencyNumber: '3' });
await this.page('20', senderNumber, code, message, txt, { emergencyNumber: '3' });
await this.page('21', senderNumber, code, message, txt, { emergencyNumber: '3' });
break;
default:
break;

View File

@ -10,15 +10,6 @@
"bio": "so baby come light me up, and maybe ill let you on it. a little bit dangerous, but baby thats how i want it. a little less conversation and a little more touch my body. cuz im so into you... ~ Ariana Grande, Into You - Dangerous Woman",
"acknowledgements": ["Maintainer & Lead Developer"]
},
{
"name": "Joe",
"id": "556969659531001858",
"dept": "Board of Directors",
"emailAddress": "joe@staff.libraryofcode.org",
"gitlab": "https://gitlab.libraryofcode.org/Joe",
"github": "https://github.com/sirdroolio",
"bio": "new Error(\"Proper Bio not found\");"
},
{
"name": "Bsian",
"id": "253600545972027394",
@ -93,7 +84,7 @@
{
"name": "Hector",
"id": "377781496292835339",
"dept": "Core Team",
"dept": "Technician",
"emailAddress": "hector@staff.libraryofcode.org",
"gitlab": "https://gitlab.libraryofcode.org/Hector",
"github": "https://github.com/Hector6704",
@ -110,14 +101,6 @@
"bio": "I baguette for a living and eat code for breakfast.",
"acknowledgements": ["Assistant Maintainer"]
},
{
"name": "Zloth",
"id": "382368885267234816",
"dept": "Associate",
"emailAddress": "zloth@staff.libraryofcode.org",
"github": "https://github.com/gavintjhxx",
"bio": "Wake up. Eat. Code. Sleep. Loop()"
},
{
"name": "PlayerVMachine",
"id": "273999507174195203",