abort sound upgrade if no sounds set in config

v1.18.x
Julian Lam 8 years ago
parent 039f80c5aa
commit 8166f30b90

@ -331,14 +331,17 @@ Upgrade.upgrade = function (callback) {
'waterdrop-low.mp3': 'Default | Water drop (low)', 'waterdrop-low.mp3': 'Default | Water drop (low)',
}; };
async.parallel([ db.getObject('settings:sounds', function (err, settings) {
function (cb) { if (err) {
var keys = ['chat-incoming', 'chat-outgoing', 'notification']; return next(err);
} else if (!settings) {
winston.info(schemaName + ' - done');
return Upgrade.update(thisSchemaDate, next);
}
db.getObject('settings:sounds', function (err, settings) { async.parallel([
if (err || !settings) { function (cb) {
return cb(err); var keys = ['chat-incoming', 'chat-outgoing', 'notification'];
}
keys.forEach(function (key) { keys.forEach(function (key) {
if (settings[key] && settings[key].indexOf(' | ') === -1) { if (settings[key] && settings[key].indexOf(' | ') === -1) {
@ -347,38 +350,38 @@ Upgrade.upgrade = function (callback) {
}); });
meta.configs.setMultiple(settings, cb); meta.configs.setMultiple(settings, cb);
}); },
}, function (cb) {
function (cb) { var keys = ['notificationSound', 'incomingChatSound', 'outgoingChatSound'];
var keys = ['notificationSound', 'incomingChatSound', 'outgoingChatSound'];
batch.processSortedSet('users:joindate', function (ids, next) {
batch.processSortedSet('users:joindate', function (ids, next) { async.each(ids, function (uid, next) {
async.each(ids, function (uid, next) { user.getSettings(uid, function (err, settings) {
user.getSettings(uid, function (err, settings) { if (err) {
if (err) { return next(err);
return next(err);
}
keys.forEach(function (key) {
if (settings[key] && settings[key].indexOf(' | ') === -1) {
settings[key] = map[settings[key]] || '';
} }
});
user.saveSettings(uid, settings, next); keys.forEach(function (key) {
}); if (settings[key] && settings[key].indexOf(' | ') === -1) {
}, next); settings[key] = map[settings[key]] || '';
}, cb); }
}, });
], function (err) {
if (err) { user.saveSettings(uid, settings, next);
return next(err); });
} }, next);
winston.verbose(schemaName + ' - done'); }, cb);
Upgrade.update(thisSchemaDate, next); },
], function (err) {
if (err) {
return next(err);
}
winston.info(schemaName + ' - done');
Upgrade.update(thisSchemaDate, next);
});
}); });
} else { } else {
winston.verbose(schemaName + ' - skipped!'); winston.info(schemaName + ' - skipped!');
next(); next();
} }
}, },

Loading…
Cancel
Save