Abstract message error handling

// FREEBIE

js/background.js

@@ -198,13 +198,7 @@
         if (ev.proto) {
             var envelope = ev.proto;
             var message = initIncomingMessage(envelope.source, envelope.timestamp.toNumber());
-            var attributes = {};
+            message.saveErrors(e).then(function() {
-            if (e.name === 'IncomingIdentityKeyError') {
-                attributes = { errors : [e] };
-            } else if (e.message !== 'Bad MAC') {
-                attributes = { errors : [ _.pick(e, ['name', 'message'])]};
-            }
-            message.save(attributes).then(function() {
                 ConversationController.findOrCreatePrivateById(message.get('conversationId')).then(function(conversation) {
                     conversation.save({
                         active_at: Date.now(),

js/models/messages.js

@@ -142,6 +142,12 @@
             return promise.then(function() {
                 this.save({sent: true});
             }.bind(this)).catch(function(errors) {
+                this.set({sent: true});
+                this.saveErrors(errors);
+            }.bind(this));
+        },
+
+        saveErrors: function(errors) {
             if (!(errors instanceof Array)) {
                 errors = [errors];
             }
@@ -149,8 +155,7 @@
                 console.log(e);
                 console.log(e.reason, e.stack);
             });
-                this.save({
+            return this.save({
-                    sent: true,
                 errors : errors.map(function(e) {
                     if (e.constructor === Error) {
                         return _.pick(e, 'name', 'message', 'code', 'number', 'reason');
@@ -158,7 +163,6 @@
                     return e;
                 })
             });
-            }.bind(this));
         },
 
         resolveConflict: function(number) {
@@ -166,25 +170,15 @@
             if (error) {
                 var promise = new textsecure.ReplayableError(error).replay();
                 if (this.isIncoming()) {
-                    promise.then(function(dataMessage) {
+                    promise = promise.then(function(dataMessage) {
                         this.handleDataMessage(dataMessage);
-                        this.save('errors', []);
-                    }.bind(this)).catch(function(e) {
-                        //this.save('errors', [_.pick(e, ['name', 'message'])]);
-                        var errors = this.get('errors').concat(
-                            _.pick(e, ['name', 'message'])
-                        );
-                        this.save('errors', errors);
                     }.bind(this));
-                } else {
+                }
                 promise.then(function() {
-                        var errors = _.reject(this.get('errors'), function(e) {
+                    this.save('errors', []);
-                            return e.name === 'OutgoingIdentityKeyError' &&
+                }.bind(this)).catch(function(e) {
-                                   e.number === number;
+                    this.saveErrors(e);
-                        });
-                        this.save({sent: true, errors: errors});
                 }.bind(this));
-                }
                 return promise;
             }
         },