Compare commits
2 Commits
decoupling
...
a626dd849d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a626dd849d | ||
|
|
d0b1edea7a |
@@ -25,6 +25,15 @@
|
||||
{% endcall %}
|
||||
</div>
|
||||
|
||||
{# Container nav widgets (market links, etc.) #}
|
||||
{% if container_nav_widgets %}
|
||||
{% for wdata in container_nav_widgets %}
|
||||
{% with ctx=wdata.ctx %}
|
||||
{% include wdata.widget.template with context %}
|
||||
{% endwith %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
{# Admin link #}
|
||||
{% if g.rights.admin %}
|
||||
{% from 'macros/admin_nav.html' import admin_nav_item %}
|
||||
|
||||
@@ -22,6 +22,14 @@
|
||||
{% endcall %}
|
||||
</div>
|
||||
|
||||
{% if container_nav_widgets %}
|
||||
{% for wdata in container_nav_widgets %}
|
||||
{% with ctx=wdata.ctx %}
|
||||
{% include wdata.widget.template with context %}
|
||||
{% endwith %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
{# Admin link #}
|
||||
{% if g.rights.admin %}
|
||||
|
||||
|
||||
@@ -53,6 +53,10 @@ async def try_publish(
|
||||
elif activity_type == "Delete":
|
||||
return # never published, nothing to delete
|
||||
|
||||
# Delete must reference the same object id Mastodon received in Create
|
||||
if activity_type == "Delete" and existing:
|
||||
object_data["id"] = existing.activity_id + "/object"
|
||||
|
||||
try:
|
||||
await services.federation.publish_activity(
|
||||
session,
|
||||
|
||||
Reference in New Issue
Block a user