diff --git a/apiserver/server.py b/apiserver/server.py index 0e3d92e..022875a 100644 --- a/apiserver/server.py +++ b/apiserver/server.py @@ -171,9 +171,9 @@ def static_story(sid): except NotFound: pass - story = database.get_story(sid) - if not story: return abort(404) - story = json.loads(story.full_json) + story_obj = database.get_story(sid) + if not story_obj: return abort(404) + story = json.loads(story_obj.full_json) score = story['score'] num_comments = story['num_comments'] @@ -182,7 +182,7 @@ def static_story(sid): score, 's' if score != 1 else '', num_comments, 's' if num_comments != 1 else '', source) - url = urlparse(story['url']).hostname or urlparse(story['link']).hostname or '' + url = urlparse(story.get('url') or story.get('link') or '').hostname or '' url = url.replace('www.', '') return render_template('index.html', @@ -190,6 +190,8 @@ def static_story(sid): url=url, description=description, robots='noindex', + story=story, + show_comments=request.path.endswith('/c'), ) http_server = WSGIServer(('', 33842), flask_app) diff --git a/webclient/public/index.html b/webclient/public/index.html index 9f7675f..712e04a 100644 --- a/webclient/public/index.html +++ b/webclient/public/index.html @@ -46,18 +46,52 @@
- + +
+
+ {% if story %} +
+
+ {% if show_comments %} +

{{ story.title }}

+ {% else %} +

{{ story.title }}

+ {% endif %} +
+ {{ story.score }} points + by {{ story.author }} + on {{ story.source }} | + + {{ story.num_comments }} comment{{ 's' if story.num_comments != 1 }} + +
+
+
+ + {{ '' if not show_comments else '' }} + +
+
+
+ {% if not show_comments %} +
{{ story.text | safe }}
+ {% else %} + {% macro render_comment(comment, level) %} +
+
{{ comment.author }}
+
{{ comment.text | safe }}
+ {% for reply in comment.comments %} + {{ render_comment(reply, level + 1) }} + {% endfor %} +
+ {% endmacro %} +
+ {% for comment in story.comments %}{{ render_comment(comment, 0) }}{% endfor %} +
+ {% endif %} +
+ {% endif %}
-