+ {% for post in posts %}
+
+
{% if post.subject %}
{{ post.subject }}
{% endif %}
{{ post.name }}
- {% if post.trip_code %}
- {{ post.trip_code }}
+ {% if post.tripcode %}
+ {{ post.tripcode }}
{% endif %}
{{ post.time.strftime('%Y-%m-%d %H:%M') }}
No.{{ post.id }}
@@ -35,9 +42,9 @@
{% for line in post.body.splitlines() %}
{% if line.startswith('>') %}
- {{ line|quotelink(post) }}
+ {{ line|quotelink(links[post.id]) }}
{% else %} - {{ line|quotelink(post) }}
+ {{ line|quotelink(links[post.id]) }}
{% endif %} {% endfor %}
diff --git a/voyage.py b/voyage.py
index 77e9c30..416a28e 100644
--- a/voyage.py
+++ b/voyage.py
@@ -2,6 +2,8 @@
"""
A display interface for archived 4chan quest threads.
"""
+from collections import defaultdict
+
from aiohttp import web
import jinja2
import aiohttp_jinja2
@@ -26,41 +28,70 @@ async def index(request):
@routes.get(r'/{thread_id:\d+}', name='thread')
async def thread(request):
"""A single thread page."""
+ thread_id = int(request.match_info['thread_id'])
async with request.app['pool'].acquire() as conn:
- data = await conn.fetch(
- "SELECT post.id, post.name, post.trip_code, post.subject, "
- "post.time, post.body, "
- "tag.name AS tag_name, link.link_to, link.link_from "
- "FROM post "
- "LEFT JOIN tag ON (post.id = tag.post_id) "
- "LEFT JOIN link ON (post.id = link.link_from) "
- "WHERE post.thread_id = $1 "
- "ORDER BY post.id ASC",
- int(request.match_info['thread_id']))
- posts = {}
- backlinks = {}
- for row in data:
- post = posts.get(row['id'], {})
- for key, value in row.items():
- if key == 'tag_name':
- tags = post.get('tags', [])
- tags.append(value)
- post['tags'] = tags
- elif key == 'link_to':
- link_tos = post.get('link_tos', [])
- link_tos.append(value)
- post['link_tos'] = link_tos
- elif key == 'link_from':
- back_post = backlinks.get(row['link_to'], [])
- back_post.append(value)
- backlinks[row['link_to']] = back_post
- post[key] = value
- post['tags'] = [t for t in post['tags'] if t]
- posts[row['id']] = post
+ posts = await conn.fetch(
+ "SELECT * FROM post WHERE thread_id = $1 ORDER BY id ASC",
+ thread_id)
+ tags_raw = await conn.fetch(
+ "SELECT tag.post_id, tag.name FROM tag "
+ "LEFT JOIN post ON (tag.post_id = post.id) "
+ "WHERE post.thread_id = $1",
+ thread_id)
+ links_raw = await conn.fetch(
+ "SELECT link.link_from, link.link_to FROM link "
+ "LEFT JOIN post ON (link.link_from = post.id) "
+ "WHERE post.thread_id = $1",
+ thread_id)
+ tags = defaultdict(list)
+ links = defaultdict(list)
+ backlinks = defaultdict(list)
+
+ for tag_raw in tags_raw:
+ tag = tags[tag_raw['post_id']]
+ tag.append(tag_raw['name'])
+ tags[tag_raw['post_id']] = tag
+
+ for link_raw in links_raw:
+ link = links[link_raw['link_from']]
+ link.append(link_raw['link_to'])
+ links[link_raw['link_from']] = link
+
+ backlink = backlinks[link_raw['link_to']]
+ backlink.append(link_raw['link_from'])
+ backlinks[link_raw['link_to']] = backlink
+
+ url_prefix = config.url_prefix
return render_template("thread.html", request, locals())
+@routes.post('/add_tag', name='add_tag')
+async def add_tag(request):
+ """Adds a tag to a post."""
+ data = await request.json()
+ post_id = int(data.get('post_id'))
+ tag_name = data.get('tag_name')
+ async with request.app['pool'].acquire() as conn:
+ await conn.execute(
+ "INSERT INTO tag (post_id, name) VALUES ($1, $2)",
+ post_id, tag_name)
+ return web.json_response({'ok': True})
+
+
+@routes.post('/remove_tag', name='remove_tag')
+async def remove_tag(request):
+ """Removes a tag to a post."""
+ data = await request.json()
+ post_id = int(data.get('post_id'))
+ tag_name = data.get('tag_name')
+ async with request.app['pool'].acquire() as conn:
+ await conn.execute(
+ "DELETE FROM tag WHERE post_id = $1 AND name = $2",
+ post_id, tag_name)
+ return web.json_response({'ok': True})
+
+
async def init_app():
"""Initializes the application."""
app = web.Application()
diff --git a/voyage.sql b/voyage.sql
index 2818cdc..9db64f5 100644
--- a/voyage.sql
+++ b/voyage.sql
@@ -1,28 +1,33 @@
-CREATE TABLE IF NOT EXISTS thread(
+CREATE TABLE IF NOT EXISTS thread (
id INTEGER PRIMARY KEY,
title TEXT NOT NULL,
time TIMESTAMP WITH TIME ZONE NOT NULL
);
-CREATE TABLE IF NOT EXISTS post(
+CREATE TABLE IF NOT EXISTS post (
thread_id INTEGER REFERENCES thread(id) ON DELETE CASCADE NOT NULL,
id INTEGER PRIMARY KEY,
name TEXT NOT NULL,
- trip_code TEXT,
+ tripcode TEXT,
subject TEXT,
time TIMESTAMP WITH TIME ZONE NOT NULL,
- file_url TEXT,
- file_name TEXT,
- file_md5 TEXT,
body TEXT NOT NULL
);
-CREATE TABLE IF NOT EXISTS link(
+CREATE TABLE IF NOT EXISTS link (
link_from INTEGER REFERENCES post(id) ON DELETE CASCADE NOT NULL,
- link_to INTEGER REFERENCES post(id) ON DELETE CASCADE NOT NULL
+ link_to INTEGER REFERENCES post(id) ON DELETE CASCADE NOT NULL,
+ PRIMARY KEY (link_from, link_to)
);
-CREATE TABLE IF NOT EXISTS tag(
+CREATE TABLE IF NOT EXISTS tag (
post_id INTEGER REFERENCES post(id) ON DELETE CASCADE NOT NULL,
- name TEXT NOT NULL
+ name TEXT NOT NULL,
+ PRIMARY KEY (post_id, name)
+);
+
+CREATE TABLE IF NOT EXISTS file (
+ file_url TEXT,
+ file_name TEXT,
+ file_md5 TEXT
);
+ {{ line|quotelink(links[post.id]) }}
{% else %} - {{ line|quotelink(post) }}
+ {{ line|quotelink(links[post.id]) }}
{% endif %} {% endfor %}