fix afk/dnd

master
Kit Kasune 3 years ago
parent ec6ca48ff9
commit c7b9e5d9d8
  1. 59
      .idea/workspace.xml
  2. 4
      commands/social/afk.js
  3. 4
      commands/social/dnd.js

@ -4,12 +4,10 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="826c705b-a7fa-4ece-b82a-e278fca7d494" name="Changes" comment="/deathnote"> <list default="true" id="826c705b-a7fa-4ece-b82a-e278fca7d494" name="Changes" comment="marriage declining">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bot.js" beforeDir="false" afterPath="$PROJECT_DIR$/bot.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/events/messageCreate.js" beforeDir="false" afterPath="$PROJECT_DIR$/events/messageCreate.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/util/lxp/cacheloop.js" beforeDir="false" afterPath="$PROJECT_DIR$/util/lxp/cacheloop.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/util/lxp/gainxp.js" beforeDir="false" afterPath="$PROJECT_DIR$/util/lxp/gainxp.js" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -79,7 +77,7 @@
<command value="git pull origin master" /> <command value="git pull origin master" />
</option> </option>
</component> </component>
<component name="RunManager" selected="npm.dev:pretty"> <component name="RunManager" selected="npm.sync">
<configuration name="Start" type="NodeJSConfigurationType" path-to-js-file="bot.js" working-dir="$PROJECT_DIR$"> <configuration name="Start" type="NodeJSConfigurationType" path-to-js-file="bot.js" working-dir="$PROJECT_DIR$">
<method v="2" /> <method v="2" />
</configuration> </configuration>
@ -163,7 +161,10 @@
<workItem from="1642638383959" duration="700000" /> <workItem from="1642638383959" duration="700000" />
<workItem from="1642707112676" duration="1337000" /> <workItem from="1642707112676" duration="1337000" />
<workItem from="1644446122031" duration="7044000" /> <workItem from="1644446122031" duration="7044000" />
<workItem from="1645389860831" duration="4164000" /> <workItem from="1645389860831" duration="6697000" />
<workItem from="1645490767613" duration="1990000" />
<workItem from="1645646716022" duration="11456000" />
<workItem from="1645765271756" duration="14000" />
</task> </task>
<task id="LOCAL-00001" summary="not even gonna explain"> <task id="LOCAL-00001" summary="not even gonna explain">
<created>1640148826800</created> <created>1640148826800</created>
@ -256,7 +257,42 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1644454968528</updated> <updated>1644454968528</updated>
</task> </task>
<option name="localTasksCounter" value="14" /> <task id="LOCAL-00014" summary="AR templating">
<created>1645501776749</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1645501776749</updated>
</task>
<task id="LOCAL-00015" summary="n?marry">
<created>1645649572924</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1645649572924</updated>
</task>
<task id="LOCAL-00016" summary="marriage status">
<created>1645650089290</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1645650089290</updated>
</task>
<task id="LOCAL-00017" summary="can't marry yourself lul">
<created>1645660453432</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1645660453432</updated>
</task>
<task id="LOCAL-00018" summary="marriage declining">
<created>1645679244004</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1645679244004</updated>
</task>
<option name="localTasksCounter" value="19" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -289,6 +325,11 @@
<MESSAGE value="slash improvements" /> <MESSAGE value="slash improvements" />
<MESSAGE value="more slash improvements" /> <MESSAGE value="more slash improvements" />
<MESSAGE value="/deathnote" /> <MESSAGE value="/deathnote" />
<option name="LAST_COMMIT_MESSAGE" value="/deathnote" /> <MESSAGE value="AR templating" />
<MESSAGE value="n?marry" />
<MESSAGE value="marriage status" />
<MESSAGE value="can't marry yourself lul" />
<MESSAGE value="marriage declining" />
<option name="LAST_COMMIT_MESSAGE" value="marriage declining" />
</component> </component>
</project> </project>

@ -21,8 +21,8 @@ module.exports = {
? message.content.slice(prefix.length).trim().split(/ +/g) ? message.content.slice(prefix.length).trim().split(/ +/g)
: msg.startsWith('<@!') : msg.startsWith('<@!')
? message.content.slice(4 + client.user.id.length).trim().split(/ +/g) ? message.content.slice(4 + client.user.id.length).trim().split(/ +/g)
: message.content.slice(3 + client.user.id.length).trim().split(/ +/g) : message.content.slice(3 + client.user.id.length).trim().split(/ +/g);
.slice(2); args = args.slice(1);
if (!args.length) {return message.channel.send(`Syntax: \`${prefix}afk [clearMode] <reason>\``);} if (!args.length) {return message.channel.send(`Syntax: \`${prefix}afk [clearMode] <reason>\``);}
let tu = await UserData.findOne({uid: message.author.id}) let tu = await UserData.findOne({uid: message.author.id})
? await UserData.findOne({uid: message.author.id}) ? await UserData.findOne({uid: message.author.id})

@ -22,8 +22,8 @@ module.exports = {
? message.content.slice(prefix.length).trim().split(/ +/g) ? message.content.slice(prefix.length).trim().split(/ +/g)
: msg.startsWith('<@!') : msg.startsWith('<@!')
? message.content.slice(4 + client.user.id.length).trim().split(/ +/g) ? message.content.slice(4 + client.user.id.length).trim().split(/ +/g)
: message.content.slice(3 + client.user.id.length).trim().split(/ +/g) : message.content.slice(3 + client.user.id.length).trim().split(/ +/g)
.slice(2); args = args.slice(1);
let tu = await UserData.findOne({uid: message.author.id}) let tu = await UserData.findOne({uid: message.author.id})
? await UserData.findOne({uid: message.author.id}) ? await UserData.findOne({uid: message.author.id})
: new UserData({uid: message.author.id}); : new UserData({uid: message.author.id});

Loading…
Cancel
Save