fix(backend,frontend): expired story keeps its kind and archive heals stories that lost it, phone inputs no longer zoom the page
This commit is contained in:
1 parent
d9378056f4
commit
acfa726e61
7 files changed
+69
-9
No files matched your search
@@ -6,7 +6,7 @@ _UPSERT_STORY = """
|
||||
INSERT INTO stories
|
||||
(account_id, peer_id, story_id, date, expire_date, caption, media_kind,
|
||||
storage_key, file_size, downloaded, views, pinned, deleted, raw, observed_at)
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14::jsonb, now())
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, false, $13::jsonb, now())
|
||||
ON CONFLICT (account_id, peer_id, story_id) DO UPDATE SET
|
||||
date = EXCLUDED.date,
|
||||
expire_date = EXCLUDED.expire_date,
|
||||
@@ -17,10 +17,17 @@ ON CONFLICT (account_id, peer_id, story_id) DO UPDATE SET
|
||||
downloaded = stories.downloaded OR EXCLUDED.downloaded,
|
||||
views = EXCLUDED.views,
|
||||
pinned = EXCLUDED.pinned,
|
||||
deleted = EXCLUDED.deleted,
|
||||
deleted = false,
|
||||
raw = EXCLUDED.raw
|
||||
"""
|
||||
|
||||
_MARK_DELETED = """
|
||||
INSERT INTO stories
|
||||
(account_id, peer_id, story_id, downloaded, pinned, deleted, raw, observed_at)
|
||||
VALUES ($1, $2, $3, false, false, true, '{}'::jsonb, now())
|
||||
ON CONFLICT (account_id, peer_id, story_id) DO UPDATE SET deleted = true
|
||||
"""
|
||||
|
||||
|
||||
async def is_downloaded(
|
||||
pool: asyncpg.Pool, account_id: int, peer_id: int, story_id: int
|
||||
@@ -51,7 +58,6 @@ async def upsert_story( # noqa: PLR0913
|
||||
raw: str,
|
||||
*,
|
||||
pinned: bool,
|
||||
deleted: bool,
|
||||
downloaded: bool,
|
||||
) -> None:
|
||||
await pool.execute(
|
||||
@@ -68,6 +74,11 @@ async def upsert_story( # noqa: PLR0913
|
||||
downloaded,
|
||||
views,
|
||||
pinned,
|
||||
deleted,
|
||||
raw,
|
||||
)
|
||||
|
||||
|
||||
async def mark_deleted(
|
||||
pool: asyncpg.Pool, account_id: int, peer_id: int, story_id: int
|
||||
) -> None:
|
||||
await pool.execute(_MARK_DELETED, account_id, peer_id, story_id)
|
||||
Reference in new issue
Block a user