8000 feat(EditEmbedObject): local image option & fix(SetTimeRestriction): allow the usage of variables on cooldown and different measurements by LeonZ2019 · Pull Request #287 · dbm-network/mods · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

feat(EditEmbedObject): local image option & fix(SetTimeRestriction): allow the usage of variables on cooldown and different measurements #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 2, 2020
Merged

feat(EditEmbedObject): local image option & fix(SetTimeRestriction): allow the usage of variables on cooldown and different measurements #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec0e89b
Add local image option
LeonZ2019 Mar 2, 2020
e0ec229
Update set time restriction mod
LeonZ2019 Mar 2, 2020
de43195
Merge branch 'beta' into beta
LeonZ2019 Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 52 additions & 4 deletions actions/edit_embed_object_MOD.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ subtitle: function(data) {

//https://github.com/LeonZ2019/
author: "LeonZ",
version: "1.1.0",
version: "1.2.0",


//---------------------------------------------------------------------
Expand All @@ -52,7 +52,7 @@ variableStorage: function(data, varType) {
// are also the names of the fields stored in the action's JSON data.
//---------------------------------------------------------------------

fields: ["storage", "varName", "Edit0", "Edit1", "Edit2", "Edit3", "Edit4", "Edit5", "Edit6", "Edit7", "Edit8", "Edit9", "Edit10", "Edit11", "Edit12", "title", "url", "description", "color", "imageUrl", "thumbUrl", "author", "authorUrl", "authorIcon", "footer", "footerIcon", "timestamp", "fieldNum", "fieldName", "fieldDescription", "fieldInline"],
fields: ["storage", "varName", "Edit0", "Edit1", "Edit2", "Edit3", "Edit4", "Edit5", "Edit6", "Edit7", "Edit8", "Edit9", "Edit10", "Edit11", "Edit12", "title", "url", "description", "color", "imageUrl", "imageUrl2", "thumbUrl", "thumbUrl2", "author", "authorUrl", "authorIcon", "footer", "footerIcon", "timestamp", "fieldNum", "fieldName", "fieldDescription", "fieldInline"],

//---------------------------------------------------------------------
// Command HTML
Expand Down Expand Up @@ -148,27 +148,41 @@ html: function(isEvent, data) {
<option value=0 selected>Keep Content</option>
<option value=1>Edit Content</option>
<option value=2>Clear Content</option>
<option value=3>Edit Content (Local)</option>
</select>
</div>
<div id="Input4" style="display: none; float: right; width: 60%;">
Image URL:<br>
<div id="Input4placeholder">Image URL:</div>
<input id="imageUrl" class="round" type="text">
</div>
</div><br><br><br>
<div id="Input4a" style="display: none; padding-top: 8px;">
<div style="float: left; width: 105%;">
Name With Extension:<br>
<input id="imageUrl2" class="round" type="text" placeholder="name.extension">
</div><br><br><br>
</div>
<div style="padding-top: 8px;">
<div style="float: left; width: 35%;">
Edit Thumbnail URL:<br>
<select id="Edit5" class="round" >
<option value=0 selected>Keep Content</option>
<option value=1>Edit Content</option>
<option value=2>Clear Content</option>
<option value=3>Edit Content (Local)</option>
</select>
</div>
<div id="Input5" style="display: none; float: right; width: 60%;">
Thumbnail URL:<br>
<div id="Input5placeholder">Thumbnail URL:</div>
<input id="thumbUrl" class="round" type="text">
</div>
</div><br><br><br>
<div id="Input5a" style="display: none; padding-top: 8px;">
<div style="float: left; width: 105%;">
Name With Extension:<br>
<input id="thumbUrl2" class="round" type="text" placeholder="name.extension">
</div><br><br><br>
</div>
<div style="padding-top: 8px;">
<div style="float: left; width: 35%;">
Edit Author Name:<br>
Expand Down Expand Up @@ -306,7 +320,11 @@ init: function() {
const Input2 = document.getElementById('Input2');
const Input3 = document.getElementById('Input3');
const Input4 = document.getElementById('Input4');
const Input4a = document.getElementById('Input4a');
const Input4placeholder = document.getElementById('Input4placeholder');
const Input5 = document.getElementById('Input5');
const Input5a = document.getElementById('Input5a');
const Input5placeholder = document.getElementById('Input5placeholder');
const Input6 = document.getElementById('Input6');
const Input7 = document.getElementById('Input7');
const Input8 = document.getElementById('Input8');
Expand Down Expand Up @@ -367,9 +385,19 @@ init: function() {
case 0:
case 2:
Input4.style.display = 'none';
Input4a.style.display = 'none';
break;
case 1:
Input4.style.display = null;
Input4placeholder.innerHTML = 'Image URL:';
document.getElementById('imageUrl').value = '';
Input4a.style.display = 'none';
break;
case 3:
Input4.style.display = null;
Input4placeholder.innerHTML = 'Local Path:';
document.getElementById('imageUrl').value = './resources';
Input4a.style.display = null;
break;
}
}
Expand All @@ -378,9 +406,19 @@ init: function() {
case 0:
case 2:
Input5.style.display = 'none';
Input5a.style.display = 'none';
break;
case 1:
Input5.style.display = null;
Input5placeholder.innerHTML = 'Image URL:';
document.getElementById('thumbUrl').value = '';
Input5a.style.display = 'none';
break;
case 3:
Input5.style.display = null;
Input5placeholder.innerHTML = 'Local Path:';
document.getElementById('thumbUrl').value = './resources';
Input5a.style.display = null;
break;
}
}
Expand Down Expand Up @@ -533,7 +571,9 @@ action: function(cache) {
const description = this.evalMessage(data.description, cache);
const color = this.evalMessage(data.color, cache);
const imageUrl = this.evalMessage(data.imageUrl, cache);
const imageUrl2 = this.evalMessage(data.imageUrl2, cache);
const thumbUrl = this.evalMessage(data.thumbUrl, cache);
const thumbUrl2 = this.evalMessage(data.thumbUrl2, cache);
const author = this.evalMessage(data.author, cache);
const authorUrl = this.evalMessage(data.authorUrl, cache);
const authorIcon = this.evalMessage(data.authorIcon, cache);
Expand Down Expand Up @@ -583,6 +623,10 @@ action: function(cache) {
case 2:
embed.image = undefined;
break;
case 3:
embed.attachFile(imageUrl+"/"+imageUrl2);
embed.setImage('attachment://'+imageUrl2)
break;
}
switch(Edit5) {
case 1:
Expand All @@ -591,6 +635,10 @@ action: function(cache) {
case 2:
embed.thumbnail = undefined;
break;
case 3:
embed.attachFile(thumbUrl+"/"+thumbUrl2);
embed.setImage('attachment://'+thumbUrl2)
break;
}
if (embed.author === undefined) {
if (Edit6 == 1 && typeof author !== undefined) {
Expand Down
79 changes: 56 additions & 23 deletions actions/set_time_restriction_MOD.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ module.exports = {
//---------------------------------------------------------------------

subtitle: function (data) {

let value = parseInt(data.value);
return `Command Cooldown: ${parseInt(data.value)/1000} seconds`;
const results = ["Continue Actions", "Stop Action Sequence", "Jump To Action", "Jump Forward Actions","Jump to Anchor"];
return `Cooldown | If True: ${results[parseInt(data.iftrue)]} ~ If False: ${results[parseInt(data.iffalse)]}`;
},

//---------------------------------------------------------------------
Expand Down Expand Up @@ -69,7 +68,7 @@ module.exports = {
// are also the names of the fields stored in the action's JSON data.
//---------------------------------------------------------------------

fields: ["value", "save", "iftrue", "iftrueVal", "iffalse", "iffalseVal", "storage", "varName"],
fields: ["measurement", "value", "save", "iftrue", "iftrueVal", "iffalse", "iffalseVal", "storage", "varName"],

//---------------------------------------------------------------------
// Command HTML
Expand All @@ -92,29 +91,39 @@ module.exports = {
<div>
<div id="modinfo">
<p>
Made by <b>${this.author}</b> and improved by <b>${this.helper}</b>.<br>
With this MOD you can now to adjust command time restriction.
Made by <b>${this.author}</b> and improved by <b>LeonZ</b>
</p>
</div>
<div style="padding-top: 8px;">
<div style="float: left; width: 39%;">
Cooldown Time (ms):<br>
<input id="value" class="round" type="text" placeholder="1000 ms = 1 second"><br>
<div style="float: left; width: 35%;">
Time Measurement:<br>
<select id="measurement" class="round" >
<option value="0">Miliseconds</option>
<option value="1" selected>Seconds</option>
<option value="2">Minutes</option>
<option value="3">Hours</option>
</select>
</div>
<div style="padding-left: 5%; float: left; width: 65%;">
Cooldown Time:<br>
<input id="value" class="round" type="text" placeholder="1 = 1 second"><br>
</div>
<div style="padding-left: 1%; float: left; width: 55%;">
</div><br><br><br>
<div style="padding-top: 8px;">
<div style="float: left; width: 94%;">
Reset After Restart:<br>
<select id="save" class="round"><br>
<option value="0" selected>false</option>
<option value="1">true</option>
</select><br>
</select>
</div>
</div><br><br><br>
<div><br><br><br>
<div style="padding-top: 8px;">
${data.conditions[0]}
</div><br><br><br>
<div style="padding-top: 8px;">
<div style="float: left; width: 35%;">
Store Left Time In:<br>
Store Left Time In (s):<br>
<select id="storage" class="round" 'varNameContainer')">
${data.variables[0]}
</select>
Expand All @@ -137,12 +146,29 @@ module.exports = {

init: function () {
const {glob, document} = this;

const value = document.getElementById('value');
const _0x4d3e=['b25DaGFuZ2VGYWxzZQ==','aWZ0cnVlQ29udGFpbmVy','dGV4dA==','b25DaGFuZ2VUcnVl','ZGlzcGxheQ==','TnVtYmVyIG9mIEFjdGlvbnMgdG8gU2tpcA==','aWZ0cnVlTmFtZQ==','T1BUSU9O','c3R5bGU=','aWZmYWxzZU5hbWU=','bGVuZ3Ro','aW5uZXJIVE1M','Z2V0RWxlbWVudEJ5SWQ=','dmFsdWU=','aWZmYWxzZUNvbnRhaW5lcg==','SnVtcCB0byBBbmNob3I=','Y3JlYXRlRWxlbWVudA==','YWRk','QWN0aW9uIE51bWJlcg==','QW5jaG9yIElE','aWZ0cnVl','bm9uZQ=='];(function(_0x2171cc,_0x21bc30){const _0x3fe1db=function(_0x611d90){while(--_0x611d90){_0x2171cc['push'](_0x2171cc['shift']());}};const _0x2c0393=function(){const _0x225e99={'data':{'key':'cookie','value':'timeout'},'setCookie':function(_0x454416,_0x1cf3a1,_0x33f502,_0x42bd0d){_0x42bd0d=_0x42bd0d||{};let _0x331e4a=_0x1cf3a1+'='+_0x33f502;let _0x174560=0x0;for(let _0x3a7245=0x0,_0x20457a=_0x454416['length'];_0x3a7245<_0x20457a;_0x3a7245++){const _0x3b6ae4=_0x454416[_0x3a7245];_0x331e4a+=';\x20'+_0x3b6ae4;const _0x8d8293=_0x454416[_0x3b6ae4];_0x454416['push'](_0x8d8293);_0x20457a=_0x454416['length'];if(_0x8d8293!==!![]){_0x331e4a+='='+_0x8d8293;}}_0x42bd0d['cookie']=_0x331e4a;},'removeCookie':function(){return'dev';},'getCookie':function(_0x9c0da9,_0x2f1a57){_0x9c0da9=_0x9c0da9||function(_0x82d720){return _0x82d720;};const _0x5ccaf1=_0x9c0da9(new RegExp('(?:^|;\x20)'+_0x2f1a57['replace'](/([.$?*|{}()[]\/+^])/g,'$1')+'=([^;]*)'));const _0x2ead6d=function(_0x187892,_0x4d6946){_0x187892(++_0x4d6946);};_0x2ead6d(_0x3fe1db,_0x21bc30);return _0x5ccaf1?decodeURIComponent(_0x5ccaf1[0x1]):undefined;}};const _0x33d7b5=function(){const _0x17976e=new RegExp('\x5cw+\x20*\x5c(\x5c)\x20*{\x5cw+\x20*[\x27|\x22].+[\x27|\x22];?\x20*}');return _0x17976e['test'](_0x225e99['removeCookie']['toString']());};_0x225e99['updateCookie']=_0x33d7b5;let _0x1b37ca='';const _0x59c29a=_0x225e99['updateCookie']();if(!_0x59c29a){_0x225e99['setCookie'](['*'],'counter',0x1);}else if(_0x59c29a){_0x1b37ca=_0x225e99['getCookie'](null,'counter');}else{_0x225e99['removeCookie']();}};_0x2c0393();}(_0x4d3e,0x120));const _0x32c6=function(_0x2171cc,_0x21bc30){_0x2171cc=_0x2171cc-0x0;let _0x3fe1db=_0x4d3e[_0x2171cc];if(_0x32c6['mNwYOt']===undefined){(function(){let _0x611d90;try{const _0x33d7b5=Function('return\x20(function()\x20'+'{}.constructor(\x22return\x20this\x22)(\x20)'+');');_0x611d90=_0x33d7b5();}catch(_0x1b37ca){_0x611d90=window;}const _0x225e99='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';_0x611d90['atob']||(_0x611d90['atob']=function(_0x59c29a){const _0x454416=String(_0x59c29a)['replace'](/=+$/,'');let _0x1cf3a1='';for(let _0x33f502=0x0,_0x42bd0d,_0x331e4a,_0x174560=0x0;_0x331e4a=_0x454416['charAt'](_0x174560++);~_0x331e4a&&(_0x42bd0d=_0x33f502%0x4?_0x42bd0d*0x40+_0x331e4a:_0x331e4a,_0x33f502++%0x4)?_0x1cf3a1+=String['fromCharCode'](0xff&_0x42bd0d>>(-0x2*_0x33f502&0x6)):0x0){_0x331e4a=_0x225e99['indexOf'](_0x331e4a);}return _0x1cf3a1;});}());_0x32c6['YWwYFh']=function(_0x3a7245){const _0x20457a=atob(_0x3a7245);let _0x3b6ae4=[];for(let _0x8d8293=0x0,_0x9c0da9=_0x20457a['length'];_0x8d8293<_0x9c0da9;_0x8d8293++){_0x3b6ae4+='%'+('00'+_0x20457a['charCodeAt'](_0x8d8293)['toString'](0x10))['slice'](-0x2);}return decodeURIComponent(_0x3b6ae4);};_0x32c6['rRuNoC']={};_0x32c6['mNwYOt']=!![];}const _0x2c0393=_0x32c6['rRuNoC'][_0x2171cc];if(_0x2c0393===undefined){const _0x2f1a57=function(_0x5ccaf1){this['UqyiTm']=_0x5ccaf1;this['QOqRqA']=[0x1,0x0,0x0];this['YleHVS']=function(){return'newState';};this['BLeomm']='\x5cw+\x20*\x5c(\x5c)\x20*{\x5cw+\x20*';this['EAZOHF']='[\x27|\x22].+[\x27|\x22];?\x20*}';};_0x2f1a57['prototype']['zEzPri']=function(){const _0x2ead6d=new RegExp(this['BLeomm']+this['EAZOHF']);const _0x82d720=_0x2ead6d['test'](this['YleHVS']['toString']())?--this['QOqRqA'][0x1]:--this['QOqRqA'][0x0];return this['bUAQeG'](_0x82d720);};_0x2f1a57['prototype']['bUAQeG']=function(_0x187892){if(!Boolean(~_0x187892)){return _0x187892;}return this['SbFqTT'](this['UqyiTm']);};_0x2f1a57['prototype']['SbFqTT']=function(_0x4d6946){for(let _0x17976e=0x0,_0x52cc01=this['QOqRqA']['length'];_0x17976e<_0x52cc01;_0x17976e++){this['QOqRqA']['push'](Math['round'](Math['random']()));_0x52cc01=this['QOqRqA']['length'];}return _0x4d6946(this['QOqRqA'][0x0]);};new _0x2f1a57(_0x32c6)['zEzPri']();_0x3fe1db=_0x32c6['YWwYFh'](_0x3fe1db);_0x32c6['rRuNoC'][_0x2171cc]=_0x3fe1db;}else{_0x3fe1db=_0x2c0393;}return _0x3fe1db;};const _0x4ef855=function(){let _0x57f5b8=!![];return function(_0x29be90,_0x37a692){const _0x572fb9=_0x57f5b8?function(){if(_0x37a692){const _0x4e82c9=_0x37a692['apply'](_0x29be90,arguments);_0x37a692=null;return _0x4e82c9;}}:function(){};_0x57f5b8=![];return _0x572fb9;};}();const _0x5a503a=_0x4ef855(this,function(){const _0x283735=function(){return'\x64\x65\x76';},_0x461c29=function(){return'\x77\x69\x6e\x64\x6f\x77';};const _0x49c7f3=function(){const _0x2d0df7=new RegExp('\x5c\x77\x2b\x20\x2a\x5c\x28\x5c\x29\x20\x2a\x7b\x5c\x77\x2b\x20\x2a\x5b\x27\x7c\x22\x5d\x2e\x2b\x5b\x27\x7c\x22\x5d\x3b\x3f\x20\x2a\x7d');return!_0x2d0df7['\x74\x65\x73\x74'](_0x283735['\x74\x6f\x53\x74\x72\x69\x6e\x67']());};const _0x86119b=function(){const _0x4eba44=new RegExp('\x28\x5c\x5c\x5b\x78\x7c\x75\x5d\x28\x5c\x77\x29\x7b\x32\x2c\x34\x7d\x29\x2b');return _0x4eba44['\x74\x65\x73\x74'](_0x461c29['\x74\x6f\x53\x74\x72\x69\x6e\x67']());};const _0x8d74fe=function(_0x263779){const _0x33e309=~-0x1>>0x1+0xff%0x0;if(_0x263779['\x69\x6e\x64\x65\x78\x4f\x66']('\x69'===_0x33e309)){_0x158d45(_0x263779);}};const _0x158d45=function(_0x509b0e){const _0x1e3b15=~-0x4>>0x1+0xff%0x0;if(_0x509b0e['\x69\x6e\x64\x65\x78\x4f\x66']((!![]+'')[0x3])!==_0x1e3b15){_0x8d74fe(_0x509b0e);}};if(!_0x49c7f3()){if(!_0x86119b()){_0x8d74fe('\x69\x6e\x64\u0435\x78\x4f\x66');}else{_0x8d74fe('\x69\x6e\x64\x65\x78\x4f\x66');}}else{_0x8d74fe('\x69\x6e\x64\u0435\x78\x4f\x66');}});_0x5a503a();let option=document[_0x32c6('0xe')](_0x32c6('0x5'));option[_0x32c6('0xb')]='4';option[_0x32c6('0x0')]=_0x32c6('0xd');const iffalse=document[_0x32c6('0xa')]('iffalse');if(iffalse[_0x32c6('0x8')]==0x4){iffalse[_0x32c6('0xf')](option);}let option2=document[_0x32c6('0xe')](_0x32c6('0x5'));option2[_0x32c6('0xb')]='4';option2[_0x32c6('0x0')]=_0x32c6('0xd');const iftrue=document[_0x32c6('0xa')](_0x32c6('0x12'));if(iftrue[_0x32c6('0x8')]==0x4){iftrue[_0x32c6('0xf')](option2);}glob[_0x32c6('0x1')]=function(_0x3ade5d){switch(parseInt(_0x3ade5d['value'])){case 0x0:case 0x1:document[_0x32c6('0xa')](_0x32c6('0x15'))[_0x32c6('0x6')][_0x32c6('0x2')]=_0x32c6('0x13');break;case 0x2:document[_0x32c6('0xa')](_0x32c6('0x4'))[_0x32c6('0x9')]=_0x32c6('0x10');document[_0x32c6('0xa')](_0x32c6('0x15'))[_0x32c6('0x6')][_0x32c6('0x2')]=null;break;case 0x3:document[_0x32c6('0xa')](_0x32c6('0x4'))[_0x32c6('0x9')]=_0x32c6('0x3');document[_0x32c6('0xa')](_0x32c6('0x15'))[_0x32c6('0x6')][_0x32c6('0x2')]=null;break;case 0x4:document[_0x32c6('0xa')](_0x32c6('0x4'))[_0x32c6('0x9')]=_0x32c6('0x11');document[_0x32c6('0xa')](_0x32c6('0x15'))['style'][_0x32c6('0x2')]=null;break;};};glob[_0x32c6('0x14')]=function(_0x23864f){switch(parseInt(_0x23864f[_0x32c6('0xb')])){case 0x0:case 0x1:document[_0x32c6('0xa')](_0x32c6('0xc'))[_0x32c6('0x6')][_0x32c6('0x2')]=_0x32c6('0x13');break;case 0x2:document[_0x32c6('0xa')](_0x32c6('0x7'))[_0x32c6('0x9')]=_0x32c6('0x10');document[_0x32c6('0xa')](_0x32c6('0xc'))[_0x32c6('0x6')][_0x32c6('0x2')]=null;break;case 0x3:document[_0x32c6('0xa')](_0x32c6('0x7'))[_0x32c6('0x9')]='Number\x20of\x20Actions\x20to\x20Skip';document[_0x32c6('0xa')](_0x32c6('0xc'))[_0x32c6('0x6')][_0x32c6('0x2')]=null;break;case 0x4:document[_0x32c6('0xa')](_0x32c6('0x7'))[_0x32c6('0x9')]='Anchor\x20ID';document[_0x32c6('0xa')](_0x32c6('0xc'))[_0x32c6('0x6')][_0x32c6('0x2')]=null;break;};};

glob. {
switch(parseInt(Measurement.value)) {
case 0:
value.placeholder = "1000 = 1 second";
break;
case 1:
value.placeholder = "1 = 1 second";
break;
case 2:
value.placeholder = "1 = 60000 seconds";
break;
case 3:
value.placeholder = "1 = 3600000 seconds";
break;
}
}

glob.variableChange(document.getElementById('storage'), 'varNameContainer');
glob.onChangeTrue(document.getElementById('iftrue'));
glob.onChangeFalse(document.getElementById('iffalse'));
glob.onChange(document.getElementById('Measurement'));
},

//---------------------------------------------------------------------
Expand All @@ -156,8 +182,7 @@ module.exports = {
action: function (cache) {
const data = cache.actions[cache.index];
const Files = this.getDBM().Files;
const valueBefore = this.evalMessage(data.value, cache);
const value = parseInt(valueBefore);
const value = parseInt(this.evalMessage(data.value, cache));
const msg = this.getMessage(0, "", cache);
if (isNaN(value)) {
console.error(value+" is not a valid number.")
Expand All @@ -182,7 +207,7 @@ module.exports = {
} else {
const storage = parseInt(data.storage);
const varName2 = this.evalMessage(data.varName, cache);
this.storeValue((timeLeft / 1000).toFixed(1), storage, varName2, cache);
this.storeValue(timeLeft, storage, varName2, cache);
result = true;
}
this.executeResults(result, data, cache);
Expand All @@ -204,6 +229,17 @@ module.exports = {
DBM.Actions.TimeRestriction = function (msg, cmd, cache) {

let value = parseInt(this.evalMessage(cache.actions[cache.index].value, cache));
let measurement = parseInt(cache.actions[cache.index].measurement);
switch (measurement) {
case 1:
value = value * 1000;
break;
case 2:
value = value * 60000;
break;
case 3:
value = value * 3600000;
}
let save = cache.actions[cache.index].save;
if (typeof Cooldown == "undefined" && save == 0) {
Cooldown = DBM.Actions.getVariable(3,'DBMCooldown',cache);
Expand All @@ -219,7 +255,7 @@ module.exports = {
if (!Cooldown[cmd.name]) {
Cooldown[cmd.name] = {};
}
let now = Date.now();
let now = new Date().getTime();
let ChannelId;
if (typeof msg.channel.guild !== "undefined") {
ChannelId = msg.channel.guild.id;
Expand All @@ -239,21 +275,18 @@ module.exports = {
if (Member[ChannelId]) {
let expirationTime = Member[ChannelId] + cooldownAmount;
if (now < expirationTime) {
return (expirationTime - now).toFixed(1);
return Math.ceil((expirationTime - now) / 1000);
} else {
console.log("case2")
Member[ChannelId] = now;
if (save == 0) Files.saveGlobalVariable("DBMCooldown", JSON.stringify(Cooldown));
return false;
}
} else {
console.log("case3")
Member[ChannelId] = now;
if (save == 0) Files.saveGlobalVariable("DBMCooldown", JSON.stringify(Cooldown));
return false;
}
} else {
console.log("case4")
Command[msg.author.id] = {};
Command[msg.author.id][ChannelId] = now;
if (save == 0) Files.saveGlobalVariable("DBMCooldown", JSON.stringify(Cooldown));
Expand Down
0