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

Fix empty tag page

Browse source
This commit is contained in:
Thomas Sileo 2022-08-24 20:52:15 +02:00
parent ae28cf2294
commit 953a6c3b91
2 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/main.py
View file

@ -685,10 +685,10 @@ async def tag_by_name(
.join(models.TaggedOutboxObject) .join(models.TaggedOutboxObject)
.where(*where) .where(*where)
) )
if is_activitypub_requested(request):
if not tagged_count: if not tagged_count:
raise HTTPException(status_code=404) raise HTTPException(status_code=404)
if is_activitypub_requested(request):
outbox_object_ids = await db_session.execute( outbox_object_ids = await db_session.execute(
select(models.OutboxObject.ap_id) select(models.OutboxObject.ap_id)
.join( .join(
@ -736,6 +736,7 @@ async def tag_by_name(
"request": request, "request": request,
"objects": outbox_objects, "objects": outbox_objects,
}, },
status_code=200 if len(outbox_objects) else 404,
) )

34
app/templates/index.html
View file

@ -21,19 +21,21 @@
{% block content %} {% block content %}
{% include "header.html" %} {% include "header.html" %}
<div class="h-feed"> {% if objects %}
<data class="p-name" value="{{ local_actor.display_name}}'s notes"></data>
{% for outbox_object in objects %}
{% if outbox_object.ap_type in ["Note", "Article", "Video", "Question"] %}
{{ utils.display_object(outbox_object) }}
{% elif outbox_object.ap_type == "Announce" %}
<div class="shared-header"><strong>{{ local_actor.display_name }}</strong> shared</div>
{{ utils.display_object(outbox_object.relates_to_anybox_object) }}
{% endif %}
{% endfor %}
</div>
<div class="box"> <div class="h-feed">
<data class="p-name" value="{{ local_actor.display_name}}'s notes"></data>
{% for outbox_object in objects %}
{% if outbox_object.ap_type in ["Note", "Article", "Video", "Question"] %}
{{ utils.display_object(outbox_object) }}
{% elif outbox_object.ap_type == "Announce" %}
<div class="shared-header"><strong>{{ local_actor.display_name }}</strong> shared</div>
{{ utils.display_object(outbox_object.relates_to_anybox_object) }}
{% endif %}
{% endfor %}
</div>
<div class="box">
{% if has_previous_page %} {% if has_previous_page %}
<a href="{{ url_for("index") }}?page={{ current_page - 1 }}">Previous</a> <a href="{{ url_for("index") }}?page={{ current_page - 1 }}">Previous</a>
{% endif %} {% endif %}
@ -41,6 +43,12 @@
{% if has_next_page %} {% if has_next_page %}
<a href="{{ url_for("index") }}?page={{ current_page + 1 }}">Next</a> <a href="{{ url_for("index") }}?page={{ current_page + 1 }}">Next</a>
{% endif %} {% endif %}
</div> </div>
{% else %}
<div style="padding: 20px;">
<p>Nothing to see here yet!</p>
</div>
{% endif %}
{% endblock %} {% endblock %}