Merge branch 'staging' into communities-trim

lib/commands/channel.js

@@ -93,7 +93,15 @@ Channel.removeOwnedChannel = function (Env, safeKey, channelId, cb) {
     });
 };
 
-Channel.removeOwnedChannelHistory = function (Env, channelId, unsafeKey, hash, cb) { // XXX UNSAFE
+Channel.trimHistory = function (Env, safeKey, data, cb) {
+    if (!(data && typeof(data.channel) === 'string' && typeof(data.hash) === 'string' && data.hash.length === 64)) {
+        return void cb('INVALID_ARGS');
+    }
+
+    var channelId = data.channel;
+    var unsafeKey = Util.unescapeKeyCharacters(safeKey);
+    var hash = data.hash;
+
     nThen(function (w) {
         Metadata.getMetadata(Env, channelId, w(function (err, metadata) {
             if (err) { return void cb(err); }

lib/commands/core.js

@@ -70,7 +70,7 @@ Core.expireSession = function (Sessions, safeKey) {
 
 Core.expireSessionAsync = function (Env, safeKey, cb) {
     setTimeout(function () {
-        Core.expireSession(Sessions, safeKey);
+        Core.expireSession(Env.Sessions, safeKey);
         cb(void 0, 'OK');
     });
 };

lib/rpc.js

@@ -118,6 +118,7 @@ const AUTHENTICATED_USER_TARGETED = {
     UNPIN: Pinning.unpinChannel,
     CLEAR_OWNED_CHANNEL: Channel.clearOwnedChannel,
     REMOVE_OWNED_CHANNEL: Channel.removeOwnedChannel,
+    TRIM_HISTORY: Channel.trimHistory,
     UPLOAD_STATUS: Upload.status,
     UPLOAD: Upload.upload,
     UPLOAD_COMPLETE: Upload.complete,
@@ -166,11 +167,6 @@ var handleAuthenticatedMessage = function (Env, map) {
 
     switch (msg[0]) {
         case 'COOKIE': return void Respond(void 0);
-        case 'TRIM_OWNED_CHANNEL_HISTORY':
-            return void Channel.removeOwnedChannelHistory(Env, msg[1], publicKey, msg[2], function (e) { // XXX USER_TARGETED_DOUBLE
-                if (e) { return void Respond(e); }
-                Respond(void 0, 'OK');
-            });
         case 'WRITE_LOGIN_BLOCK':
             return void Block.writeLoginBlock(Env, msg[1], function (e) { // XXX SPECIAL
                 if (e) {
@@ -196,8 +192,6 @@ var handleAuthenticatedMessage = function (Env, map) {
                 Respond(void 0, result);
             });
         default:
-            console.log(msg);
-            throw new Error("OOPS");
             return void Respond('UNSUPPORTED_RPC_CALL', msg);
     }
 };