Improve stream content

main
Thomas Sileo 2022-07-17 09:32:04 +02:00
parent 4a48079360
commit e8dd1a549c
3 changed files with 26 additions and 10 deletions

View File

@ -2,6 +2,7 @@
import uuid import uuid
from collections import defaultdict from collections import defaultdict
from dataclasses import dataclass from dataclasses import dataclass
from datetime import timedelta
from urllib.parse import urlparse from urllib.parse import urlparse
import fastapi import fastapi
@ -32,6 +33,7 @@ from app.source import markdownify
from app.uploads import upload_to_attachment from app.uploads import upload_to_attachment
from app.utils import opengraph from app.utils import opengraph
from app.utils import webmentions from app.utils import webmentions
from app.utils.datetime import as_utc
from app.utils.datetime import now from app.utils.datetime import now
from app.utils.datetime import parse_isoformat from app.utils.datetime import parse_isoformat
@ -435,9 +437,8 @@ async def _compute_recipients(
return recipients return recipients
async def _get_followers_recipients(db_session: AsyncSession) -> set[str]: async def _get_followers(db_session: AsyncSession) -> list[models.Follower]:
"""Returns all the recipients from the local follower collection.""" return (
followers = (
( (
await db_session.scalars( await db_session.scalars(
select(models.Follower).options(joinedload(models.Follower.actor)) select(models.Follower).options(joinedload(models.Follower.actor))
@ -446,8 +447,13 @@ async def _get_followers_recipients(db_session: AsyncSession) -> set[str]:
.unique() .unique()
.all() .all()
) )
async def _get_followers_recipients(db_session: AsyncSession) -> set[str]:
"""Returns all the recipients from the local follower collection."""
followers = await _get_followers(db_session)
return { return {
follower.actor.shared_inbox_url or follower.actor.inbox_url follower.actor.shared_inbox_url or follower.actor.inbox_url # type: ignore
for follower in followers for follower in followers
} }
@ -756,6 +762,9 @@ async def _process_note_object(
if "published" in ro.ap_object: if "published" in ro.ap_object:
ap_published_at = parse_isoformat(ro.ap_object["published"]) ap_published_at = parse_isoformat(ro.ap_object["published"])
followers = await _get_followers(db_session)
is_from_followers = ro.actor.ap_id in {f.ap_actor_id for f in followers}
is_reply = bool(ro.in_reply_to) is_reply = bool(ro.in_reply_to)
is_local_reply = ro.in_reply_to and ro.in_reply_to.startswith(BASE_URL) is_local_reply = ro.in_reply_to and ro.in_reply_to.startswith(BASE_URL)
is_mention = False is_mention = False
@ -778,7 +787,9 @@ async def _process_note_object(
relates_to_outbox_object_id=None, relates_to_outbox_object_id=None,
activity_object_ap_id=ro.activity_object_ap_id, activity_object_ap_id=ro.activity_object_ap_id,
# Hide replies from the stream # Hide replies from the stream
is_hidden_from_stream=not (not is_reply or is_mention or is_local_reply), is_hidden_from_stream=not (
(not is_reply and is_from_followers) or is_mention or is_local_reply
),
) )
db_session.add(inbox_object) db_session.add(inbox_object)
@ -1032,8 +1043,12 @@ async def save_to_inbox(
# This is announce for a maybe unknown object # This is announce for a maybe unknown object
if relates_to_inbox_object: if relates_to_inbox_object:
# We already know about this object, show the announce in the # We already know about this object, show the announce in the
# streal # stream if it's not already there
inbox_object.is_hidden_from_stream = False if (
now()
- as_utc(relates_to_inbox_object.ap_published_at) # type: ignore
) > timedelta(hours=1):
inbox_object.is_hidden_from_stream = False
else: else:
# Save it as an inbox object # Save it as an inbox object
if not activity_ro.activity_object_ap_id: if not activity_ro.activity_object_ap_id:
@ -1067,7 +1082,6 @@ async def save_to_inbox(
) )
else: else:
if activity_ro.ap_type == "Like": if activity_ro.ap_type == "Like":
# TODO(ts): notification
relates_to_outbox_object.likes_count = ( relates_to_outbox_object.likes_count = (
models.OutboxObject.likes_count + 1 models.OutboxObject.likes_count + 1
) )
@ -1080,7 +1094,6 @@ async def save_to_inbox(
) )
db_session.add(notif) db_session.add(notif)
elif activity_ro.ap_type == "Announce": elif activity_ro.ap_type == "Announce":
# TODO(ts): notification
relates_to_outbox_object.announces_count = ( relates_to_outbox_object.announces_count = (
models.OutboxObject.announces_count + 1 models.OutboxObject.announces_count + 1
) )

View File

@ -75,7 +75,6 @@ _RESIZED_CACHE: MutableMapping[tuple[str, int], tuple[bytes, str, Any]] = LFUCac
# TODO(ts): # TODO(ts):
# #
# Next: # Next:
# - fix stream (only content from follows + mention, and dedup shares)
# - allow to undo follow requests # - allow to undo follow requests
# - indieauth tweaks # - indieauth tweaks
# - API for posting notes # - API for posting notes

View File

@ -10,3 +10,7 @@ def parse_isoformat(isodate: str) -> datetime:
def now() -> datetime: def now() -> datetime:
return datetime.now(timezone.utc) return datetime.now(timezone.utc)
def as_utc(dt: datetime) -> datetime:
return dt.replace(tzinfo=timezone.utc)