Push For conni

The-name-Tranquility-is-already-taken · Apr 3, 2021 · ebbd2de · ebbd2de
1 parent dd9bcd9
commit ebbd2de
Show file tree

Hide file tree

Showing 7 changed files with 148 additions and 25 deletions.
diff --git a/Utils/BitWiseTesting.js b/Utils/BitWiseTesting.js
@@ -1,12 +1,112 @@
-if(Connis_Channel_Perms & View_Channel)
+const ChannelBits = require(`./api/BitFlags/PermissionBitfields`).codes;
+const { PerformanceObserver, performance } = require('perf_hooks');
+/*
+    0th bit = view channel
+    1st bit = send messages
+    2nd bit = manage messages
+    00000000000000000000000000000000
+*/
+function isBitSet(b,pos) 
 {
-    console.log("COnni can view the channel");
+	return (b.field & (1 << pos)) != 0;
 }
-if(Connis_Channel_Perms & Send_Messages)
+function setBit(b,pos)
 {
-    console.log("COnni can speak in the channel");
+    b.field |= (1 << pos);
 }
-if(Connis_Channel_Perms & Ping_Messages)
+function clearBit(b,pos)
 {
-    console.log("COnni can ping in the channel");
+    b.field = ~(1 << pos);
 }
+
+
+
+
+var ChannelObj = 
+{
+    ChannelID:"",
+    Name:"",
+    Description:"",
+    RoleOverrides:
+    [
+        {
+            RoleID:"",
+            VIEW_CHANNEL: true,
+            MANAGE_CHANNEL: null,
+            MANAGE_PERMISSION: null,
+            CREATE_INVITE: null,
+            SEND_MESSAGES: true,
+        }
+    ]
+};
+
+var RoleObject = 
+{
+    RoleID:"",
+    RoleName:"",
+    Colour:{r:255,g:0,b:255,a:255},
+    Permissions:
+    {
+        VIEW_CHANNEL: true,
+        MANAGE_CHANNEL: null,
+        MANAGE_PERMISSION: null,
+        CREATE_INVITE: null,
+        SEND_MESSAGES: true,
+    }
+}
+
+
+/*
+
+
+
+*/
+
+
+
+
+/*
+let start = (new Date()).getTime()
+let pog =0;
+/*setBit(testing,0);
+setBit(testing,1); 
+var testing = {field:3};
+
+for(var i = 0; i < 100000000; ++i)
+{
+    if(isBitSet(testing,0))
+    {
+        ++pog;
+        //console.log("Conni can view the channel");
+    }
+    if(isBitSet(testing,1))
+    {
+        ++pog;
+        //console.log("Conni can Send_Messages in the channel");
+    }
+    if(isBitSet(testing,2))
+    {
+        ++pog;
+     //console.log("Conni can Manage_Messages the channel");
+    }
+}
+let end = (new Date()).getTime()
+var duration = end-start;
+console.log(duration, "ms");
+console.log(pog);
+
+
+
+
+console.log(ConnisChannelPerms.field & 1<<1 );
+setBit(ConnisChannelPerms,2);
+clearBit(ConnisChannelPerms,1);
+clearBit(ConnisChannelPerms,0);
+console.log(`field = ${ConnisChannelPerms.field}`);
+
+console.log((ConnisChannelPerms.field & ChannelBits.Manage_Messages) ? "can manage messages in the channel" : "cant manage messages");
+setHexBit(ConnisChannelPerms,)
+console.log(ConnisChannelPerms.field);
+console.log((ConnisChannelPerms.field & ChannelBits.Manage_Messages) ? "can manage messages in the channel" : "cant manage messages");
+*/
+
diff --git a/Utils/api/BitFlags/ChannelBits.js b/Utils/api/BitFlags/ChannelBits.js
diff --git a/Utils/api/BitFlags/PermissionBitfields.js b/Utils/api/BitFlags/PermissionBitfields.js
@@ -0,0 +1,17 @@
+exports.codes = { 
+    //#region ChannelPerms
+    View_Channel    : {
+        field   :0x1,
+        pos     :0
+    },
+    Send_Messages    : {
+        field   :0x10,
+        pos     :1
+    },
+    Manage_Messages    : {
+        field   :0x100,
+        pos     :2
+    },
+    //#endregion
+
+};
diff --git a/Utils/api/controllers/memberController.js b/Utils/api/controllers/memberController.js
@@ -30,19 +30,18 @@ exports.createNewMember = (req, res) => {
   });
 };
 exports.getMemberRecord = (req, res) => {
-    Members.find({MemberID: req.params.MemberID}, (err, Response) => {
+    Members.find({id: req.params.MemberID}, (err, Response) => {
     if (err) {
       res.status(codes.Bad_Request);
       res.send(err);
     }
     res.json(Response);
   });
 };
-exports.update_a_member = (req, res) => {
+exports.updateMember = (req, res) => {
     Members.findOneAndUpdate(
       {
-        MemberID: req.params.MemberID,
-        Token: req.body.token
+        id: req.params.MemberID
       }, req.body, {new: true}, (err, Response) => {
     if (err) {
       res.status(codes.Bad_Request);
@@ -53,8 +52,8 @@ exports.update_a_member = (req, res) => {
     res.json(Response);
   });
 };
-exports.delete_a_member = (req, res) => {
-  Members.find({MemberID: req.params.MemberID}, (err, Response) => {
+exports.deleteMember = (req, res) => {
+  Members.find({id: req.params.MemberID}, (err, Response) => {
     if (err) {
         res.send(err);
     }
@@ -71,7 +70,7 @@ exports.delete_a_member = (req, res) => {
     }
     Members.deleteOne(
       {
-        MemberID: req.params.MemberID
+        id: req.params.MemberID
       }, (err, DeleteResponse) => {
         if (err)
           res.send(err);

diff --git a/Utils/api/routes/routes.js b/Utils/api/routes/routes.js
@@ -6,10 +6,10 @@ module.exports = (app) => {
     .post(MemberList.createNewMember);
   app.route('/api/member/:MemberID')
     .get(MemberList.getMemberRecord)
-    .put(MemberList.update_a_member)
-    .delete(MemberList.delete_a_member);
+    .put(MemberList.updateMember)
+    .delete(MemberList.deleteMember);
   app.route('/api/member/:MemberID')
     .get(MemberList.getMemberRecord)
-    .put(MemberList.update_a_member)
-    .delete(MemberList.delete_a_member);
+    .put(MemberList.updateMember)
+    .delete(MemberList.deleteMember);
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,8 +4,9 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "start": "nodemon index.js",
-    "dev": "nodemon index.js"
+    "start": "nodemon index.js testing",
+    "release": "node index.js release",
+    "dev": "nodemon index.js dev"
   },
   "repository": {
     "type": "git",