forks/microblog.pub
1
0
Fork 1
mirror of https://git.sr.ht/~tsileo/microblog.pub synced 2024-11-15 03:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add a way to hide sensitive content once it's displayed

Browse source
This commit is contained in:
Thomas Sileo 2019-08-16 12:04:23 +02:00
parent a9fa483bcc
commit 558fb9c310
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/activitypub.py
View file

@ -29,9 +29,11 @@ from config import ID
from config import KEY from config import KEY
from config import ME from config import ME
from config import USER_AGENT from config import USER_AGENT
from core.db import find_one_activity
from core.db import update_many_activities from core.db import update_many_activities
from core.meta import Box from core.meta import Box
from core.meta import MetaKey from core.meta import MetaKey
from core.meta import by_object_id
from core.meta import flag from core.meta import flag
from core.meta import upsert from core.meta import upsert
from core.tasks import Tasks from core.tasks import Tasks
@ -160,6 +162,7 @@ def post_to_inbox(activity: ap.BaseActivity) -> None:
actor.has_type(ap.ActivityType.APPLICATION) actor.has_type(ap.ActivityType.APPLICATION)
and actor.id.endswith("/relay") and actor.id.endswith("/relay")
and activity.has_type(ap.ActivityType.ANNOUNCE) and activity.has_type(ap.ActivityType.ANNOUNCE)
and not find_one_activity(by_object_id(activity.get_object_id()))
and not DB.replies.find_one({"remote_id": activity.id}) and not DB.replies.find_one({"remote_id": activity.id})
): ):
Tasks.process_reply(activity.get_object_id()) Tasks.process_reply(activity.get_object_id())

13
templates/utils.html
View file

@ -156,12 +156,25 @@
<div style="clear:both"> <div style="clear:both">
<form action="{{redir}}" class="action-form" method="GET" style="display:inline-block"> <form action="{{redir}}" class="action-form" method="GET" style="display:inline-block">
<input type="hidden" name="show_sensitive" value="{{perma_id}}"> <input type="hidden" name="show_sensitive" value="{{perma_id}}">
{% if request.path == url_for("admin.admin_lookup") %}
<input type="hidden" name="url" value="{{obj.id}}"> <input type="hidden" name="url" value="{{obj.id}}">
{% endif %}
<button type="submit" class="bar-item-reverse">display sensitive content</button> <button type="submit" class="bar-item-reverse">display sensitive content</button>
</form> </form>
</div> </div>
{% else %} {% else %}
{% if obj.sensitive %}
<div style="clear:both;margin-bottom: 20px;">
<form action="{{redir}}" class="action-form" method="GET" style="display:inline-block">
{% if request.path == url_for("admin.admin_lookup") %}
<input type="hidden" name="url" value="{{obj.id}}">
{% endif %}
<button type="submit" class="bar-item-reverse">hide sensitive content</button>
</form>
</div>
{% endif %}
{% if obj.attachment | not_only_imgs %} {% if obj.attachment | not_only_imgs %}
<h3 class="l">Attachments</h3> <h3 class="l">Attachments</h3>
<ul style="padding:0;"> <ul style="padding:0;">