askiiart/microblog.pub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:tsileo/microblog.pub

Browse source
This commit is contained in:
Thomas Sileo 2018-07-10 23:02:35 +02:00
commit 9f5b87f47d
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
activitypub.py
View file

@ -24,6 +24,7 @@ from little_boxes import activitypub as ap
from little_boxes import strtobool from little_boxes import strtobool
from little_boxes.activitypub import _to_list from little_boxes.activitypub import _to_list
from little_boxes.backend import Backend from little_boxes.backend import Backend
from little_boxes.errors import ActivityGoneError
from little_boxes.errors import Error from little_boxes.errors import Error
from utils.media import Kind from utils.media import Kind
@ -150,6 +151,8 @@ class MicroblogPubBackend(Backend):
iri = iri.replace("/activity", "") iri = iri.replace("/activity", "")
is_a_note = True is_a_note = True
data = DB.activities.find_one({"box": Box.OUTBOX.value, "remote_id": iri}) data = DB.activities.find_one({"box": Box.OUTBOX.value, "remote_id": iri})
if data and data["meta"]["deleted"]:
raise ActivityGoneError(f"{iri} is gone")
if data and is_a_note: if data and is_a_note:
return data["activity"]["object"] return data["activity"]["object"]
elif data: elif data:
@ -158,6 +161,8 @@ class MicroblogPubBackend(Backend):
# Check if the activity is stored in the inbox # Check if the activity is stored in the inbox
data = DB.activities.find_one({"remote_id": iri}) data = DB.activities.find_one({"remote_id": iri})
if data: if data:
if data["meta"]["deleted"]:
raise ActivityGoneError(f"{iri} is gone")
return data["activity"] return data["activity"]
# Fetch the URL via HTTP # Fetch the URL via HTTP

27
app.py
View file

@ -472,7 +472,9 @@ def admin_login():
session["challenge"] = None session["challenge"] = None
session["logged_in"] = True session["logged_in"] = True
return redirect(request.args.get("redirect") or url_for("admin_notifications")) return redirect(
request.args.get("redirect") or url_for("admin_notifications")
)
else: else:
abort(401) abort(401)
@ -940,7 +942,7 @@ def outbox():
# TODO(tsileo): returns the whole outbox if authenticated # TODO(tsileo): returns the whole outbox if authenticated
q = { q = {
"box": Box.OUTBOX.value, "box": Box.OUTBOX.value,
"meta.deleted": False, # TODO(tsileo): retrieve deleted and expose tombstone "meta.deleted": False,
"type": {"$in": [ActivityType.CREATE.value, ActivityType.ANNOUNCE.value]}, "type": {"$in": [ActivityType.CREATE.value, ActivityType.ANNOUNCE.value]},
} }
return jsonify( return jsonify(
@ -974,9 +976,12 @@ def outbox_detail(item_id):
doc = DB.activities.find_one( doc = DB.activities.find_one(
{"box": Box.OUTBOX.value, "remote_id": back.activity_url(item_id)} {"box": Box.OUTBOX.value, "remote_id": back.activity_url(item_id)}
) )
if not doc:
abort(404)
if doc["meta"].get("deleted", False): if doc["meta"].get("deleted", False):
obj = ap.parse_activity(doc["activity"]) obj = ap.parse_activity(doc["activity"])
resp = jsonify(**obj.get_object().get_tombstone()) resp = jsonify(**obj.get_tombstone().to_dict())
resp.status_code = 410 resp.status_code = 410
return resp return resp
return jsonify(**activity_from_doc(doc)) return jsonify(**activity_from_doc(doc))
@ -984,17 +989,18 @@ def outbox_detail(item_id):
@app.route("/outbox/<item_id>/activity") @app.route("/outbox/<item_id>/activity")
def outbox_activity(item_id): def outbox_activity(item_id):
# TODO(tsileo): handle Tombstone
data = DB.activities.find_one( data = DB.activities.find_one(
{ {"box": Box.OUTBOX.value, "remote_id": back.activity_url(item_id)}
"box": Box.OUTBOX.value,
"remote_id": back.activity_url(item_id),
"meta.deleted": False,
}
) )
if not data: if not data:
abort(404) abort(404)
obj = activity_from_doc(data) obj = activity_from_doc(data)
if data["meta"].get("deleted", False):
obj = ap.parse_activity(data["activity"])
resp = jsonify(**obj.get_object().get_tombstone().to_dict())
resp.status_code = 410
return resp
if obj["type"] != ActivityType.CREATE.value: if obj["type"] != ActivityType.CREATE.value:
abort(404) abort(404)
return jsonify(**obj["object"]) return jsonify(**obj["object"])
@ -1002,7 +1008,6 @@ def outbox_activity(item_id):
@app.route("/outbox/<item_id>/replies") @app.route("/outbox/<item_id>/replies")
def outbox_activity_replies(item_id): def outbox_activity_replies(item_id):
# TODO(tsileo): handle Tombstone
if not is_api_request(): if not is_api_request():
abort(404) abort(404)
data = DB.activities.find_one( data = DB.activities.find_one(
@ -1038,7 +1043,6 @@ def outbox_activity_replies(item_id):
@app.route("/outbox/<item_id>/likes") @app.route("/outbox/<item_id>/likes")
def outbox_activity_likes(item_id): def outbox_activity_likes(item_id):
# TODO(tsileo): handle Tombstone
if not is_api_request(): if not is_api_request():
abort(404) abort(404)
data = DB.activities.find_one( data = DB.activities.find_one(
@ -1077,7 +1081,6 @@ def outbox_activity_likes(item_id):
@app.route("/outbox/<item_id>/shares") @app.route("/outbox/<item_id>/shares")
def outbox_activity_shares(item_id): def outbox_activity_shares(item_id):
# TODO(tsileo): handle Tombstone
if not is_api_request(): if not is_api_request():
abort(404) abort(404)
data = DB.activities.find_one( data = DB.activities.find_one(