Merge branch 'staging' into communities-allow-list

lib/historyKeeper.js

@@ -6,6 +6,7 @@ const WriteQueue = require("./write-queue");
 const BatchRead = require("./batch-read");
 const RPC = require("./rpc");
 const HK = require("./hk-util.js");
+const Core = require("./commands/core");
 
 const Store = require("./storage/file");
 const BlobStore = require("./storage/blob");
@@ -54,7 +55,6 @@ module.exports.create = function (config, cb) {
 
         limits: {},
         admins: [],
-        Log: Log,
         WARN: WARN,
         flushCache: config.flushCache,
         adminEmail: config.adminEmail,
@@ -149,7 +149,7 @@ module.exports.create = function (config, cb) {
             blobStagingPath: config.blobStagingPath,
             archivePath: config.archivePath,
             getSession: function (safeKey) {
-                return Core.getSession(Sessions, safeKey);
+                return Core.getSession(Env.Sessions, safeKey);
             },
         }, w(function (err, blob) {
             if (err) { throw new Error(err); }

lib/storage/file.js

@@ -970,6 +970,8 @@ var trimChannel = function (env, channelName, hash, _cb) {
             }
 
             var msg = Util.tryParse(s_msg);
+            if (!msg) { return void readMore(); }
+
             var msgHash = Extras.getHash(msg[4]);
 
             if (msgHash === hash) {