From 89b8ddeabae81fd3a8891ce9d8191fbc9e27c83c Mon Sep 17 00:00:00 2001
From: 蒼時弦也
Date: Tue, 10 Jan 2017 10:02:37 +0800
Subject: Add limited and protected permission

---
 lib/realtime.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib/realtime.js')

diff --git a/lib/realtime.js b/lib/realtime.js
index a662deeb..b728622f 100644
--- a/lib/realtime.js
+++ b/lib/realtime.js
@@ -251,13 +251,13 @@ function getStatus(callback) {
             return logger.error('count user failed: ' + err);
         });
     }).catch(function (err) {
-        return logger.error('count note failed: ' + err); 
+        return logger.error('count note failed: ' + err);
     });
 }
 
 function isReady() {
-    return realtime.io 
-    && Object.keys(notes).length == 0 && Object.keys(users).length == 0 
+    return realtime.io
+    && Object.keys(notes).length == 0 && Object.keys(users).length == 0
     && connectionSocketQueue.length == 0 && !isConnectionBusy
     && disconnectSocketQueue.length == 0 && !isDisconnectBusy;
 }
@@ -420,7 +420,7 @@ function finishConnection(socket, note, user) {
 function startConnection(socket) {
     if (isConnectionBusy) return;
     isConnectionBusy = true;
-        
+
     var noteId = socket.noteId;
     if (!noteId) {
         return failConnection(404, 'note id not found', socket);
@@ -521,7 +521,7 @@ function disconnect(socket) {
         logger.info("SERVER disconnected a client");
         logger.info(JSON.stringify(users[socket.id]));
     }
-	
+
     if (users[socket.id]) {
         delete users[socket.id];
     }
@@ -618,12 +618,12 @@ function ifMayEdit(socket, callback) {
         case "freely":
             //not blocking anyone
             break;
-        case "editable":
+        case "editable": case: "limited":
             //only login user can change
             if (!socket.request.user || !socket.request.user.logged_in)
                 mayEdit = false;
             break;
-        case "locked": case "private":
+        case "locked": case "private": case "protected":
             //only owner can change
             if (!note.owner || note.owner != socket.request.user.id)
                 mayEdit = false;
@@ -672,7 +672,7 @@ function operationCallback(socket, operation) {
             var noteId = note.alias ? note.alias : LZString.compressToBase64(note.id);
             if (note.server) history.updateHistory(userId, noteId, note.server.document);
         }, 0);
-        
+
     }
     // save authorship
     note.authorship = models.Note.updateAuthorshipByOperation(operation, userId, note.authorship);
@@ -689,10 +689,10 @@ function connection(socket) {
         }
 
         if (isDuplicatedInSocketQueue(socket, connectionSocketQueue)) return;
-        
+
         // store noteId in this socket session
         socket.noteId = noteId;
-        
+
         //initialize user data
         //random color
         var color = randomcolor();
-- 
cgit v1.2.3


From be7696170fbfb9a0744a1400709479ac2e4c60e7 Mon Sep 17 00:00:00 2001
From: 蒼時弦也
Date: Tue, 10 Jan 2017 10:19:18 +0800
Subject: Fix syntax when use case

---
 lib/realtime.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/realtime.js')

diff --git a/lib/realtime.js b/lib/realtime.js
index b728622f..a3c56c41 100644
--- a/lib/realtime.js
+++ b/lib/realtime.js
@@ -618,7 +618,7 @@ function ifMayEdit(socket, callback) {
         case "freely":
             //not blocking anyone
             break;
-        case "editable": case: "limited":
+        case "editable": case "limited":
             //only login user can change
             if (!socket.request.user || !socket.request.user.logged_in)
                 mayEdit = false;
-- 
cgit v1.2.3