From 96f199adaa572193aeae4787c4882b6f045651fb Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sat, 24 Sep 2016 16:07:35 +0200
Subject: [PATCH] Fix issue #1

---
 bower.json                                    |  5 +-
 src/Gist/Model/Gist.php                       |  2 +-
 .../Resources/views/View/cipherJs.html.twig   | 30 +++++++++
 .../Resources/views/View/revisions.html.twig  | 62 ++++++++++++++++++-
 src/Gist/Resources/views/View/view.html.twig  | 31 +---------
 src/Gist/Service/Gist.php                     |  4 ++
 web/app/js/app.js                             | 20 +++++-
 7 files changed, 116 insertions(+), 38 deletions(-)
 create mode 100644 src/Gist/Resources/views/View/cipherJs.html.twig

diff --git a/bower.json b/bower.json
index f1f83b6..201d38d 100644
--- a/bower.json
+++ b/bower.json
@@ -11,11 +11,12 @@
     "GIT"
   ],
   "license": "LGPL",
-  "homepage": "https://gitlab.deblan.org/deblan/gist.deblan.org",
+  "homepage": "https://gitnet.fr/deblan/gist",
   "dependencies": {
     "bootstrap": "3.3.4",
     "flag-icon-css": "0.7.1",
     "SyntaxHighlighter": "3.0.83",
-    "iframe-resizer": "2.8.6"
+    "iframe-resizer": "2.8.6",
+    "jsdiff": "~2.2.2"
   }
 }
