From de4c34746c447e2553d29ae782de1d470bdf852f Mon Sep 17 00:00:00 2001
From: Nicolas Stepien <stepien.nicolas@gmail.com>
Date: Tue, 24 Jan 2012 18:02:52 +0100
Subject: [PATCH] Restore email after sage.

---
 4chan_x.user.js | 12 +++++++++---
 script.coffee   | 26 +++++++++-----------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/4chan_x.user.js b/4chan_x.user.js
index 5f059d12a..6642a2213 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1346,10 +1346,15 @@
     reply: (function() {
 
       function _Class(file) {
-        var persona, previous, _ref,
+        var persona, previous,
           _this = this;
+        previous = qr.replies[qr.replies.length - 1];
+        persona = $.get('qr.persona', {});
+        this.name = previous ? previous.name : persona.name || null;
+        this.email = previous && !/^sage$/.test(previous.email) ? previous.email : persona.email || null;
+        this.sub = previous && conf['Remember Subject'] ? previous.sub : conf['Remember Subject'] ? persona.sub : null;
+        this.spoiler = previous && conf['Remember Spoiler'] ? previous.spoiler : false;
         this.com = null;
-        _ref = (previous = qr.replies[qr.replies.length - 1]) ? [previous.name, /^sage$/.test(previous.email) ? null : previous.email, conf['Remember Subject'] ? previous.sub : null, conf['Remember Spoiler'] ? previous.spoiler : false] : (persona = $.get('qr.persona', {})) ? [persona.name || null, persona.email || null, conf['Remember Subject'] ? persona.sub || null : null, false] : void 0, this.name = _ref[0], this.email = _ref[1], this.sub = _ref[2], this.spoiler = _ref[3];
         this.el = $.el('a', {
           className: 'preview',
           href: 'javascript:;',
@@ -1632,9 +1637,10 @@
       }
       reply = qr.replies[0];
       sage = /sage/i.test(reply.email);
+      persona = $.get('qr.persona', {});
       persona = {
         name: reply.name,
-        email: /^sage$/.test(reply.email) ? null : reply.email,
+        email: /^sage$/.test(reply.email) ? persona.email : reply.email,
         sub: conf['Remember Subject'] ? reply.sub : null
       };
       $.set('qr.persona', persona);
diff --git a/script.coffee b/script.coffee
index 4248ac280..6147d003a 100644
--- a/script.coffee
+++ b/script.coffee
@@ -991,22 +991,13 @@ qr =
   reply: class
     constructor: (file) ->
       # set values, or null, to avoid 'undefined' values in inputs
+      previous = qr.replies[qr.replies.length-1]
+      persona  = $.get 'qr.persona', {}
+      @name    = if previous then previous.name else persona.name or null
+      @email   = if previous and !/^sage$/.test previous.email then previous.email   else persona.email or null
+      @sub     = if previous and conf['Remember Subject']      then previous.sub     else if conf['Remember Subject'] then persona.sub else null
+      @spoiler = if previous and conf['Remember Spoiler']      then previous.spoiler else false
       @com = null
-      [@name, @email, @sub, @spoiler] =
-        if previous = qr.replies[qr.replies.length-1]
-          [
-            previous.name,
-            if /^sage$/.test(previous.email) then null else previous.email,
-            if conf['Remember Subject'] then previous.sub else null,
-            if conf['Remember Spoiler'] then previous.spoiler else false
-          ]
-        else if persona = $.get 'qr.persona', {}
-          [
-            persona.name  or null,
-            persona.email or null,
-            if conf['Remember Subject'] then persona.sub or null else null,
-            false
-          ]
 
       @el = $.el 'a',
         className: 'preview'
@@ -1247,10 +1238,11 @@ qr =
     sage = /sage/i.test reply.email
     # cooldown
 
+    persona = $.get 'qr.persona', {}
     persona =
       name:  reply.name
-      email: if /^sage$/.test reply.email then null else reply.email
-      sub:   if conf['Remember Subject'] then reply.sub else null
+      email: if /^sage$/.test reply.email then persona.email else reply.email
+      sub:   if conf['Remember Subject']  then reply.sub     else null
     $.set 'qr.persona', persona
 
     if conf['Persistent QR'] or qr.replies.length > 1