upd action

.github/workflows/lint.yml

@@ -0,0 +1,23 @@
+name: Lint
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  eslint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - run: npm ci # or yarn install
+      - uses: sibiraj-s/action-eslint@v2
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }} # Optional
+          eslint-args: '--ignore-path=.gitignore --quiet'
+          extensions: 'js,jsx,ts,tsx'
+          annotations: true

modules/iapi.mjs

@@ -16,7 +16,6 @@ class IAPI {
         this.log = log;
         this.salt = salt;
         this.rp = redisPrefix;
-        this.rateLimitFallback = siteConfig.ratelimit_fallback;
         //For util functions in IAPI, redis prefix will not be automatically added.
         //Redis prefix needed to be added manually in caller function.
         this.log("log", "IAPI", "IAPI instance created.");
@@ -196,7 +195,7 @@ class IAPI {
                     }));
                 }
                 Promise.allSettled(promisePool).then((results) => {
-                    let permissions = getPermissionSum(this.rateLimitFallback, results);
+                    let permissions = getPermissionSum(results);
                     resolve(permissions);
                 }).catch((err) => {
                     reject(err);
@@ -209,7 +208,7 @@ class IAPI {
         return new Promise((resolve, reject) => {
             password = blake3Hash(this.salt + password);
             this.mysql.query(
-                "SELECT uid,password,permissions FROM users WHERE username = ?",
+                "SELECT uid,password,roles FROM users WHERE username = ?",
                 [username],
                 (err, results) => {
                     if (err) {

modules/utils.mjs

@@ -171,6 +171,10 @@ function pureArray(arr){
     //remove all empty items in an array
     return arr.filter(item => item !== "");
 }
+
+function mergeArray(...args){
+    return Array.from(new Set(args.reduce((a, b) => a.concat(b))));
+}
 
 function getPermissionSum(...p){
     //return the greatest permissions of all given role permissions
@@ -184,7 +188,13 @@ function getPermissionSum(...p){
     };
     let isRateLimitContained = false;
     for(const perm of p){
-
+        if(perm.with_rate_limit == 1){
+            if(!isRateLimitContained){
+                p.rate_limits = perm.rate_limits;
+            }
+            isRateLimitContained = true;
+            //todo: rate limit merge
+        }
     }
     return permSum;
 }