From 1ecf9b262ba0646886e45d9c9354ade282bbf458 Mon Sep 17 00:00:00 2001
From: Flancian <0@flancia.org>
Date: Sun, 27 Dec 2020 20:41:59 +0100
Subject: [PATCH] Add support for push links.

---
 app/agora.py                     |  8 +++-----
 app/db.py                        |  6 +++---
 app/templates/links.html         |  2 +-
 app/templates/node_rendered.html | 17 +++++++----------
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/app/agora.py b/app/agora.py
index 631f5ad..a992fa2 100644
--- a/app/agora.py
+++ b/app/agora.py
@@ -110,15 +110,13 @@ def pull(node):
 @bp.route('/wikilink/<node>') # alias for now
 def wikilink(node):
 
-    n = db.wikilink_to_node(node)
+    n = G.node(node)
     return render_template(
             'node_rendered.html', 
-            wikilink=node, 
-            subnodes=db.subnodes_by_wikilink(node), 
-            pull_nodes=n.pull_nodes() if n else [],
-            # backlinks=db.nodes_by_outlink(node),
+            node=n,
             backlinks=[x.wikilink for x in db.nodes_by_outlink(node)],
             pushlinks=n.push_links() if n else [],
+            pull_nodes=n.pull_nodes() if n else [],
             forwardlinks=n.forward_links() if n else [],
             )
 
diff --git a/app/db.py b/app/db.py
index 9f28d16..bbbd0e3 100644
--- a/app/db.py
+++ b/app/db.py
@@ -201,9 +201,9 @@ class Subnode:
         """
 
         # TODO: test.
-        pull_nodes = subnode_to_actions(self, 'pull')
-        entities = content_to_forward_links("\n".join(pull_nodes))
-        return [Node(entity) for entity in entities]
+        pull_blocks = subnode_to_actions(self, 'pull')
+        pull_nodes = content_to_forward_links("\n".join(pull_blocks))
+        return [G.node(node) for node in pull_nodes]
 
     def push_links(self):
         """
diff --git a/app/templates/links.html b/app/templates/links.html
index 6a50f17..197c28d 100644
--- a/app/templates/links.html
+++ b/app/templates/links.html
@@ -34,7 +34,7 @@
     -->
 
     <div class="pulllinks">
-        <span class="pulllinks-header">pulled</span><br />
+        <span class="pulllinks-header">↑ pulled</span><br />
     {% for node in pull_nodes %}
     <a href="/node/{{node.uri}}">{{node.uri}}</a><br />
     {% endfor %}
diff --git a/app/templates/node_rendered.html b/app/templates/node_rendered.html
index e6dfc94..f76dea9 100644
--- a/app/templates/node_rendered.html
+++ b/app/templates/node_rendered.html
@@ -16,21 +16,21 @@
 
 {% extends "base.html" %}
 {% block content %}
-{% if not subnodes %}
+{% if not node %}
 <div class="not-found">
-No node found at [[{{wikilink}}]]. 
+No node found at [[{{node}}]]. 
 <br /><br />
-If you <a href="https://flancia.org/go/agora">contributed a subnode</a> named '{{wikilink}}' to the Agora, this node would exist :)
+If you <a href="https://flancia.org/go/agora">contributed a subnode</a> that mapped to '{{node}}' in the Agora, this node would exist :)
 <br /><br />
-Try listing <a href="/nodes">nodes</a> or perhaps <a href="/search">search</a>.
+Try listing all <a href="/nodes">nodes</a> or perhaps <a href="/search">search</a>.
 </div>
 {% endif %}
 
-{% if subnodes %}
+{% if node %}
 <div class="node">
-<span class="node-header"><strong>Node</strong> <a href="/node/{{wikilink}}">[[{{wikilink}}]]</a></span>
+<span class="node-header"><strong>Node</strong> <a href="/node/{{node.uri}}">[[{{node.uri}}]]</a></span>
 
-{% for subnode in subnodes %}
+{% for subnode in node.subnodes %}
 <div class="subnode">
     <span class="subnode-header"><strong>Subnode</strong> <a href="{{subnode.url}}">{{subnode.uri}}</a> by <a href="/@{{subnode.user}}">@{{subnode.user}}</a></span>
 {{ subnode.content|markdown|linkify|safe }}
@@ -39,11 +39,9 @@ Try listing <a href="/nodes">nodes</a> or perhaps <a href="/search">search</a>.
 </div>
 {% endif %}
 
-<!--
 {% for node in pull_nodes %}
 <div class="node">
 <span class="node-header"><strong>Pulled node</strong> <a href="/node/{{node.uri}}">[[{{node.uri}}]]</a></span>
-{{node.subnodes}}
 
 {% for subnode in node.subnodes %}
 <div class="subnode">
@@ -53,7 +51,6 @@ Try listing <a href="/nodes">nodes</a> or perhaps <a href="/search">search</a>.
 {% endfor %}
 </div>
 {% endfor %}
--->
 
 {% include "links.html" %}