diff --git a/src/Gist/Model/Gist.php b/src/Gist/Model/Gist.php
index 31fa5d9..c0cb024 100644
--- a/src/Gist/Model/Gist.php
+++ b/src/Gist/Model/Gist.php
@@ -39,7 +39,7 @@ class Gist extends BaseGist
     {
         $data = array(
             'javascript' => 'js',
-            'yaml'=> 'yml',
+            'yaml' => 'yml',
             'perl' => 'pl',
             'python' => 'py',
             'bash' => 'sh',
diff --git a/src/Gist/Resources/views/View/cipherJs.html.twig b/src/Gist/Resources/views/View/cipherJs.html.twig
new file mode 100644
index 0000000..1bd89a3
--- /dev/null
+++ b/src/Gist/Resources/views/View/cipherJs.html.twig
@@ -0,0 +1,30 @@
+<script type="text/javascript" src="{{ web_path }}components/SyntaxHighlighter/scripts/XRegExp.js"></script> <!-- XRegExp is bundled with the final shCore.js during build -->
+<script type="text/javascript" src="{{ web_path }}components/SyntaxHighlighter/scripts/shCore.js"></script>
+<script type="text/javascript" src="{{ web_path }}components/SyntaxHighlighter/scripts/shAutoloader.js"></script>
+<script type="text/javascript">
+    SyntaxHighlighter.autoloader(
+        ['applescript',                    '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushAppleScript.js' ],
+        ['actionscript3', 'as3',           '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushAS3.js' ],
+        ['bash', 'shell',                  '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushBash.js' ],
+        ['coldfusion', 'cf',               '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushColdFusion.js' ],
+        ['cpp', 'c',                       '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushCpp.js' ],
+        ['c#', 'c-sharp', 'csharp',        '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushCSharp.js' ],
+        ['css',                            '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushCss.js' ],
+        ['delphi', 'pascal',               '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushDelphi.js' ],
+        ['diff', 'patch', 'pas',           '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushDiff.js' ],
+        ['erl', 'erlang',                  '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushErlang.js' ],
+        ['groovy',                         '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushGroovy.js' ],
+        ['java',                           '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushJava.js' ],
+        ['jfx', 'javafx',                  '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushJavaFX.js' ],
+        ['js', 'jscript', 'javascript',    '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushJScript.js' ],
+        ['perl', 'pl',                     '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushPerl.js' ],
+        ['php',                            '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushPhp.js' ],
+        ['text', 'plain',                  '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushPlain.js' ],
+        ['py', 'python',                   '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushPython.js' ],
+        ['ruby', 'rails', 'ror', 'rb',     '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushRuby.js' ],
+        ['scala',                          '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushScala.js' ],
+        ['sql',                            '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushSql.js' ],
+        ['vb', 'vbnet',                    '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushVb.js' ],
+        ['xml', 'xhtml', 'xslt', 'html',   '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushXml.js' ]
+    );
+</script>
diff --git a/src/Gist/Resources/views/View/revisions.html.twig b/src/Gist/Resources/views/View/revisions.html.twig
index 7ba0b47..78bf52b 100644
--- a/src/Gist/Resources/views/View/revisions.html.twig
+++ b/src/Gist/Resources/views/View/revisions.html.twig
@@ -52,9 +52,10 @@
                                     </p>
                                     <div>
                                         {% if not loop.first %}
-
                                             <div class="diff" id="diff-{{ loop.index }}">
-                                                {{ commit.diff|raw }}
+                                                {% if not gist.cipher %}
+                                                    {{ commit.diff|raw }}
+                                                {% endif %}
                                             </div>
                                         {% endif %}
                                     </div>
@@ -74,4 +75,61 @@
 
 {% block js %}
     {{ parent() }}
+
+    {% if gist.cipher %}
+        {{ include('View/cipherJs.html.twig') }}
+
+        <script src="{{ web_path }}components/jsdiff/diff.min.js"></script>
+
+        <script>
+            var key = getKey();
+
+            var decrypt = function(content) {
+                var decrypted = CryptoJS.AES.decrypt(content, key, {
+                    format: JsonFormatter
+                });
+
+                return decrypted.toString(CryptoJS.enc.Utf8);
+            }
+
+            var commits = [];
+
+            {% for commit in history %}
+                try {
+                    var content = decrypt('{{ commit.content|raw }}');
+                    commits[{{ loop.index - 1 }}] = content;
+                } catch(e) {
+                }
+            {% endfor %}
+
+            for (var u = commits.length - 1; u > 0; u--) {
+                if (commits.hasOwnProperty(u) && commits.hasOwnProperty(u - 1)) {
+                    var previous = commits[u - 1];
+                    var current = commits[u];
+                    var diff = JsDiff.diffLines(previous, current);
+                    var diffContent = [];
+
+                    for (var v = 0, c = diff.length; v < c; v++) {
+                        var value = diff[v].value;
+                        var sign = diff[v].added ? '+' : '-';
+                        var lines = value.split("\n");
+
+                        for (var i = 0, l = lines.length; i < l; i++) {
+                            diffContent.push(sign + lines[i]);
+                        }
+                    }
+
+                    diffContent = diffContent.join("\n");
+                    
+                    var $pre = $('<pre>')
+                        .attr('class', 'brush: diff; syntaxhighlighter')
+                        .html(diffContent);
+                                    
+                    $('#diff-' + (u + 1).toString()).append($pre);
+                }
+            }
+
+            SyntaxHighlighter.all();
+        </script>
+    {% endif %}
 {% endblock %}
diff --git a/src/Gist/Resources/views/View/view.html.twig b/src/Gist/Resources/views/View/view.html.twig
index 518a0ed..97db4ca 100644
--- a/src/Gist/Resources/views/View/view.html.twig
+++ b/src/Gist/Resources/views/View/view.html.twig
@@ -84,35 +84,6 @@
     {{ parent() }}
     
     {% if gist.cipher %}
-        <script type="text/javascript" src="{{ web_path }}components/SyntaxHighlighter/scripts/XRegExp.js"></script> <!-- XRegExp is bundled with the final shCore.js during build -->
-        <script type="text/javascript" src="{{ web_path }}components/SyntaxHighlighter/scripts/shCore.js"></script>
-        <script type="text/javascript" src="{{ web_path }}components/SyntaxHighlighter/scripts/shAutoloader.js"></script>
-        <script type="text/javascript">
-            SyntaxHighlighter.autoloader(
-                ['applescript',                    '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushAppleScript.js' ],
-                ['actionscript3', 'as3',           '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushAS3.js' ],
-                ['bash', 'shell',                  '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushBash.js' ],
-                ['coldfusion', 'cf',               '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushColdFusion.js' ],
-                ['cpp', 'c',                       '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushCpp.js' ],
-                ['c#', 'c-sharp', 'csharp',        '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushCSharp.js' ],
-                ['css',                            '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushCss.js' ],
-                ['delphi', 'pascal',               '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushDelphi.js' ],
-                ['diff', 'patch', 'pas',           '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushDiff.js' ],
-                ['erl', 'erlang',                  '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushErlang.js' ],
-                ['groovy',                         '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushGroovy.js' ],
-                ['java',                           '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushJava.js' ],
-                ['jfx', 'javafx',                  '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushJavaFX.js' ],
-                ['js', 'jscript', 'javascript',    '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushJScript.js' ],
-                ['perl', 'pl',                     '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushPerl.js' ],
-                ['php',                            '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushPhp.js' ],
-                ['text', 'plain',                  '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushPlain.js' ],
-                ['py', 'python',                   '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushPython.js' ],
-                ['ruby', 'rails', 'ror', 'rb',     '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushRuby.js' ],
-                ['scala',                          '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushScala.js' ],
-                ['sql',                            '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushSql.js' ],
-                ['vb', 'vbnet',                    '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushVb.js' ],
-                ['xml', 'xhtml', 'xslt', 'html',   '{{ web_path }}components/SyntaxHighlighter/scripts/shBrushXml.js' ]
-            );
-        </script>
+        {{ include('View/cipherJs.html.twig') }}
     {% endif %}
 {% endblock %}
diff --git a/src/Gist/Service/Gist.php b/src/Gist/Service/Gist.php
index 45337f8..234678c 100644
--- a/src/Gist/Service/Gist.php
+++ b/src/Gist/Service/Gist.php
@@ -65,6 +65,10 @@ class Gist
                 'diff' => $this->highlight('diff', $diff),
             );
 
+            if ($gist->isCipher()) {
+                $data['content'] = $this->getContent($gist, $commit);
+            }
+
             $history[] = $data;
         }
 
diff --git a/web/app/js/app.js b/web/app/js/app.js
index 59c691c..b325e5a 100644
--- a/web/app/js/app.js
+++ b/web/app/js/app.js
@@ -66,14 +66,28 @@ var editorEvents = function() {
         $(this).trigger('change');
     });
 
+    var key = getKey();
+
+    if (key) {
+        $('.show-diff').each(function() {
+            var href = $(this).attr('href');
+            href = href.replace('#', '#key=' + key + '&');
+
+            $(this).attr('href', href);
+        });
+    }
+
     $('.show-diff').click(function() {
         $($(this).data('target')).toggle();
     });
 
-    if ((document.location.href).indexOf('#diff-') !== -1) {
+    var diffLinkTest1 = (document.location.href).indexOf('#diff-') !== -1;
+    var diffLinkTest2 = (document.location.href).indexOf('&diff-') !== -1;
+
+    if (diffLinkTest1 || diffLinkTest2) {
         var anchor = '#' + (document.location.href).toString().split('#')[1];
+
         $('.show-diff[href="' + anchor + '"]').click();
-        document.location.href = anchor;
     }
 }
 
@@ -119,7 +133,7 @@ var getKey = function() {
     var parts = url.split('#key=');
 
     if (parts.length === 2) {
-        return parts[1];
+        return parts[1].split('&')[0];
     }
 
     return null;