override thread discovery with data-isso-id="...", close #27

11 years ago · 77df31d06f
parent a6f54f0191
commit 77df31d06f
6 changed files with 38 additions and 23 deletions
--- a/isso/js/app/api.js
+++ b/isso/js/app/api.js
@ -122,8 +122,8 @@ define(["q"], function(Q) {
        return rv.substring(0, rv.length - 1);  // chop off trailing "&"
    };

-    var create = function(data) {
-        return curl("POST", endpoint + "/new?" + qs({uri: location}), JSON.stringify(data)).then(
+    var create = function(tid, data) {
+        return curl("POST", endpoint + "/new?" + qs({uri: tid || location}), JSON.stringify(data)).then(
            function (rv) { return JSON.parse(rv.body); });
    };

@ -148,9 +148,9 @@ define(["q"], function(Q) {
        });
    };

-    var fetch = function(plain) {
+    var fetch = function(tid) {

-        return curl("GET", endpoint + "/?" + qs({uri: location, plain: plain}), null).then(function (rv) {
+        return curl("GET", endpoint + "/?" + qs({uri: tid || location}), null).then(function (rv) {
            if (rv.status === 200) {
                return JSON.parse(rv.body);
            } else {
@ -159,8 +159,8 @@ define(["q"], function(Q) {
        });
    };

-    var count = function(uri) {
-        return curl("GET", endpoint + "/count?" + qs({uri: uri}), null).then(function(rv) {
+    var count = function(tid) {
+        return curl("GET", endpoint + "/count?" + qs({uri: tid || location}), null).then(function(rv) {
            return JSON.parse(rv.body);
        });
    };
--- a/isso/js/app/count.js
+++ b/isso/js/app/count.js
@ -5,11 +5,13 @@ define(["app/api", "app/dom", "app/markup"], function(api, $, Mark) {
                return;
            }

-            var uri = el.href.match("^(.+)#isso-thread$")[1]
+            var tid = el.getAttribute("data-isso-id") ||
+                      el.href.match("^(.+)#isso-thread$")[1]
                             .replace(/^.*\/\/[^\/]+/, '');
-            api.count(uri).then(function(rv) {
+
+            api.count(tid).then(function(rv) {
                el.textContent = Mark.up("{{ i18n-num-comments | pluralize : `n` }}", {n: rv});
            });
        });
    };
-});
+});
--- a/isso/js/app/isso.js
+++ b/isso/js/app/isso.js
@ -59,7 +59,7 @@ define(["app/text/html", "app/dom", "app/utils", "app/config", "app/api", "app/m
                return;
            }

-            api.create({
+            api.create($("#isso-thread").getAttribute("data-isso-id"), {
                author: $("[name=author]", el).value || null,
                email: $("[name=email]", el).value || null,
                text: $("textarea", el).value,
--- a/isso/js/embed.js
+++ b/isso/js/embed.js
@ -26,7 +26,7 @@ require(["ready", "app/config", "app/api", "app/isso", "app/count", "app/dom", "
        $("#isso-thread").append(new isso.Postbox(null));
        $("#isso-thread").append('<div id="isso-root"></div>');

-        api.fetch().then(function(rv) {
+        api.fetch($("#isso-thread").getAttribute("data-isso-id")).then(function(rv) {

            if (! rv.length) {
                $("#isso-thread > h4").textContent = Mark.up("{{ i18n-no-comments }}");
--- a/isso/utils/parse.py
+++ b/isso/utils/parse.py
@ -76,14 +76,14 @@ def host(name):
    return (rv.netloc.rsplit(':')[0], rv.port or 80, rv.scheme == 'https')


-def title(data, default=u"Untitled."):
+def thread(data, default=u"Untitled.", id=None):
    """
    Extract <h1> title from web page. The title is *probably* the text node,
    which is the nearest H1 node in context to an element with the `isso-thread` id.

-    >>> title("asdf")  # doctest: +IGNORE_UNICODE
-    'Untitled.'
-    >>> title('''
+    >>> thread("asdf")  # doctest: +IGNORE_UNICODE
+    (None, 'Untitled.')
+    >>> thread('''
    ... <html>
    ... <head>
    ...     <title>Foo!</title>
@ -102,14 +102,22 @@ def title(data, default=u"Untitled."):
    ...     </article>
    ... </body>
    ... </html>''')  # doctest: +IGNORE_UNICODE
-    'Can you find me?'
-    >>> title('''
+    (None, 'Can you find me?')
+    >>> thread('''
    ... <html>
    ... <body>
    ... <h1>I'm the real title!1
    ... <section data-title="No way%21" id="isso-thread">
    ... ''')  # doctest: +IGNORE_UNICODE
-    'No way!'
+    (None, 'No way!')
+    >>> thread('''
+    ... <section id="isso-thread" data-title="Test" data-isso-id="test">
+    ... ''')  # doctest: +IGNORE_UNICODE
+    ('test', 'Test')
+    >>> thread('''
+    ... <section id="isso-thread" data-isso-id="Fuu.">
+    ... ''')  # doctest: +IGNORE_UNICODE
+    ('Fuu.', 'Untitled.')
    """

    html = html5lib.parse(data, treebuilder="dom")
@ -123,7 +131,7 @@ def title(data, default=u"Untitled."):
                     chain(*map(html.getElementsByTagName, ("div", "section"))))))

    if not el:
-        return default
+        return id, default

    el = el[0]
    visited = []
@ -146,7 +154,12 @@ def title(data, default=u"Untitled."):
                    yield item

    try:
-        return unquote(el.attributes["data-title"].value)
+        id = unquote(el.attributes["data-isso-id"].value)
+    except (KeyError, AttributeError):
+        pass
+
+    try:
+        return id, unquote(el.attributes["data-title"].value)
    except (KeyError, AttributeError):
        pass

@ -156,8 +169,8 @@ def title(data, default=u"Untitled."):
        rv = recurse(el)

        if rv:
-            return ''.join(gettext(rv)).strip()
+            return id, ''.join(gettext(rv)).strip()

        el = el.parentNode

-    return default
+    return id, default
--- a/isso/views/comments.py
+++ b/isso/views/comments.py
@ -117,7 +117,7 @@ class API(object):
            if uri not in self.threads:
                with http.curl('GET', local("origin"), uri) as resp:
                    if resp and resp.status == 200:
-                        title = parse.title(resp.read())
+                        uri, title = parse.thread(resp.read(), id=uri)
                    else:
                        return NotFound('URI does not exist')