Re-enable the remote follow

app.py

@@ -211,9 +211,9 @@ def login_required(f):
 
 def _api_required():
     if session.get('logged_in'):
-        #if request.method not in ['GET', 'HEAD']:
+        if request.method not in ['GET', 'HEAD']:
-        #    # If a standard API request is made with a "login session", it must havw a CSRF token
+            # If a standard API request is made with a "login session", it must havw a CSRF token
-        #    csrf.protect()
+            csrf.protect()
         return
 
     # Token verification
@@ -325,12 +325,12 @@ def login():
 
 
 @app.route('/remote_follow', methods=['GET', 'POST'])
-@login_required
 def remote_follow():
     if request.method == 'GET':
         return render_template('remote_follow.html')
 
-    return redirect(get_remote_follow_template('@'+request.form.get('profile')).format(uri=ID))
+    csrf.protect()
+    return redirect(get_remote_follow_template('@'+request.form.get('profile')).format(uri=f'{USERNAME}@{DOMAIN}'))
 
 
 @app.route('/authorize_follow', methods=['GET', 'POST'])
@@ -373,7 +373,6 @@ def u2f_register():
 
 @app.route('/')
 def index():
-    print(request.headers.get('Accept'))
     if is_api_request():
         return jsonify(**ME)
 
@@ -412,6 +411,41 @@ def index():
     )
 
 
+@app.route('/with_replies')
+def with_replies():
+    limit = 50
+    q = {
+        'type': 'Create',
+        'activity.object.type': 'Note',
+        'meta.deleted': False,
+    }
+    c = request.args.get('cursor')
+    if c:
+        q['_id'] = {'$lt': ObjectId(c)}
+
+    outbox_data = list(DB.outbox.find({'$or': [q, {'type': 'Announce', 'meta.undo': False}]}, limit=limit).sort('_id', -1))
+    cursor = None
+    if outbox_data and len(outbox_data) == limit:
+        cursor = str(outbox_data[-1]['_id'])
+
+    for data in outbox_data:
+        if data['type'] == 'Announce':
+            print(data)
+            if data['activity']['object'].startswith('http'):
+                data['ref'] = {'activity': {'object': OBJECT_SERVICE.get(data['activity']['object'])}, 'meta': {}}
+
+
+    return render_template(
+        'index.html',
+        me=ME,
+        notes=DB.inbox.find({'type': 'Create', 'activity.object.type': 'Note', 'meta.deleted': False}).count(),
+        followers=DB.followers.count(),
+        following=DB.following.count(),
+        outbox_data=outbox_data,
+        cursor=cursor,
+    )
+
+
 def _build_thread(data, include_children=True):
     data['_requested'] = True
     root_id = data['meta'].get('thread_root_parent', data['activity']['object']['id'])

templates/header.html

@@ -11,6 +11,7 @@
 <div class="menu">
 <ul>
 <li><a href="/" {% if request.path == "/" %}class="selected"{% endif %}>/</a></li>
+<li><a href="/with_replies" {% if request.path == "/with_replies" %}class="selected"{% endif %}>/with_replies</a></li>
 <li><a href="/followers"{% if request.path == "/followers" %} class="selected" {% endif %}>/followers</a></li>
 <li><a href="/following"{% if request.path == "/following" %} class="selected" {% endif %}>/following</a></li>
 <!-- <li><a href="/about"{% if request.path == "/about" %} class="selected" {% endif %}>/about</a></li>
@@ -22,8 +23,7 @@
 <li><a href="/admin"{% if request.path == "/admin" %} class="selected" {% endif %}>/admin</a></li>
 <li><a href="/logout">/logout</a></li>
 {% else %}
-<!-- <li><a href="/remote_follow"{% if request.path == "/remote_follow" %} class="selected" {% endif %}>/remote_follow</a></li>
+<li><a href="/remote_follow"{% if request.path == "/remote_follow" %} class="selected" {% endif %}>/remote_follow</a></li>
-!-->
 {% endif %}
 </ul>
 </div>

templates/remote_follow.html

@@ -5,9 +5,10 @@
 {% block content %}
 <div id="container">
 {% include "header.html" %}
-<h2>You're about to follow me</h2>
+<h2 style="font-weight:normal">You're about to follow me <small style="font-weight:normal;font-family:sans-serif">\o/</small></h2>
 
 <form method="POST" action="">
+	<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
 	<input type="text" name="profile" placeholder="you@your-instance">
 	<input type="submit" value="Proceed to remote follow">
 </form>