Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions activities/migrations/0029_post_url_db_index.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
from django.contrib.postgres.operations import AddIndexConcurrently
from django.db import migrations, models


class Migration(migrations.Migration):
atomic = False

dependencies = [
("activities", "0028_previewcard_post_preview_card"),
]

operations = [
AddIndexConcurrently(
model_name="post",
index=models.Index(fields=["url"], name="activities_post_url_idx"),
),
]
1 change: 1 addition & 0 deletions activities/models/post.py
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,7 @@ class Meta:
fields=["visibility", "local", "created"],
name="ix_post_local_public_created",
),
models.Index(fields=["url"], name="activities_post_url_idx"),
]

class urls(urlman.Urls):
Expand Down
13 changes: 6 additions & 7 deletions api/views/statuses.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from datetime import timedelta
from typing import Literal

from django.db.models import Q
from django.http import HttpRequest
from api.views import get_object_or_404
from django.utils import timezone
Expand Down Expand Up @@ -123,12 +122,12 @@ def _extract_quote_from_trailing_url(
if not match:
return None, text
url = match.group(2)
post = (
Post.objects.not_hidden()
.visible_to(identity, include_replies=True)
.filter(Q(object_uri=url) | Q(url=url))
.first()
)
# Look up by object_uri first (unique index), then fall back to url.
# Avoids an OR query that causes a full table scan on large tables.
base_qs = Post.objects.not_hidden().visible_to(identity, include_replies=True)
post = base_qs.filter(object_uri=url).first()
if post is None:
post = base_qs.filter(url=url).first()
if not post:
return None, text
cleaned = text[: match.start(2)].rstrip("\n ")
Expand Down
Loading