From 956ad2aedc3a33ccb35750a49ed23534a3857a93 Mon Sep 17 00:00:00 2001
From: Marcin Wielgoszewski <marcin.wielgoszewski@gmail.com>
Date: Mon, 14 Jan 2013 00:28:21 -0500
Subject: [PATCH] improvements to disqus functions  * add option to embed
 count.js for easy adding of comment counts to posts  * per post configuration
 / override

---
 rstblog/modules/disqus.py | 53 ++++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/rstblog/modules/disqus.py b/rstblog/modules/disqus.py
index cd6ee67..6636829 100644
--- a/rstblog/modules/disqus.py
+++ b/rstblog/modules/disqus.py
@@ -19,13 +19,22 @@
 
 @jinja2.contextfunction
 def get_disqus(context):
-    var_shortname=context['builder'].config.root_get('modules.disqus.shortname', 'YOUR-DISQUS-SHORTNAME')
+    var_shortname = context['builder'].config.root_get('modules.disqus.shortname', 'YOUR-DISQUS-SHORTNAME')
+
+    vars = []
+
+    if context['config'].get('disqus_id', context['config'].get('post_id', None)):
+        vars.append("var disqus_identifier = '%s';" % (
+            context['config'].get('disqus_id',  # fall back to post_id if None
+                context['config'].get('post_id', None)), ))
+
+    if context['config'].get('disqus_url', None):
+        vars.append("var disqus_url = '%s';" % (context['config'].get('disqus_url'), ))
 
-    var_developer=''
     if context['builder'].config.root_get('modules.disqus.developer', False):
-        var_developer='var disqus_developer = 1;'
-    
-    disqus_txt="""
+        vars.append("var disqus_developer = 1;")
+
+    disqus_txt = """
 <div id="disqus_thread"></div>
 <script type="text/javascript">
     var disqus_shortname = '%s'; // required: replace example with your forum shortname
@@ -34,19 +43,45 @@ def get_disqus(context):
     /* * * DON'T EDIT BELOW THIS LINE * * */
     (function() {
         var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-        dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
+        dsq.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + disqus_shortname + '.disqus.com/embed.js';
         (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
     })();
 </script>
 <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
 <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
-""" % ( var_shortname, var_developer, )
+""" % (var_shortname, '\n    '.join(vars), )
 
     if not context['config'].get('disqus', True):
-        disqus_txt='' # "<h1>DISQUS DEFEATED</h1>"
-        
+        disqus_txt = ''
+
+    return jinja2.Markup(disqus_txt.encode('utf-8'))
+
+
+@jinja2.contextfunction
+def get_disqus_count(context):
+    var_shortname = context['builder'].config.root_get('modules.disqus.shortname', 'YOUR-DISQUS-SHORTNAME')
+    disqus_txt = """
+<script type="text/javascript">
+    var disqus_shortname = '%s'; // required: replace example with your forum shortname
+
+    /* * * DON'T EDIT BELOW THIS LINE * * */
+    (function() {
+        var cnt = document.createElement('script'); cnt.type = 'text/javascript'; cnt.async = true;
+        cnt.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + disqus_shortname + '.disqus.com/count.js';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(cnt);
+    })();
+</script>
+<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
+""" % (var_shortname, )
+
+    if not context['config'].get('disqus', True):
+        disqus_txt = ''
+
     return jinja2.Markup(disqus_txt.encode('utf-8'))
 
 
 def setup(builder):
     builder.jinja_env.globals['get_disqus'] = get_disqus
+    builder.jinja_env.globals['get_disqus_count'] = get_disqus_count
+