Merge pull request #47 from wzhouwzhou/perms-merger_1

Chips v0.4.0 Stable Build Release

.eslintrc-old.json

@@ -0,0 +1,36 @@
+{
+    "env": {
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "parserOptions": {
+        "ecmaVersion": 2017,
+        "sourceType": "module"
+    },
+    "rules": {
+        "indent": [
+            "error",
+            "tab"
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "double"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "strict": 0,
+        "indent": 0,
+        "quotes": 0,
+        "no-undef": 0,
+        "no-console": 0,
+        "no-mixed-spaces-and-tabs": 0,
+        "no-unused-vars": 1,
+        "semi": 1
+    }
+}

.eslintrc.json

@@ -1,36 +1,153 @@
 {
-    "env": {
-        "node": true
-    },
-    "extends": "eslint:recommended",
-    "parserOptions": {
-        "ecmaVersion": 2017,
-        "sourceType": "module"
-    },
-    "rules": {
-        "indent": [
-            "error",
-            "tab"
-        ],
-        "linebreak-style": [
-            "error",
-            "unix"
-        ],
-        "quotes": [
-            "error",
-            "double"
-        ],
-        "semi": [
-            "error",
-            "always"
-        ],
-        "strict": 0,
-        "indent": 0,
-        "quotes": 0,
-        "no-undef": 0,
-        "no-console": 0,
-        "no-mixed-spaces-and-tabs": 0,
-        "no-unused-vars": 1,
-        "semi": 1
-    }
+  "extends": "eslint:recommended",
+  "parserOptions": {
+    "ecmaVersion": 2017
+  },
+  "env": {
+    "es6": true,
+    "node": true
+  },
+  "overrides": [
+    { "files": ["*.browser.js"], "env": { "browser": true } }
+  ],
+  "rules": {
+    "no-await-in-loop": "warn",
+    "no-compare-neg-zero": "error",
+    "no-extra-parens": ["warn", "all", {
+      "nestedBinaryExpressions": false
+    }],
+    "no-template-curly-in-string": "error",
+    "no-unsafe-negation": "error",
+    "valid-jsdoc": ["error", {
+      "requireReturn": false,
+      "requireReturnDescription": false,
+      "prefer": {
+        "return": "returns",
+        "arg": "param"
+      },
+      "preferType": {
+        "String": "string",
+        "Number": "number",
+        "Boolean": "boolean",
+        "Symbol": "symbol",
+        "object": "Object",
+        "function": "Function",
+        "array": "Array",
+        "date": "Date",
+        "error": "Error",
+        "null": "void"
+      }
+    }],
+
+    "accessor-pairs": "warn",
+    "array-callback-return": "error",
+    "complexity": "warn",
+    "consistent-return": "error",
+    "curly": ["error", "multi-line", "consistent"],
+    "dot-location": ["error", "property"],
+    "dot-notation": "error",
+    "eqeqeq": "error",
+    "no-empty-function": "error",
+    "no-floating-decimal": "error",
+    "no-implied-eval": "error",
+    "no-invalid-this": "error",
+    "no-lone-blocks": "error",
+    "no-multi-spaces": "error",
+    "no-new-func": "error",
+    "no-new-wrappers": "error",
+    "no-new": "error",
+    "no-octal-escape": "error",
+    "no-return-assign": "error",
+    "no-return-await": "error",
+    "no-self-compare": "error",
+    "no-sequences": "error",
+    "no-throw-literal": "error",
+    "no-unmodified-loop-condition": "error",
+    "no-unused-expressions": "error",
+    "no-useless-call": "error",
+    "no-useless-concat": "error",
+    "no-useless-escape": "error",
+    "no-useless-return": "error",
+    "no-void": "error",
+    "no-warning-comments": "warn",
+    "prefer-promise-reject-errors": "error",
+    "require-await": "warn",
+    "wrap-iife": "error",
+    "yoda": "error",
+
+    "no-label-var": "error",
+    "no-shadow": "error",
+    "no-undef-init": "error",
+
+    "callback-return": "error",
+    "handle-callback-err": "error",
+    "no-mixed-requires": "error",
+    "no-new-require": "error",
+    "no-path-concat": "error",
+
+    "array-bracket-spacing": "error",
+    "block-spacing": "error",
+    "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
+    "capitalized-comments": ["error", "always", { "ignoreConsecutiveComments": true }],
+    "comma-dangle": ["error", "always-multiline"],
+    "comma-spacing": "error",
+    "comma-style": "error",
+    "computed-property-spacing": "error",
+    "consistent-this": ["error", "$this"],
+    "eol-last": "error",
+    "func-names": "error",
+    "func-name-matching": "error",
+    "func-style": ["error", "declaration", { "allowArrowFunctions": true }],
+    "indent": ["error", 2, { "SwitchCase": 1 }],
+    "key-spacing": "error",
+    "keyword-spacing": "error",
+    "max-depth": "error",
+    "max-len": ["error", 120, 2],
+    "max-nested-callbacks": ["error", { "max": 4 }],
+    "max-statements-per-line": ["error", { "max": 2 }],
+    "new-cap": "off",
+    "newline-per-chained-call": ["error", { "ignoreChainWithDepth": 3 }],
+    "no-array-constructor": "error",
+    "no-inline-comments": "error",
+    "no-lonely-if": "error",
+    "no-mixed-operators": "error",
+    "no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 1, "maxBOF": 0 }],
+    "no-new-object": "error",
+    "no-spaced-func": "error",
+    "no-trailing-spaces": "error",
+    "no-unneeded-ternary": "error",
+    "no-whitespace-before-property": "error",
+    "nonblock-statement-body-position": "error",
+    "object-curly-spacing": ["error", "always"],
+    "operator-assignment": "error",
+    "operator-linebreak": ["error", "after"],
+    "padded-blocks": ["error", "never"],
+    "quote-props": ["error", "as-needed"],
+    "quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
+    "semi-spacing": "error",
+    "semi": "error",
+    "space-before-blocks": "error",
+    "space-before-function-paren": ["error", "never"],
+    "space-in-parens": "error",
+    "space-infix-ops": "error",
+    "space-unary-ops": "error",
+    "spaced-comment": "error",
+    "template-tag-spacing": "error",
+    "unicode-bom": "error",
+
+    "arrow-body-style": "error",
+    "arrow-parens": ["error", "as-needed"],
+    "arrow-spacing": "error",
+    "no-duplicate-imports": "error",
+    "no-useless-computed-key": "error",
+    "no-useless-constructor": "error",
+    "prefer-arrow-callback": "error",
+    "prefer-numeric-literals": "error",
+    "prefer-rest-params": "error",
+    "prefer-spread": "error",
+    "prefer-template": "error",
+    "rest-spread-spacing": "error",
+    "template-curly-spacing": "error",
+    "yield-star-spacing": "error"
+  }
 }

.gitattributes

@@ -1 +1,2 @@
 *.jpg filter=lfs diff=lfs merge=lfs -text
+*.mp3 filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -3,7 +3,7 @@ node_modules
 bower_components
 c.js
 crypto.js
-
+testfonts
 gource.mp4
 
 start.bat
@@ -16,3 +16,14 @@ deploy.bat
 deploy2.bat
 
 setup/log/access.log
+
+npm-debug.log
+
+*.log
+
+public/commands.html
+
+servers.json
+setup/cert.pem
+setup/key.pem
+mps.png

DMLogger.js

@@ -1,47 +1,45 @@
 module.exports = function(Discord, client, dmC, moment) {
-  return async (message) => {
-    await log(message ,Discord, client, dmC, moment);
+  return async message => {
+    await log(message, Discord, client, dmC, moment);
   };
 };
 
 async function log(message, Discord, client, dmC, moment) {
-  if(dmC==null||message.author.id==client.user.id)return;
+  if (dmC == null || message.author.id == client.user.id) return;
 
-  let mainContent = new Discord.RichEmbed()
+  let mainContent = new Discord.MessageEmbed()
     .setAuthor(`DM Received!: ${message.author.username}#${message.author.discriminator}\nUser ID: ${message.author.id}`)
     .setColor(205)
-    .addField("message id:", message.id,true)
+    .addField('message id:', message.id, true)
     .setThumbnail(message.author.displayAvatarURL)
     .setTitle(moment(message.timestamp).format('ddd, Do of MMM @ HH:mm:ss.SSS'));
-  if(message.cleanContent == "")
-    mainContent.addField(message.author.username, "[ERR]--No Content in Message--");
-  else
-    mainContent.addField(message.author.username, message.cleanContent);
-  if(message.attachments.length>1){
-    mainContent.addField("More than one attachment received..");
-    message.reply("Please only send one attachment at a time.");
+  if (message.cleanContent == '') mainContent.addField(message.author.username, '[ERR]--No Content in Message--');
+  else mainContent.addField(message.author.username, message.cleanContent);
+  if (message.attachments.length > 1) {
+    mainContent.addField('More than one attachment received..');
+    message.reply('Please only send one attachment at a time.');
   }
-  if(message.attachments.first()!=null) mainContent.addField("Attachment URL: ", message.attachments.first().url);
+  if (message.attachments.first() != null) mainContent.addField('Attachment URL: ', message.attachments.first().url);
   dmC.sendEmbed(mainContent);
 
-  let msgembeds=message.embeds;
-  msgembeds.forEach(function (item){
+  let msgembeds = message.embeds;
+  msgembeds.forEach(item => {
     dmC.sendEmbed(duplicateEmbed(item, Discord));
   });
 }
 
 const duplicateEmbed = (me, Discord) => {
-    let bad = new Discord.RichEmbed();
-    if (me.author) bad.setAuthor(me.author.name,me.author.iconURL);
-    if (me.color) bad.setColor(me.color);
-    if (me.createdTimestamp);
-    if (me.description) bad.setDescription(me.description);
-    me.fields.forEach(fi => {
-        bad.addField(fi.name,fi.value,fi.inline);
-    });
-    if (me.footer) bad.setFooter(me.footer.text,me.footer.iconURL);
-    if (me.thumbnail) bad.setThumbnail(me.thumbnail.url);
-    if (me.title) bad.setTitle(me.title);
-    if (me.url) bad.setURL(me.url);
-    return bad;
+  let bad = new Discord.MessageEmbed();
+  if (me.author) bad.setAuthor(me.author.name, me.author.iconURL);
+  if (me.color) bad.setColor(me.color);
+  if (me.createdTimestamp);
+  if (me.description) bad.setDescription(me.description);
+  me.fields.forEach(fi => {
+    bad.addField(fi.name, fi.value, fi.inline);
+  });
+  if (me.footer) bad.setFooter(me.footer.text, me.footer.iconURL);
+  if (me.thumbnail) bad.setThumbnail(me.thumbnail.url);
+  if (me.title) bad.setTitle(me.title);
+  if (me.url) bad.setURL(me.url);
+  return bad;
 };